[SCM] hdf5 branch, master, updated. upstream/1.8.7-174-g75bc680

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit 75bc680716722932e52bb58c0cccc56954db7783
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Sun Sep 29 13:01:56 2013 +0200

    Forgot to update debian/control.in ...

diff --git a/debian/changelog b/debian/changelog
index 1c5dc6a..cb03298 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hdf5 (1.8.11-5) unstable; urgency=low
+
+  * Forgot to update debian/control.in ...
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 29 Sep 2013 13:01:29 +0200
+
 hdf5 (1.8.11-4) unstable; urgency=low
 
   * Fix a miscompilation issue with gcc 4.8 (Closes: #721805)
diff --git a/debian/control.in b/debian/control.in
index d15a8b3..9f7c7f9 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,7 +7,7 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
 Build-Depends: dpkg-dev (>= 1.16.1~), libmpich2-dev, zlib1g-dev,
  libopenmpi-dev [!hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>= 8.1.3), sed (>=4.1.5),
  gfortran, libibverbs-dev [!arm !hppa !mips !mipsel !s390 !s390x !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
- sharutils, mpi-default-dev
+ sharutils, mpi-default-dev, chrpath
 Standards-Version: 3.9.4
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/hdf5.git
@@ -38,6 +38,7 @@ Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libhdf5- at SONAME@ (= ${binary:Version})
+Conflicts: libhdf5-mpich2- at SONAME@-dbg, libhdf5-openmpi- at SONAME@-dbg
 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
@@ -119,6 +120,7 @@ Priority: extra
 Architecture: @ARCHS@
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libhdf5-openmpi- at SONAME@ (= ${binary:Version}),
+Conflicts: libhdf5- at SONAME@-dbg, libhdf5-mpich2- at SONAME@-dbg
 Description: Hierarchical Data Format 5 (HDF5) - OpenMPI Debug package
  HDF5 is a file format and library for storing scientific data.
  HDF5 was designed and implemented to address the deficiencies of
@@ -173,6 +175,7 @@ Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libhdf5-mpich2- at SONAME@ (= ${binary:Version}),
+Conflicts: libhdf5-openmpi- at SONAME@-dbg, libhdf5- at SONAME@-dbg
 Description: Hierarchical Data Format 5 (HDF5) - Mpich2 Debug package
  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)