[libpdl-io-hdf5-perl] 06/07: Imported Debian patch 0.63-3.1

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository libpdl-io-hdf5-perl.

commit b7758dfd2e747f416e4c61345fc485eee4df55ae
Author: Gilles Filippini <pini at debian.org>
Date:   Wed Aug 6 08:58:17 2014 +0200

    Imported Debian patch 0.63-3.1
---
 debian/changelog                         |  8 ++++++++
 debian/patches/series                    |  1 +
 debian/patches/support-hdf5-1.8.13.patch | 20 ++++++++++++++++++++
 debian/rules                             |  8 ++++++++
 4 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 278152e..1ee2516 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libpdl-io-hdf5-perl (0.63-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * New patch support-hdf5-1.8.13.patch: support hdf5 1.8.13 new
+    packaging layout (closes: #756676, #729343).
+
+ -- Gilles Filippini <pini at debian.org>  Wed, 06 Aug 2014 08:58:17 +0200
+
 libpdl-io-hdf5-perl (0.63-3) unstable; urgency=low
 
   * rebuild with fixed pdl dh_pdl, update build-dep 
diff --git a/debian/patches/series b/debian/patches/series
index 1a2cae9..0fdc5b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 remove-interpreter-from-package.patch
 clean_newFile_hd5.patch
 ccflags-5.14.patch
+support-hdf5-1.8.13.patch
diff --git a/debian/patches/support-hdf5-1.8.13.patch b/debian/patches/support-hdf5-1.8.13.patch
new file mode 100644
index 0000000..f71ad85
--- /dev/null
+++ b/debian/patches/support-hdf5-1.8.13.patch
@@ -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 --git a/debian/rules b/debian/rules
index 1043472..4ee72f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libpdl-io-hdf5-perl.git