[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 e78466dde191719340e4341644b750fbe655b48d
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Fri Aug 7 15:32:18 2009 +0000

diff --git a/debian/changelog b/debian/changelog
index 890b3d6..661c8cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+hdf5 (1.8.3-2) unstable; urgency=low
+
+  * Uploaded to unstable.
+    (closes: #519575, #501564, #470159)
+  * Fixed shlibs.in to avoid wrong interdependencies.
+    (closes: #537413)
+  * Added libjpeg-dev as an alternative build-dep and replaced
+    into the -dev package list of deps.
+  * [PATCH] mpi.diff added to remove mpio.h including, which
+    is supefluous for LAM, MPICH and OpenMPI AFAIK.
+    (closes: #515579)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 06 Aug 2009 16:40:50 +0200
+
 hdf5 (1.8.3-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 84c7603..ee4b50b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 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], libjpeg62-dev, debhelper (>> 7), sed (>=4.1.5), gfortran,
- libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390]
+ libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390], libjpeg62-dev | libjpeg-dev, debhelper (>> 7), sed (>=4.1.5), 
+ gfortran, libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390]
 Standards-Version: 3.8.1
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/hdf5/trunk/
@@ -28,7 +28,7 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
 Package: libhdf5-serial-dev
 Section: libdevel
 Architecture: any
-Depends: libhdf5-serial-1.8.3 (= ${binary:Version}), zlib1g-dev, libjpeg62-dev
+Depends: libhdf5-serial-1.8.3 (= ${binary:Version}), zlib1g-dev, libjpeg-dev
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
diff --git a/debian/control.in b/debian/control.in
index b845f65..0b7e809 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 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], libjpeg62-dev, debhelper (>> 7), sed (>=4.1.5), gfortran,
- libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390]
+ libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390], libjpeg62-dev | libjpeg-dev, debhelper (>> 7), sed (>=4.1.5), 
+ gfortran, libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390]
 Standards-Version: 3.8.1
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/hdf5/trunk/
@@ -28,7 +28,7 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
 Package: libhdf5-serial-dev
 Section: libdevel
 Architecture: any
-Depends: libhdf5-serial- at VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg62-dev
+Depends: libhdf5-serial- at VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg-dev
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
diff --git a/debian/patches/mpi.diff b/debian/patches/mpi.diff
new file mode 100644
index 0000000..9706d22
--- /dev/null
+++ b/debian/patches/mpi.diff
@@ -0,0 +1,14 @@
+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/series b/debian/patches/series
index 6ebafaf..8902f5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 autotools.diff -p1
+mpi.diff
diff --git a/debian/rules b/debian/rules
index 89a2a71..848f93a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -249,14 +249,14 @@ binary-arch: build install-serial install-lam $(install_openmpi) install-mpich
 	dh_strip $(ARCH_FLAG)
 	dh_compress $(ARCH_FLAG)
 	dh_fixperms $(ARCH_FLAG)
-#	dh_makeshlibs -p$(serpack) -V "$(serpack) | $(virtpack)"
+	dh_makeshlibs -p$(serpack) -V "$(serpack) | $(virtpack)"
 	dh_makeshlibs -p$(lampack) -V $(lampack)
 ifeq ($(build_openmpi),yes)
 	dh_makeshlibs -p$(openmpipack) -V $(openmpipack)
 endif
 	dh_makeshlibs -p$(mpichpack) -V $(mpichpack)
 	dh_installdeb $(ARCH_FLAG)
-	dh_shlibdeps -phdf5-tools -L$(serpack) -ldebian/$(serpack)/usr/lib:debian/build-serial/test/.libs
+	dh_shlibdeps -phdf5-tools -Lhdf5-tools -ldebian/$(serpack)/usr/lib:debian/build-serial/test/.libs
 	dh_shlibdeps -p$(serpack) -L$(serpack) -ldebian/$(serpack)/usr/lib:debian/build-serial/test/.libs
 	dh_shlibdeps -p$(lampack) -L$(lampack) -ldebian/$(lampack)/usr/lib
 ifeq ($(build_openmpi),yes)

-- 
Hierarchical Data Format 5 (HDF5)