[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 e2766b912f7da601a789960306408ea3479d9f59
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Jan 25 16:40:57 2010 +0000

    Sigh, still urgent change.

diff --git a/debian/changelog b/debian/changelog
index 32c1b6d..e5939e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hdf5 (1.8.4-3) unstable; urgency=low
+
+  * All libraries have to conflict against past 1.8.3 virtual package to solve
+    previous mess.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 25 Jan 2010 17:37:39 +0100
+
 hdf5 (1.8.4-2) unstable; urgency=low
 
   * Current library still retains the 1.8 SONAME and that causes problems 
diff --git a/debian/control b/debian/control
index 4a5bce6..35b85b2 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-serial-1.8.3
 Provides: libhdf5-1.8.4, libhdf5-1.8
-Replaces: libhdf5-serial-1.8.3
+Replaces: libhdf5-1.8.3
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -49,7 +49,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-lam-1.8.3
 Provides: libhdf5-1.8.4, libhdf5-1.8
-Replaces: libhdf5-lam-1.8.3
+Replaces: libhdf5-1.8.3
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - LAM version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -81,7 +81,7 @@ Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}
 Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-openmpi-1.8.3
 Provides: libhdf5-1.8.4, libhdf5-1.8
-Replaces: libhdf5-openmpi-1.8.3
+Replaces: libhdf5-1.8.3
 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
@@ -113,7 +113,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-mpich-1.8.3
 Provides: libhdf5-1.8.4, libhdf5-1.8
-Replaces: libhdf5-mpich-1.8.3
+Replaces: libhdf5-1.8.3
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH 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 98235ee..72fc64a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -18,7 +18,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@, libhdf5-serial-1.8.3
 Provides: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@
-Replaces: libhdf5-serial-1.8.3
+Replaces: libhdf5-1.8.3
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -49,7 +49,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@, libhdf5-lam-1.8.3
 Provides: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@
-Replaces: libhdf5-lam-1.8.3
+Replaces: libhdf5-1.8.3
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - LAM version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -81,7 +81,7 @@ Architecture: @ARCHS@
 Depends: ${shlibs:Depends}
 Conflicts: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@, libhdf5-openmpi-1.8.3
 Provides: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@
-Replaces: libhdf5-openmpi-1.8.3
+Replaces: libhdf5-1.8.3
 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
@@ -113,7 +113,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@, libhdf5-mpich-1.8.3
 Provides: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@
-Replaces: libhdf5-mpich-1.8.3
+Replaces: libhdf5-1.8.3
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of

-- 
Hierarchical Data Format 5 (HDF5)