r46838 - in /packages/code-saturne/trunk/debian: changelog rules

[pini at users.alioth.debian.org]

Author: pini
Date: Sat Aug  2 10:43:09 2014
New Revision: 46838

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46838
Log:
* Team upload release 3.3.1-2 to unstable.
* Support hdf5 1.8.13 new packaging layout (closes: #756661).

Modified:
    packages/code-saturne/trunk/debian/changelog
    packages/code-saturne/trunk/debian/rules

Modified: packages/code-saturne/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/trunk/debian/changelog?rev=46838&op=diff
==============================================================================
--- packages/code-saturne/trunk/debian/changelog	(original)
+++ packages/code-saturne/trunk/debian/changelog	Sat Aug  2 10:43:09 2014
@@ -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

Modified: packages/code-saturne/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/trunk/debian/rules?rev=46838&op=diff
==============================================================================
--- packages/code-saturne/trunk/debian/rules	(original)
+++ packages/code-saturne/trunk/debian/rules	Sat Aug  2 10:43:09 2014
@@ -5,7 +5,18 @@
 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