The following commit has been merged in the upstream branch:
commit 4528e12e3d6bff9b6b378f1713917901656c9005
Author: Sylvestre Ledru <sylvestre.le...@scilab.org>
Date:   Tue Aug 2 18:30:40 2011 +0200

    Rename package from libhdf5-serial-1.8.7 to libhdf5-serial-7 since upstream 
is now trying to manage correctly sonames and other abi/api changes

diff --git a/debian/changelog b/debian/changelog
index 3a5d863..1f9beda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,10 @@ hdf5 (1.8.7-2) UNRELEASED; urgency=low
   [ Sylvestre Ledru ]
   * Support of hurd-i386. Thanks to Pino Toscano for doing the work.
     (Closes: #627896)
-  * Drop the useless lam4-dev dependency. Thanks to Pino Toscano.
-    (Closes: #604714)
+  * Drop the useless lam4-dev dependency. Thanks to Pino Toscano & Adam C 
+    Powell IV (Closes: #604714)
   * armel/arm added to the archs of libhdf5-openmpi-dev (Closes: #636185)
+  * .la file are no longer shipped
 
   [ Francesco Paolo Lovergine ]
   * Ready for unstable.
diff --git a/debian/control b/debian/control
index fd01aa0..6155703 100644
--- a/debian/control
+++ b/debian/control
@@ -13,13 +13,13 @@ Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/hdf5.git
 Vcs-Git: git://git.debian.org/git/pkg-grass/hdf5.git
 
-Package: libhdf5-serial-1.8.7
+Package: libhdf5-serial-7
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libhdf5-1.8.7, libhdf5-1.8,
+Conflicts: libhdf5-7, libhdf5-1.8,
  libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, libhdf5-serial-1.8.6
-Provides: libhdf5-1.8.7, libhdf5-1.8
+Provides: libhdf5-7, libhdf5-1.8
 Replaces: libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, 
libhdf5-serial-1.8.6
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
  HDF5 is a file format and library for storing scientific data. 
@@ -32,7 +32,7 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime 
files - serial version
 Package: libhdf5-serial-dev
 Section: libdevel
 Architecture: any
-Depends: libhdf5-serial-1.8.7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, 
${misc:Depends}
+Depends: libhdf5-serial-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, 
${misc:Depends}
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -44,14 +44,14 @@ Description: Hierarchical Data Format 5 (HDF5) - 
development files - serial vers
  .
  This package contains development files for serial platforms.
 
-Package: libhdf5-openmpi-1.8.7
+Package: libhdf5-openmpi-7
 Section: libs
 Priority: extra
 Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 
hurd-i386
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libhdf5-1.8.7, libhdf5-1.8,
+Conflicts: libhdf5-7, libhdf5-1.8,
  libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6
-Provides: libhdf5-1.8.7, libhdf5-1.8
+Provides: libhdf5-7, libhdf5-1.8
 Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, 
libhdf5-openmpi-1.8.6
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - OpenMPI 
version
  HDF5 is a file format and library for storing scientific data. 
@@ -65,7 +65,7 @@ Package: libhdf5-openmpi-dev
 Section: libdevel
 Priority: extra
 Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 
hurd-i386
-Depends: libhdf5-openmpi-1.8.7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, 
libopenmpi-dev, ${misc:Depends}
+Depends: libhdf5-openmpi-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, 
libopenmpi-dev, ${misc:Depends}
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -77,14 +77,14 @@ Description: Hierarchical Data Format 5 (HDF5) - 
development files - OpenMPI ver
  .
  This package contains development files for use with OpenMPI.
 
-Package: libhdf5-mpich2-1.8.7
+Package: libhdf5-mpich2-7
 Section: libs
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libhdf5-1.8.7, libhdf5-1.8, 
+Conflicts: libhdf5-7, libhdf5-1.8, 
  libhdf5-1.8.4,  libhdf5-openmpi-1.8.4, libhdf5-1.8.6,  libhdf5-openmpi-1.8.6
-Provides: libhdf5-1.8.7, libhdf5-1.8
+Provides: libhdf5-7, libhdf5-1.8
 Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, 
libhdf5-openmpi-1.8.6
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH2 version
  HDF5 is a file format and library for storing scientific data. 
@@ -99,7 +99,7 @@ Package: libhdf5-mpich2-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libhdf5-mpich2-1.8.7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, 
libmpich21.0-dev, ${misc:Depends}
+Depends: libhdf5-mpich2-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, 
libmpich21.0-dev, ${misc:Depends}
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
diff --git a/debian/control.in b/debian/control.in
index 9a88e75..d3e1e1e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,13 +13,13 @@ Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/hdf5.git
 Vcs-Git: git://git.debian.org/git/pkg-grass/hdf5.git
 
-Package: libhdf5-serial-@VERSION@
+Package: libhdf5-serial-@SONAME@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@,
+Conflicts: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@,
  libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, libhdf5-serial-1.8.6
-Provides: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@
+Provides: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@
 Replaces: libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, 
libhdf5-serial-1.8.6
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
  HDF5 is a file format and library for storing scientific data. 
@@ -32,7 +32,7 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime 
files - serial version
 Package: libhdf5-serial-dev
 Section: libdevel
 Architecture: any
-Depends: libhdf5-serial-@VERSION@ (= ${binary:Version}), zlib1g-dev, 
libjpeg-dev, ${misc:Depends}
+Depends: libhdf5-serial-@SONAME@ (= ${binary:Version}), zlib1g-dev, 
libjpeg-dev, ${misc:Depends}
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -44,14 +44,14 @@ Description: Hierarchical Data Format 5 (HDF5) - 
development files - serial vers
  .
  This package contains development files for serial platforms.
 
-Package: libhdf5-openmpi-@VERSION@
+Package: libhdf5-openmpi-@SONAME@
 Section: libs
 Priority: extra
 Architecture: @ARCHS@
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@,
+Conflicts: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@,
  libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6
-Provides: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@
+Provides: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@
 Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, 
libhdf5-openmpi-1.8.6
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - OpenMPI 
version
  HDF5 is a file format and library for storing scientific data. 
@@ -65,7 +65,7 @@ Package: libhdf5-openmpi-dev
 Section: libdevel
 Priority: extra
 Architecture: @ARCHS@
-Depends: libhdf5-openmpi-@VERSION@ (= ${binary:Version}), zlib1g-dev, 
libjpeg-dev, libopenmpi-dev, ${misc:Depends}
+Depends: libhdf5-openmpi-@SONAME@ (= ${binary:Version}), zlib1g-dev, 
libjpeg-dev, libopenmpi-dev, ${misc:Depends}
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -77,14 +77,14 @@ Description: Hierarchical Data Format 5 (HDF5) - 
development files - OpenMPI ver
  .
  This package contains development files for use with OpenMPI.
 
-Package: libhdf5-mpich2-@VERSION@
+Package: libhdf5-mpich2-@SONAME@
 Section: libs
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@, 
+Conflicts: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@, 
  libhdf5-1.8.4,  libhdf5-openmpi-1.8.4, libhdf5-1.8.6,  libhdf5-openmpi-1.8.6
-Provides: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@
+Provides: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@
 Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, 
libhdf5-openmpi-1.8.6
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH2 version
  HDF5 is a file format and library for storing scientific data. 
@@ -99,7 +99,7 @@ Package: libhdf5-mpich2-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libhdf5-mpich2-@VERSION@ (= ${binary:Version}), zlib1g-dev, 
libjpeg-dev, libmpich21.0-dev, ${misc:Depends}
+Depends: libhdf5-mpich2-@SONAME@ (= ${binary:Version}), zlib1g-dev, 
libjpeg-dev, libmpich21.0-dev, ${misc:Depends}
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
diff --git a/debian/rules b/debian/rules
index 666d08e..35ede19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,11 +11,12 @@
 package = libhdf5
 pkgversion ?= $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
 version ?= $(shell echo $(pkgversion) | sed 's/\([0-9\.]\)-.*$$/\1/')
+soname =  7
 major_version = $(shell echo $(version) | cut -d. -f1,2)
-serpack = $(package)-serial-$(version)
-openmpipack = $(package)-openmpi-$(version)
-mpich2pack = $(package)-mpich2-$(version)
-virtpack = $(package)-$(version)
+serpack = $(package)-serial-$(soname)
+openmpipack = $(package)-openmpi-$(soname)
+mpich2pack = $(package)-mpich2-$(soname)
+virtpack = $(package)-$(soname)
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -100,7 +101,7 @@ configure-stamp-debian: debian/control.in
                ln -sf $$i $(openmpipack).$$j ; \
                ln -sf $$i $(mpich2pack).$$j ; \
                done
-       sed -e "s/@VERSION@/$(version)/g" debian/shlibs.in > 
debian/$(serpack).shlibs
+       sed -e "s/@SONAME@/$(soname)/g" debian/shlibs.in > 
debian/$(serpack).shlibs
        touch $@
 
 configure-stamp-serial: configure-stamp-debian
@@ -167,7 +168,7 @@ clean:
        -rm -rf debian/build-openmpi
        -rm -rf debian/build-mpich2
        -find debian -type l | xargs rm -f
-       grep -v ^\% debian/control.in | sed -e "s/@VERSION@/$(version)/g" -e 
"s/@ARCHS@/$(ARCHS)/" -e "s/@MAJOR_VERSION@/$(major_version)/" > debian/control
+       grep -v ^\% debian/control.in | sed -e "s/@SONAME@/$(soname)/g" -e 
"s/@ARCHS@/$(ARCHS)/" -e "s/@MAJOR_VERSION@/$(major_version)/" > debian/control
        dh_clean configure-stamp* build-stamp* install-stamp* debian/*.shlibs
 
 install: build prep install-serial $(install_openmpi) install-mpich2 
install-doc
diff --git a/debian/shlibs.in b/debian/shlibs.in
index c5dedcf..48f442a 100644
--- a/debian/shlibs.in
+++ b/debian/shlibs.in
@@ -1,7 +1,7 @@
-libhdf5_cpp 7 libhdf5-serial-@VERSION@
-libhdf5_fortran 7 libhdf5-serial-@VERSION@
-libhdf5 7 libhdf5-serial-@VERSION@ | libhdf5-@VERSION@
-libh5test 7 libhdf5-serial-@VERSION@ | libhdf5-@VERSION@
-libhdf5_hl 7 libhdf5-serial-@VERSION@ | libhdf5-@VERSION@
-libhdf5_hl_cpp 7 libhdf5-serial-@VERSION@ | libhdf5-@VERSION@
-libhdf5hl_fortran 7 libhdf5-serial-@VERSION@ | libhdf5-@VERSION@
+libhdf5_cpp 7 libhdf5-serial-@SONAME@
+libhdf5_fortran 7 libhdf5-serial-@SONAME@
+libhdf5 7 libhdf5-serial-@SONAME@ | libhdf5-@SONAME@
+libh5test 7 libhdf5-serial-@SONAME@ | libhdf5-@SONAME@
+libhdf5_hl 7 libhdf5-serial-@SONAME@ | libhdf5-@SONAME@
+libhdf5_hl_cpp 7 libhdf5-serial-@SONAME@ | libhdf5-@SONAME@
+libhdf5hl_fortran 7 libhdf5-serial-@SONAME@ | libhdf5-@SONAME@

-- 
Hierarchical Data Format 5 (HDF5)

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to