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 0f45b42f9c2a2628c32c0b4898690522338173be
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Wed Jun 15 16:51:48 2016 +0200
Refresh patches & add DEP3 headers. Disable ccflags-5.14.patch for now.
---
debian/patches/clean_newFile_hd5.patch | 9 ++--
.../patches/remove-interpreter-from-package.patch | 3 ++
debian/patches/series | 2 +-
debian/patches/support-hdf5-1.8.13.patch | 48 ++++++++--------------
4 files changed, 27 insertions(+), 35 deletions(-)
diff --git a/debian/patches/clean_newFile_hd5.patch
b/debian/patches/clean_newFile_hd5.patch
index 46543c8..43ff19d 100644
--- a/debian/patches/clean_newFile_hd5.patch
+++ b/debian/patches/clean_newFile_hd5.patch
@@ -1,11 +1,14 @@
+Description: clean newFile.hdf5, created in test phase.
+Author: Henning Glawe <gla...@debian.org>
+
--- a/Makefile.PL
+++ b/Makefile.PL
-@@ -211,7 +211,7 @@
+@@ -218,7 +218,7 @@ WriteMakefile(
'INC' => &PDL_INCLUDE()." -I$hdf5_include_path",
'LIBS' => [$LIBS],
'clean' => {'FILES' =>
- 'HDF5.pm HDF5.xs HDF5.o HDF5.c'},
-+ 'HDF5.pm HDF5.xs HDF5.o HDF5.c newFile.hd5'},
- 'dist' => { COMPRESS => 'gzip', SUFFIX => 'gz' },
++ 'HDF5.pm HDF5.xs HDF5.o HDF5.c
newFile.hdf5'},
+ 'dist' => { COMPRESS => 'gzip', SUFFIX => 'gz', PREOP =>
$preop },
);
diff --git a/debian/patches/remove-interpreter-from-package.patch
b/debian/patches/remove-interpreter-from-package.patch
index 3dbfa26..4f23d83 100644
--- a/debian/patches/remove-interpreter-from-package.patch
+++ b/debian/patches/remove-interpreter-from-package.patch
@@ -1,3 +1,6 @@
+Description: Remove interpreter from package.
+Author: Henning Glawe <gla...@debian.org>
+
--- a/HDF5/tkview.pm
+++ b/HDF5/tkview.pm
@@ -1,5 +1,3 @@
diff --git a/debian/patches/series b/debian/patches/series
index 0fdc5b1..0a9db0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
remove-interpreter-from-package.patch
clean_newFile_hd5.patch
-ccflags-5.14.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
index 812e728..fb18a11 100644
--- a/debian/patches/support-hdf5-1.8.13.patch
+++ b/debian/patches/support-hdf5-1.8.13.patch
@@ -1,29 +1,20 @@
+Description: Support HDF5 >= 1.8.13.
+Author: Gilles Filippini <p...@debian.org>
+
--- a/Makefile.PL
+++ b/Makefile.PL
-@@ -43,6 +43,7 @@
+@@ -42,6 +42,7 @@ $ENV{'HDF5_PATH'} = '' unless defined (
@libdirs = (
$ENV{'HDF5_PATH'}."/lib",
$ENV{'HDF5_PATH'}."/lib64",
-+ "$ENV{HDF5_LIBDIR}",
++ $ENV{HDF5_LIBDIR},
+ split(/ /, $Config{libpth}), # TODO: This will break for paths with
spaces
'/usr/local/hdf5/lib',
'/usr/local/lib',
- '/opt/local/lib',
-@@ -51,26 +52,24 @@
+@@ -51,6 +52,26 @@ $ENV{'HDF5_PATH'} = '' unless defined (
'/usr/lib64'
);
push(@libdirs,split(":",$ENV{'LD_LIBRARY_PATH'}));
--foreach my $libdir ( @libdirs ) {
--
-- if (-e "$libdir/libhdf5.so") {
-- $hdf5_lib_path = $libdir;
-- print "Found libhdf5.so at $libdir/libhdf5.so\n";
-- last;
-- }
--
-- if (-e "$libdir/libhdf5.dll.a") {
-- $hdf5_lib_path = $libdir;
-- print "Found libhdf5.so at $libdir/libhdf5.so\n";
-- last;
+@hdf5_lib=(
+ "libhdf5.so",
+ "libhdf5_serial.so",
@@ -41,26 +32,21 @@
+ $hdf5_lib_path = $libdir;
+ last dirloop;
+ }
- }
--
-- if (-e "$libdir/libhdf5.a") {
-- $hdf5_lib_path = $libdir;
-- print "Found libhdf5.a at $libdir/libhdf5.a\n";
-- last;
-- }
--
- }
-
- # We don't do a die here, because we would get bogus emails from CPAN testers
-@@ -82,6 +81,7 @@
++ }
++}
++
+ foreach my $libdir ( @libdirs ) {
+
+ if (-e "$libdir/libhdf5.so") {
+@@ -82,6 +103,7 @@ unless(defined ($hdf5_lib_path) ){
@incdirs = (
$ENV{'HDF5_PATH'}."/include",
-+ "$ENV{HDF5_INCDIR}",
++ $ENV{HDF5_INCDIR},
+ $Config{usrinc},
'/usr/local/hdf5/include',
'/usr/local/include',
- '/opt/local/include',
-@@ -133,7 +133,7 @@
+@@ -134,7 +156,7 @@ if ($Config{'osname'} =~ /win32/i) {
print "Defining _HDF5USEDLL_ for win32\n";
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libpdl-io-hdf5-perl.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
