[SCM] hdf5 branch, master, updated. upstream/1.8.8-29-g244a6c0

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit 244a6c017236a57a0c245b0b29bc10d0249eae29
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Thu Jan 19 18:32:54 2012 +0100

    Fix various dependencies issues

diff --git a/debian/changelog b/debian/changelog
index 6f0779e..03a770d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hdf5 (1.8.8-3) UNRELEASED; urgency=low
+hdf5 (1.8.8-3) unstable; urgency=low
 
   * libhdf5-openmpi-7-dbg was build for arch:any while it should be built
     only on openmpi supported archs
@@ -10,7 +10,7 @@ hdf5 (1.8.8-3) UNRELEASED; urgency=low
   * hdf5-tools could not be installed at the same time as libhdf5-openmpi-7
     or libhdf5-mpich2-7
 
- -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 19 Jan 2012 10:58:09 +0100
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 19 Jan 2012 14:28:13 +0100
 
 hdf5 (1.8.8-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6359461..07f6577 100644
--- a/debian/control
+++ b/debian/control
@@ -205,7 +205,8 @@ Package: hdf5-helpers
 Section: science
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: hdf5-tools
+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 was designed and implemented to address the deficiencies of
@@ -219,7 +220,7 @@ Description: Hierarchical Data Format 5 (HDF5) - Helper tools
 Package: hdf5-tools
 Section: science
 Architecture: any
-Depends: ${shlibs:Depends}, libhdf5-1.8, ${misc:Depends}
+Depends: libhdf5-1.8, ${misc:Depends}
 Description: Hierarchical Data Format 5 (HDF5) - Runtime tools 
  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 c8e4d31..8eadd65 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -205,6 +205,8 @@ Package: hdf5-helpers
 Section: science
 Architecture: any
 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 was designed and implemented to address the deficiencies of
@@ -218,7 +220,7 @@ Description: Hierarchical Data Format 5 (HDF5) - Helper tools
 Package: hdf5-tools
 Section: science
 Architecture: any
-Depends: ${shlibs:Depends}, libhdf5- at MAJOR_VERSION@, ${misc:Depends}
+Depends: libhdf5- at MAJOR_VERSION@, ${misc:Depends}
 Description: Hierarchical Data Format 5 (HDF5) - Runtime tools 
  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/rules b/debian/rules
index 476d7e6..4e246fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ major_version = $(shell echo $(version) | cut -d. -f1,2)
 serpack = $(package)-$(soname)
 openmpipack = $(package)-openmpi-$(soname)
 mpich2pack = $(package)-mpich2-$(soname)
-virtpack = $(package)-$(soname)
+virtpack = $(package)-$(major_version)
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -246,8 +246,8 @@ endif
 	dh_makeshlibs -p$(serpack) -V "$(serpack) | $(virtpack)"
 	dh_installdeb $(ARCH_FLAG)
 	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 
-	dh_shlibdeps -phdf5-helpers -L$(serpack) -ldebian/$(serpack)/usr/lib:debian/build/test/.libs 
+	dh_shlibdeps -phdf5-tools -X$(serpack) -X$(openmpipack) -X$(mpich2pack) -L$(virtpack) -ldebian/$(serpack)/usr/lib:debian/build/test/.libs 
+	dh_shlibdeps -phdf5-helpers -X$(serpack) -X$(openmpipack) -X$(mpich2pack) -L$(virtpack) -ldebian/$(serpack)/usr/lib:debian/build/test/.libs 
 ifeq ($(build_openmpi),yes)
 	dh_shlibdeps -p$(openmpipack) -L$(openmpipack) -ldebian/$(openmpipack)/usr/lib
 endif

-- 
Hierarchical Data Format 5 (HDF5)