[code-saturne] 44/70: * Team upload release 3.3.1-2 to unstable. * Support hdf5 1.8.13 new packaging layout (closes: #756661).

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository code-saturne.

commit 9765dd7ffbd8f35d0e78dcff641196503561f5d8
Author: Gilles Filippini <pini at debian.org>
Date:   Sat Aug 2 10:43:09 2014 +0000

    * Team upload release 3.3.1-2 to unstable.
    * Support hdf5 1.8.13 new packaging layout (closes: #756661).
---
 debian/changelog |  8 ++++++++
 debian/rules     | 11 +++++++++++
 2 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8e36295..ee3d71e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+code-saturne (3.3.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * Support hdf5 1.8.13 new packaging layout (closes: #756661).
+  * debian/control: fix Vcs-* fields.
+
+ -- Gilles Filippini <pini at debian.org>  Thu, 24 Jul 2014 16:15:19 +0200
+
 code-saturne (3.3.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index e2b401b..3c278c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,18 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
 
+# Which MPI implementation?
+# set ARCH_DEFAULT_MPI_IMPL
+include /usr/share/mpi-default-dev/debian_defaults
+
 DEB_CONFIGURE_USER_FLAGS := --with-syrthes=/usr/lib/syrthes/ --with-mpi  --libexecdir=/usr/lib/
+
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)/libhdf5.so),)
+  DEB_CONFIGURE_USER_FLAGS += \
+	--with-hdf5-include=/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL) \
+	--with-hdf5-lib=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)
+endif
+
 #--libdir=/usr/lib/code_saturne
 DEB_MAKE_BUILD_TARGET    := all
 DEB_MAKE_INSTALL_TARGET  := install DESTDIR=`pwd`/debian/tmp

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