[SCM] hdf5 branch, master, updated. debian/1.8.12-3-5-g1d70a08

Tue Jan 7 16:59:59 UTC 2014

The following commit has been merged in the master branch:
commit 4250134132182a823144050462c621aabb056834
Author: Gilles Filippini <pini at debian.org>
Date:   Tue Jan 7 11:14:38 2014 +0100

    Use dh_autoreconf to ease autotools files patching

diff --git a/debian/changelog b/debian/changelog
index 08a388b..95b96cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ hdf5 (1.8.12-4) UNRELEASED; urgency=medium
 
   * Fix a missed s/mpich2/mpich/g. 
   * Remove Pre-Depends for dummy transitional packages.
+  * Use dh_autoreconf{,_clean} to ease autotools files patching.
+  * Refresh patch soname.diff accordingly.
 
  -- Gilles Filippini <pini at debian.org>  Tue, 07 Jan 2014 11:10:16 +0100
 
diff --git a/debian/control b/debian/control
index ce8a2ee..58577d2 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
 Build-Depends: dpkg-dev (>= 1.16.1~), libmpich-dev, zlib1g-dev,
  libopenmpi-dev [!hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>= 9~), sed (>=4.1.5),
  gfortran, libibverbs-dev [!arm64 !arm !hppa !mips !mipsel !s390 !s390x !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
- sharutils, mpi-default-dev, chrpath, autotools-dev
+ sharutils, mpi-default-dev, chrpath, autotools-dev, automake, dh-autoreconf
 Standards-Version: 3.9.4
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/hdf5.git
diff --git a/debian/control.in b/debian/control.in
index 17e9252..abb20d4 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -8,7 +8,7 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
 Build-Depends: dpkg-dev (>= 1.16.1~), libmpich-dev, zlib1g-dev,
  libopenmpi-dev [!hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>= 9~), sed (>=4.1.5),
  gfortran, libibverbs-dev [!arm64 !arm !hppa !mips !mipsel !s390 !s390x !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
- sharutils, mpi-default-dev, chrpath, autotools-dev
+ sharutils, mpi-default-dev, chrpath, autotools-dev, automake, dh-autoreconf
 Standards-Version: 3.9.4
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/hdf5.git
diff --git a/debian/patches/soname.diff b/debian/patches/soname.diff
index 74f076e..78f8c34 100644
--- a/debian/patches/soname.diff
+++ b/debian/patches/soname.diff
@@ -17,19 +17,6 @@ Description: Rollback upstream change from soname 7 => 8.
     
     (I am not planning to put these two functions back)
 Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
-Index: hdf5/c++/src/Makefile.in
-===================================================================
---- hdf5.orig/c++/src/Makefile.in	2013-12-07 15:20:15.000000000 +0100
-+++ hdf5/c++/src/Makefile.in	2013-12-07 15:22:18.000000000 +0100
-@@ -468,7 +468,7 @@
- # See libtool versioning documentation online.
- LT_VERS_INTERFACE = 8
- LT_VERS_REVISION = 1
--LT_VERS_AGE = 0
-+LT_VERS_AGE = 1
- 
- # Include src directory
- INCLUDES = -I$(top_srcdir)/src
 Index: hdf5/config/lt_vers.am
 ===================================================================
 --- hdf5.orig/config/lt_vers.am	2013-12-07 15:20:15.000000000 +0100
@@ -43,68 +30,3 @@ Index: hdf5/config/lt_vers.am
  
  ## If the API changes *at all*, increment LT_VERS_INTERFACE and
  ## reset LT_VERS_REVISION to 0.
-Index: hdf5/fortran/src/Makefile.in
-===================================================================
---- hdf5.orig/fortran/src/Makefile.in	2013-12-07 15:20:15.000000000 +0100
-+++ hdf5/fortran/src/Makefile.in	2013-12-07 15:22:42.000000000 +0100
-@@ -519,7 +519,7 @@
- # See libtool versioning documentation online.
- LT_VERS_INTERFACE = 8
- LT_VERS_REVISION = 1
--LT_VERS_AGE = 0
-+LT_VERS_AGE = 1
- 
- # Include src directory in both Fortran and C flags (C compiler is used
- # for linking).
-Index: hdf5/hl/c++/src/Makefile.in
-===================================================================
---- hdf5.orig/hl/c++/src/Makefile.in	2013-12-07 15:20:15.000000000 +0100
-+++ hdf5/hl/c++/src/Makefile.in	2013-12-07 15:22:58.000000000 +0100
-@@ -459,7 +459,7 @@
- # See libtool versioning documentation online.
- LT_VERS_INTERFACE = 8
- LT_VERS_REVISION = 1
--LT_VERS_AGE = 0
-+LT_VERS_AGE = 1
- 
- # Include src directory
- INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src
-Index: hdf5/hl/fortran/src/Makefile.in
-===================================================================
---- hdf5.orig/hl/fortran/src/Makefile.in	2013-12-07 15:20:15.000000000 +0100
-+++ hdf5/hl/fortran/src/Makefile.in	2013-12-07 15:23:12.000000000 +0100
-@@ -475,7 +475,7 @@
- # See libtool versioning documentation online.
- LT_VERS_INTERFACE = 8
- LT_VERS_REVISION = 1
--LT_VERS_AGE = 0
-+LT_VERS_AGE = 1
- INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \
-          -I$(top_srcdir)/fortran/src -I$(top_builddir)/fortran/src
- 
-Index: hdf5/hl/src/Makefile.in
-===================================================================
---- hdf5.orig/hl/src/Makefile.in	2013-12-07 15:20:15.000000000 +0100
-+++ hdf5/hl/src/Makefile.in	2013-12-07 15:23:23.000000000 +0100
-@@ -458,7 +458,7 @@
- # See libtool versioning documentation online.
- LT_VERS_INTERFACE = 8
- LT_VERS_REVISION = 1
--LT_VERS_AGE = 0
-+LT_VERS_AGE = 1
- 
- # This library is our main target.
- lib_LTLIBRARIES = libhdf5_hl.la
-Index: hdf5/src/Makefile.in
-===================================================================
---- hdf5.orig/src/Makefile.in	2013-12-07 15:20:15.000000000 +0100
-+++ hdf5/src/Makefile.in	2013-12-07 15:23:33.000000000 +0100
-@@ -515,7 +515,7 @@
- # See libtool versioning documentation online.
- LT_VERS_INTERFACE = 8
- LT_VERS_REVISION = 1
--LT_VERS_AGE = 0
-+LT_VERS_AGE = 1
- 
- # Our main target, the HDF5 library
- lib_LTLIBRARIES = libhdf5.la
diff --git a/debian/rules b/debian/rules
index f91e78b..fd14e63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -109,7 +109,8 @@ configure-stamp-debian: debian/control.in
 		ln -sf $$i $(mpichpack).$$j ; \
 		done
 	sed -e "s/@SONAME@/$(soname)/g" debian/shlibs.in > debian/$(serpack).shlibs
-	dh_autotools-dev_updateconfig
+	mkdir -p m4
+	dh_autoreconf
 	touch $@
 
 configure-stamp: configure-stamp-debian
@@ -179,7 +180,8 @@ clean:
 	-rm -rf debian/build-mpich
 	-find debian -type l | xargs rm -f
 	grep -v ^\% debian/control.in | sed -e "s/@SONAME@/$(soname)/g" -e "s/@ARCHS@/$(ARCHS)/" -e "s/@MAJOR_VERSION@/$(major_version)/" > debian/control
-	dh_autotools-dev_restoreconfig
+	dh_autoreconf_clean
+	rm -rf m4
 	dh_clean configure-stamp* build-stamp* install-stamp* debian/*.shlibs
 
 install: build prep install-serial $(install_openmpi) install-mpich install-doc

-- 
Hierarchical Data Format 5 (HDF5)

