The following commit has been merged in the upstream branch: commit 8a6383d4d176d186953421109744654d7d961dd0 Author: Sylvestre Ledru <sylvestre.le...@scilab.org> Date: Thu Aug 4 16:54:58 2011 +0200
Rename libhdf5-serial-* to libhdf5 diff --git a/debian/changelog b/debian/changelog index edfd959..9865252 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ hdf5 (1.8.7-2~exp1) experimental; urgency=low + * Rename libhdf5-serial-* to libhdf5 to avoid confusion and to highlight + which one is the default version (Closes: #566541) * hdf5 packages renamed to use soname versionning. Upstream looks like ready to support them correctly. Therefor, here is the changes: - libhdf5-serial-1.8.7 => libhdf5-serial-7 + libhdf5-serial-1.8.7 => libhdf5-7 libhdf5-openmpi-1.8.7 => libhdf5-openmpi-7 libhdf5-mpich2-1.8.7 => libhdf5-mpich2-7 * C, C++ and Fortran symbol files introduced (mpich2, openmpi and serial). diff --git a/debian/control b/debian/control index a10658d..511a705 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-serial-7 +Package: libhdf5-7 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -30,10 +30,10 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version . This package contains runtime files for serial platforms. -Package: libhdf5-serial-dev +Package: libhdf5-dev Section: libdevel Architecture: any -Depends: libhdf5-serial-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, ${misc:Depends} +Depends: libhdf5-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, ${misc:Depends} Conflicts: libhdf5-dev Provides: libhdf5-dev Suggests: libhdf5-doc @@ -52,10 +52,10 @@ Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 h Depends: ${shlibs:Depends}, ${misc: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-serial-1.8.7 + libhdf5-1.8.7, libhdf5-openmpi-1.8.7 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-serial-1.8.7 + libhdf5-1.8.7, libhdf5-openmpi-1.8.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 @@ -86,11 +86,11 @@ Priority: extra Architecture: any Depends: ${shlibs:Depends}, ${misc: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-serial-1.8.7 + 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-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-serial-1.8.7 +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 Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH2 version HDF5 is a file format and library for storing scientific data. HDF5 was designed and implemented to address the deficiencies of diff --git a/debian/control.in b/debian/control.in index 4183b75..38e8c4d 100644 --- a/debian/control.in +++ b/debian/control.in @@ -13,14 +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-@SONAME@ +Package: libhdf5-@SONAME@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@, 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-@SONAME@, libhdf5-@MAJOR_VERSION@ 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 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version HDF5 is a file format and library for storing scientific data. @@ -30,10 +29,10 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version . This package contains runtime files for serial platforms. -Package: libhdf5-serial-dev +Package: libhdf5-dev Section: libdevel Architecture: any -Depends: libhdf5-serial-@SONAME@ (= ${binary:Version}), zlib1g-dev, libjpeg-dev, ${misc:Depends} +Depends: libhdf5-@SONAME@ (= ${binary:Version}), zlib1g-dev, libjpeg-dev, ${misc:Depends} Conflicts: libhdf5-dev Provides: libhdf5-dev Suggests: libhdf5-doc @@ -55,7 +54,7 @@ Conflicts: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@, libhdf5-1.8.7, libhdf5-serial-1.8.7 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, - libhdf5-1.8.7, libhdf5-serial-1.8.7 + libhdf5-1.8.7, libhdf5-openmpi-1.8.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 @@ -86,11 +85,11 @@ Priority: extra Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@, - libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6, - libhdf5-1.8.7, libhdf5-serial-1.8.7 + 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-@SONAME@, libhdf5-@MAJOR_VERSION@ -Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6, - libhdf5-1.8.7, libhdf5-serial-1.8.7 +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 Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH2 version HDF5 is a file format and library for storing scientific data. HDF5 was designed and implemented to address the deficiencies of diff --git a/debian/libhdf5-serial-7.symbols b/debian/libhdf5-7.symbols similarity index 99% rename from debian/libhdf5-serial-7.symbols rename to debian/libhdf5-7.symbols index 321732e..19c9aa9 100644 --- a/debian/libhdf5-serial-7.symbols +++ b/debian/libhdf5-7.symbols @@ -1,4 +1,4 @@ -libhdf5.so.7 libhdf5-serial-7 #MINVER# +libhdf5.so.7 libhdf5-7 #MINVER# H5AC_BT2_HDR@Base 1.8.7 H5AC_BT2_INT@Base 1.8.7 H5AC_BT2_LEAF@Base 1.8.7 @@ -2398,7 +2398,7 @@ libhdf5.so.7 libhdf5-serial-7 #MINVER# HDsrand@Base 1.8.7 HDstrtoll@Base 1.8.7 epoch_marker_class@Base 1.8.7 -libhdf5_cpp.so.7 libhdf5-serial-7 #MINVER# +libhdf5_cpp.so.7 libhdf5-7 #MINVER# _ZN2H510AbstractDsC1ERKS0_@Base 1.8.7 _ZN2H510AbstractDsC1Ei@Base 1.8.7 _ZN2H510AbstractDsC1Ev@Base 1.8.7 @@ -3456,7 +3456,7 @@ libhdf5_cpp.so.7 libhdf5-serial-7 #MINVER# _ZThn4_NK2H59Attribute5getIdEv@Base 1.8.7 _ZThn4_NK2H59Attribute9fromClassEv@Base 1.8.7 userAttrOpWrpr@Base 1.8.7 -libhdf5_fortran.so.7 libhdf5-serial-7 #MINVER# +libhdf5_fortran.so.7 libhdf5-7 #MINVER# HD5f2cstring@Base 1.8.7 HD5packFstring@Base 1.8.7 __h5_dble_interface_MOD_h5aread_double_1@Base 1.8.7 @@ -4467,7 +4467,7 @@ libhdf5_fortran.so.7 libhdf5-serial-7 #MINVER# h5zunregister_c_@Base 1.8.7 integer_types_@Base 1.8.7 predefined_types_@Base 1.8.7 -libhdf5_hl.so.7 libhdf5-serial-7 #MINVER# +libhdf5_hl.so.7 libhdf5-7 #MINVER# H5DS_get_REFLIST_type@Base 1.8.7 H5DS_is_reserved@Base 1.8.7 H5DSattach_scale@Base 1.8.7 @@ -4639,7 +4639,7 @@ libhdf5_hl.so.7 libhdf5-serial-7 #MINVER# str_cset@Base 1.8.7 str_pad@Base 1.8.7 str_size@Base 1.8.7 -libhdf5_hl_cpp.so.7 libhdf5-serial-7 #MINVER# +libhdf5_hl_cpp.so.7 libhdf5-7 #MINVER# _ZN11PacketTable10ResetIndexEv@Base 1.8.7 _ZN11PacketTable14GetPacketCountERi@Base 1.8.7 _ZN11PacketTable7IsValidEv@Base 1.8.7 @@ -4665,7 +4665,7 @@ libhdf5_hl_cpp.so.7 libhdf5-serial-7 #MINVER# _ZTS14FL_PacketTable@Base 1.8.7 _ZTT14FL_PacketTable@Base 1.8.7 _ZTV14FL_PacketTable@Base 1.8.7 -libhdf5hl_fortran.so.7 libhdf5-serial-7 #MINVER# +libhdf5hl_fortran.so.7 libhdf5-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/rules b/debian/rules index 35ede19..e4c89e0 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ 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-$(soname) +serpack = $(package)-$(soname) openmpipack = $(package)-openmpi-$(soname) mpich2pack = $(package)-mpich2-$(soname) virtpack = $(package)-$(soname) @@ -85,12 +85,12 @@ CONFIGURE_FLAGS = --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) \ --disable-sharedlib-rpath --with-zlib --with-default-api-version=v18 SERIAL_ONLY_FLAGS = --enable-cxx --enable-fortran --enable-threadsafe -configure: configure-stamp-debian configure-stamp-serial configure-stamp-lam \ +configure: configure-stamp-debian configure-stamp configure-stamp-lam \ $(configure_stamp_openmpi) configure-stamp-mpich2 configure-stamp-debian: debian/control.in cd debian && for i in *_devlib; do j=`basename $$i _devlib`; \ - ln -sf $$i $(package)-serial-dev.$$j ; \ + ln -sf $$i $(package)-dev.$$j ; \ ln -sf $$i $(package)-lam-dev.$$j ; \ ln -sf $$i $(package)-openmpi-dev.$$j ; \ ln -sf $$i $(package)-mpich2-dev.$$j ; \ @@ -104,11 +104,11 @@ configure-stamp-debian: debian/control.in sed -e "s/@SONAME@/$(soname)/g" debian/shlibs.in > debian/$(serpack).shlibs touch $@ -configure-stamp-serial: configure-stamp-debian +configure-stamp: configure-stamp-debian dh_testdir - -mkdir debian/build-serial + -mkdir debian/build # configure serial version - cd debian/build-serial && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \ + cd debian/build && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \ ../../configure $(CONFIGURE_FLAGS) $(SERIAL_ONLY_FLAGS) touch $@ @@ -136,11 +136,11 @@ configure-stamp-mpich2: configure-stamp-debian prep: dh_prep -build: build-stamp-serial $(build_stamp_openmpi) build-stamp-mpich2 +build: build-stamp $(build_stamp_openmpi) build-stamp-mpich2 -build-stamp-serial: configure-stamp-serial +build-stamp: configure-stamp dh_testdir - $(MAKE) -C debian/build-serial/ + $(MAKE) -C debian/build/ touch $@ build-stamp-openmpi: configure-stamp-openmpi @@ -157,14 +157,14 @@ build-stamp-mpich2: configure-stamp-mpich2 # Be sure to not have a previous version installed before running # the test suite # -test: build-stamp-serial - $(MAKE) -C debian/build-serial/ test +test: build-stamp + $(MAKE) -C debian/build/ test clean: test -f debian/control.in dh_testroot -rm -rf html - -rm -rf debian/build-serial + -rm -rf debian/build -rm -rf debian/build-openmpi -rm -rf debian/build-mpich2 -find debian -type l | xargs rm -f @@ -173,13 +173,13 @@ clean: install: build prep install-serial $(install_openmpi) install-mpich2 install-doc -install-serial: build-stamp-serial +install-serial: build-stamp dh_testdir dh_testroot - -mkdir debian/build-serial/tmpinst - $(MAKE) -C debian/build-serial/ install prefix=$(CURDIR)/debian/build-serial/tmpinst/usr - dh_install -p$(serpack) -p$(package)-serial-dev -phdf5-tools \ - --sourcedir=debian/build-serial/tmpinst + -mkdir debian/build/tmpinst + $(MAKE) -C debian/build/ install prefix=$(CURDIR)/debian/build/tmpinst/usr + dh_install -p$(serpack) -p$(package)-dev -phdf5-tools \ + --sourcedir=debian/build/tmpinst install-openmpi: build-stamp-openmpi dh_testdir @@ -233,8 +233,8 @@ endif dh_makeshlibs -p$(mpich2pack) -V $(mpich2pack) dh_makeshlibs -p$(serpack) -V "$(serpack) | $(virtpack)" dh_installdeb $(ARCH_FLAG) - dh_shlibdeps -p$(serpack) -L$(serpack) -ldebian/$(serpack)/usr/lib:debian/build-serial/test/.libs - dh_shlibdeps -phdf5-tools -L$(serpack) -ldebian/$(serpack)/usr/lib:debian/build-serial/test/.libs + dh_shlibdeps -p$(serpack) -L$(serpack) -ldebian/$(serpack)/usr/lib:debian/build/test/.libs + dh_shlibdeps -phdf5-tools -L$(serpack) -ldebian/$(serpack)/usr/lib:debian/build/test/.libs ifeq ($(build_openmpi),yes) dh_shlibdeps -p$(openmpipack) -L$(openmpipack) -ldebian/$(openmpipack)/usr/lib endif @@ -246,4 +246,4 @@ endif binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure \ - install-serial install-doc install-openmpi install-mpich2 prep + install-doc install-serial install-openmpi install-mpich2 prep diff --git a/debian/shlibs.in b/debian/shlibs.in index 48f442a..b2f7482 100644 --- a/debian/shlibs.in +++ b/debian/shlibs.in @@ -1,7 +1,7 @@ -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@ +libhdf5_cpp 7 libhdf5-@SONAME@ +libhdf5_fortran 7 libhdf5-@SONAME@ +libhdf5 7 libhdf5-@SONAME@ | libhdf5-@SONAME@ +libh5test 7 libhdf5-@SONAME@ | libhdf5-@SONAME@ +libhdf5_hl 7 libhdf5-@SONAME@ | libhdf5-@SONAME@ +libhdf5_hl_cpp 7 libhdf5-@SONAME@ | libhdf5-@SONAME@ +libhdf5hl_fortran 7 libhdf5-@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