Source: libmatio
Version: 1.5.2-2
Severity: important
Tags: patch
User: p...@debian.org
Usertags: HDF5-transition

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hi,

The hdf5 1.8.13 package in experimental features a new layout for
headers and libraries, so that all the binary packages are now
co-installable.

Please find attached a patch proposal to support both the current
and the new layouts.

Because this bug is in the way of the hdf5 transition I intend to NMU
in a few days. I apologize for the urge, and I hope this approach won't
offend you. Please tell me otherwise.

Kind regards,

_g.

- -- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (500, 'testing'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.14-1-486
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAEBCAAGBQJT2sL9AAoJEO/obGx//s+DBUkIAI7ZkydEGo5SXs1yO2qVMSES
q9UazUekdh/vX1ZpCM5gAvH04Hua+8rRaP5lyhM8NdWrYoDWPPtVmQF7yvOTFk7x
eZQ52tUmRoEu+oysZOALWgcl+fO96KWzMWDz6zwArhTp757RNhdAuUn0iUNBbXy9
EEgKsj0bRvrS5RHENMcbYPoiHsm4ShVA0RnXA4juZk+rbFax5MplAZ8D8ixbUI2z
Ro0dnvhsSXQurftCInOR/pMFYfgaS9fvD7TubumgY86yrkUXvS5mNstsPVJOlTAB
kxY7nPd/HSHWItm5GPCw3+smvYBzXLVpcHPPAb8lmAS1NXrTQclk4qSkrD3Tg10=
=VcJi
-----END PGP SIGNATURE-----
diff -Nru libmatio-1.5.2/debian/changelog libmatio-1.5.2/debian/changelog
--- libmatio-1.5.2/debian/changelog	2014-07-15 18:06:42.000000000 +0200
+++ libmatio-1.5.2/debian/changelog	2014-07-25 11:36:19.000000000 +0200
@@ -1,3 +1,10 @@
+libmatio (1.5.2-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout.
+
+ -- Gilles Filippini <p...@debian.org>  Fri, 25 Jul 2014 11:36:19 +0200
+
 libmatio (1.5.2-2) unstable; urgency=medium
 
   * Use plain dh-autoreconf. (Closes: #753521)
diff -Nru libmatio-1.5.2/debian/rules libmatio-1.5.2/debian/rules
--- libmatio-1.5.2/debian/rules	2014-07-15 18:00:43.000000000 +0200
+++ libmatio-1.5.2/debian/rules	2014-07-31 10:18:55.000000000 +0200
@@ -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::
-- 
debian-science-maintainers mailing list
debian-science-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers

Reply via email to