[libpdl-io-hdf5-perl] 07/07: Imported Debian patch 0.6501-2
Bas Couwenberg
sebastic at debian.org
Sun Jun 12 17:42:52 UTC 2016
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 dd42ac27e98c0f57639cb7fd524aa138ae20aa7a
Merge: b7758df ec476a4
Author: Henning Glawe <glaweh at debian.org>
Date: Sat Sep 27 15:06:53 2014 +0200
Imported Debian patch 0.6501-2
COPYRIGHT | 3 +
ChangeLog | 420 -------------------------------
HDF5/Dataset.pm | 267 +++++++++++++++++---
HDF5/Group.pm | 141 ++++++++++-
MANIFEST | 23 ++
META.json | 64 +++++
META.yml | 34 +++
Makefile.PL | 131 +++++++---
README | 18 +-
Release_Notes | 50 ++++
debian/changelog | 15 ++
debian/control | 4 +-
debian/patches/ccflags-5.14.patch | 14 +-
debian/patches/clean_newFile_hd5.patch | 2 +-
debian/patches/support-hdf5-1.8.13.patch | 87 +++++--
debian/rules | 15 +-
hdf5.pd | 178 ++++++++++---
t/attribPDL.t | 266 +++++++++++---------
t/file.t | 24 +-
t/group.t | 58 ++---
t/reference.t | 42 ++++
t/total.t | 86 +++----
t/unlink.t | 38 +++
t/vlenString.t | 32 +--
t/xData.t | 40 +++
t/ztotal_index.t | 33 +--
tkviewtest | 3 +-
typemap | 9 +-
varlen.h5 => varlen.hdf5 | Bin 12288 -> 12360 bytes
29 files changed, 1246 insertions(+), 851 deletions(-)
diff --cc debian/changelog
index 1ee2516,0000000..9a74bcc
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,43 -1,0 +1,58 @@@
++libpdl-io-hdf5-perl (0.6501-2) unstable; urgency=low
++
++ * update library detection scheme in Makefile.PL, which previously
++ caused an rpath to be set, in turn leading to a rejection of the
++ previous upload
++
++ -- Henning Glawe <glaweh at debian.org> Sat, 27 Sep 2014 15:06:53 +0200
++
++libpdl-io-hdf5-perl (0.6501-1) unstable; urgency=low
++
++ * new upstream version
++ * update standards-version
++
++ -- Henning Glawe <glaweh at debian.org> Sat, 27 Sep 2014 13:17:19 +0200
++
+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
+
+ -- Henning Glawe <glaweh at debian.org> Thu, 31 May 2012 09:11:32 +0200
+
+libpdl-io-hdf5-perl (0.63-2) unstable; urgency=low
+
+ * update pdl dependency to >= 1:2.4.11 (I did not put the epoch before)
+
+ -- Henning Glawe <glaweh at debian.org> Mon, 28 May 2012 14:10:49 +0200
+
+libpdl-io-hdf5-perl (0.63-1) unstable; urgency=low
+
+ * new upstream version (closes: #663598, #670667)
+ * acknowledge NMU
+ * switch to source format "3.0 (quilt)"
+
+ -- Henning Glawe <glaweh at debian.org> Mon, 28 May 2012 11:35:00 +0200
+
+libpdl-io-hdf5-perl (0.6-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add $Config{ccflags} to CCFLAGS, to fix FTBFS with perl 5.14
+ (Closes: #636656)
+
+ -- Dominic Hargreaves <dom at earth.li> Sat, 20 Aug 2011 18:27:30 +0100
+
+libpdl-io-hdf5-perl (0.6-1) unstable; urgency=low
+
+ * Initial release. (Closes: #580696: ITP: libpdl-io-hdf5-perl -- PDL
+ Interface to the HDF5 Data Format)
+ (Closes: #478079: pdl: Please enable HDF5 support)
+
+ -- Henning Glawe <glaweh at debian.org> Sun, 09 May 2010 12:36:55 +0200
diff --cc debian/control
index f46ce63,0000000..a24e176
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,24 -1,0 +1,24 @@@
+Source: libpdl-io-hdf5-perl
+Section: perl
+Priority: optional
+Build-Depends:
+ libhdf5-serial-dev,
- pdl (>>1:2.4.11-3),
++ pdl (>=1:2.007),
+ perl,
+ debhelper (>= 9),
+ dpkg-dev (>= 1.16.1~)
+Maintainer: Henning Glawe <glaweh at debian.org>
- Standards-Version: 3.9.3
++Standards-Version: 3.9.5
+Homepage: http://search.cpan.org/dist/PDL-IO=HDF5/
+
+Package: libpdl-io-hdf5-perl
+Architecture: any
+Depends:
+ ${pdl:Depends},
+ ${shlibs:Depends},
+ ${perl:Depends},
+ ${misc:Depends}
+Description: PDL Interface to the HDF5 Data Format.
+ This package provides an object-oriented interface for PDLs to the HDF5
+ data-format. Information on the HDF5 Format can be found at the NCSA's web
+ site at http://www.hdfgroup.org .
diff --cc debian/patches/ccflags-5.14.patch
index f91125c,0000000..7ae8d6d
mode 100644,000000..100644
--- a/debian/patches/ccflags-5.14.patch
+++ b/debian/patches/ccflags-5.14.patch
@@@ -1,11 -1,0 +1,11 @@@
+--- a/Makefile.PL
++++ b/Makefile.PL
- @@ -131,7 +131,7 @@
- $package = ["hdf5.pd",HDF5,PDL::IO::HDF5];
++@@ -193,7 +193,7 @@
++
+ WriteMakefile(
+ 'NAME' => 'PDL::IO::HDF5',
- - 'CCFLAGS' => "$define_bool $define_win32HDF -DH5_USE_16_API -g",
- + 'CCFLAGS' => "$define_bool $define_win32HDF -DH5_USE_16_API $Config{ccflags}",
- 'PREREQ_PM' => { PDL => 2.1 },
- 'VERSION_FROM' => 'hdf5.pd',
- 'TYPEMAPS' => [&PDL_TYPEMAP()],
++- 'CCFLAGS' => "$Config{ccflags} $define_bool $define_win32HDF -DH5_USE_16_API -g",
+++ 'CCFLAGS' => "$Config{ccflags} $define_bool $define_win32HDF -DH5_USE_16_API $Config{ccflags}",
++ 'CONFIGURE_REQUIRES' => { PDL => '2.004' },
++ 'BUILD_REQUIRES' => { PDL => '2.004' },
++ # 'TEST_REQUIRES' => { PDL => '2.004' },
diff --cc debian/patches/clean_newFile_hd5.patch
index 9651207,0000000..46543c8
mode 100644,000000..100644
--- a/debian/patches/clean_newFile_hd5.patch
+++ b/debian/patches/clean_newFile_hd5.patch
@@@ -1,11 -1,0 +1,11 @@@
+--- a/Makefile.PL
++++ b/Makefile.PL
- @@ -144,7 +144,7 @@
++@@ -211,7 +211,7 @@
+ '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' },
+ );
+
diff --cc debian/patches/support-hdf5-1.8.13.patch
index f71ad85,0000000..812e728
mode 100644,000000..100644
--- a/debian/patches/support-hdf5-1.8.13.patch
+++ b/debian/patches/support-hdf5-1.8.13.patch
@@@ -1,20 -1,0 +1,71 @@@
- 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'} ) ;
++--- a/Makefile.PL
+++++ b/Makefile.PL
++@@ -43,6 +43,7 @@
++ @libdirs = (
++ $ENV{'HDF5_PATH'}."/lib",
++ $ENV{'HDF5_PATH'}."/lib64",
+++ "$ENV{HDF5_LIBDIR}",
++ '/usr/local/hdf5/lib',
++ '/usr/local/lib',
++ '/opt/local/lib',
++@@ -51,26 +52,24 @@
++ '/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;
+++ at hdf5_lib=(
+++ "libhdf5.so",
+++ "libhdf5_serial.so",
+++ "libhdf5.dll.a",
+++ "libhdf5.a",
+++);
+++
+++dirloop: foreach my $libdir ( @libdirs ) {
+++ foreach my $hdf5_lib_test (@hdf5_lib) {
+++ print STDERR "testing $libdir/$hdf5_lib_test\n";
+++ if (-e "$libdir/$hdf5_lib_test") {
+++ print "Found $hdf5_lib_test at $libdir/$hdf5_lib_test\n";
+++ $hdf5_lib=$hdf5_lib_test;
+++ $hdf5_lib=~s/\..*//;
+++ $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;
++- }
++-
++ }
+
- foreach my $libdir (
- + "$ENV{HDF5_LIBDIR}",
- '/usr/local/hdf5/lib',
- '/usr/local/lib',
- '/opt/local/lib',
- @@ -70,6 +71,7 @@
- }
++ # We don't do a die here, because we would get bogus emails from CPAN testers
++@@ -82,6 +81,7 @@
+
- foreach my $incdir (
- + "$ENV{HDF5_INCDIR}",
- '/usr/local/hdf5/include',
- '/usr/local/include',
- '/opt/local/include',
++ @incdirs = (
++ $ENV{'HDF5_PATH'}."/include",
+++ "$ENV{HDF5_INCDIR}",
++ '/usr/local/hdf5/include',
++ '/usr/local/include',
++ '/opt/local/include',
++@@ -133,7 +133,7 @@
++ print "Defining _HDF5USEDLL_ for win32\n";
++ }
++
++-$LIBS = "-L$hdf5_lib_path -lhdf5 ";
+++$LIBS = "-L$hdf5_lib_path -lhdf5_serial ";
++ $LIBS .= " -lz" if($zLib);
++ $LIBS .= " -ljpeg" if($jpegLib);
++ $LIBS .= " -lm";
diff --cc debian/rules
index 4ee72f5,0000000..86023fb
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,24 -1,0 +1,23 @@@
+#!/usr/bin/make -f
-
++DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+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
++DPKG_EXPORT_BUILDFLAGS = 1
++include /usr/share/dpkg/buildflags.mk
++
++
++export HDF5_INCDIR := /usr/include/hdf5/serial
++export HDF5_LIBDIR := /usr/lib/$(DEB_HOST_MULTIARCH)
+
+build:
+ dh build
+
+clean:
+ dh clean
+# Build architecture-dependent files here.
+override_dh_perl:
+ dh_perl
+ dh_pdl
+
+%:
+ dh $@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libpdl-io-hdf5-perl.git
More information about the Pkg-perl-cvs-commits
mailing list