[SCM] hdf5 branch, upstream, updated. upstream/1.8.4-patch1-79-gbfcb1ff

Francesco Paolo Lovergine frankie at debian.org
Wed Nov 16 10:34:05 UTC 2011


The following commit has been merged in the upstream branch:
commit 5bd540657d2a536527ee240db9cddf6a3750534a
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Oct 9 13:46:18 2008 +0000

    Long due changes

diff --git a/debian/changelog b/debian/changelog
index 16e322c..99142bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hdf5 (1.6.7-1) unstable; urgency=low
+hdf5 (1.6.7-1) UNRELEASED; urgency=low
 
   * New upstream release. This is a bug fix release, but for removing of the
     virtual stream I/O library, which is now stripped out of the main library.
@@ -8,11 +8,19 @@ hdf5 (1.6.7-1) unstable; urgency=low
     --copy; aclocal; autoconf" in the c++/ directory.
   * [LINTIAN] Changed a bit versions used in build-dep to avoid possible breakages. 
   * Homepage field updated in debian/control.in.
+    (closes: #501564)
   * Updated and normalized debian/copyright.
   * Now enabled Fortran (openmpi and mpich only) and C++ (serial only) binding.
     (closes: #470159)
-
- -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 09 Apr 2008 15:06:58 +0200
+  * Dropped -0 suffix in all run-time libraries packages.
+  * Changed SONAMEs and solib names as consequence. Dependencies will require
+    rebuilding in order to use the new libraries. Now SONAMEs uses an
+    ordinary serialization which depends on the upstream versions.
+    Incidentally the new SONAMEs and library names do not conflict with 
+    the old ones.
+  * Now using quilt to manage patches.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 09 Oct 2008 15:44:25 +0200
 
 hdf5 (1.6.6-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3f857ab..f0f4a39 100644
--- a/debian/control
+++ b/debian/control
@@ -10,12 +10,12 @@ Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/hdf5/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/hdf5/trunk
 
-Package: libhdf5-serial-1.6.7-0
+Package: libhdf5-serial-1.6.7
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libhdf5-1.6.7-0
-Provides: libhdf5-1.6.7-0
+Conflicts: libhdf5-1.6.7
+Provides: libhdf5-1.6.7
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -27,7 +27,7 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
 Package: libhdf5-serial-dev
 Section: libdevel
 Architecture: any
-Depends: libhdf5-serial-1.6.7-0 (= ${binary:Version}), libc6-dev, zlib1g-dev, libjpeg62-dev
+Depends: libhdf5-serial-1.6.7 (= ${binary:Version}), zlib1g-dev, libjpeg62-dev
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -39,13 +39,13 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - serial vers
  .
  This package contains development files for serial platforms.
 
-Package: libhdf5-lam-1.6.7-0
+Package: libhdf5-lam-1.6.7
 Section: libs
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libhdf5-1.6.7-0
-Provides: libhdf5-1.6.7-0
+Conflicts: libhdf5-1.6.7
+Provides: libhdf5-1.6.7
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - LAM version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -58,7 +58,7 @@ Package: libhdf5-lam-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libhdf5-lam-1.6.7-0 (= ${binary:Version}), libc6-dev, zlib1g-dev, libjpeg62-dev, lam4-dev
+Depends: libhdf5-lam-1.6.7 (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, lam4-dev
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -70,13 +70,13 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - LAM version
  .
  This package contains development files for use with LAM.
 
-Package: libhdf5-openmpi-1.6.7-0
+Package: libhdf5-openmpi-1.6.7
 Section: libs
 Priority: extra
 Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}
-Conflicts: libhdf5-1.6.7-0
-Provides: libhdf5-1.6.7-0
+Conflicts: libhdf5-1.6.7
+Provides: libhdf5-1.6.7
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - OpenMPI version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -89,7 +89,7 @@ Package: libhdf5-openmpi-dev
 Section: libdevel
 Priority: extra
 Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64
-Depends: libhdf5-openmpi-1.6.7-0 (= ${binary:Version}), libc6-dev, zlib1g-dev, libjpeg62-dev, libopenmpi-dev
+Depends: libhdf5-openmpi-1.6.7 (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libopenmpi-dev
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -101,13 +101,13 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - OpenMPI ver
  .
  This package contains development files for use with OpenMPI.
 
-Package: libhdf5-mpich-1.6.7-0
+Package: libhdf5-mpich-1.6.7
 Section: libs
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libhdf5-1.6.7-0
-Provides: libhdf5-1.6.7-0
+Conflicts: libhdf5-1.6.7
+Provides: libhdf5-1.6.7
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -121,7 +121,7 @@ Package: libhdf5-mpich-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libhdf5-mpich-1.6.7-0 (= ${binary:Version}), libc6-dev, zlib1g-dev, libjpeg62-dev, libmpich1.0-dev
+Depends: libhdf5-mpich-1.6.7 (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libmpich1.0-dev
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
diff --git a/debian/control.in b/debian/control.in
index c0c9c16..c550fe6 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,12 +10,12 @@ Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/hdf5/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/hdf5/trunk
 
-Package: libhdf5-serial- at VERSION@-0
+Package: libhdf5-serial- at VERSION@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libhdf5- at VERSION@-0
-Provides: libhdf5- at VERSION@-0
+Conflicts: libhdf5- at VERSION@
+Provides: libhdf5- at VERSION@
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -27,7 +27,7 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
 Package: libhdf5-serial-dev
 Section: libdevel
 Architecture: any
-Depends: libhdf5-serial- at VERSION@-0 (= ${binary:Version}), libc6-dev, zlib1g-dev, libjpeg62-dev
+Depends: libhdf5-serial- at VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg62-dev
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -39,13 +39,13 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - serial vers
  .
  This package contains development files for serial platforms.
 
-Package: libhdf5-lam- at VERSION@-0
+Package: libhdf5-lam- at VERSION@
 Section: libs
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libhdf5- at VERSION@-0
-Provides: libhdf5- at VERSION@-0
+Conflicts: libhdf5- at VERSION@
+Provides: libhdf5- at VERSION@
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - LAM version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -58,7 +58,7 @@ Package: libhdf5-lam-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libhdf5-lam- at VERSION@-0 (= ${binary:Version}), libc6-dev, zlib1g-dev, libjpeg62-dev, lam4-dev
+Depends: libhdf5-lam- at VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, lam4-dev
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -70,13 +70,13 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - LAM version
  .
  This package contains development files for use with LAM.
 
-Package: libhdf5-openmpi- at VERSION@-0
+Package: libhdf5-openmpi- at VERSION@
 Section: libs
 Priority: extra
 Architecture: @ARCHS@
 Depends: ${shlibs:Depends}
-Conflicts: libhdf5- at VERSION@-0
-Provides: libhdf5- at VERSION@-0
+Conflicts: libhdf5- at VERSION@
+Provides: libhdf5- at VERSION@
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - OpenMPI version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -89,7 +89,7 @@ Package: libhdf5-openmpi-dev
 Section: libdevel
 Priority: extra
 Architecture: @ARCHS@
-Depends: libhdf5-openmpi- at VERSION@-0 (= ${binary:Version}), libc6-dev, zlib1g-dev, libjpeg62-dev, libopenmpi-dev
+Depends: libhdf5-openmpi- at VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libopenmpi-dev
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -101,13 +101,13 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - OpenMPI ver
  .
  This package contains development files for use with OpenMPI.
 
-Package: libhdf5-mpich- at VERSION@-0
+Package: libhdf5-mpich- at VERSION@
 Section: libs
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libhdf5- at VERSION@-0
-Provides: libhdf5- at VERSION@-0
+Conflicts: libhdf5- at VERSION@
+Provides: libhdf5- at VERSION@
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -121,7 +121,7 @@ Package: libhdf5-mpich-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libhdf5-mpich- at VERSION@-0 (= ${binary:Version}), libc6-dev, zlib1g-dev, libjpeg62-dev, libmpich1.0-dev
+Depends: libhdf5-mpich- at VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libmpich1.0-dev
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
diff --git a/debian/rules b/debian/rules
index 1922565..16e192a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 # debian/rules for libhdf5,
 # (c) 2001 Brian Russo, under GPL. 
 # (c) 2003 Josselin Mouette
+# (c) 2007-2008 Francesco P. Lovergine.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -10,16 +11,25 @@
 package = libhdf5
 pkgversion ?= $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
 version ?= $(shell echo $(pkgversion) | sed 's/-[^-]*$$//')
-serpack = $(package)-serial-$(version)-0
-lampack = $(package)-lam-$(version)-0
-openmpipack = $(package)-openmpi-$(version)-0
-mpichpack = $(package)-mpich-$(version)-0
-virtpack = $(package)-$(version)-0
+serpack = $(package)-serial-$(version)
+lampack = $(package)-lam-$(version)
+openmpipack = $(package)-openmpi-$(version)
+mpichpack = $(package)-mpich-$(version)
+virtpack = $(package)-$(version)
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
+patch: patch-stamp
+patch-stamp:
+	QUILT_PATCHES=debian/patches quilt push --color=auto -a
+	touch patch-stamp
+
+unpatch:
+	QUILT_PATCHES=debian/patches quilt pop -a || true
+	rm -rf .pc patch-stamp
+
 # To be used if binary packages were buildable on any arch
 #ARCH_FLAG=-a
 #ARCHS=any
@@ -84,7 +94,8 @@ CONFIGURE_FLAGS = --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) \
 		  --enable-threadsafe
 SERIAL_ONLY_FLAGS = --enable-cxx
 
-configure: configure-stamp-debian configure-stamp-serial configure-stamp-lam $(configure_stamp_openmpi) configure-stamp-mpich
+configure: patch configure-stamp-debian configure-stamp-serial configure-stamp-lam \
+	   $(configure_stamp_openmpi) configure-stamp-mpich
 
 configure-stamp-debian: debian/control.in
 	cd debian && for i in *_devlib; do j=`basename $$i _devlib`; \
diff --git a/debian/shlibs.in b/debian/shlibs.in
index ed39cfd..41b1295 100644
--- a/debian/shlibs.in
+++ b/debian/shlibs.in
@@ -1,4 +1,4 @@
-libhdf5_cpp- at VERSION@ 0 libhdf5-serial- at VERSION@-0
-libhdf5- at VERSION@ 0 libhdf5-serial- at VERSION@-0 | libhdf5- at VERSION@-0
-libh5test- at VERSION@ 0 libhdf5-serial- at VERSION@-0 | libhdf5- at VERSION@-0
-libhdf5_hl- at VERSION@ 0 libhdf5-serial- at VERSION@-0 | libhdf5- at VERSION@-0
+libhdf5_cpp- at VERSION@ 0 libhdf5-serial- at VERSION@
+libhdf5- at VERSION@ 0 libhdf5-serial- at VERSION@ | libhdf5- at VERSION@
+libh5test- at VERSION@ 0 libhdf5-serial- at VERSION@ | libhdf5- at VERSION@
+libhdf5_hl- at VERSION@ 0 libhdf5-serial- at VERSION@ | libhdf5- at VERSION@

-- 
Hierarchical Data Format 5 (HDF5)



More information about the Pkg-grass-devel mailing list