The following commit has been merged in the master branch:
commit 87ff9871fe69965a5bc13c5d05c5360e7bf9b947
Author: Gilles Filippini <p...@debian.org>
Date:   Tue Dec 31 11:04:40 2013 +0100

    mpich2 to mpich transition.

diff --git a/debian/changelog b/debian/changelog
index 4e86776..a677dac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ hdf5 (1.8.12-3) UNRELEASED; urgency=medium
     + Simplify DEFAULT_MPI retrieval
     + Simplify build_openmpi detection depending on arch
     + Enable arch arm64 for openmpi to be consistent with debian/control
+  * mpich2 to mpich transition (closes: #733046):
+    - s/mpich2/mpich/g
+    - libhdf5-mpich2-* transition packages
 
- -- Gilles Filippini <p...@debian.org>  Tue, 31 Dec 2013 10:41:51 +0100
+ -- Gilles Filippini <p...@debian.org>  Fri, 27 Dec 2013 12:46:47 +0100
 
 hdf5 (1.8.12-2) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 6472118..be8cd65 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian GIS Project 
<pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <fran...@debian.org>,
  Sylvestre Ledru <sylves...@debian.org>,
  Gilles Filippini <p...@debian.org>
-Build-Depends: dpkg-dev (>= 1.16.1~), libmpich2-dev, zlib1g-dev,
+Build-Depends: dpkg-dev (>= 1.16.1~), libmpich-dev, zlib1g-dev,
  libopenmpi-dev [!hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, 
debhelper (>= 9~), sed (>=4.1.5),
  gfortran, libibverbs-dev [!arm64 !arm !hppa !mips !mipsel !s390 !s390x 
!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
  sharutils, mpi-default-dev, chrpath, autotools-dev
@@ -19,11 +19,8 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Conflicts: libhdf5-7, libhdf5-1.8,
- libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, libhdf5-serial-1.8.6,
- libhdf5-1.8.7, libhdf5-serial-1.8.7
-Provides: libhdf5-7, libhdf5-1.8
-Replaces: libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, 
libhdf5-serial-1.8.6, libhdf5-1.8.7, libhdf5-serial-1.8.7
+Conflicts: libhdf5-7
+Provides: libhdf5-7
 Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
  HDF5 is a file format and library for storing scientific data.
@@ -39,7 +36,7 @@ Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libhdf5-7 (= ${binary:Version})
-Conflicts: libhdf5-mpich2-7-dbg, libhdf5-openmpi-7-dbg
+Conflicts: libhdf5-mpich-7-dbg, libhdf5-openmpi-7-dbg
 Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - Debug package
  HDF5 is a file format and library for storing scientific data.
@@ -88,9 +85,6 @@ Architecture: any
 Depends: libhdf5-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev,
  ${misc:Depends}, hdf5-helpers, libhdf5-cpp-7 (= ${binary:Version})
 Suggests: libhdf5-doc
-Provides: libhdf5-serial-dev
-Replaces: libhdf5-serial-dev (<< 1.8.8-2)
-Breaks: libhdf5-serial-dev (<< 1.8.8-2)
 Description: Hierarchical Data Format 5 (HDF5) - development files - serial 
version
  HDF5 is a file format and library for storing scientific data.
  HDF5 was designed and implemented to address the deficiencies of
@@ -99,30 +93,14 @@ Description: Hierarchical Data Format 5 (HDF5) - 
development files - serial vers
  .
  This package contains development files for serial platforms.
 
-Package: libhdf5-serial-dev
-Section: libdevel
-Architecture: any
-Depends: libhdf5-dev (= ${binary:Version}), ${misc:Depends}
-Description: Hierarchical Data Format 5 (HDF5) - development files - 
transitionnal package
- 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 is a transitionnal package.
-
 Package: libhdf5-openmpi-7
 Section: libs
 Priority: extra
-Architecture: alpha armel armhf amd64 i386 ia64 powerpc powerpcspe ppc64 sparc 
kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Architecture: alpha arm64 armel armhf amd64 i386 ia64 powerpc powerpcspe ppc64 
sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Conflicts: libhdf5-7, libhdf5-1.8,
- libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6,
- libhdf5-1.8.7, libhdf5-openmpi-1.8.7
-Provides: libhdf5-7, libhdf5-1.8
-Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, 
libhdf5-openmpi-1.8.6,
- libhdf5-1.8.7, libhdf5-openmpi-1.8.7
+Conflicts: libhdf5-7
+Provides: libhdf5-7
 Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - OpenMPI 
version
  HDF5 is a file format and library for storing scientific data.
@@ -135,7 +113,7 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime 
files - OpenMPI version
 Package: libhdf5-openmpi-dev
 Section: libdevel
 Priority: extra
-Architecture: alpha armel armhf amd64 i386 ia64 powerpc powerpcspe ppc64 sparc 
kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Architecture: alpha arm64 armel armhf amd64 i386 ia64 powerpc powerpcspe ppc64 
sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Depends: libhdf5-openmpi-7 (= ${binary:Version}), zlib1g-dev,
  libjpeg-dev, libopenmpi-dev, ${misc:Depends}, hdf5-helpers
 Conflicts: libhdf5-dev
@@ -152,10 +130,10 @@ Description: Hierarchical Data Format 5 (HDF5) - 
development files - OpenMPI ver
 Package: libhdf5-openmpi-7-dbg
 Section: debug
 Priority: extra
-Architecture: alpha armel armhf amd64 i386 ia64 powerpc powerpcspe ppc64 sparc 
kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Architecture: alpha arm64 armel armhf amd64 i386 ia64 powerpc powerpcspe ppc64 
sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libhdf5-openmpi-7 (= ${binary:Version}),
-Conflicts: libhdf5-7-dbg, libhdf5-mpich2-7-dbg
+Conflicts: libhdf5-7-dbg, libhdf5-mpich-7-dbg
 Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - OpenMPI Debug package
  HDF5 is a file format and library for storing scientific data.
@@ -165,18 +143,16 @@ Description: Hierarchical Data Format 5 (HDF5) - OpenMPI 
Debug package
  .
  This package contains debug hdf5/openmpi libraries.
 
-Package: libhdf5-mpich2-7
+Package: libhdf5-mpich-7
 Section: libs
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Conflicts: libhdf5-7, libhdf5-1.8,
- libhdf5-1.8.4,  libhdf5-mpich2-1.8.4, libhdf5-1.8.6,  libhdf5-mpich2-1.8.6,
- libhdf5-1.8.7, libhdf5-mpich2-1.8.7
-Provides: libhdf5-7, libhdf5-1.8
-Replaces: libhdf5-1.8.4, libhdf5-mpich2-1.8.4, libhdf5-1.8.6, 
libhdf5-mpich2-1.8.6,
- libhdf5-1.8.7, libhdf5-mpich2-1.8.7
+Conflicts: libhdf5-7
+Provides: libhdf5-7, libhdf5-mpich2-7
+Replaces: libhdf5-mpich2-7 (<< 1.8.12-2~)
+Breaks: libhdf5-mpich2-7 (<< 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.
@@ -187,16 +163,33 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime 
files - MPICH2 version
  This package contains runtime files for use with MPICH2. Warning: the
  C++ interface is not provided for this version.
 
-Package: libhdf5-mpich2-dev
+Package: libhdf5-mpich2-7
+Section: oldlibs
+Priority: extra
+Architecture: any
+Depends: libhdf5-mpich-7
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+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
+ HDF4.x. It has a more powerful and flexible data model, supports
+ files larger than 2 GB, and supports parallel I/O.
+ .
+ Transitional dummy package for libhdf5-mpich-7.
+
+Package: libhdf5-mpich-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libhdf5-mpich2-7 (= ${binary:Version}), zlib1g-dev,
- libjpeg-dev, libmpich2-dev, ${misc:Depends}, hdf5-helpers
+Depends: libhdf5-mpich-7 (= ${binary:Version}), zlib1g-dev,
+ libjpeg-dev, libmpich-dev, ${misc:Depends}, hdf5-helpers
 Conflicts: libhdf5-dev
-Provides: libhdf5-dev
+Provides: libhdf5-dev, libhdf5-mpich2-dev
+Replaces: libhdf5-mpich2-dev (<< 1.8.12-2~)
+Breaks: libhdf5-mpich2-dev (<< 1.8.12-2~)
 Suggests: libhdf5-doc
-Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH2 
version
+Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH 
version
  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
@@ -205,21 +198,51 @@ Description: Hierarchical Data Format 5 (HDF5) - 
development files - MPICH2 vers
  This package contains development files for use with MPICH2. Warning:
  the C++ interface is not provided for this version.
 
-Package: libhdf5-mpich2-7-dbg
+Package: libhdf5-mpich2-dev
+Section: oldlibs
+Priority: extra
+Architecture: any
+Depends: libhdf5-mpich-dev
+Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH 
version
+ 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.
+ .
+ Transitional dummy package for libhdf5-mpich-dev.
+
+Package: libhdf5-mpich-7-dbg
 Section: debug
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libhdf5-mpich2-7 (= ${binary:Version}),
+ libhdf5-mpich-7 (= ${binary:Version}),
 Conflicts: libhdf5-openmpi-7-dbg, libhdf5-7-dbg
+Provides: libhdf5-mpich2-7-dbg
+Replaces: libhdf5-mpich2-7-dbg (<< 1.8.12-2~)
+Breaks: libhdf5-mpich2-7-dbg (<< 1.8.12-2~)
 Multi-Arch: same
-Description: Hierarchical Data Format 5 (HDF5) - Mpich2 Debug package
+Description: Hierarchical Data Format 5 (HDF5) - Mpich Debug package
  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 debug hdf5/mpich2 libraries.
+ This package contains debug hdf5/mpich libraries.
+
+Package: libhdf5-mpich2-7-dbg
+Section: oldlibs
+Priority: extra
+Architecture: any
+Depends: libhdf5-mpich-7-dbg
+Multi-Arch: same
+Description: Hierarchical Data Format 5 (HDF5) - Mpich Debug package
+ 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.
+ .
+ Transitional dummy package for libhdf5-mpich-7-dbg.
 
 Package: libhdf5-mpi-dev
 Section: libdevel
@@ -250,8 +273,6 @@ Description: Hierarchical Data Format 5 (HDF5) - 
Documentation
 Package: hdf5-helpers
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: hdf5-tools (<< 1.8.7-1)
-Breaks: hdf5-tools (<< 1.8.7-1)
 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
@@ -259,8 +280,6 @@ Description: Hierarchical Data Format 5 (HDF5) - Helper 
tools
  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
 Architecture: any
diff --git a/debian/control.in b/debian/control.in
index b428343..f7c5c5e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Debian GIS Project 
<pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <fran...@debian.org>,
  Sylvestre Ledru <sylves...@debian.org>,
  Gilles Filippini <p...@debian.org>
-Build-Depends: dpkg-dev (>= 1.16.1~), libmpich2-dev, zlib1g-dev,
+Build-Depends: dpkg-dev (>= 1.16.1~), libmpich-dev, zlib1g-dev,
  libopenmpi-dev [!hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, 
debhelper (>= 9~), sed (>=4.1.5),
  gfortran, libibverbs-dev [!arm64 !arm !hppa !mips !mipsel !s390 !s390x 
!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
  sharutils, mpi-default-dev, chrpath, autotools-dev
@@ -19,11 +19,8 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Conflicts: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@,
- libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, libhdf5-serial-1.8.6,
- libhdf5-1.8.7, libhdf5-serial-1.8.7
-Provides: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@
-Replaces: libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, 
libhdf5-serial-1.8.6, libhdf5-1.8.7, libhdf5-serial-1.8.7
+Conflicts: libhdf5-@SONAME@
+Provides: libhdf5-@SONAME@
 Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
  HDF5 is a file format and library for storing scientific data.
@@ -39,7 +36,7 @@ Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libhdf5-@SONAME@ (= ${binary:Version})
-Conflicts: libhdf5-mpich2-@SONAME@-dbg, libhdf5-openmpi-@SONAME@-dbg
+Conflicts: libhdf5-mpich-@SONAME@-dbg, libhdf5-openmpi-@SONAME@-dbg
 Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - Debug package
  HDF5 is a file format and library for storing scientific data.
@@ -88,9 +85,6 @@ Architecture: any
 Depends: libhdf5-@SONAME@ (= ${binary:Version}), zlib1g-dev, libjpeg-dev,
  ${misc:Depends}, hdf5-helpers, libhdf5-cpp-@SONAME@ (= ${binary:Version})
 Suggests: libhdf5-doc
-Provides: libhdf5-serial-dev
-Replaces: libhdf5-serial-dev (<< 1.8.8-2)
-Breaks: libhdf5-serial-dev (<< 1.8.8-2)
 Description: Hierarchical Data Format 5 (HDF5) - development files - serial 
version
  HDF5 is a file format and library for storing scientific data.
  HDF5 was designed and implemented to address the deficiencies of
@@ -99,30 +93,14 @@ Description: Hierarchical Data Format 5 (HDF5) - 
development files - serial vers
  .
  This package contains development files for serial platforms.
 
-Package: libhdf5-serial-dev
-Section: libdevel
-Architecture: any
-Depends: libhdf5-dev (= ${binary:Version}), ${misc:Depends}
-Description: Hierarchical Data Format 5 (HDF5) - development files - 
transitionnal package
- 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 is a transitionnal package.
-
 Package: libhdf5-openmpi-@SONAME@
 Section: libs
 Priority: extra
 Architecture: @ARCHS@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Conflicts: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@,
- libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6,
- libhdf5-1.8.7, libhdf5-openmpi-1.8.7
-Provides: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@
-Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, 
libhdf5-openmpi-1.8.6,
- libhdf5-1.8.7, libhdf5-openmpi-1.8.7
+Conflicts: libhdf5-@SONAME@
+Provides: libhdf5-@SONAME@
 Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - OpenMPI 
version
  HDF5 is a file format and library for storing scientific data.
@@ -155,7 +133,7 @@ Priority: extra
 Architecture: @ARCHS@
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libhdf5-openmpi-@SONAME@ (= ${binary:Version}),
-Conflicts: libhdf5-@SONAME@-dbg, libhdf5-mpich2-@SONAME@-dbg
+Conflicts: libhdf5-@SONAME@-dbg, libhdf5-mpich-@SONAME@-dbg
 Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - OpenMPI Debug package
  HDF5 is a file format and library for storing scientific data.
@@ -165,18 +143,16 @@ Description: Hierarchical Data Format 5 (HDF5) - OpenMPI 
Debug package
  .
  This package contains debug hdf5/openmpi libraries.
 
-Package: libhdf5-mpich2-@SONAME@
+Package: libhdf5-mpich-@SONAME@
 Section: libs
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Conflicts: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@,
- libhdf5-1.8.4,  libhdf5-mpich2-1.8.4, libhdf5-1.8.6,  libhdf5-mpich2-1.8.6,
- libhdf5-1.8.7, libhdf5-mpich2-1.8.7
-Provides: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@
-Replaces: libhdf5-1.8.4, libhdf5-mpich2-1.8.4, libhdf5-1.8.6, 
libhdf5-mpich2-1.8.6,
- libhdf5-1.8.7, libhdf5-mpich2-1.8.7
+Conflicts: libhdf5-@SONAME@
+Provides: libhdf5-@SONAME@, libhdf5-mpich2-@SONAME@
+Replaces: libhdf5-mpich2-@SONAME@ (<< 1.8.12-2~)
+Breaks: libhdf5-mpich2-@SONAME@ (<< 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.
@@ -187,16 +163,33 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime 
files - MPICH2 version
  This package contains runtime files for use with MPICH2. Warning: the
  C++ interface is not provided for this version.
 
-Package: libhdf5-mpich2-dev
+Package: libhdf5-mpich2-@SONAME@
+Section: oldlibs
+Priority: extra
+Architecture: any
+Depends: libhdf5-mpich-@SONAME@
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+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
+ HDF4.x. It has a more powerful and flexible data model, supports
+ files larger than 2 GB, and supports parallel I/O.
+ .
+ Transitional dummy package for libhdf5-mpich-@SONAME@.
+
+Package: libhdf5-mpich-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libhdf5-mpich2-@SONAME@ (= ${binary:Version}), zlib1g-dev,
- libjpeg-dev, libmpich2-dev, ${misc:Depends}, hdf5-helpers
+Depends: libhdf5-mpich-@SONAME@ (= ${binary:Version}), zlib1g-dev,
+ libjpeg-dev, libmpich-dev, ${misc:Depends}, hdf5-helpers
 Conflicts: libhdf5-dev
-Provides: libhdf5-dev
+Provides: libhdf5-dev, libhdf5-mpich2-dev
+Replaces: libhdf5-mpich2-dev (<< 1.8.12-2~)
+Breaks: libhdf5-mpich2-dev (<< 1.8.12-2~)
 Suggests: libhdf5-doc
-Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH2 
version
+Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH 
version
  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
@@ -205,21 +198,51 @@ Description: Hierarchical Data Format 5 (HDF5) - 
development files - MPICH2 vers
  This package contains development files for use with MPICH2. Warning:
  the C++ interface is not provided for this version.
 
-Package: libhdf5-mpich2-@SONAME@-dbg
+Package: libhdf5-mpich2-dev
+Section: oldlibs
+Priority: extra
+Architecture: any
+Depends: libhdf5-mpich-dev
+Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH 
version
+ 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.
+ .
+ Transitional dummy package for libhdf5-mpich-dev.
+
+Package: libhdf5-mpich-@SONAME@-dbg
 Section: debug
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libhdf5-mpich2-@SONAME@ (= ${binary:Version}),
+ libhdf5-mpich-@SONAME@ (= ${binary:Version}),
 Conflicts: libhdf5-openmpi-@SONAME@-dbg, libhdf5-@SONAME@-dbg
+Provides: libhdf5-mpich2-@SONAME@-dbg
+Replaces: libhdf5-mpich2-@SONAME@-dbg (<< 1.8.12-2~)
+Breaks: libhdf5-mpich2-@SONAME@-dbg (<< 1.8.12-2~)
 Multi-Arch: same
-Description: Hierarchical Data Format 5 (HDF5) - Mpich2 Debug package
+Description: Hierarchical Data Format 5 (HDF5) - Mpich Debug package
  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 debug hdf5/mpich2 libraries.
+ This package contains debug hdf5/mpich libraries.
+
+Package: libhdf5-mpich2-@SONAME@-dbg
+Section: oldlibs
+Priority: extra
+Architecture: any
+Depends: libhdf5-mpich-@SONAME@-dbg
+Multi-Arch: same
+Description: Hierarchical Data Format 5 (HDF5) - Mpich Debug package
+ 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.
+ .
+ Transitional dummy package for libhdf5-mpich-@SONAME@-dbg.
 
 Package: libhdf5-mpi-dev
 Section: libdevel
@@ -250,8 +273,6 @@ Description: Hierarchical Data Format 5 (HDF5) - 
Documentation
 Package: hdf5-helpers
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: hdf5-tools (<< 1.8.7-1)
-Breaks: hdf5-tools (<< 1.8.7-1)
 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
@@ -259,8 +280,6 @@ Description: Hierarchical Data Format 5 (HDF5) - Helper 
tools
  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
 Architecture: any
diff --git a/debian/libhdf5-mpich-7.lintian-overrides 
b/debian/libhdf5-mpich-7.lintian-overrides
new file mode 100644
index 0000000..163ee24
--- /dev/null
+++ b/debian/libhdf5-mpich-7.lintian-overrides
@@ -0,0 +1,2 @@
+libhdf5-mpich-7: package-name-doesnt-match-sonames libhdf5-7 libhdf5-fortran7 
libhdf5-hl7 libhdf5hl-fortran7
+
diff --git a/debian/libhdf5-mpich2-7.symbols b/debian/libhdf5-mpich-7.symbols
similarity index 99%
rename from debian/libhdf5-mpich2-7.symbols
rename to debian/libhdf5-mpich-7.symbols
index dc232d5..8db74c9 100644
--- a/debian/libhdf5-mpich2-7.symbols
+++ b/debian/libhdf5-mpich-7.symbols
@@ -1,4 +1,4 @@
-libhdf5.so.7 libhdf5-mpich2-7 #MINVER#
+libhdf5.so.7 libhdf5-mpich-7 #MINVER#
  H5AC_BT2_HDR@Base 1.8.7
  H5AC_BT2_INT@Base 1.8.7
  H5AC_BT2_LEAF@Base 1.8.7
@@ -2489,7 +2489,7 @@ libhdf5.so.7 libhdf5-mpich2-7 #MINVER#
  HDsrand@Base 1.8.7
  HDstrtoll@Base 1.8.7
  epoch_marker_class@Base 1.8.7
-libhdf5_fortran.so.7 libhdf5-mpich2-7 #MINVER#
+libhdf5_fortran.so.7 libhdf5-mpich-7 #MINVER#
  HD5f2cstring@Base 1.8.7
  HD5packFstring@Base 1.8.7
  __h5_dble_interface_MOD_h5aread_double_1@Base 1.8.7
@@ -3559,7 +3559,7 @@ libhdf5_fortran.so.7 libhdf5-mpich2-7 #MINVER#
  h5zunregister_c_@Base 1.8.7
  integer_types_@Base 1.8.7
  predefined_types_@Base 1.8.7
-libhdf5_hl.so.7 libhdf5-mpich2-7 #MINVER#
+libhdf5_hl.so.7 libhdf5-mpich-7 #MINVER#
  H5DO_write_chunk@Base 1.8.11
  H5DOwrite_chunk@Base 1.8.11
  H5DS_get_REFLIST_type@Base 1.8.7
@@ -3735,7 +3735,7 @@ libhdf5_hl.so.7 libhdf5-mpich2-7 #MINVER#
  str_cset@Base 1.8.7
  str_pad@Base 1.8.7
  str_size@Base 1.8.7
-libhdf5hl_fortran.so.7 libhdf5-mpich2-7 #MINVER#
+libhdf5hl_fortran.so.7 libhdf5-mpich-7 #MINVER#
  H5IM_get_palette@Base 1.8.7
  H5IMget_palettef@Base 1.8.7
  H5IMmake_image_24bitf@Base 1.8.7
diff --git a/debian/libhdf5-mpich2-7.lintian-overrides 
b/debian/libhdf5-mpich2-7.lintian-overrides
deleted file mode 100644
index 97fc0bc..0000000
--- a/debian/libhdf5-mpich2-7.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libhdf5-mpich2-7: package-name-doesnt-match-sonames libhdf5-7 libhdf5-fortran7 
libhdf5-hl7 libhdf5hl-fortran7
-
diff --git a/debian/rules b/debian/rules
index 79d2361..e74c432 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ major_version = $(shell echo $(version) | cut -d. -f1,2)
 serpack = $(package)-$(soname)
 sercpppack = $(package)-cpp-$(soname)
 openmpipack = $(package)-openmpi-$(soname)
-mpich2pack = $(package)-mpich2-$(soname)
+mpichpack = $(package)-mpich-$(soname)
 virtpack = $(package)-$(major_version)
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -90,18 +90,18 @@ CONFIGURE_FLAGS = --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) 
\
 SERIAL_ONLY_FLAGS = --enable-fortran --enable-threadsafe --enable-cxx
 
 configure: configure-stamp-debian configure-stamp \
-          $(configure_stamp_openmpi) configure-stamp-mpich2
+          $(configure_stamp_openmpi) configure-stamp-mpich
 
 configure-stamp-debian: debian/control.in
        cd debian && for i in *_devlib; do j=`basename $$i _devlib`; \
                ln -sf $$i $(package)-dev.$$j ; \
                ln -sf $$i $(package)-openmpi-dev.$$j ; \
-               ln -sf $$i $(package)-mpich2-dev.$$j ; \
+               ln -sf $$i $(package)-mpich-dev.$$j ; \
                done
        cd debian && for i in *_shlib; do j=`basename $$i _shlib`; \
                ln -sf $$i $(serpack).$$j ; \
                ln -sf $$i $(openmpipack).$$j ; \
-               ln -sf $$i $(mpich2pack).$$j ; \
+               ln -sf $$i $(mpichpack).$$j ; \
                done
        sed -e "s/@SONAME@/$(soname)/g" debian/shlibs.in > 
debian/$(serpack).shlibs
        dh_autotools-dev_updateconfig
@@ -126,13 +126,13 @@ configure-stamp-openmpi: configure-stamp-debian
                --enable-parallel=yes || { cat config.log; exit 1; }
        touch $@
 
-configure-stamp-mpich2: configure-stamp-debian
+configure-stamp-mpich: configure-stamp-debian
        dh_testdir
-       -mkdir debian/build-mpich2
-# configure version with mpich2
-       cd debian/build-mpich2 && FCFLAGS=-I/usr/lib/mpich2/include/ 
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
-               LDFLAGS=-L/usr/lib/mpich2/lib/ CC=mpicc.mpich2 \
-               CXX=mpicxx.mpich2 FC=mpif90.mpich2 F9X=mpif90.mpich2 
RUNPARALLEL=/usr/bin/mpirun.mpich2 \
+       -mkdir debian/build-mpich
+# configure version with mpich
+       cd debian/build-mpich && FCFLAGS=-I/usr/lib/mpich/include/ 
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
+               LDFLAGS=-L/usr/lib/mpich/lib/ CC=mpicc.mpich \
+               CXX=mpicxx.mpich FC=mpif90.mpich F9X=mpif90.mpich 
RUNPARALLEL=/usr/bin/mpirun.mpich \
                ../../configure $(CONFIGURE_FLAGS) --enable-fortran \
                --enable-parallel=yes || { cat config.log; exit 1; }
        touch $@
@@ -142,7 +142,7 @@ prep:
 
 
 build: build-arch build-indep
-build-arch: build-stamp $(build_stamp_openmpi) build-stamp-mpich2
+build-arch: build-stamp $(build_stamp_openmpi) build-stamp-mpich
 build-indep:
 
 build-stamp: configure-stamp
@@ -155,9 +155,9 @@ build-stamp-openmpi: configure-stamp-openmpi
        $(MAKE)  $(MAKEFLAGS) -C debian/build-openmpi/ 
OMPI_MCA_disable_memory_allocator=1
        touch $@
 
-build-stamp-mpich2: configure-stamp-mpich2 
+build-stamp-mpich: configure-stamp-mpich 
        dh_testdir
-       $(MAKE)  $(MAKEFLAGS) -C debian/build-mpich2/
+       $(MAKE)  $(MAKEFLAGS) -C debian/build-mpich/
        touch $@
 
 #
@@ -171,13 +171,13 @@ clean:
        test -f debian/control.in
        -rm -rf debian/build
        -rm -rf debian/build-openmpi
-       -rm -rf debian/build-mpich2
+       -rm -rf debian/build-mpich
        -find debian -type l | xargs rm -f
        grep -v ^\% debian/control.in | sed -e "s/@SONAME@/$(soname)/g" -e 
"s/@ARCHS@/$(ARCHS)/" -e "s/@MAJOR_VERSION@/$(major_version)/" > debian/control
        dh_autotools-dev_restoreconfig
        dh_clean configure-stamp* build-stamp* install-stamp* debian/*.shlibs
 
-install: build prep install-serial $(install_openmpi) install-mpich2 
install-doc
+install: build prep install-serial $(install_openmpi) install-mpich install-doc
 
 install-serial: build-stamp
        dh_testdir
@@ -198,14 +198,14 @@ install-openmpi: build-stamp-openmpi
        dh_install -p$(openmpipack) -p$(package)-openmpi-dev \
                --sourcedir=debian/build-openmpi/tmpinst
 
-install-mpich2: build-stamp-mpich2
+install-mpich: build-stamp-mpich
        dh_testdir
        dh_testroot
-       -mkdir debian/build-mpich2/tmpinst
-       $(MAKE) -C debian/build-mpich2/ install 
prefix=$(CURDIR)/debian/build-mpich2/tmpinst/usr
-       chrpath -d $(CURDIR)/debian/build-mpich2/tmpinst/usr/lib/*/libhdf5*so*
-       dh_install -p$(mpich2pack) -p$(package)-mpich2-dev \
-               --sourcedir=debian/build-mpich2/tmpinst
+       -mkdir debian/build-mpich/tmpinst
+       $(MAKE) -C debian/build-mpich/ install 
prefix=$(CURDIR)/debian/build-mpich/tmpinst/usr
+       chrpath -d $(CURDIR)/debian/build-mpich/tmpinst/usr/lib/*/libhdf5*so*
+       dh_install -p$(mpichpack) -p$(package)-mpich-dev \
+               --sourcedir=debian/build-mpich/tmpinst
 
 install-doc: build-indep
        dh_testdir
@@ -225,7 +225,7 @@ binary-indep: install-doc
        dh_md5sums -i
        dh_builddeb -i
 
-binary-arch: prep install-serial $(install_openmpi) install-mpich2
+binary-arch: prep install-serial $(install_openmpi) install-mpich
        dh_testdir
        dh_testroot
        echo "hdf5-mpi-dev=libhdf5-$(DEFAULT_MPI)-dev" > 
debian/libhdf5-mpi-dev.substvars
@@ -238,7 +238,7 @@ binary-arch: prep install-serial $(install_openmpi) 
install-mpich2
        dh_strip -phdf5-helpers
        dh_strip -p$(serpack) --dbg-package=$(serpack)-dbg
        dh_strip -p$(sercpppack) --dbg-package=$(sercpppack)-dbg
-       dh_strip -p$(mpich2pack) --dbg-package=$(mpich2pack)-dbg
+       dh_strip -p$(mpichpack) --dbg-package=$(mpichpack)-dbg
 ifeq ($(build_openmpi),yes)
        dh_strip -p$(openmpipack) --dbg-package=$(openmpipack)-dbg
 endif
@@ -247,7 +247,7 @@ endif
 ifeq ($(build_openmpi),yes)
        dh_makeshlibs -p$(openmpipack) -V $(openmpipack) -- -v$(version)
 endif
-       dh_makeshlibs -p$(mpich2pack) -V $(mpich2pack) -- -v$(version)
+       dh_makeshlibs -p$(mpichpack) -V $(mpichpack) -- -v$(version)
        dh_makeshlibs -p$(serpack) -V "$(serpack) | $(virtpack)" -- -v$(version)
        dh_makeshlibs -p$(sercpppack) -V $(sercpppack) -- -v$(version)
        dh_installdeb $(ARCH_FLAG)
@@ -258,7 +258,7 @@ endif
 ifeq ($(build_openmpi),yes)
        dh_shlibdeps -p$(openmpipack) -L$(openmpipack) 
-ldebian/$(openmpipack)/usr/lib
 endif
-       dh_shlibdeps -p$(mpich2pack) -L$(mpich2pack) 
-ldebian/$(mpich2pack)/usr/lib
+       dh_shlibdeps -p$(mpichpack) -L$(mpichpack) -ldebian/$(mpichpack)/usr/lib
        dh_gencontrol $(ARCH_FLAG)
        dh_md5sums $(ARCH_FLAG)
        dh_builddeb $(ARCH_FLAG)
@@ -266,7 +266,7 @@ endif
 binary: binary-indep binary-arch
 
 .PHONY: build clean binary-indep binary-arch binary install configure \
-               install-doc install-serial install-openmpi install-mpich2 prep
+               install-doc install-serial install-openmpi install-mpich prep
 
 .NOTPARALLEL: configure-stamp-debian configure-stamp \
-          $(configure_stamp_openmpi) configure-stamp-mpich2
+          $(configure_stamp_openmpi) configure-stamp-mpich

-- 
Hierarchical Data Format 5 (HDF5)

_______________________________________________
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