diff -Nru aster-11.5.0+dfsg2/debian/changelog aster-11.5.0+dfsg2/debian/changelog --- aster-11.5.0+dfsg2/debian/changelog 2014-06-16 14:04:11.000000000 +0200 +++ aster-11.5.0+dfsg2/debian/changelog 2014-07-24 14:46:25.000000000 +0200 @@ -1,3 +1,10 @@ +aster (11.5.0+dfsg2-2.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Support hdf5 1.8.13 new packaging layout. + + -- Gilles Filippini Thu, 24 Jul 2014 14:46:06 +0200 + aster (11.5.0+dfsg2-2) unstable; urgency=low * Team upload. diff -Nru aster-11.5.0+dfsg2/debian/compat aster-11.5.0+dfsg2/debian/compat --- aster-11.5.0+dfsg2/debian/compat 2014-03-26 11:55:03.000000000 +0100 +++ aster-11.5.0+dfsg2/debian/compat 2014-07-24 15:54:25.000000000 +0200 @@ -1 +1 @@ -8 +9 diff -Nru aster-11.5.0+dfsg2/debian/rules aster-11.5.0+dfsg2/debian/rules --- aster-11.5.0+dfsg2/debian/rules 2014-06-13 09:57:12.000000000 +0200 +++ aster-11.5.0+dfsg2/debian/rules 2014-07-31 08:56:51.000000000 +0200 @@ -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 @@ ./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)))