The following commit has been merged in the master branch: commit 799396b3ad5c097e6c14bfd8939b603f113abefc Author: Sylvestre Ledru <sylvestre.le...@scilab-enterprises.com> Date: Tue Jul 2 15:41:16 2013 +0200
* Rollback upstream change from soname 7 => 8. They only removed two functions which were unused and buggy. I checked with them and they agree it was not worth changing the soname. Upstream mail: --- I checked with the developers to be sure it would be okay for you to plug these functions back in and keep soname 7. The short answer is "yes". It seems that these APIs were broken and users would not or could not have been using them. Therefore, adding them back in for the sake of distribution simplification should not have a negative effect on most (or all?) user applications. Rather than removing those APIs outright, we should have deprecated them and removed them from the documentation, but not actually removed them from the software until the next major release. :| --- (I am not planning to put these two functions back) diff --git a/debian/changelog b/debian/changelog index 2a4ef06..5e813f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ hdf5 (1.8.11-1~exp1) experimental; urgency=low * New upstream release - * This new release will require a transition (7 => 8) + * Rollback upstream change from soname 7 => 8. + They only removed two functions which were unused and buggy. + I checked with them and they agree it was not worth changing the soname. -- Sylvestre Ledru <sylves...@debian.org> Fri, 21 Jun 2013 13:50:29 +0200 diff --git a/debian/control b/debian/control index 13f468d..e5352a2 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ 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-8 +Package: libhdf5-7 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -21,7 +21,7 @@ Pre-Depends: ${misc:Pre-Depends} Conflicts: libhdf5-7, libhdf5-1.8, libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, libhdf5-serial-1.8.6, libhdf5-1.8.7, libhdf5-serial-1.8.7 -Provides: libhdf5-8, 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, libhdf5-1.8.7, libhdf5-serial-1.8.7 Multi-Arch: same Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version @@ -32,12 +32,12 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version . This package contains runtime files for serial platforms. -Package: libhdf5-8-dbg +Package: libhdf5-7-dbg Section: debug Priority: extra Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libhdf5-8 (= ${binary:Version}) + libhdf5-7 (= ${binary:Version}) Description: Hierarchical Data Format 5 (HDF5) - Debug package HDF5 is a file format and library for storing scientific data. HDF5 was designed and implemented to address the deficiencies of @@ -49,7 +49,7 @@ Description: Hierarchical Data Format 5 (HDF5) - Debug package Package: libhdf5-dev Section: libdevel Architecture: any -Depends: libhdf5-8 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, +Depends: libhdf5-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, ${misc:Depends}, hdf5-helpers Suggests: libhdf5-doc Provides: libhdf5-serial-dev @@ -68,14 +68,14 @@ Section: libdevel Architecture: any Depends: libhdf5-dev (= ${binary:Version}), ${misc:Depends} Description: Hierarchical Data Format 5 (HDF5) - development files - transitionnal package - HDF5 is a file format and library for storing scientific data. + HDF5 is a file format and library for storing scientific data. HDF5 was designed and implemented to address the deficiencies of HDF4.x. It has a more powerful and flexible data model, supports files larger than 2 GB, and supports parallel I/O. . This package is a transitionnal package. -Package: libhdf5-openmpi-8 +Package: libhdf5-openmpi-7 Section: libs Priority: extra Architecture: alpha armel armhf amd64 i386 ia64 powerpc powerpcspe ppc64 sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386 @@ -84,7 +84,7 @@ Pre-Depends: ${misc:Pre-Depends} Conflicts: libhdf5-7, libhdf5-1.8, libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6, libhdf5-1.8.7, libhdf5-openmpi-1.8.7 -Provides: libhdf5-8, 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, libhdf5-1.8.7, libhdf5-openmpi-1.8.7 Multi-Arch: same @@ -100,7 +100,7 @@ Package: libhdf5-openmpi-dev Section: libdevel Priority: extra Architecture: alpha armel armhf amd64 i386 ia64 powerpc powerpcspe ppc64 sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386 -Depends: libhdf5-openmpi-8 (= ${binary:Version}), zlib1g-dev, +Depends: libhdf5-openmpi-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, libopenmpi-dev, ${misc:Depends}, hdf5-helpers Conflicts: libhdf5-dev Provides: libhdf5-dev @@ -113,12 +113,12 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - OpenMPI ver . This package contains development files for use with OpenMPI. -Package: libhdf5-openmpi-8-dbg +Package: libhdf5-openmpi-7-dbg Section: debug Priority: extra Architecture: alpha armel armhf amd64 i386 ia64 powerpc powerpcspe ppc64 sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386 Depends: ${shlibs:Depends}, ${misc:Depends}, - libhdf5-openmpi-8 (= ${binary:Version}), + libhdf5-openmpi-7 (= ${binary:Version}), Description: Hierarchical Data Format 5 (HDF5) - OpenMPI Debug package HDF5 is a file format and library for storing scientific data. HDF5 was designed and implemented to address the deficiencies of @@ -127,7 +127,7 @@ Description: Hierarchical Data Format 5 (HDF5) - OpenMPI Debug package . This package contains debug hdf5/openmpi libraries. -Package: libhdf5-mpich2-8 +Package: libhdf5-mpich2-7 Section: libs Priority: extra Architecture: any @@ -136,7 +136,7 @@ Pre-Depends: ${misc:Pre-Depends} Conflicts: libhdf5-7, libhdf5-1.8, libhdf5-1.8.4, libhdf5-mpich2-1.8.4, libhdf5-1.8.6, libhdf5-mpich2-1.8.6, libhdf5-1.8.7, libhdf5-mpich2-1.8.7 -Provides: libhdf5-8, libhdf5-1.8 +Provides: libhdf5-7, libhdf5-1.8 Replaces: libhdf5-1.8.4, libhdf5-mpich2-1.8.4, libhdf5-1.8.6, libhdf5-mpich2-1.8.6, libhdf5-1.8.7, libhdf5-mpich2-1.8.7 Multi-Arch: same @@ -153,7 +153,7 @@ Package: libhdf5-mpich2-dev Section: libdevel Priority: extra Architecture: any -Depends: libhdf5-mpich2-8 (= ${binary:Version}), zlib1g-dev, +Depends: libhdf5-mpich2-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, libmpich2-dev, ${misc:Depends}, hdf5-helpers Conflicts: libhdf5-dev Provides: libhdf5-dev @@ -167,12 +167,12 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH2 vers This package contains development files for use with MPICH2. Warning: the C++ interface is not provided for this version. -Package: libhdf5-mpich2-8-dbg +Package: libhdf5-mpich2-7-dbg Section: debug Priority: extra Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libhdf5-mpich2-8 (= ${binary:Version}), + libhdf5-mpich2-7 (= ${binary:Version}), Description: Hierarchical Data Format 5 (HDF5) - Mpich2 Debug package HDF5 is a file format and library for storing scientific data. HDF5 was designed and implemented to address the deficiencies of @@ -214,7 +214,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: hdf5-tools (<< 1.8.7-1) Breaks: hdf5-tools (<< 1.8.7-1) Description: Hierarchical Data Format 5 (HDF5) - Helper tools - HDF5 is a file format and library for storing scientific data. + HDF5 is a file format and library for storing scientific data. HDF5 was designed and implemented to address the deficiencies of HDF4.x. It has a more powerful and flexible data model, supports files larger than 2 GB, and supports parallel I/O. @@ -234,4 +234,3 @@ Description: Hierarchical Data Format 5 (HDF5) - Runtime tools files larger than 2 GB, and supports parallel I/O. . This package contains runtime tools for HDF5. - diff --git a/debian/control.in b/debian/control.in index 80d7305..d15a8b3 100644 --- a/debian/control.in +++ b/debian/control.in @@ -228,10 +228,9 @@ Section: science Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Hierarchical Data Format 5 (HDF5) - Runtime tools - HDF5 is a file format and library for storing scientific data. + HDF5 is a file format and library for storing scientific data. HDF5 was designed and implemented to address the deficiencies of HDF4.x. It has a more powerful and flexible data model, supports files larger than 2 GB, and supports parallel I/O. . This package contains runtime tools for HDF5. - diff --git a/debian/libhdf5-8.symbols b/debian/libhdf5-7.symbols similarity index 99% rename from debian/libhdf5-8.symbols rename to debian/libhdf5-7.symbols index 28237a8..f21a38e 100644 --- a/debian/libhdf5-8.symbols +++ b/debian/libhdf5-7.symbols @@ -1,4 +1,4 @@ -libhdf5.so.8 libhdf5-8 +libhdf5.so.7 libhdf5-7 H5AC_BT2_HDR@Base 1.8.7 H5AC_BT2_INT@Base 1.8.7 H5AC_BT2_LEAF@Base 1.8.7 @@ -2441,7 +2441,7 @@ libhdf5.so.8 libhdf5-8 HDsrand@Base 1.8.7 HDstrtoll@Base 1.8.7 epoch_marker_class@Base 1.8.7 -libhdf5_cpp.so.8 libhdf5-8 #MINVER# +libhdf5_cpp.so.7 libhdf5-7 #MINVER# (optional)_ZN2H510AbstractDsC1ERKS0_@Base 1.8.9 (optional)_ZN2H510AbstractDsC1Ei@Base 1.8.9 (optional)_ZN2H510AbstractDsC1Ev@Base 1.8.9 @@ -3506,7 +3506,7 @@ libhdf5_cpp.so.8 libhdf5-8 #MINVER# (optional)_ZThn8_NK2H59Attribute5getIdEv@Base 1.8.9 (optional)_ZThn8_NK2H59Attribute9fromClassEv@Base 1.8.9 (optional)userAttrOpWrpr@Base 1.8.9 -libhdf5_fortran.so.8 libhdf5-8 +libhdf5_fortran.so.7 libhdf5-7 HD5f2cstring@Base 1.8.7 HD5packFstring@Base 1.8.7 __h5_dble_interface_MOD_h5aread_double_1@Base 1.8.7 @@ -4562,7 +4562,7 @@ libhdf5_fortran.so.8 libhdf5-8 h5zunregister_c_@Base 1.8.7 integer_types_@Base 1.8.7 predefined_types_@Base 1.8.7 -libhdf5_hl.so.8 libhdf5-8 +libhdf5_hl.so.7 libhdf5-7 H5DO_write_chunk@Base 1.8.11-1~exp1 H5DOwrite_chunk@Base 1.8.11-1~exp1 H5DS_get_REFLIST_type@Base 1.8.7 @@ -4738,7 +4738,7 @@ libhdf5_hl.so.8 libhdf5-8 str_cset@Base 1.8.7 str_pad@Base 1.8.7 str_size@Base 1.8.7 -libhdf5_hl_cpp.so.8 libhdf5-8 #MINVER# +libhdf5_hl_cpp.so.7 libhdf5-7 #MINVER# (optional)_ZN11PacketTable10ResetIndexEv@Base 1.8.9 (optional)_ZN11PacketTable14GetPacketCountERi@Base 1.8.9 (optional)_ZN11PacketTable7IsValidEv@Base 1.8.9 @@ -4764,7 +4764,7 @@ libhdf5_hl_cpp.so.8 libhdf5-8 #MINVER# (optional)_ZTS14FL_PacketTable@Base 1.8.9 (optional)_ZTT14FL_PacketTable@Base 1.8.9 (optional)_ZTV14FL_PacketTable@Base 1.8.9 -libhdf5hl_fortran.so.8 libhdf5-8 +libhdf5hl_fortran.so.7 libhdf5-7 H5IM_get_palette@Base 1.8.7 H5IMget_palettef@Base 1.8.7 H5IMmake_image_24bitf@Base 1.8.7 diff --git a/debian/libhdf5-mpich2-8.symbols b/debian/libhdf5-mpich2-7.symbols similarity index 99% rename from debian/libhdf5-mpich2-8.symbols rename to debian/libhdf5-mpich2-7.symbols index 70f5815..0776d51 100644 --- a/debian/libhdf5-mpich2-8.symbols +++ b/debian/libhdf5-mpich2-7.symbols @@ -1,4 +1,4 @@ -libhdf5.so.8 libhdf5-mpich2-8 #MINVER# +libhdf5.so.7 libhdf5-mpich2-7 #MINVER# H5AC_BT2_HDR@Base 1.8.7 H5AC_BT2_INT@Base 1.8.7 H5AC_BT2_LEAF@Base 1.8.7 @@ -2763,7 +2763,7 @@ libhdf5.so.8 libhdf5-mpich2-8 #MINVER# HDsrand@Base 1.8.7 HDstrtoll@Base 1.8.7 epoch_marker_class@Base 1.8.7 -libhdf5_fortran.so.8 libhdf5-mpich2-8 #MINVER# +libhdf5_fortran.so.7 libhdf5-mpich2-7 #MINVER# HD5f2cstring@Base 1.8.7 HD5packFstring@Base 1.8.7 __h5_dble_interface_MOD_h5aread_double_1@Base 1.8.7 @@ -3834,7 +3834,7 @@ libhdf5_fortran.so.8 libhdf5-mpich2-8 #MINVER# h5zunregister_c_@Base 1.8.7 integer_types_@Base 1.8.7 predefined_types_@Base 1.8.7 -libhdf5_hl.so.8 libhdf5-mpich2-8 #MINVER# +libhdf5_hl.so.7 libhdf5-mpich2-7 #MINVER# H5DO_write_chunk@Base 1.8.11 H5DOwrite_chunk@Base 1.8.11 H5DS_get_REFLIST_type@Base 1.8.7 @@ -4010,7 +4010,7 @@ libhdf5_hl.so.8 libhdf5-mpich2-8 #MINVER# str_cset@Base 1.8.7 str_pad@Base 1.8.7 str_size@Base 1.8.7 -libhdf5hl_fortran.so.8 libhdf5-mpich2-8 #MINVER# +libhdf5hl_fortran.so.7 libhdf5-mpich2-7 #MINVER# H5IM_get_palette@Base 1.8.7 H5IMget_palettef@Base 1.8.7 H5IMmake_image_24bitf@Base 1.8.7 diff --git a/debian/libhdf5-openmpi-8.symbols b/debian/libhdf5-openmpi-7.symbols similarity index 99% rename from debian/libhdf5-openmpi-8.symbols rename to debian/libhdf5-openmpi-7.symbols index fd12b11..6809df5 100644 --- a/debian/libhdf5-openmpi-8.symbols +++ b/debian/libhdf5-openmpi-7.symbols @@ -1,4 +1,4 @@ -libhdf5.so.8 libhdf5-openmpi-8 #MINVER# +libhdf5.so.7 libhdf5-openmpi-7 #MINVER# H5AC_BT2_HDR@Base 1.8.7 H5AC_BT2_INT@Base 1.8.7 H5AC_BT2_LEAF@Base 1.8.7 @@ -2763,7 +2763,7 @@ libhdf5.so.8 libhdf5-openmpi-8 #MINVER# HDsrand@Base 1.8.7 HDstrtoll@Base 1.8.7 epoch_marker_class@Base 1.8.7 -libhdf5_fortran.so.8 libhdf5-openmpi-8 #MINVER# +libhdf5_fortran.so.7 libhdf5-openmpi-7 #MINVER# HD5f2cstring@Base 1.8.7 HD5packFstring@Base 1.8.7 __h5_dble_interface_MOD_h5aread_double_1@Base 1.8.7 @@ -3834,7 +3834,7 @@ libhdf5_fortran.so.8 libhdf5-openmpi-8 #MINVER# h5zunregister_c_@Base 1.8.7 integer_types_@Base 1.8.7 predefined_types_@Base 1.8.7 -libhdf5_hl.so.8 libhdf5-openmpi-8 #MINVER# +libhdf5_hl.so.7 libhdf5-openmpi-7 #MINVER# H5DO_write_chunk@Base 1.8.11 H5DOwrite_chunk@Base 1.8.11 H5DS_get_REFLIST_type@Base 1.8.7 @@ -4010,7 +4010,7 @@ libhdf5_hl.so.8 libhdf5-openmpi-8 #MINVER# str_cset@Base 1.8.7 str_pad@Base 1.8.7 str_size@Base 1.8.7 -libhdf5hl_fortran.so.8 libhdf5-openmpi-8 #MINVER# +libhdf5hl_fortran.so.7 libhdf5-openmpi-7 #MINVER# H5IM_get_palette@Base 1.8.7 H5IMget_palettef@Base 1.8.7 H5IMmake_image_24bitf@Base 1.8.7 diff --git a/debian/patches/series b/debian/patches/series index 206d1b8..c07aa72 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ path_max.diff ullong_force.diff relax-version-check.patch skip_cxx_inclusion.diff +soname.diff diff --git a/debian/patches/soname.diff b/debian/patches/soname.diff new file mode 100644 index 0000000..2ac379d --- /dev/null +++ b/debian/patches/soname.diff @@ -0,0 +1,91 @@ +Index: hdf5/c++/src/Makefile.in +=================================================================== +--- hdf5.orig/c++/src/Makefile.in 2013-06-21 11:25:27.587954635 +0200 ++++ hdf5/c++/src/Makefile.in 2013-07-02 14:54:16.297409399 +0200 +@@ -466,7 +466,7 @@ + + # Add libtool shared library version numbers to the HDF5 library + # See libtool versioning documentation online. +-LT_VERS_INTERFACE = 8 ++LT_VERS_INTERFACE = 7 + LT_VERS_REVISION = 0 + LT_VERS_AGE = 0 + +Index: hdf5/config/lt_vers.am +=================================================================== +--- hdf5.orig/config/lt_vers.am 2013-06-21 11:25:27.591954634 +0200 ++++ hdf5/config/lt_vers.am 2013-07-02 14:54:29.865409829 +0200 +@@ -16,7 +16,7 @@ + ## + # Add libtool shared library version numbers to the HDF5 library + # See libtool versioning documentation online. +-LT_VERS_INTERFACE = 8 ++LT_VERS_INTERFACE = 7 + LT_VERS_REVISION = 0 + LT_VERS_AGE = 0 + +Index: hdf5/fortran/src/Makefile.in +=================================================================== +--- hdf5.orig/fortran/src/Makefile.in 2013-06-21 11:25:27.607954636 +0200 ++++ hdf5/fortran/src/Makefile.in 2013-07-02 14:54:13.145409297 +0200 +@@ -517,7 +517,7 @@ + + # Add libtool shared library version numbers to the HDF5 library + # See libtool versioning documentation online. +-LT_VERS_INTERFACE = 8 ++LT_VERS_INTERFACE = 7 + LT_VERS_REVISION = 0 + LT_VERS_AGE = 0 + +Index: hdf5/hl/c++/src/Makefile.in +=================================================================== +--- hdf5.orig/hl/c++/src/Makefile.in 2013-06-21 11:25:27.611954636 +0200 ++++ hdf5/hl/c++/src/Makefile.in 2013-07-02 14:54:11.465409245 +0200 +@@ -457,7 +457,7 @@ + + # Add libtool shared library version numbers to the HDF5 library + # See libtool versioning documentation online. +-LT_VERS_INTERFACE = 8 ++LT_VERS_INTERFACE = 7 + LT_VERS_REVISION = 0 + LT_VERS_AGE = 0 + +Index: hdf5/hl/fortran/src/Makefile.in +=================================================================== +--- hdf5.orig/hl/fortran/src/Makefile.in 2013-06-21 11:25:27.615954636 +0200 ++++ hdf5/hl/fortran/src/Makefile.in 2013-07-02 14:54:24.201409649 +0200 +@@ -473,7 +473,7 @@ + + # Add libtool shared library version numbers to the HDF5 library + # See libtool versioning documentation online. +-LT_VERS_INTERFACE = 8 ++LT_VERS_INTERFACE = 7 + LT_VERS_REVISION = 0 + LT_VERS_AGE = 0 + INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \ +Index: hdf5/hl/src/Makefile.in +=================================================================== +--- hdf5.orig/hl/src/Makefile.in 2013-06-21 11:25:27.615954636 +0200 ++++ hdf5/hl/src/Makefile.in 2013-07-02 14:54:20.145409520 +0200 +@@ -456,7 +456,7 @@ + + # Add libtool shared library version numbers to the HDF5 library + # See libtool versioning documentation online. +-LT_VERS_INTERFACE = 8 ++LT_VERS_INTERFACE = 7 + LT_VERS_REVISION = 0 + LT_VERS_AGE = 0 + +Index: hdf5/src/Makefile.in +=================================================================== +--- hdf5.orig/src/Makefile.in 2013-06-21 11:25:27.659954637 +0200 ++++ hdf5/src/Makefile.in 2013-07-02 14:54:09.541409183 +0200 +@@ -516,7 +516,7 @@ + + # Add libtool shared library version numbers to the HDF5 library + # See libtool versioning documentation online. +-LT_VERS_INTERFACE = 8 ++LT_VERS_INTERFACE = 7 + LT_VERS_REVISION = 0 + LT_VERS_AGE = 0 + H5detect_CFLAGS = -g $(AM_CFLAGS) diff --git a/debian/rules b/debian/rules index 595cd15..4d5926f 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ # (c) 2001 Brian Russo, under GPL. # (c) 2003 Josselin Mouette # (c) 2007-2009 Francesco P. Lovergine. -# (c) 2010-2012 Sylvestre Ledru +# (c) 2010-2013 Sylvestre Ledru # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -14,7 +14,7 @@ include /usr/share/dpkg/buildflags.mk package = libhdf5 pkgversion ?= $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}') version ?= $(shell echo $(pkgversion) | sed 's/\([0-9\.]\)-.*$$/\1/') -soname = 8 +soname = 7 major_version = $(shell echo $(version) | cut -d. -f1,2) serpack = $(package)-$(soname) openmpipack = $(package)-openmpi-$(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