Source: libpdl-io-hdf5-perl
Version: 0.63-3
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
iQEcBAEBCAAGBQJT2sNiAAoJEO/obGx//s+DJK4H/3zaTuEVH+gmVD/tJLLa0xUk
45jMJ/cuA3/NGjx9lXIdBsQvdS/lAe9bFL3NPRfrwjR0WLKQOfvl9sw0mNNMrhmC
KEerz6qaJkeCKAafh73US89Gf1uHjGGuyczTsKEKW3bSNHlt6+pXttkcq/IBPwBj
jW6hDx3V8ILOLTwlveOpKIiVg0sBRQzAhsH9fIieaeLDch3q0dRsOp88OfCfzmNJ
92uSt0DO2GYX/YIbSeQ/0+lYnmfnw4zDbd+96kdbsbjUhNXofMda2DoqedYvSCbW
+h9X3114C5lhHuJkA/3REYh5UuhLKg0buEDntMQSfm9yzucTdoBiGuv5yFZpUUY=
=57i5
-----END PGP SIGNATURE-----
diff -Nru libpdl-io-hdf5-perl-0.63/debian/changelog libpdl-io-hdf5-perl-0.63/debian/changelog
--- libpdl-io-hdf5-perl-0.63/debian/changelog 2012-05-31 09:11:55.000000000 +0200
+++ libpdl-io-hdf5-perl-0.63/debian/changelog 2014-07-25 11:42:11.000000000 +0200
@@ -1,3 +1,11 @@
+libpdl-io-hdf5-perl (0.63-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * New patch support-hdf5-1.8.13.patch: support hdf5 1.8.13 new
+ packaging layout.
+
+ -- Gilles Filippini <p...@debian.org> Fri, 25 Jul 2014 11:39:46 +0200
+
libpdl-io-hdf5-perl (0.63-3) unstable; urgency=low
* rebuild with fixed pdl dh_pdl, update build-dep
diff -Nru libpdl-io-hdf5-perl-0.63/debian/patches/series libpdl-io-hdf5-perl-0.63/debian/patches/series
--- libpdl-io-hdf5-perl-0.63/debian/patches/series 2012-05-28 11:46:12.000000000 +0200
+++ libpdl-io-hdf5-perl-0.63/debian/patches/series 2014-07-25 11:42:17.000000000 +0200
@@ -1,3 +1,4 @@
remove-interpreter-from-package.patch
clean_newFile_hd5.patch
ccflags-5.14.patch
+support-hdf5-1.8.13.patch
diff -Nru libpdl-io-hdf5-perl-0.63/debian/patches/support-hdf5-1.8.13.patch libpdl-io-hdf5-perl-0.63/debian/patches/support-hdf5-1.8.13.patch
--- libpdl-io-hdf5-perl-0.63/debian/patches/support-hdf5-1.8.13.patch 1970-01-01 01:00:00.000000000 +0100
+++ libpdl-io-hdf5-perl-0.63/debian/patches/support-hdf5-1.8.13.patch 2014-07-31 10:21:52.000000000 +0200
@@ -0,0 +1,20 @@
+Index: libpdl-io-hdf5-perl-0.63/Makefile.PL
+===================================================================
+--- libpdl-io-hdf5-perl-0.63.orig/Makefile.PL 2014-07-25 11:39:35.000000000 +0200
++++ libpdl-io-hdf5-perl-0.63/Makefile.PL 2014-07-31 10:21:48.402573366 +0200
+@@ -39,6 +39,7 @@
+ $ENV{'HOME'} = '' unless defined( $ENV{'HOME'} ) ;
+
+ foreach my $libdir (
++ "$ENV{HDF5_LIBDIR}",
+ '/usr/local/hdf5/lib',
+ '/usr/local/lib',
+ '/opt/local/lib',
+@@ -70,6 +71,7 @@
+ }
+
+ foreach my $incdir (
++ "$ENV{HDF5_INCDIR}",
+ '/usr/local/hdf5/include',
+ '/usr/local/include',
+ '/opt/local/include',
diff -Nru libpdl-io-hdf5-perl-0.63/debian/rules libpdl-io-hdf5-perl-0.63/debian/rules
--- libpdl-io-hdf5-perl-0.63/debian/rules 2012-05-28 12:27:39.000000000 +0200
+++ libpdl-io-hdf5-perl-0.63/debian/rules 2014-07-31 10:23:31.000000000 +0200
@@ -2,6 +2,14 @@
export DEB_LDFLAGS_MAINT_APPEND:=-Wl,--as-needed
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+ export HDF5_INCDIR := /usr/include/hdf5/serial
+ export HDF5_LIBDIR := /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+else
+ export HDF5_INCDIR := /usr/include
+ export HDF5_LIBDIR := /usr/lib/$(DEB_HOST_MULTIARCH)
+endif
+
build:
dh build
