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

pini pushed a commit to branch master
in repository hdf5.

commit 8d9cb70bf56215cb6949b060b6e49b1c61416af8
Author: Gilles Filippini <p...@debian.org>
Date:   Sun Dec 21 14:57:16 2014 +0100

    First build of release 1.8.14.
    
    Symbols files are not updated yet. To build successfully we need
    to set DPKG_GENSYMBOLS_CHECK_LEVEL=0.
---
 debian/changelog                                   |  18 ++
 debian/control                                     |  42 +--
 debian/libhdf5-8.lintian-overrides                 |   2 -
 debian/libhdf5-9.lintian-overrides                 |   2 +
 debian/{libhdf5-8.symbols => libhdf5-9.symbols}    |   8 +-
 debian/libhdf5-cpp-8.lintian-overrides             |   1 -
 debian/libhdf5-cpp-9.lintian-overrides             |   1 +
 ...libhdf5-cpp-8.symbols => libhdf5-cpp-9.symbols} |   4 +-
 debian/libhdf5-mpich-8.lintian-overrides           |   2 -
 debian/libhdf5-mpich-9.lintian-overrides           |   2 +
 ...df5-mpich-8.symbols => libhdf5-mpich-9.symbols} |   8 +-
 debian/libhdf5-openmpi-8.lintian-overrides         |   2 -
 debian/libhdf5-openmpi-9.lintian-overrides         |   2 +
 ...openmpi-8.symbols => libhdf5-openmpi-9.symbols} |   8 +-
 debian/patches/HDFFV-8917.patch                    | 301 ---------------------
 debian/patches/flavor-configure-option.patch       |  56 ++--
 debian/patches/mpi.diff                            |  14 -
 debian/patches/path_max.diff                       |   6 +-
 debian/patches/series                              |   4 -
 debian/patches/skip_cxx_inclusion.diff             |  16 --
 debian/patches/soname.diff                         |  15 -
 debian/rules                                       |   4 +-
 22 files changed, 93 insertions(+), 425 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98e9952..99bc0a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+hdf5 (1.8.14+docs-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * soname bump due to the renaming of several public symbols in
+    H5Ppublic.h.
+
+  * Drop patches (issues fixed upstream):
+    - soname.diff
+    - HDFFV-8917.patch
+  * Definitely drop previously de-activated patches:
+    - mpi.diff
+    - skip_cxx_inclusion.diff
+  * Refresh patches:
+    - flavor-configure-option.patch
+    - path_max.diff
+
+ -- Gilles Filippini <p...@debian.org>  Sun, 21 Dec 2014 11:32:19 +0100
+
 hdf5 (1.8.13+docs-15) unstable; urgency=medium
 
   * New patch HDFFV-8917.patch from upstream to fix a resource
diff --git a/debian/control b/debian/control
index 68b1c28..f197269 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/hdf5.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/hdf5.git
 
-Package: libhdf5-8
+Package: libhdf5-9
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -26,12 +26,12 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime 
files - serial version
  .
  This package contains runtime files for serial platforms.
 
-Package: libhdf5-8-dbg
+Package: libhdf5-9-dbg
 Section: debug
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libhdf5-8 (= ${binary:Version})
+ libhdf5-9 (= ${binary:Version})
 Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - Debug package
  HDF5 is a file format and library for storing scientific data.
@@ -41,13 +41,13 @@ Description: Hierarchical Data Format 5 (HDF5) - Debug 
package
  .
  This package contains debug libraries.
 
-Package: libhdf5-cpp-8
+Package: libhdf5-cpp-9
 Section: libs
 Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
- libhdf5-8 (= ${binary:Version}),
+ libhdf5-9 (= ${binary:Version}),
 Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - C++ libraries
  HDF5 is a file format and library for storing scientific data.
@@ -57,14 +57,14 @@ Description: Hierarchical Data Format 5 (HDF5) - C++ 
libraries
  .
  This package contains C++ libraries.
 
-Package: libhdf5-cpp-8-dbg
+Package: libhdf5-cpp-9-dbg
 Section: debug
 Priority: extra
 Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
- libhdf5-cpp-8 (= ${binary:Version}), libhdf5-8-dbg (= ${binary:Version})
+ libhdf5-cpp-9 (= ${binary:Version}), libhdf5-9-dbg (= ${binary:Version})
 Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - C++ Debug package
  HDF5 is a file format and library for storing scientific data.
@@ -77,8 +77,8 @@ Description: Hierarchical Data Format 5 (HDF5) - C++ Debug 
package
 Package: libhdf5-dev
 Section: libdevel
 Architecture: any
-Depends: libhdf5-8 (= ${binary:Version}), zlib1g-dev, libjpeg-dev,
- ${misc:Depends}, hdf5-helpers, libhdf5-cpp-8 (= ${binary:Version})
+Depends: libhdf5-9 (= ${binary:Version}), zlib1g-dev, libjpeg-dev,
+ ${misc:Depends}, hdf5-helpers, libhdf5-cpp-9 (= ${binary:Version})
 Suggests: libhdf5-doc
 Provides: libhdf5-serial-dev
 Replaces: libhdf5-serial-dev (<< 1.8.12-9~)
@@ -91,7 +91,7 @@ Description: Hierarchical Data Format 5 (HDF5) - development 
files - serial vers
  .
  This package contains development files for serial platforms.
 
-Package: libhdf5-openmpi-8
+Package: libhdf5-openmpi-9
 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
@@ -110,7 +110,7 @@ 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-8 (= ${binary:Version}), zlib1g-dev,
+Depends: libhdf5-openmpi-9 (= ${binary:Version}), zlib1g-dev,
  libjpeg-dev, libopenmpi-dev, ${misc:Depends}
 Suggests: libhdf5-doc
 Description: Hierarchical Data Format 5 (HDF5) - development files - OpenMPI 
version
@@ -121,12 +121,12 @@ Description: Hierarchical Data Format 5 (HDF5) - 
development files - OpenMPI ver
  .
  This package contains development files for use with OpenMPI.
 
-Package: libhdf5-openmpi-8-dbg
+Package: libhdf5-openmpi-9-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
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libhdf5-openmpi-8 (= ${binary:Version}),
+ libhdf5-openmpi-9 (= ${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.
@@ -136,14 +136,14 @@ Description: Hierarchical Data Format 5 (HDF5) - OpenMPI 
Debug package
  .
  This package contains debug hdf5/openmpi libraries.
 
-Package: libhdf5-mpich-8
+Package: libhdf5-mpich-9
 Section: libs
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Replaces: libhdf5-mpich2-8 (<< 1.8.12-2~)
-Breaks: libhdf5-mpich2-8 (<< 1.8.12-2~)
+Replaces: libhdf5-mpich2-9 (<< 1.8.12-2~)
+Breaks: libhdf5-mpich2-9 (<< 1.8.12-2~)
 Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH2 version
  HDF5 is a file format and library for storing scientific data.
@@ -158,7 +158,7 @@ Package: libhdf5-mpich-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libhdf5-mpich-8 (= ${binary:Version}), zlib1g-dev,
+Depends: libhdf5-mpich-9 (= ${binary:Version}), zlib1g-dev,
  libjpeg-dev, libmpich-dev, ${misc:Depends}
 Replaces: libhdf5-mpich2-dev (<< 1.8.12-2~)
 Breaks: libhdf5-mpich2-dev (<< 1.8.12-2~)
@@ -185,14 +185,14 @@ Description: Hierarchical Data Format 5 (HDF5) - 
development files - MPICH versi
  .
  Transitional dummy package for libhdf5-mpich-dev.
 
-Package: libhdf5-mpich-8-dbg
+Package: libhdf5-mpich-9-dbg
 Section: debug
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libhdf5-mpich-8 (= ${binary:Version}),
-Replaces: libhdf5-mpich2-8-dbg (<< 1.8.12-2~)
-Breaks: libhdf5-mpich2-8-dbg (<< 1.8.12-2~)
+ libhdf5-mpich-9 (= ${binary:Version}),
+Replaces: libhdf5-mpich2-9-dbg (<< 1.8.12-2~)
+Breaks: libhdf5-mpich2-9-dbg (<< 1.8.12-2~)
 Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - Mpich Debug package
  HDF5 is a file format and library for storing scientific data.
diff --git a/debian/libhdf5-8.lintian-overrides 
b/debian/libhdf5-8.lintian-overrides
deleted file mode 100644
index f578a78..0000000
--- a/debian/libhdf5-8.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libhdf5-8: package-name-doesnt-match-sonames libhdf5-serial8 
libhdf5-serial-fortran8 libhdf5-serial-hl8 libhdf5-serialhl-fortran8
-
diff --git a/debian/libhdf5-9.lintian-overrides 
b/debian/libhdf5-9.lintian-overrides
new file mode 100644
index 0000000..bb1bfa5
--- /dev/null
+++ b/debian/libhdf5-9.lintian-overrides
@@ -0,0 +1,2 @@
+libhdf5-9: package-name-doesnt-match-sonames libhdf5-serial9 
libhdf5-serial-fortran9 libhdf5-serial-hl9 libhdf5-serialhl-fortran9
+
diff --git a/debian/libhdf5-8.symbols b/debian/libhdf5-9.symbols
similarity index 99%
rename from debian/libhdf5-8.symbols
rename to debian/libhdf5-9.symbols
index d0aa75b..05b5821 100644
--- a/debian/libhdf5-8.symbols
+++ b/debian/libhdf5-9.symbols
@@ -1,4 +1,4 @@
-libhdf5_serial.so.8 libhdf5-8
+libhdf5_serial.so.9 libhdf5-9
  H5AC_BT2_HDR@HDF5_SERIAL_1.8.7 1.8.13
  H5AC_BT2_INT@HDF5_SERIAL_1.8.7 1.8.13
  H5AC_BT2_LEAF@HDF5_SERIAL_1.8.7 1.8.13
@@ -2492,7 +2492,7 @@ libhdf5_serial.so.8 libhdf5-8
  HDsrand@HDF5_SERIAL_1.8.7 1.8.13
  HDstrtoll@HDF5_SERIAL_1.8.7 1.8.13
  epoch_marker_class@HDF5_SERIAL_1.8.7 1.8.13
-libhdf5_serial_fortran.so.8 libhdf5-8
+libhdf5_serial_fortran.so.9 libhdf5-9
  HD5f2cstring@HDF5_SERIAL_1.8.7 1.8.13
  HD5packFstring@HDF5_SERIAL_1.8.7 1.8.13
  HDF5_CPP_1.8.11@HDF5_CPP_1.8.11 1.8.13
@@ -3564,7 +3564,7 @@ libhdf5_serial_fortran.so.8 libhdf5-8
  h5zunregister_c_@HDF5_SERIAL_1.8.7 1.8.13
  integer_types_@HDF5_SERIAL_1.8.7 1.8.13
  predefined_types_@HDF5_SERIAL_1.8.7 1.8.13
-libhdf5_serial_hl.so.8 libhdf5-8
+libhdf5_serial_hl.so.9 libhdf5-9
  H5DOwrite_chunk@HDF5_SERIAL_1.8.11 1.8.13
  H5DS_get_REFLIST_type@HDF5_SERIAL_1.8.7 1.8.13
  H5DS_is_reserved@HDF5_SERIAL_1.8.7 1.8.13
@@ -3749,7 +3749,7 @@ libhdf5_serial_hl.so.8 libhdf5-8
  str_cset@HDF5_SERIAL_1.8.7 1.8.13
  str_pad@HDF5_SERIAL_1.8.7 1.8.13
  str_size@HDF5_SERIAL_1.8.7 1.8.13
-libhdf5_serialhl_fortran.so.8 libhdf5-8
+libhdf5_serialhl_fortran.so.9 libhdf5-9
  H5IM_get_palette@HDF5_SERIAL_1.8.7 1.8.13
  H5IMget_palettef@HDF5_SERIAL_1.8.7 1.8.13
  H5IMmake_image_24bitf@HDF5_SERIAL_1.8.7 1.8.13
diff --git a/debian/libhdf5-cpp-8.lintian-overrides 
b/debian/libhdf5-cpp-8.lintian-overrides
deleted file mode 100644
index 1afc1c3..0000000
--- a/debian/libhdf5-cpp-8.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libhdf5-cpp-8: package-name-doesnt-match-sonames libhdf5-cpp8 libhdf5-hl-cpp8
diff --git a/debian/libhdf5-cpp-9.lintian-overrides 
b/debian/libhdf5-cpp-9.lintian-overrides
new file mode 100644
index 0000000..c2278ef
--- /dev/null
+++ b/debian/libhdf5-cpp-9.lintian-overrides
@@ -0,0 +1 @@
+libhdf5-cpp-9: package-name-doesnt-match-sonames libhdf5-cpp9 libhdf5-hl-cpp9
diff --git a/debian/libhdf5-cpp-8.symbols b/debian/libhdf5-cpp-9.symbols
similarity index 99%
rename from debian/libhdf5-cpp-8.symbols
rename to debian/libhdf5-cpp-9.symbols
index f759fa6..fd3dc3d 100644
--- a/debian/libhdf5-cpp-8.symbols
+++ b/debian/libhdf5-cpp-9.symbols
@@ -1,4 +1,4 @@
-libhdf5_cpp.so.8 libhdf5-cpp-8 #MINVER#
+libhdf5_cpp.so.9 libhdf5-cpp-9 #MINVER#
  (optional|c++)"H5::AbstractDs::AbstractDs()@HDF5_CPP_1.8.9" 1.8.13
  (optional|c++)"H5::AbstractDs::AbstractDs(H5::AbstractDs 
const&)@HDF5_CPP_1.8.9" 1.8.13
  (optional|c++)"H5::AbstractDs::AbstractDs(int)@HDF5_CPP_1.8.9" 1.8.13
@@ -890,7 +890,7 @@ libhdf5_cpp.so.8 libhdf5-cpp-8 #MINVER#
  HDF5_SERIAL_1.8.8@HDF5_SERIAL_1.8.8 1.8.13
  HDF5_SERIAL_1.8.9@HDF5_SERIAL_1.8.9 1.8.13
  userAttrOpWrpr@HDF5_CPP_1.8.9 1.8.13
-libhdf5_hl_cpp.so.8 libhdf5-cpp-8 #MINVER#
+libhdf5_hl_cpp.so.9 libhdf5-cpp-9 #MINVER#
  (optional|c++)"FL_PacketTable::AppendPacket(void*)@HDF5_CPP_1.8.9" 1.8.13
  (optional|c++)"FL_PacketTable::AppendPackets(unsigned int, 
void*)@HDF5_CPP_1.8.11" 1.8.13
  (optional|c++)"FL_PacketTable::FL_PacketTable(int, char*)@HDF5_CPP_1.8.9" 
1.8.13
diff --git a/debian/libhdf5-mpich-8.lintian-overrides 
b/debian/libhdf5-mpich-8.lintian-overrides
deleted file mode 100644
index 41da5fa..0000000
--- a/debian/libhdf5-mpich-8.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libhdf5-mpich-8: package-name-doesnt-match-sonames libhdf5-mpich8 
libhdf5-mpich-fortran8 libhdf5-mpich-hl8 libhdf5-mpichhl-fortran8
-
diff --git a/debian/libhdf5-mpich-9.lintian-overrides 
b/debian/libhdf5-mpich-9.lintian-overrides
new file mode 100644
index 0000000..0f2babb
--- /dev/null
+++ b/debian/libhdf5-mpich-9.lintian-overrides
@@ -0,0 +1,2 @@
+libhdf5-mpich-9: package-name-doesnt-match-sonames libhdf5-mpich9 
libhdf5-mpich-fortran9 libhdf5-mpich-hl9 libhdf5-mpichhl-fortran9
+
diff --git a/debian/libhdf5-mpich-8.symbols b/debian/libhdf5-mpich-9.symbols
similarity index 99%
rename from debian/libhdf5-mpich-8.symbols
rename to debian/libhdf5-mpich-9.symbols
index c4e2960..6e345c9 100644
--- a/debian/libhdf5-mpich-8.symbols
+++ b/debian/libhdf5-mpich-9.symbols
@@ -1,4 +1,4 @@
-libhdf5_mpich.so.8 libhdf5-mpich-8 #MINVER#
+libhdf5_mpich.so.9 libhdf5-mpich-9 #MINVER#
  H5AC_BT2_HDR@HDF5_MPI_1.8.7 1.8.13
  H5AC_BT2_INT@HDF5_MPI_1.8.7 1.8.13
  H5AC_BT2_LEAF@HDF5_MPI_1.8.7 1.8.13
@@ -2531,7 +2531,7 @@ libhdf5_mpich.so.8 libhdf5-mpich-8 #MINVER#
  HDsrand@HDF5_MPI_1.8.7 1.8.13
  HDstrtoll@HDF5_MPI_1.8.7 1.8.13
  epoch_marker_class@HDF5_MPI_1.8.7 1.8.13
-libhdf5_mpich_fortran.so.8 libhdf5-mpich-8 #MINVER#
+libhdf5_mpich_fortran.so.9 libhdf5-mpich-9 #MINVER#
  HD5f2cstring@HDF5_MPI_1.8.7 1.8.13
  HD5packFstring@HDF5_MPI_1.8.7 1.8.13
  HDF5_MPI_1.8.10@HDF5_MPI_1.8.10 1.8.13
@@ -3610,7 +3610,7 @@ libhdf5_mpich_fortran.so.8 libhdf5-mpich-8 #MINVER#
  h5zunregister_c_@HDF5_MPI_1.8.7 1.8.13
  integer_types_@HDF5_MPI_1.8.7 1.8.13
  predefined_types_@HDF5_MPI_1.8.7 1.8.13
-libhdf5_mpich_hl.so.8 libhdf5-mpich-8 #MINVER#
+libhdf5_mpich_hl.so.9 libhdf5-mpich-9 #MINVER#
  H5DOwrite_chunk@HDF5_MPI_1.8.11 1.8.13
  H5DS_get_REFLIST_type@HDF5_MPI_1.8.7 1.8.13
  H5DS_is_reserved@HDF5_MPI_1.8.7 1.8.13
@@ -3792,7 +3792,7 @@ libhdf5_mpich_hl.so.8 libhdf5-mpich-8 #MINVER#
  str_cset@HDF5_MPI_1.8.7 1.8.13
  str_pad@HDF5_MPI_1.8.7 1.8.13
  str_size@HDF5_MPI_1.8.7 1.8.13
-libhdf5_mpichhl_fortran.so.8 libhdf5-mpich-8 #MINVER#
+libhdf5_mpichhl_fortran.so.9 libhdf5-mpich-9 #MINVER#
  H5IM_get_palette@HDF5_MPI_1.8.7 1.8.13
  H5IMget_palettef@HDF5_MPI_1.8.7 1.8.13
  H5IMmake_image_24bitf@HDF5_MPI_1.8.7 1.8.13
diff --git a/debian/libhdf5-openmpi-8.lintian-overrides 
b/debian/libhdf5-openmpi-8.lintian-overrides
deleted file mode 100644
index 5f53c72..0000000
--- a/debian/libhdf5-openmpi-8.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libhdf5-openmpi-8: package-name-doesnt-match-sonames libhdf5-openmpi8 
libhdf5-openmpi-fortran8 libhdf5-openmpi-hl8 libhdf5-openmpihl-fortran8
-
diff --git a/debian/libhdf5-openmpi-9.lintian-overrides 
b/debian/libhdf5-openmpi-9.lintian-overrides
new file mode 100644
index 0000000..89a7ed1
--- /dev/null
+++ b/debian/libhdf5-openmpi-9.lintian-overrides
@@ -0,0 +1,2 @@
+libhdf5-openmpi-9: package-name-doesnt-match-sonames libhdf5-openmpi9 
libhdf5-openmpi-fortran9 libhdf5-openmpi-hl9 libhdf5-openmpihl-fortran9
+
diff --git a/debian/libhdf5-openmpi-8.symbols b/debian/libhdf5-openmpi-9.symbols
similarity index 99%
rename from debian/libhdf5-openmpi-8.symbols
rename to debian/libhdf5-openmpi-9.symbols
index 4d5a9c2..6fba406 100644
--- a/debian/libhdf5-openmpi-8.symbols
+++ b/debian/libhdf5-openmpi-9.symbols
@@ -1,4 +1,4 @@
-libhdf5_openmpi.so.8 libhdf5-openmpi-8 #MINVER#
+libhdf5_openmpi.so.9 libhdf5-openmpi-9 #MINVER#
  H5AC_BT2_HDR@HDF5_MPI_1.8.7 1.8.13
  H5AC_BT2_INT@HDF5_MPI_1.8.7 1.8.13
  H5AC_BT2_LEAF@HDF5_MPI_1.8.7 1.8.13
@@ -2531,7 +2531,7 @@ libhdf5_openmpi.so.8 libhdf5-openmpi-8 #MINVER#
  HDsrand@HDF5_MPI_1.8.7 1.8.13
  HDstrtoll@HDF5_MPI_1.8.7 1.8.13
  epoch_marker_class@HDF5_MPI_1.8.7 1.8.13
-libhdf5_openmpi_fortran.so.8 libhdf5-openmpi-8 #MINVER#
+libhdf5_openmpi_fortran.so.9 libhdf5-openmpi-9 #MINVER#
  HD5f2cstring@HDF5_MPI_1.8.7 1.8.13
  HD5packFstring@HDF5_MPI_1.8.7 1.8.13
  HDF5_MPI_1.8.10@HDF5_MPI_1.8.10 1.8.13
@@ -3610,7 +3610,7 @@ libhdf5_openmpi_fortran.so.8 libhdf5-openmpi-8 #MINVER#
  h5zunregister_c_@HDF5_MPI_1.8.7 1.8.13
  integer_types_@HDF5_MPI_1.8.7 1.8.13
  predefined_types_@HDF5_MPI_1.8.7 1.8.13
-libhdf5_openmpi_hl.so.8 libhdf5-openmpi-8 #MINVER#
+libhdf5_openmpi_hl.so.9 libhdf5-openmpi-9 #MINVER#
  H5DOwrite_chunk@HDF5_MPI_1.8.11 1.8.13
  H5DS_get_REFLIST_type@HDF5_MPI_1.8.7 1.8.13
  H5DS_is_reserved@HDF5_MPI_1.8.7 1.8.13
@@ -3792,7 +3792,7 @@ libhdf5_openmpi_hl.so.8 libhdf5-openmpi-8 #MINVER#
  str_cset@HDF5_MPI_1.8.7 1.8.13
  str_pad@HDF5_MPI_1.8.7 1.8.13
  str_size@HDF5_MPI_1.8.7 1.8.13
-libhdf5_openmpihl_fortran.so.8 libhdf5-openmpi-8 #MINVER#
+libhdf5_openmpihl_fortran.so.9 libhdf5-openmpi-9 #MINVER#
  H5IM_get_palette@HDF5_MPI_1.8.7 1.8.13
  H5IMget_palettef@HDF5_MPI_1.8.7 1.8.13
  H5IMmake_image_24bitf@HDF5_MPI_1.8.7 1.8.13
diff --git a/debian/patches/HDFFV-8917.patch b/debian/patches/HDFFV-8917.patch
deleted file mode 100644
index 0a158f3..0000000
--- a/debian/patches/HDFFV-8917.patch
+++ /dev/null
@@ -1,301 +0,0 @@
-Description: Merge upstream fix for issue HDFFV-8917
- Changeset from upstream SVN r25681 (branches/hdf5_1_8).
-Index: hdf5/src/H5T.c
-===================================================================
---- hdf5.orig/src/H5T.c
-+++ hdf5/src/H5T.c
-@@ -529,7 +529,7 @@ H5FL_DEFINE_STATIC(H5T_path_t);
- /* Datatype ID class */
- static const H5I_class_t H5I_DATATYPE_CLS[1] = {{
-     H5I_DATATYPE,             /* ID class value */
--    0,                                /* Class flags */
-+    H5I_CLASS_REUSE_IDS,      /* Class flags */
-     8,                                /* # of reserved IDs for class */
-     (H5I_free_t)H5T_close     /* Callback routine for closing objects of this 
class */
- }};
-Index: hdf5/src/H5E.c
-===================================================================
---- hdf5.orig/src/H5E.c
-+++ hdf5/src/H5E.c
-@@ -122,7 +122,7 @@ H5FL_DEFINE_STATIC(H5E_msg_t);
- /* Error class ID class */
- static const H5I_class_t H5I_ERRCLS_CLS[1] = {{
-     H5I_ERROR_CLASS,          /* ID class value */
--    0,                                /* Class flags */
-+    H5I_CLASS_REUSE_IDS,      /* Class flags */
-     0,                                /* # of reserved IDs for class */
-     (H5I_free_t)H5E_unregister_class /* Callback routine for closing objects 
of this class */
- }};
-@@ -130,7 +130,7 @@ static const H5I_class_t H5I_ERRCLS_CLS[
- /* Error message ID class */
- static const H5I_class_t H5I_ERRMSG_CLS[1] = {{
-     H5I_ERROR_MSG,            /* ID class value */
--    0,                                /* Class flags */
-+    H5I_CLASS_REUSE_IDS,      /* Class flags */
-     0,                                /* # of reserved IDs for class */
-     (H5I_free_t)H5E_close_msg   /* Callback routine for closing objects of 
this class */
- }};
-@@ -138,7 +138,7 @@ static const H5I_class_t H5I_ERRMSG_CLS[
- /* Error stack ID class */
- static const H5I_class_t H5I_ERRSTK_CLS[1] = {{
-     H5I_ERROR_STACK,          /* ID class value */
--    0,                                /* Class flags */
-+    H5I_CLASS_REUSE_IDS,      /* Class flags */
-     0,                                /* # of reserved IDs for class */
-     (H5I_free_t)H5E_close_stack /* Callback routine for closing objects of 
this class */
- }};
-Index: hdf5/src/H5I.c
-===================================================================
---- hdf5.orig/src/H5I.c
-+++ hdf5/src/H5I.c
-@@ -814,7 +814,7 @@ H5I__wrapped_cb(void *_item, void UNUSED
-     HDassert(udata);
- 
-     /* Break out if we see a free ID */
--    if(udata->nextid != item->id) {
-+    if(udata->nextid != (ID_MASK & item->id)) {
-         /* Sanity check */
-         HDassert(item->id > udata->nextid);
- 
-@@ -874,6 +874,40 @@ H5I_register(H5I_type_t type, const void
-     /* If no available ID structure, then create a new id for use, and
-      * allocate a new struct to house it. */
-     else {
-+        /*
-+         * This next section of code checks for the 'nextid' getting too 
large and
-+         * wrapping around, thus necessitating checking for duplicate IDs 
being
-+         * handed out.
-+         */
-+        if(type_ptr->nextid > (hid_t)ID_MASK)
-+            type_ptr->wrapped = TRUE;
-+
-+        /*
-+         * If we've wrapped around then we need to check for duplicate id's 
being
-+         * handed out.
-+         */
-+        if(type_ptr->wrapped) {
-+            H5I_wrap_ud_t udata;    /* User data for iteration */
-+            herr_t iter_status;     /* Iteration status */
-+
-+            /* Set up user data for iteration */
-+            udata.nextid = (hid_t)type_ptr->cls->reserved;
-+
-+            /* Iterate over all the ID nodes, looking for a gap in the ID 
sequence */
-+            if((iter_status = H5SL_iterate(type_ptr->ids, H5I__wrapped_cb, 
&udata)) < 0)
-+                HGOTO_ERROR(H5E_ATOM, H5E_BADITER, FAIL, "ID iteration 
failed")
-+
-+            /* If we didn't break out of the iteration and we're at the max. 
ID, we've used all the IDs */
-+            if(0 == iter_status && udata.nextid >= ID_MASK)
-+                HGOTO_ERROR(H5E_ATOM, H5E_NOIDS, FAIL, "no IDs available in 
type")
-+
-+            /* Sanity check */
-+            HDassert(udata.nextid < ID_MASK);
-+
-+            /* Retain the next ID for the class */
-+            type_ptr->nextid = udata.nextid;
-+        } /* end if */
-+
-         /* Allocate new ID struct */
-         if(NULL == (id_ptr = H5FL_MALLOC(H5I_id_info_t)))
-             HGOTO_ERROR(H5E_ATOM, H5E_NOSPACE, FAIL, "memory allocation 
failed")
-@@ -895,40 +929,6 @@ H5I_register(H5I_type_t type, const void
-         HGOTO_ERROR(H5E_ATOM, H5E_CANTINSERT, FAIL, "can't insert ID node 
into skip list")
-     type_ptr->id_count++;
- 
--    /*
--     * This next section of code checks for the 'nextid' getting too large and
--     * wrapping around, thus necessitating checking for duplicate IDs being
--     * handed out.
--     */
--    if(type_ptr->nextid > (hid_t)ID_MASK)
--      type_ptr->wrapped = TRUE;
--
--    /*
--     * If we've wrapped around then we need to check for duplicate id's being
--     * handed out.
--     */
--    if(type_ptr->wrapped) {
--        H5I_wrap_ud_t udata;    /* User data for iteration */
--        herr_t iter_status;     /* Iteration status */
--
--        /* Set up user data for iteration */
--        udata.nextid = (hid_t)type_ptr->cls->reserved;
--
--        /* Iterate over all the ID nodes, looking for a gap in the ID 
sequence */
--        if((iter_status = H5SL_iterate(type_ptr->ids, H5I__wrapped_cb, 
&udata)) < 0)
--            HGOTO_ERROR(H5E_ATOM, H5E_BADITER, FAIL, "ID iteration failed")
--
--        /* If we didn't break out of the iteration and we're at the max. ID, 
we've used all the IDs */
--        if(0 == iter_status && udata.nextid >= ID_MASK)
--            HGOTO_ERROR(H5E_ATOM, H5E_NOIDS, FAIL, "no IDs available in type")
--
--        /* Sanity check */
--        HDassert(udata.nextid < ID_MASK);
--
--        /* Retain the next ID for the class */
--        type_ptr->nextid = udata.nextid;
--    } /* end if */
--
-     /* Set return value */
-     ret_value = id_ptr->id;
- 
-@@ -1249,13 +1249,24 @@ H5I__remove_common(H5I_id_type_t *type_p
-     /* (Casting away const OK -QAK) */
-     ret_value = (void *)curr_id->obj_ptr;
- 
--    /* If there's room, and we can save IDs of this type, then 
--       save the struct (and its ID) for future re-use */
--    if((type_ptr->cls->flags & H5I_CLASS_REUSE_IDS)
--            && (type_ptr->avail_count < MAX_FREE_ID_STRUCTS)) {
--        if(H5SL_insert(type_ptr->avail_ids, curr_id, &curr_id->id) < 0)
--            HGOTO_ERROR(H5E_ATOM, H5E_CANTINSERT, NULL, "can't insert 
available ID node into skip list")
--        type_ptr->avail_count++;
-+    /* See if we can reuse IDs of this type */
-+    if(type_ptr->cls->flags & H5I_CLASS_REUSE_IDS) {
-+        /* See if we can decrement the next ID for the ID class */
-+        if(type_ptr->nextid == (ID_MASK & (curr_id->id + 1))) {
-+            type_ptr->nextid--;
-+            curr_id = H5FL_FREE(H5I_id_info_t, curr_id);
-+        } /* end if */
-+        else {
-+            /* Store the ID on the available ID list, for later */
-+            if((type_ptr->avail_count < MAX_FREE_ID_STRUCTS)
-+                    && (type_ptr->id_count > 1)) {
-+                if(H5SL_insert(type_ptr->avail_ids, curr_id, &curr_id->id) < 
0)
-+                    HGOTO_ERROR(H5E_ATOM, H5E_CANTINSERT, NULL, "can't insert 
available ID node into skip list")
-+                type_ptr->avail_count++;
-+            }
-+            else
-+                curr_id = H5FL_FREE(H5I_id_info_t, curr_id);
-+        } /* end else */
-     } /* end if */
-     /* Otherwise, just toss it. */
-     else
-Index: hdf5/src/H5Pint.c
-===================================================================
---- hdf5.orig/src/H5Pint.c
-+++ hdf5/src/H5Pint.c
-@@ -276,7 +276,7 @@ static const H5I_class_t H5I_GENPROPCLS_
- /* Generic Property List ID class */
- static const H5I_class_t H5I_GENPROPLST_CLS[1] = {{
-     H5I_GENPROP_LST,          /* ID class value */
--    0,                                /* Class flags */
-+    H5I_CLASS_REUSE_IDS,      /* Class flags */
-     0,                                /* # of reserved IDs for class */
-     (H5I_free_t)H5P_close     /* Callback routine for closing objects of this 
class */
- }};
-Index: hdf5/test/tid.c
-===================================================================
---- hdf5.orig/test/tid.c
-+++ hdf5/test/tid.c
-@@ -533,6 +533,103 @@ out:
-       return -1;
- }
- 
-+/* 'Fake' free routine for ID wrapping test */
-+static herr_t fake_free(void *obj)
-+{
-+    /* Shut compilers up */
-+    obj = obj;
-+
-+    return(0);
-+}
-+
-+      /* Test boundary cases with lots of IDs */
-+
-+/* Type IDs range from 0 to ID_MASK before wrapping around.  The code will 
assign */
-+/* IDs in sequential order until ID_MASK IDs have been given out, at which */
-+/* point it will search for type IDs that were allocated but have since been 
*/
-+/* closed. */
-+/* This test will allocate IDs up to ID_MASK, ensure that IDs wrap around */
-+/* to low values successfully, ensure that an error is thrown when all 
possible */
-+/* type IDs are taken, then ensure that deleting types frees up their IDs. */
-+/* NOTE: this test depends on the implementation of IDs, so may break */
-+/*            if the implementation changes. */
-+static int test_id_wrap(void)
-+{
-+    H5I_type_t testType;        /* ID class for testing */
-+    hid_t *id_array;    /* Array of IDs allocated */
-+    hid_t test_id;      /* Test ID */
-+    void *obj;          /* Object pointer returned for ID */
-+    unsigned u;         /* Local index variable */
-+    herr_t status;      /* Status from routine */
-+
-+    /* Allocate array for storing IDs */
-+    id_array = (hid_t *)HDmalloc((ID_MASK + 1) * sizeof(hid_t));
-+    CHECK(id_array, NULL, "HDmalloc");
-+
-+    /* Register type for testing */
-+    testType = H5Iregister_type((size_t)8, 0, (H5I_free_t)fake_free);
-+    CHECK(testType, H5I_BADID, "H5Iregister_type");
-+    if(testType == H5I_BADID)
-+        goto out;
-+
-+    /* Get IDs, up to the maximum possible */
-+    for(u = 0; u <= ID_MASK; u++) {
-+        id_array[u] = H5Iregister(testType, &id_array[u]);
-+        CHECK(id_array[u], FAIL, "H5Iregister");
-+        if(id_array[u] < 0)
-+            goto out;
-+    } /* end for */
-+
-+    /* There should be no room at the inn for a new ID */
-+    H5E_BEGIN_TRY
-+        test_id = H5Iregister(testType, id_array);
-+    H5E_END_TRY
-+    VERIFY(test_id, H5I_BADID, "H5Iregister_type");
-+    if(test_id != H5I_BADID)
-+        goto out;
-+
-+    /* Release the first ID in the array */
-+    obj = H5Iremove_verify(id_array[0], testType);
-+    CHECK(obj, NULL, "H5Iremove_verify");
-+    if(NULL == obj)
-+        goto out;
-+    VERIFY(obj, &id_array[0], "H5Iremove_verify");
-+    if(&id_array[0] != obj)
-+        goto out;
-+
-+    /* Register another object, should be room now, but will wraparound */
-+    test_id = H5Iregister(testType, &id_array[0]);
-+    CHECK(test_id, FAIL, "H5Iregister");
-+    if(test_id < 0)
-+        goto out;
-+    VERIFY(test_id, id_array[0], "H5Iregister");
-+    if(id_array[0] != test_id)
-+        goto out;
-+
-+    /* Release all IDs, unregister the ID class and free the array */
-+    for(u = 0; u <= ID_MASK; u++) {
-+        obj = H5Iremove_verify(id_array[u], testType);
-+        CHECK(obj, NULL, "H5Iremove_verify");
-+        if(NULL == obj)
-+            goto out;
-+        VERIFY(obj, &id_array[u], "H5Iremove_verify");
-+        if(&id_array[u] != obj)
-+            goto out;
-+    } /* end for */
-+
-+    status = H5Idestroy_type(testType);
-+    CHECK(status, FAIL, "H5Idestroy_type");
-+    if(status < 0)
-+        goto out;
-+
-+    HDfree(id_array);
-+
-+    return(0);
-+
-+out:
-+    return(-1);
-+}
-+
- void test_ids(void)
- {
-       if (basic_id_test() < 0) TestErrPrintf("Basic ID test failed\n");
-@@ -540,5 +637,5 @@ void test_ids(void)
-       if (test_is_valid() < 0) TestErrPrintf("H5Iis_valid test failed\n");
-       if (test_get_type() < 0) TestErrPrintf("H5Iget_type test failed\n");
-       if (test_id_type_list() < 0) TestErrPrintf("ID type list test 
failed\n");
--
-+      if (test_id_wrap() < 0) TestErrPrintf("ID wraparound test failed\n");
- }
diff --git a/debian/patches/flavor-configure-option.patch 
b/debian/patches/flavor-configure-option.patch
index 8907119..33217f5 100644
--- a/debian/patches/flavor-configure-option.patch
+++ b/debian/patches/flavor-configure-option.patch
@@ -10,7 +10,7 @@ Index: hdf5/configure.ac
 ===================================================================
 --- hdf5.orig/configure.ac
 +++ hdf5/configure.ac
-@@ -4494,6 +4494,24 @@ fi
+@@ -4491,6 +4491,24 @@ fi
  ##
  AM_CONDITIONAL([HAVE_SHARED_CONDITIONAL], [test "X$enable_shared" = "Xyes"])
  
@@ -337,37 +337,12 @@ Index: hdf5/fortran/src/Makefile.am
 @@ -80,7 +80,7 @@ libhdf5_fortran_la_SOURCES=H5f90global.f
          H5Off$(F_STATUS).f90 H5Pff$(F_STATUS).f90 H5Rff$(F_STATUS).f90 
H5Tff$(F_STATUS).f90 $(PARALLEL_COND_SRC)
  
- # HDF5 Fortran library depends on HDF5 Library.
+ # HDF5 Fortran library depends on HDF5 Library. 
 -libhdf5_fortran_la_LIBADD=$(LIBHDF5)
 +libhdf5@FLAVOR@_fortran_la_LIBADD=$(LIBHDF5)
  
  # h5fc is generated during configure.
  # Remove it only when distclean.
-Index: hdf5/hl/src/Makefile.am
-===================================================================
---- hdf5.orig/hl/src/Makefile.am
-+++ hdf5/hl/src/Makefile.am
-@@ -25,16 +25,16 @@ include $(top_srcdir)/config/lt_vers.am
- AM_CPPFLAGS+=-I$(top_srcdir)/src
- 
- # This library is our main target.
--lib_LTLIBRARIES=libhdf5_hl.la
-+lib_LTLIBRARIES=libhdf5@FLAVOR@_hl.la
- 
- # Add libtool numbers to the HDF5 hl library (from config/lt_vers.am)
--libhdf5_hl_la_LDFLAGS= -version-info 
$(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-+libhdf5@FLAVOR@_hl_la_LDFLAGS= -version-info 
$(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
- 
- # List sources to include in the HDF5 HL Library.
--libhdf5_hl_la_SOURCES=H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c 
H5PT.c H5TB.c
-+libhdf5@FLAVOR@_hl_la_SOURCES=H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c 
H5LTparse.c H5PT.c H5TB.c
- 
- # HDF5 HL library depends on HDF5 Library.
--libhdf5_hl_la_LIBADD=$(LIBHDF5)
-+libhdf5@FLAVOR@_hl_la_LIBADD=$(LIBHDF5)
- 
- # Public header files (to be installed)
- include_HEADERS=hdf5_hl.h H5DOpublic.h H5IMpublic.h H5LTpublic.h H5TBpublic.h 
H5DSpublic.h H5PTpublic.h
 Index: hdf5/hl/fortran/src/Makefile.am
 ===================================================================
 --- hdf5.orig/hl/fortran/src/Makefile.am
@@ -393,7 +368,7 @@ Index: hdf5/hl/fortran/src/Makefile.am
 +libhdf5@FLAVOR@hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c  H5IMfc.c H5IMcc.c 
H5TBfc.c \
        H5DSff.f90 H5LTff.f90 H5IMff.f90 H5TBff.f90
  
- # HDF5 HL Fortran library depends on HDF5 Library.
+ # HDF5 HL Fortran library depends on HDF5 Library. 
 -libhdf5hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
 +libhdf5@FLAVOR@hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
  
@@ -422,3 +397,28 @@ Index: hdf5/config/commence.am
  LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
  
  # Install directories that automake doesn't know about
+Index: hdf5/hl/src/Makefile.am
+===================================================================
+--- hdf5.orig/hl/src/Makefile.am
++++ hdf5/hl/src/Makefile.am
+@@ -25,16 +25,16 @@ include $(top_srcdir)/config/lt_vers.am
+ AM_CPPFLAGS+=-I$(top_srcdir)/src
+ 
+ # This library is our main target.
+-lib_LTLIBRARIES=libhdf5_hl.la
++lib_LTLIBRARIES=libhdf5@FLAVOR@_hl.la
+ 
+ # Add libtool numbers to the HDF5 hl library (from config/lt_vers.am)
+-libhdf5_hl_la_LDFLAGS= -version-info 
$(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
++libhdf5@FLAVOR@_hl_la_LDFLAGS= -version-info 
$(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
+ 
+ # List sources to include in the HDF5 HL Library.
+-libhdf5_hl_la_SOURCES=H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c 
H5PT.c H5TB.c
++libhdf5@FLAVOR@_hl_la_SOURCES=H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c 
H5LTparse.c H5PT.c H5TB.c
+ 
+ # HDF5 HL library depends on HDF5 Library. 
+-libhdf5_hl_la_LIBADD=$(LIBHDF5)
++libhdf5@FLAVOR@_hl_la_LIBADD=$(LIBHDF5)
+ 
+ # Public header files (to be installed)
+ include_HEADERS=hdf5_hl.h H5DOpublic.h H5IMpublic.h H5LTpublic.h H5TBpublic.h 
H5DSpublic.h H5PTpublic.h
diff --git a/debian/patches/mpi.diff b/debian/patches/mpi.diff
deleted file mode 100644
index 9706d22..0000000
--- a/debian/patches/mpi.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: hdf5-1.8.3/src/H5public.h
-===================================================================
---- hdf5-1.8.3.orig/src/H5public.h     2009-08-06 16:37:19.000000000 +0200
-+++ hdf5-1.8.3/src/H5public.h  2009-08-06 16:37:51.000000000 +0200
-@@ -55,9 +55,6 @@
- #endif
- #ifdef H5_HAVE_PARALLEL
- #   include <mpi.h>
--#ifndef MPI_FILE_NULL         /*MPIO may be defined in mpi.h already       */
--#   include <mpio.h>
--#endif
- #endif
- 
- 
diff --git a/debian/patches/path_max.diff b/debian/patches/path_max.diff
index 100ba39..2d2a60f 100644
--- a/debian/patches/path_max.diff
+++ b/debian/patches/path_max.diff
@@ -7,9 +7,9 @@ Index: hdf5/src/H5F.c
 ===================================================================
 --- hdf5.orig/src/H5F.c
 +++ hdf5/src/H5F.c
-@@ -128,6 +128,10 @@ static const H5I_class_t H5I_FILE_CLS[1]
- }};
- 
+@@ -116,6 +116,10 @@ done:
+     FUNC_LEAVE_NOAPI(ret_value)
+ } /* H5F__init_pub_interface() */
  
 +#ifndef PATH_MAX
 +#define PATH_MAX    4096
diff --git a/debian/patches/series b/debian/patches/series
index 8f6a91f..e0ac21e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,4 @@
-#mpi.diff
 flavor-configure-option.patch
 path_max.diff
 ullong_force.diff
 relax-version-check.patch
-#skip_cxx_inclusion.diff
-soname.diff
-HDFFV-8917.patch
diff --git a/debian/patches/skip_cxx_inclusion.diff 
b/debian/patches/skip_cxx_inclusion.diff
deleted file mode 100644
index f4fea7f..0000000
--- a/debian/patches/skip_cxx_inclusion.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Skip the inclusion of C++ when dealing with parallel HDF5.
- Thanks to Mike Miller, Rafael Laboissiere & Sebastien Villemot.
-Author: Sylvestre Ledru <sylvestre.le...@scilab-enterprises.com>
-Index: hdf5-1.8.11/src/H5public.h
-===================================================================
---- hdf5-1.8.11.orig/src/H5public.h    2013-07-02 16:40:57.269612753 +0200
-+++ hdf5-1.8.11/src/H5public.h 2013-07-02 16:40:57.269612753 +0200
-@@ -58,6 +58,8 @@
- #   include <stddef.h>
- #endif
- #ifdef H5_HAVE_PARALLEL
-+#   define MPICH_SKIP_MPICXX 1
-+#   define OMPI_SKIP_MPICXX 1
- #   include <mpi.h>
- #ifndef MPI_FILE_NULL         /*MPIO may be defined in mpi.h already       */
- #   include <mpio.h>
diff --git a/debian/patches/soname.diff b/debian/patches/soname.diff
deleted file mode 100644
index 1d0c208..0000000
--- a/debian/patches/soname.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix trailing space in libtool versionning
-Author: Gilles Filippini <p...@debian.org>
-Index: hdf5/config/lt_vers.am
-===================================================================
---- hdf5.orig/config/lt_vers.am
-+++ hdf5/config/lt_vers.am
-@@ -17,7 +17,7 @@
- # Add libtool shared library version numbers to the HDF5 library
- # See libtool versioning documentation online.
- LT_VERS_INTERFACE = 8
--LT_VERS_REVISION = 2 
-+LT_VERS_REVISION = 2
- LT_VERS_AGE = 0
- 
- ## If the API changes *at all*, increment LT_VERS_INTERFACE and
diff --git a/debian/rules b/debian/rules
index a6e0427..626abb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ include /usr/share/dpkg/buildflags.mk
 package = libhdf5
 pkgversion ?= $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
 version ?= $(shell echo $(pkgversion) | sed 
's/\([0-9\.]\)\(+docs[0-9]*\)\?-[^-]*$$/\1/')
-soname =  8
+soname =  9
 major_version = $(shell echo $(version) | cut -d. -f1,2)
 serpack = $(package)-$(soname)
 sercpppack = $(package)-cpp-$(soname)
@@ -203,7 +203,7 @@ build-stamp-mpich: configure-stamp-mpich
 build-stamp-doc: configure-stamp
        cd c++/src && doxygen cpp_doc_config_u >/dev/null
        rm -rf html/cpplus_RM
-       mv c++/src/HTML/HTML html/cpplus_RM
+       mv c++/src/cpplus_RM html/cpplus_RM
        touch $@
 
 #

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to