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

[Francesco Paolo Lovergine]

The following commit has been merged in the upstream branch:
commit 669129221f9401995a3748b7258b7b111050b543
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Fri Apr 23 09:33:28 2010 +0000

    Adding default-mpi support.

diff --git a/debian/changelog b/debian/changelog
index 04949e1..0c196f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+hdf5 (1.8.4-7) unstable; urgency=low
+
+  [ Adam C. Powell, IV ]
+  * Added libhdf5-mpi-dev package which simply depends on default MPI version
+    of HDF5 for each platform.
+
+  [ Francesco Paolo Lovergine ]
+  * Policy bumped to 3.8.4, no changes required. 
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 23 Apr 2010 11:32:55 +0200
+
 hdf5 (1.8.4-patch1-1) unstable; urgency=low
 
   * New upstream patch release.
diff --git a/debian/control b/debian/control
index 23182c0..d63cbd4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
 Build-Depends: libmpich1.0-dev (>= 1.2.7-1), zlib1g-dev, lam4-dev (>= 7.1.1-3.2), quilt,
  libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390 !sh4 !m68k], libjpeg62-dev | libjpeg-dev, debhelper (>> 7), sed (>=4.1.5), 
  gfortran, libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
- sharutils
-Standards-Version: 3.8.3
+ sharutils, mpi-default-dev
+Standards-Version: 3.8.4
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/hdf5/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/hdf5/trunk
@@ -163,3 +163,16 @@ Description: Hierarchical Data Format 5 (HDF5) - Runtime tools
  files larger than 2 GB, and supports parallel I/O.
  .
  This package contains runtime tools for HDF5.
+ 
+Package: libhdf5-mpi-dev
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: ${hdf5-mpi-dev}, mpi-default-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.
+ .
+ This package depends on the default MPI version of HDF5 for each platform.
diff --git a/debian/control.in b/debian/control.in
index 7750978..99d1372 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,8 +6,8 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
 Build-Depends: libmpich1.0-dev (>= 1.2.7-1), zlib1g-dev, lam4-dev (>= 7.1.1-3.2), quilt,
  libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390 !sh4 !m68k], libjpeg62-dev | libjpeg-dev, debhelper (>> 7), sed (>=4.1.5), 
  gfortran, libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
- sharutils
-Standards-Version: 3.8.3
+ sharutils, mpi-default-dev
+Standards-Version: 3.8.4
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/hdf5/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/hdf5/trunk
@@ -140,6 +140,19 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH versi
  This package contains development files for use with MPICH. Warning:
  the C++ interface is not provided for this version.
 
+Package: libhdf5-mpi-dev
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: ${hdf5-mpi-dev}, mpi-default-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.
+ .
+ This package depends on the default MPI version of HDF5 for each platform.
+
 Package: libhdf5-doc
 Section: doc
 Architecture: all
@@ -163,3 +176,4 @@ Description: Hierarchical Data Format 5 (HDF5) - Runtime tools
  files larger than 2 GB, and supports parallel I/O.
  .
  This package contains runtime tools for HDF5.
+ 
diff --git a/debian/rules b/debian/rules
index a4b9516..3c580a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,8 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
+DEFAULT_MPI=$(shell readlink /etc/alternatives/mpi | sed s/usr//g | sed s/include//g | sed s/lib//g | sed s/\\///g)
+
 patch: patch-stamp
 patch-stamp:
 	QUILT_PATCHES=debian/patches quilt push --color=auto -a || [ $$? = 2 ]
@@ -257,6 +259,7 @@ binary-indep: install-doc
 binary-arch: prep install-serial install-lam $(install_openmpi) install-mpich
 	dh_testdir
 	dh_testroot 
+	echo "hdf5-mpi-dev=libhdf5-$(DEFAULT_MPI)-dev" > debian/libhdf5-mpi-dev.substvars
 	dh_installdocs $(ARCH_FLAG)
 	dh_installman $(ARCH_FLAG)
 	dh_installchangelogs -a -k release_docs/RELEASE.txt

-- 
Hierarchical Data Format 5 (HDF5)