[aster] 01/02: Support hdf5 1.8.13 new packaging layout

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository aster.

commit 8f7573cbc22f6f719b8977d8d97ebab616f5e7bc
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Aug 4 12:17:04 2014 +0200

    Support hdf5 1.8.13 new packaging layout
    
    and bump debian/compat to 9 to support DEB_<flags>_MAINT_APPEND.
---
 debian/changelog |  8 ++++++++
 debian/compat    |  2 +-
 debian/rules     | 13 ++++++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 31205bcf..fe88e87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+aster (11.5.0+dfsg2-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Support hdf5 1.8.13 new packaging layout (closes: #756659).
+  * Bump debian/compat to 9 to support DEB_<flags>_MAINT_APPEND.
+
+ -- Gilles Filippini <pini at debian.org>  Thu, 24 Jul 2014 14:46:06 +0200
+
 aster (11.5.0+dfsg2-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/rules b/debian/rules
index 000bc84..8f62d01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,16 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+
+# 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),)
+  export DEB_CPPFLAGS_MAINT_APPEND := -I/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL)
+  export DEB_LDFLAGS_MAINT_APPEND := -Wl,-L/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)
+endif
+
 %:
 	dh $@  --with=python2
 
@@ -18,7 +28,8 @@ configure override_dh_auto_configure:
 	./waf configure --install-tests --prefix=/usr \
 		--disable-metis \
 		--build-executable \
-		--enable-mpi
+		--enable-mpi \
+		--enable-hdf5
 
 override_dh_auto_build:
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))

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