[hdf5] 02/12: Merge branch 'master' into master-1.10

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch master-1.10
in repository hdf5.

commit 4bd123d99407cf538259d75bfa1191aac7d5536e
Merge: d8b05a4 cda2b9e
Author: Gilles Filippini <pini at debian.org>
Date:   Fri Mar 18 23:32:22 2016 +0100

    Merge branch 'master' into master-1.10

 debian/changelog  | 34 +++++++++++++++++++++++++++++
 debian/control    | 16 ++++++++------
 debian/control.in | 10 +++++----
 debian/rules      | 64 ++++++++++++++++++++++++++++++++++++++-----------------
 debian/watch      |  2 +-
 5 files changed, 95 insertions(+), 31 deletions(-)

diff --cc debian/changelog
index 6ebacad,1fba6d3..266b677
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,37 +1,52 @@@
 +hdf5 (1.10.0~alpha1+docs-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +  * Refresh lintian overrides.
 +  * Drop patches:
 +    - format-not-a-string-literal-and-no-format-arguments.patch: fixed
 +      upstream
 +    - hurd-sigsetjmp.patch: no more needed now that #800900 is fixed.
 +  * Refresh other patches.
 +  * libhdf5-cpp-<SONAME_CXX>: drop versioned dependency on libhdf5-<SONAME>
 +    to ease future transitions.
 +  * debian/rules: improve soname retrival.
 +
 + -- Gilles Filippini <pini at debian.org>  Sat, 23 Jan 2016 15:18:33 +0100
 +
+ hdf5 (1.8.16+docs-6) unstable; urgency=medium
+ 
+   * Don't support openmpi on archs where it is broken: [!hppa !m68k !sh4]
+ 
+  -- Gilles Filippini <pini at debian.org>  Wed, 24 Feb 2016 17:57:01 +0100
+ 
+ hdf5 (1.8.16+docs-5) unstable; urgency=medium
+ 
+   * Build -doc package only on archs where php5-cli is available:
+     [!m68k !sh4].
+ 
+  -- Gilles Filippini <pini at debian.org>  Sun, 21 Feb 2016 20:56:48 +0100
+ 
+ hdf5 (1.8.16+docs-4) unstable; urgency=medium
+ 
+   * Support openmpi for any arch but m68k (closes: #814329).
+   * Fix debian/watch to show every available releases.
+ 
+  -- Gilles Filippini <pini at debian.org>  Fri, 19 Feb 2016 01:06:49 +0100
+ 
+ hdf5 (1.8.16+docs-3) unstable; urgency=medium
+ 
+   * libhdf5{,-mpich,-openmpi}-dev: Depends: libaec-dev (closes: #812683).
+ 
+  -- Gilles Filippini <pini at debian.org>  Mon, 25 Jan 2016 22:51:16 +0100
+ 
+ hdf5 (1.8.16+docs-2) unstable; urgency=medium
+ 
+   * Build against libaec-dev which provide SZLIB (closes: #811093).
+   * libhdf5-cpp-<SONAME_CXX>: drop versioned dependency on libhdf5-<SONAME>
+     to ease future transitions.
+ 
+  -- Gilles Filippini <pini at debian.org>  Sun, 24 Jan 2016 22:52:49 +0100
+ 
  hdf5 (1.8.16+docs-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index b7243b6,0d6de2c..6fe1c34
--- a/debian/control
+++ b/debian/control
@@@ -79,8 -81,8 +81,8 @@@ Description: Hierarchical Data Format 
  Package: libhdf5-dev
  Section: libdevel
  Architecture: any
- Depends: libhdf5-100 (= ${binary:Version}), zlib1g-dev, libjpeg-dev,
 -Depends: libhdf5-10 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, libaec-dev,
 - ${misc:Depends}, hdf5-helpers, libhdf5-cpp-11 (= ${binary:Version})
++Depends: libhdf5-100 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, libaec-dev,
 + ${misc:Depends}, hdf5-helpers, libhdf5-cpp-100 (= ${binary:Version})
  Suggests: libhdf5-doc
  Provides: libhdf5-serial-dev
  Replaces: libhdf5-serial-dev (<< 1.8.12-9~)
@@@ -93,10 -95,10 +95,10 @@@ Description: Hierarchical Data Format 
   .
   This package contains development files for serial platforms.
  
 -Package: libhdf5-openmpi-10
 +Package: libhdf5-openmpi-100
  Section: libs
  Priority: extra
- Architecture: alpha amd64 armel armhf arm64 i386 ia64 powerpc powerpcspe ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 mips64 mips64el mips mipsel
+ Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}
  Pre-Depends: ${misc:Pre-Depends}
  Multi-Arch: same
@@@ -111,8 -113,8 +113,8 @@@ Description: Hierarchical Data Format 
  Package: libhdf5-openmpi-dev
  Section: libdevel
  Priority: extra
- Architecture: alpha amd64 armel armhf arm64 i386 ia64 powerpc powerpcspe ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 mips64 mips64el mips mipsel
- Depends: libhdf5-openmpi-100 (= ${binary:Version}), zlib1g-dev,
+ Architecture: any
 -Depends: libhdf5-openmpi-10 (= ${binary:Version}), zlib1g-dev, libaec-dev,
++Depends: libhdf5-openmpi-100 (= ${binary:Version}), zlib1g-dev, libaec-dev,
   libjpeg-dev, libopenmpi-dev, ${misc:Depends}
  Suggests: libhdf5-doc
  Description: Hierarchical Data Format 5 (HDF5) - development files - OpenMPI version
@@@ -123,12 -125,12 +125,12 @@@
   .
   This package contains development files for use with OpenMPI.
  
 -Package: libhdf5-openmpi-10-dbg
 +Package: libhdf5-openmpi-100-dbg
  Section: debug
  Priority: extra
- Architecture: alpha amd64 armel armhf arm64 i386 ia64 powerpc powerpcspe ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 mips64 mips64el mips mipsel
+ Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends},
 - libhdf5-openmpi-10 (= ${binary:Version}),
 + libhdf5-openmpi-100 (= ${binary:Version}),
  Multi-Arch: same
  Description: Hierarchical Data Format 5 (HDF5) - OpenMPI Debug package
   HDF5 is a file format and library for storing scientific data.
@@@ -158,7 -160,7 +160,7 @@@ Package: libhdf5-mpich-de
  Section: libdevel
  Priority: extra
  Architecture: any
- Depends: libhdf5-mpich-100 (= ${binary:Version}), zlib1g-dev,
 -Depends: libhdf5-mpich-10 (= ${binary:Version}), zlib1g-dev, libaec-dev,
++Depends: libhdf5-mpich-100 (= ${binary:Version}), zlib1g-dev, libaec-dev,
   libjpeg-dev, libmpich-dev, ${misc:Depends}
  Suggests: libhdf5-doc
  Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH version

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git