Source: med-fichier Version: 3.0.6-5 Severity: important Tags: patch User: p...@debian.org Usertags: HDF5-transition
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, The hdf5 1.8.13 package in experimental features a new layout for headers and libraries, so that all the binary packages are now co-installable. Please find attached a patch proposal to support both the current and the new layouts. Because this bug is in the way of the hdf5 transition I intend to NMU in a few days. I apologize for the urge, and I hope this approach won't offend you. Please tell me otherwise. Kind regards, _g. - -- System Information: Debian Release: jessie/sid APT prefers testing APT policy: (500, 'testing'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 3.14-1-486 Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBCAAGBQJT2sRvAAoJEO/obGx//s+DHP0H/2vq1Dz6xjG/3ulL9xxIpgIX +ekyJ5b9mvBeLl0NIZfaPdTo5D9EzXQ0bQadSTuhjU0Y+tfCCvmbIPXpdiBSvYiW 8LMi/20MgJH9EjSmgm59TU34psORbY1h04tKIXPmbC94MUolRuA1Ii8wWRWBsRCj xagiA0yPJlEWBAu9S0OClLfNNzTVKy5UVaZSxQlQxY3B5tnM2Cyk9vVt0sGdQz8E WhibR/XBs0hEFE+6yfU6mubp5yksEWj3BTyN9ZRWjhsz4KpZEIyefxxyUpWexact sevKPFtBLR2qVqj38r6X6tDaTgUPN1rozw0zSas5scWaMoLogjpnNB3BaiodTp4= =v5qk -----END PGP SIGNATURE-----
diff -Nru med-fichier-3.0.6/debian/changelog med-fichier-3.0.6/debian/changelog --- med-fichier-3.0.6/debian/changelog 2014-05-04 10:38:13.000000000 +0200 +++ med-fichier-3.0.6/debian/changelog 2014-07-25 13:15:05.000000000 +0200 @@ -1,3 +1,10 @@ +med-fichier (3.0.6-5.1) unstable; urgency=low + + * Non-maintainer upload. + * Support hdf5 1.8.13 new packaging layout. + + -- Gilles Filippini <p...@debian.org> Fri, 25 Jul 2014 13:15:05 +0200 + med-fichier (3.0.6-5) unstable; urgency=medium * [e70adff] Fix autotests. diff -Nru med-fichier-3.0.6/debian/rules med-fichier-3.0.6/debian/rules --- med-fichier-3.0.6/debian/rules 2014-04-24 23:49:28.000000000 +0200 +++ med-fichier-3.0.6/debian/rules 2014-07-31 10:28:57.000000000 +0200 @@ -2,8 +2,18 @@ %: dh $@ --parallel --with autoreconf +# Which MPI implementation? +# set ARCH_DEFAULT_MPI_IMPL +include /usr/share/mpi-default-dev/debian_defaults + +ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)/libhdf5.so),) + HDF5_CPPFLAGS := -I/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL) -DOMPI_SKIP_MPICXX=1 -DMPICH_SKIP_MPICXX=1 + HDF5_LDFLAGS := -Wl,-L/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL) +endif + export OMPI_MCA_orte_rsh_agent=/bin/false #workaround to start MPI-applications in chroot -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_CPPFLAGS_MAINT_APPEND := -I/usr/include/$(ARCH_DEFAULT_MPI_IMPL) $(HDF5_CPPFLAGS) +export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed $(HDF5_LDFLAGS) override_dh_auto_install: dh_auto_install
