Bug#756678: med-fichier: diff for NMU version 3.0.6-5.1

[Gilles Filippini]

tags 756678 + pending
thanks

Dear maintainer,

I've prepared an NMU for med-fichier (versioned as 3.0.6-5.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

_g.

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-08-06 17:56:29.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 (closes: #756678).
+
+ -- Gilles Filippini <pini at debian.org>  Wed, 06 Aug 2014 17:56:12 +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-08-06 17:56:09.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