[med-fichier] 01/01: Support hdf5 1.8.13

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository med-fichier.

commit 0c07779547b18a71deba77a1b6d22ac983d22f1c
Author: Gilles Filippini <pini at debian.org>
Date:   Tue Aug 12 23:56:07 2014 +0200

    Support hdf5 1.8.13
---
 debian/changelog |  7 +++++++
 debian/rules     | 12 +++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 803f218..7a5262a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 --git a/debian/rules b/debian/rules
index ccc15cc..1e57d95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/med-fichier.git