Bug#756687: netcdf: diff for NMU version 1:4.1.3-7.1

[Gilles Filippini]

tags 756687 + pending
thanks

Dear maintainer,

I've prepared an NMU for netcdf (versioned as 1:4.1.3-7.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

_g.

diff -Nru netcdf-4.1.3/debian/changelog netcdf-4.1.3/debian/changelog
--- netcdf-4.1.3/debian/changelog	2013-10-09 14:50:35.000000000 +0200
+++ netcdf-4.1.3/debian/changelog	2014-08-06 16:30:08.000000000 +0200
@@ -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 (closes: #756687).
+
+ -- 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 -Nru netcdf-4.1.3/debian/rules netcdf-4.1.3/debian/rules
--- netcdf-4.1.3/debian/rules	2013-10-09 14:35:06.000000000 +0200
+++ netcdf-4.1.3/debian/rules	2014-08-06 16:29:31.000000000 +0200
@@ -9,14 +9,19 @@
 # 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