[libmatio] 45/48: * Team upload release 1.5.2-3 to unstable. * Support hdf5 1.8.13 new packaging layout (closes: #756675).

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository libmatio.

commit 3d6d9018e10a30f214f235fa076509b58fc0bb5e
Author: Gilles Filippini <pini at debian.org>
Date:   Sat Aug 2 09:41:49 2014 +0000

    * Team upload release 1.5.2-3 to unstable.
    * Support hdf5 1.8.13 new packaging layout (closes: #756675).
---
 debian/changelog |  7 +++++++
 debian/rules     | 10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a4f977..06d7319 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libmatio (1.5.2-3) unstable; urgency=medium
+
+  * Team upload.
+  * Support hdf5 1.8.13 new packaging layout (closes: #756675).
+
+ -- Gilles Filippini <pini at debian.org>  Sat, 02 Aug 2014 11:02:07 +0200
+
 libmatio (1.5.2-2) unstable; urgency=medium
 
   * Use plain dh-autoreconf. (Closes: #753521)
diff --git a/debian/rules b/debian/rules
index a27a338..1c70aca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
 
-DEB_CONFIGURE_NORMAL_ARGS += --enable-shared --with-hdf5 --enable-fortran --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
-DEB_MAKE_BUILD_TARGET     := libmatio_la_LIBADD="-lz -lhdf5"
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+  WITH_HDF5:=--with-hdf5=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+else
+  WITH_HDF5:=--with-hdf5
+endif
+
+DEB_CONFIGURE_NORMAL_ARGS += --enable-shared $(WITH_HDF5) --enable-fortran --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+DEB_MAKE_BUILD_TARGET     := libmatio_la_LIBADD="\$$(ZLIB_LIBS) \$$(HDF5_LIBS)"
 DEB_COMPRESS_EXCLUDE := .pdf
 
 install/libmatio-doc::

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