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

[Francesco Paolo Lovergine]

The following commit has been merged in the upstream branch:
commit 0372aba00e9c24466af2bba649889d9cce93b6c7
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Fri Aug 7 15:33:51 2009 +0000

    True fixes for shlibs.in

diff --git a/debian/rules b/debian/rules
index 848f93a..fa575e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -111,7 +111,7 @@ configure-stamp-debian: patch debian/control.in
 		ln -sf $$i $(mpichpack).$$j ; \
 		done
 	sed "s/@VERSION@/$(version)/g" debian/shlibs.in > debian/$(serpack).shlibs
-	touch configure-stamp-debian
+	touch $@
 
 configure-stamp-serial: configure-stamp-debian
 	dh_testdir
@@ -119,7 +119,7 @@ configure-stamp-serial: configure-stamp-debian
 # configure serial version
 	cd debian/build-serial && CC=$(DEBCC) CXX=$(DEBCXX) F9X=$(DEBFORTRAN) \
 		../../configure $(CONFIGURE_FLAGS) $(SERIAL_ONLY_FLAGS) 
-	touch configure-stamp-serial
+	touch $@
 
 configure-stamp-lam: configure-stamp-debian
 	dh_testdir
@@ -129,7 +129,7 @@ configure-stamp-lam: configure-stamp-debian
 		CC=mpicc.lam RUNPARALLEL=/usr/bin/mpirun.lam \
 		../../configure $(CONFIGURE_FLAGS) \
 		--enable-parallel=yes
-	touch configure-stamp-lam
+	touch $@
 
 configure-stamp-openmpi: configure-stamp-debian
 	dh_testdir
@@ -139,7 +139,7 @@ configure-stamp-openmpi: configure-stamp-debian
 		CC=mpicc.openmpi F9X=mpif90.openmpi RUNPARALLEL=/usr/bin/mpirun.openmpi \
 		OMPI_MCA_disable_memory_allocator=1 ../../configure $(CONFIGURE_FLAGS) --enable-fortran \
 		--enable-parallel=yes
-	touch configure-stamp-openmpi
+	touch $@
 
 configure-stamp-mpich: configure-stamp-debian
 	dh_testdir
@@ -150,32 +150,32 @@ configure-stamp-mpich: configure-stamp-debian
 		CXX=mpiCC.mpich F9X=mpif90.mpich RUNPARALLEL=/usr/bin/mpirun.mpich \
 		../../configure $(CONFIGURE_FLAGS) --enable-fortran \
 		--enable-parallel=yes
-	touch configure-stamp-mpich
+	touch $@
 
 prep: 
 	dh_prep
 
-build: prep build-stamp-serial build-stamp-lam $(build_stamp_openmpi) build-stamp-mpich
+build: build-stamp-serial build-stamp-lam $(build_stamp_openmpi) build-stamp-mpich
 
 build-stamp-serial: configure-stamp-serial
 	dh_testdir
 	$(MAKE) -C debian/build-serial/
-	touch build-stamp-serial
+	touch $@
 
 build-stamp-lam: configure-stamp-lam 
 	dh_testdir
 	$(MAKE) -C debian/build-lam/
-	touch build-stamp-lam
+	touch $@
 
 build-stamp-openmpi: configure-stamp-openmpi 
 	dh_testdir
 	$(MAKE)  -C debian/build-openmpi/ OMPI_MCA_disable_memory_allocator=1
-	touch build-stamp-openmpi
+	touch $@
 
 build-stamp-mpich: configure-stamp-mpich 
 	dh_testdir
 	$(MAKE) -C debian/build-mpich/
-	touch build-stamp-mpich
+	touch $@
 
 clean: unpatch
 	test -f debian/control.in
@@ -188,9 +188,9 @@ clean: unpatch
 	grep -v ^\% debian/control.in | sed -e "s/@VERSION@/$(version)/g" -e "s/@ARCHS@/$(ARCHS)/" > debian/control
 	dh_clean configure-stamp* build-stamp* install-stamp* debian/*.shlibs
 
-install: install-serial install-lam $(install_openmpi) install-mpich install-doc
+install: build prep install-serial install-lam $(install_openmpi) install-mpich install-doc
 
-install-serial: build-stamp-serial
+install-serial: build-stamp-serial 
 	dh_testdir
 	dh_testroot
 	-mkdir debian/build-serial/tmpinst
@@ -239,7 +239,7 @@ binary-indep: install-doc
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: build install-serial install-lam $(install_openmpi) install-mpich
+binary-arch: prep install-serial install-lam $(install_openmpi) install-mpich
 	dh_testdir
 	dh_testroot 
 	dh_installdocs $(ARCH_FLAG)
@@ -249,15 +249,15 @@ binary-arch: build install-serial install-lam $(install_openmpi) install-mpich
 	dh_strip $(ARCH_FLAG)
 	dh_compress $(ARCH_FLAG)
 	dh_fixperms $(ARCH_FLAG)
-	dh_makeshlibs -p$(serpack) -V "$(serpack) | $(virtpack)"
 	dh_makeshlibs -p$(lampack) -V $(lampack)
 ifeq ($(build_openmpi),yes)
 	dh_makeshlibs -p$(openmpipack) -V $(openmpipack)
 endif
 	dh_makeshlibs -p$(mpichpack) -V $(mpichpack)
+	dh_makeshlibs -p$(serpack) -V "$(serpack) | $(virtpack)"
 	dh_installdeb $(ARCH_FLAG)
-	dh_shlibdeps -phdf5-tools -Lhdf5-tools -ldebian/$(serpack)/usr/lib:debian/build-serial/test/.libs
 	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$(lampack) -L$(lampack) -ldebian/$(lampack)/usr/lib
 ifeq ($(build_openmpi),yes)
 	dh_shlibdeps -p$(openmpipack) -L$(openmpipack) -ldebian/$(openmpipack)/usr/lib
@@ -269,4 +269,5 @@ endif
 
 binary: binary-indep binary-arch
 
-.PHONY: build clean binary-indep binary-arch binary install configure install-serial install-doc install-lam install-openmpi install-mpich prep
+.PHONY: build clean binary-indep binary-arch binary install configure \
+		install-serial install-doc install-lam install-openmpi install-mpich prep
diff --git a/debian/shlibs.in b/debian/shlibs.in
index 41b1295..e70ff09 100644
--- a/debian/shlibs.in
+++ b/debian/shlibs.in
@@ -1,4 +1,7 @@
-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@
+libhdf5_cpp 6 libhdf5-serial- at VERSION@
+libhdf5_fortran 6 libhdf5-serial- at VERSION@
+libhdf5 6 libhdf5-serial- at VERSION@ | libhdf5- at VERSION@
+libh5test 6 libhdf5-serial- at VERSION@ | libhdf5- at VERSION@
+libhdf5_hl 6 libhdf5-serial- at VERSION@ | libhdf5- at VERSION@
+libhdf5_hl_cpp 6 libhdf5-serial- at VERSION@ | libhdf5- at VERSION@
+libhdf5hl_fortran 6 libhdf5-serial- at VERSION@ | libhdf5- at VERSION@

-- 
Hierarchical Data Format 5 (HDF5)