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

[Sylvestre Ledru]

The following commit has been merged in the upstream branch:
commit 249b363c2da4d5c12c4d977c0aa65b5592c3cad4
Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
Date:   Wed May 25 12:00:33 2011 +0200

      * Support of hurd-i386. Thanks to Pino Toscano for doing the work
        (Closes: #627896)
      * Drop the useless lam4-dev dependency. Thanks to Pino Toscano.

diff --git a/debian/changelog b/debian/changelog
index c6edbdd..1d11008 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hdf5 (1.8.7-2) experimental; urgency=low
+
+  * Support of hurd-i386. Thanks to Pino Toscano for doing the work
+    (Closes: #627896)
+  * Drop the useless lam4-dev dependency. Thanks to Pino Toscano.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 25 May 2011 11:55:11 +0200
+
 hdf5 (1.8.7-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index b6aea44..1d71caa 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
  Sylvestre Ledru <sylvestre at debian.org>
-Build-Depends: libmpich2-dev, zlib1g-dev, lam4-dev (>= 7.1.1-3.2),
+Build-Depends: libmpich2-dev, zlib1g-dev,
  libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390 !sh4 !m68k], 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, mpi-default-dev
diff --git a/debian/control.in b/debian/control.in
index cae1e69..bb83af7 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
  Sylvestre Ledru <sylvestre at debian.org>
-Build-Depends: libmpich2-dev, zlib1g-dev, lam4-dev (>= 7.1.1-3.2),
+Build-Depends: libmpich2-dev, zlib1g-dev,
  libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390 !sh4 !m68k], 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, mpi-default-dev
diff --git a/debian/patches/path_max.diff b/debian/patches/path_max.diff
new file mode 100644
index 0000000..367bf9b
--- /dev/null
+++ b/debian/patches/path_max.diff
@@ -0,0 +1,26 @@
+--- a/src/H5F.c
++++ b/src/H5F.c
+@@ -80,6 +80,10 @@
+ /* Declare a free list to manage the H5F_file_t struct */
+ H5FL_DEFINE(H5F_file_t);
+ 
++#ifndef PATH_MAX
++#define PATH_MAX    4096
++#endif  /* !PATH_MAX */
++
+ 
+ /*-------------------------------------------------------------------------
+  * Function:	H5F_init
+--- a/testpar/t_cache.c
++++ b/testpar/t_cache.c
+@@ -35,6 +35,10 @@
+ 
+ #include "H5Fpkg.h"
+ 
++#ifndef PATH_MAX
++#define PATH_MAX    512
++#endif  /* !PATH_MAX */
++
+ 
+ int     	nerrors = 0;
+ int		failures = 0;
diff --git a/debian/patches/series b/debian/patches/series
index 455eb94..a67c11f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,7 @@ mpi.diff
 sscanf.diff
 disabler16check.diff
 
+debian-changes-1.8.7-1
+debian_no-lam.diff
+debian_openmpi-on-hurd.diff
+path_max.diff
diff --git a/debian/rules b/debian/rules
index 7c5d1b2..666d08e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ DEFAULT_MPI=$(shell dpkg -s mpi-default-dev | grep Depends | sed "s/Depends: lib
 #ARCH_FLAG=-a
 #ARCHS=any
 ARCH_FLAG=-s
-ARCHS=alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64
+ARCHS=alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386
 
 ifeq ($(DEB_BUILD_ARCH),arm)
 build_openmpi = no

-- 
Hierarchical Data Format 5 (HDF5)