r46830 - in /packages/libmatio/trunk/debian: changelog rules

[pini at users.alioth.debian.org]

Author: pini
Date: Sat Aug  2 09:41:49 2014
New Revision: 46830

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

Modified:
    packages/libmatio/trunk/debian/changelog
    packages/libmatio/trunk/debian/rules

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

Modified: packages/libmatio/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libmatio/trunk/debian/rules?rev=46830&op=diff
==============================================================================
--- packages/libmatio/trunk/debian/rules	(original)
+++ packages/libmatio/trunk/debian/rules	Sat Aug  2 09:41:49 2014
@@ -4,8 +4,14 @@
 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::