[SCM] hdf5 branch, master, updated. upstream/1.8.8-30-g3389f8a

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit 3389f8a05f5cef8375038c2e2aa6d016850fa262
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Mon Jan 23 11:43:51 2012 +0100

    Upload into unstable

diff --git a/debian/changelog b/debian/changelog
index 03a770d..2b6a124 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ 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
-  * Some wierd artefacts in the define were breaking ia64 build
+  * Some weird artefacts in the define were breaking ia64 build
   * Force g++ as the C++ compiler
   * Update the symbol list for sparc
   * In some cases, configures were executed in parallel. Disable it.
diff --git a/debian/control b/debian/control
index 07f6577..2bb4104 100644
--- a/debian/control
+++ b/debian/control
@@ -204,7 +204,7 @@ Description: Hierarchical Data Format 5 (HDF5) - Documentation
 Package: hdf5-helpers
 Section: science
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libhdf5-1.8, ${misc:Depends}
 Replaces: hdf5-tools (<< 1.8.7-1)
 Breaks: hdf5-tools (<< 1.8.7-1)
 Description: Hierarchical Data Format 5 (HDF5) - Helper tools 
diff --git a/debian/hdf5-helpers.lintian-overrides b/debian/hdf5-helpers.lintian-overrides
new file mode 100644
index 0000000..cc37636
--- /dev/null
+++ b/debian/hdf5-helpers.lintian-overrides
@@ -0,0 +1,4 @@
+# Right but otherwise, hdf5-helpers will depend on one of the 3 hdf5 implementation
+# causing some potential conflicts
+hdf5-helpers: missing-dependency-on-libc needed by *
+
diff --git a/debian/hdf5-tools.lintian-overrides b/debian/hdf5-tools.lintian-overrides
new file mode 100644
index 0000000..866d177
--- /dev/null
+++ b/debian/hdf5-tools.lintian-overrides
@@ -0,0 +1,4 @@
+# Right but otherwise, hdf5-tools will depend on one of the 3 hdf5 implementation
+# causing some potential conflicts
+hdf5-tools: missing-dependency-on-libc needed by *
+
diff --git a/debian/rules b/debian/rules
index 4e246fb..c604a76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -218,6 +218,7 @@ binary-indep: install-doc
 	dh_compress -i -X.pdf
 	dh_fixperms -i
 	dh_installdeb -i
+	dh_lintian -i
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i
@@ -228,6 +229,7 @@ binary-arch: prep install-serial $(install_openmpi) install-mpich2
 	echo "hdf5-mpi-dev=libhdf5-$(DEFAULT_MPI)-dev" > debian/libhdf5-mpi-dev.substvars
 	dh_installdocs $(ARCH_FLAG)
 	dh_installman $(ARCH_FLAG)
+	dh_lintian $(ARCH_FLAG)
 	dh_installchangelogs -a -k release_docs/RELEASE.txt
 	dh_link $(ARCH_FLAG)
 	dh_strip -phdf5-tools
@@ -246,8 +248,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 -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 
+	dh_shlibdeps -phdf5-tools -L$(virtpack) -ldebian/$(serpack)/usr/lib:debian/build/test/.libs 
+	dh_shlibdeps -phdf5-helpers -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)