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

[Sylvestre Ledru]

The following commit has been merged in the upstream branch:
commit 9786ff4de8608d0c2ade81038b0f95112d2398ea
Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
Date:   Sun Aug 21 09:49:49 2011 +0200

      * New package hdf5-helpers introduced. Contains now h5cc, h5c++ & h5fc.
        All hdf5 *-dev now depends on it (Closes: #629157, #637749)
        (LP: #770347)

diff --git a/debian/changelog b/debian/changelog
index d661113..5c483f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ hdf5 (1.8.7-2~exp7) experimental; urgency=low
   * Fix a mistake in the powerpc symbol file
   * mipsel and hurd-i386 symbols
   * s390x support. Thanks to Aurelien Jarno (Closes: #638363)
-  * h5cc, h5c++ & h5fc moved to the dev packages (Closes: #629157, #637749)
+  * New package hdf5-helpers introduced. Contains now h5cc, h5c++ & h5fc.
+    All hdf5 *-dev now depends on it (Closes: #629157, #637749)
     (LP: #770347)
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 12 Aug 2011 15:19:01 +0200
diff --git a/debian/control b/debian/control
index 237f0a5..5d03349 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Section: debug
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libhdf5-7 (= ${binary:Version}),
+ libhdf5-7 (= ${binary:Version})
 Description: Hierarchical Data Format 5 (HDF5) - Debug package
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -47,7 +47,8 @@ Description: Hierarchical Data Format 5 (HDF5) - Debug package
 Package: libhdf5-dev
 Section: libdevel
 Architecture: any
-Depends: libhdf5-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, ${misc:Depends}
+Depends: libhdf5-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev,
+ ${misc:Depends}, hdf5-helper
 Conflicts: libhdf5-dev
 Suggests: libhdf5-doc
 Description: Hierarchical Data Format 5 (HDF5) - development files - serial version
@@ -81,7 +82,8 @@ Package: libhdf5-openmpi-dev
 Section: libdevel
 Priority: extra
 Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386
-Depends: libhdf5-openmpi-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, libopenmpi-dev, ${misc:Depends}
+Depends: libhdf5-openmpi-7 (= ${binary:Version}), zlib1g-dev,
+ libjpeg-dev, libopenmpi-dev, ${misc:Depends}, hdf5-helper
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -131,7 +133,8 @@ Package: libhdf5-mpich2-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libhdf5-mpich2-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, libmpich21.0-dev, ${misc:Depends}
+Depends: libhdf5-mpich2-7 (= ${binary:Version}), zlib1g-dev,
+ libjpeg-dev, libmpich21.0-dev, ${misc:Depends}, hdf5-helper
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -184,6 +187,20 @@ Description: Hierarchical Data Format 5 (HDF5) - Documentation
  .
  This package contains documentation for HDF5.
 
+Package: hdf5-helper
+Section: science
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+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
+ HDF4.x. It has a more powerful and flexible data model, supports
+ files larger than 2 GB, and supports parallel I/O.
+ .
+ This package contains helper tools for HDF5.
+ .
+ These tools were provided by hdf5-tools before version 1.8.7-2.
+
 Package: hdf5-tools
 Section: science
 Architecture: any
diff --git a/debian/control.in b/debian/control.in
index 53244fe..0e74cc2 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -35,7 +35,7 @@ Section: debug
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libhdf5- at SONAME@ (= ${binary:Version}),
+ libhdf5- at SONAME@ (= ${binary:Version})
 Description: Hierarchical Data Format 5 (HDF5) - Debug package
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -47,7 +47,8 @@ Description: Hierarchical Data Format 5 (HDF5) - Debug package
 Package: libhdf5-dev
 Section: libdevel
 Architecture: any
-Depends: libhdf5- at SONAME@ (= ${binary:Version}), zlib1g-dev, libjpeg-dev, ${misc:Depends}
+Depends: libhdf5- at SONAME@ (= ${binary:Version}), zlib1g-dev, libjpeg-dev,
+ ${misc:Depends}, hdf5-helper
 Conflicts: libhdf5-dev
 Suggests: libhdf5-doc
 Description: Hierarchical Data Format 5 (HDF5) - development files - serial version
@@ -81,7 +82,8 @@ Package: libhdf5-openmpi-dev
 Section: libdevel
 Priority: extra
 Architecture: @ARCHS@
-Depends: libhdf5-openmpi- at SONAME@ (= ${binary:Version}), zlib1g-dev, libjpeg-dev, libopenmpi-dev, ${misc:Depends}
+Depends: libhdf5-openmpi- at SONAME@ (= ${binary:Version}), zlib1g-dev,
+ libjpeg-dev, libopenmpi-dev, ${misc:Depends}, hdf5-helper
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -131,7 +133,8 @@ Package: libhdf5-mpich2-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libhdf5-mpich2- at SONAME@ (= ${binary:Version}), zlib1g-dev, libjpeg-dev, libmpich21.0-dev, ${misc:Depends}
+Depends: libhdf5-mpich2- at SONAME@ (= ${binary:Version}), zlib1g-dev,
+ libjpeg-dev, libmpich21.0-dev, ${misc:Depends}, hdf5-helper
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -184,6 +187,20 @@ Description: Hierarchical Data Format 5 (HDF5) - Documentation
  .
  This package contains documentation for HDF5.
 
+Package: hdf5-helper
+Section: science
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+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
+ HDF4.x. It has a more powerful and flexible data model, supports
+ files larger than 2 GB, and supports parallel I/O.
+ .
+ This package contains helper tools for HDF5.
+ .
+ These tools were provided by hdf5-tools before version 1.8.7-2.
+
 Package: hdf5-tools
 Section: science
 Architecture: any
diff --git a/debian/hdf5-helper.install b/debian/hdf5-helper.install
new file mode 100644
index 0000000..25d40b6
--- /dev/null
+++ b/debian/hdf5-helper.install
@@ -0,0 +1,4 @@
+usr/bin/h5c++
+usr/bin/h5cc
+usr/bin/h5fc
+
diff --git a/debian/install_devlib b/debian/install_devlib
index 09c4f4c..ad156fa 100644
--- a/debian/install_devlib
+++ b/debian/install_devlib
@@ -2,4 +2,3 @@ usr/include
 usr/lib/libhdf5*.so
 usr/lib/libhdf5*.settings
 usr/lib/libhdf5*.a
-

-- 
Hierarchical Data Format 5 (HDF5)