[netcdf] 01/01: Incorporate NMU for hdf5 transition

[Ross Gammon]

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

ross-guest pushed a commit to branch master
in repository netcdf.

commit 2d36915852314948a2a6e83d9f38d7de42dad111
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Sun Aug 17 13:02:45 2014 +0200

    Incorporate NMU for hdf5 transition
---
 debian/changelog | 7 +++++++
 debian/rules     | 9 +++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b681f17..6f5fc76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+netcdf (1:4.1.3-7.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout.
+
+ -- Gilles Filippini <pini at debian.org>  Thu, 24 Jul 2014 16:11:22 +0200
+
 netcdf (1:4.1.3-7) unstable; urgency=low
 
   * Team upload
diff --git a/debian/rules b/debian/rules
index 3a945c5..a3e36c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,14 +9,19 @@ include /usr/share/cdbs/1/class/autotools.mk
 # skipping of fort-nc4.c without that.
 #
 # Remote sites could be not available at check time, so disabling some tests...
-#DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --enable-pic --enable-docs-install --enable-netcdf-4  --with-hdf5=/usr --with-libcf --enable-dap 
+#DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --enable-pic --enable-docs-install --enable-netcdf-4  --with-libcf --enable-dap 
 # This is useful to avoid remote Nap checks
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --enable-pic --enable-docs-install --enable-netcdf-4  --with-hdf5=/usr --with-libcf --enable-dap --disable-dap-remote-tests
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --enable-pic --enable-docs-install --enable-netcdf-4  --with-libcf --enable-dap --disable-dap-remote-tests
 DEB_CONFIGURE_SCRIPT_ENV += FC="gfortran"
 DEB_CONFIGURE_SCRIPT_ENV += CXX="g++"
 DEB_CONFIGURE_SCRIPT_ENV += CC="gcc"
 DEB_CONFIGURE_SCRIPT_ENV += CPPFLAGS="-DgFortran"
 
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+  CFLAGS += -I/usr/include/hdf5/serial
+  LDFLAGS += -Wl,-L/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+endif
+
 DEB_MAKE_CHECK_TARGET = check
 
 DEB_INSTALL_CHANGELOGS_ALL = $(CURDIR)/RELEASE_NOTES

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git