[SCM] hdf5 branch, master, updated. upstream/1.8.4-patch1-49-gccd04af

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit ccd04af29832ef3012c57f380b6a9982a1157801
Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
Date:   Mon Aug 8 17:32:41 2011 +0200

    Fix package-relation-with-self on libhdf5-7 (Provides:)

diff --git a/debian/changelog b/debian/changelog
index 87a8525..ba1f5ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 hdf5 (1.8.7-2~exp2) experimental; urgency=low
 
   * Update of the symbol files. Further uploads might come. (Closes: #636967)
+  * Fix package-relation-with-self on libhdf5-7 (Provides:)
+  * Fix a typo in the manpage h5import & h5diff
+  * Missing manpages for h5copy h5fc h5mkgrp h5perf_serial h5stat
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 08 Aug 2011 13:22:06 +0200
 
diff --git a/debian/control b/debian/control
index 511a705..6e0260b 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Depends: ${shlibs:Depends}, ${misc: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-7, libhdf5-1.8
+Provides: 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
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
  HDF5 is a file format and library for storing scientific data. 
diff --git a/debian/control.in b/debian/control.in
index 38e8c4d..c8c95f6 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -20,6 +20,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libhdf5- at SONAME@, libhdf5- at 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-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
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
  HDF5 is a file format and library for storing scientific data. 

-- 
Hierarchical Data Format 5 (HDF5)