[SCM] hdf5 branch, master, updated. upstream/1.8.7-167-gc5c4cfb

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit ba11285a6c79dc9233fbf535c4e83e56fd87d8d8
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Wed Jul 3 11:49:31 2013 +0200

    * Fix the FTBFS under ia64 (Closes: #711777)
    * Disable openmpi on m68k, too (Closes: #695607)

diff --git a/debian/changelog b/debian/changelog
index 00268ab..4560490 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hdf5 (1.8.11-2) unstable; urgency=low
+
+  * Fix the FTBFS under ia64 (Closes: #711777)
+  * Disable openmpi on m68k, too (Closes: #695607)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 03 Jul 2013 11:49:10 +0200
+
 hdf5 (1.8.11-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/ftbfs-ia64.diff b/debian/patches/ftbfs-ia64.diff
new file mode 100644
index 0000000..e520eee
--- /dev/null
+++ b/debian/patches/ftbfs-ia64.diff
@@ -0,0 +1,33 @@
+--- tools/lib/h5tools_dump.c.orig	2013-07-03 08:30:00.000000000 +0000
++++ tools/lib/h5tools_dump.c	2013-07-03 08:30:09.000000000 +0000
+@@ -632,7 +632,7 @@
+ {
+         HERROR(H5E_tools_g, H5E_tools_min_id_g, "Could not allocate buffer for ptdata");
+         HGOTO_DONE(dimension_break);
+-        //HGOTO_ERROR(dimension_break, H5E_tools_min_id_g, "Could not allocate buffer for ptdata");
++        /*HGOTO_ERROR(dimension_break, H5E_tools_min_id_g, "Could not allocate buffer for ptdata"); */
+ }
+ 
+     H5_CHECK_OVERFLOW(nblocks, hssize_t, hsize_t);
+--- tools/lib/h5tools_str.c.orig	2013-07-03 08:31:07.000000000 +0000
++++ tools/lib/h5tools_str.c	2013-07-03 08:31:13.000000000 +0000
+@@ -632,7 +632,6 @@
+         h5tools_str_append(str, "%s", OPT(info->line_indent, ""));
+     }
+ 
+-//    ctx->need_prefix = 0;
+ }
+ 
+ /*-------------------------------------------------------------------------
+--- tools/h5dump/h5dump_ddl.c.orig	2013-07-03 08:36:42.000000000 +0000
++++ tools/h5dump/h5dump_ddl.c	2013-07-03 08:36:58.000000000 +0000
+@@ -1341,8 +1341,7 @@
+     string_dataformat.do_escape = display_escape;
+     outputformat = &string_dataformat;
+ 
+-    //attr_name = attr + j + 1;
+-	// need to replace escape characters
++    /* need to replace escape characters */
+ 	attr_name = h5tools_str_replace(attr + j + 1, "\\/", "/");
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c07aa72..b2077d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ ullong_force.diff
 relax-version-check.patch
 skip_cxx_inclusion.diff
 soname.diff
+ftbfs-ia64.diff
diff --git a/debian/rules b/debian/rules
index 4d5926f..9751848 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,8 @@ ifeq ($(DEB_HOST_ARCH),arm)
 build_openmpi = no
 else ifeq ($(DEB_HOST_ARCH),hppa)
 build_openmpi = no
+else ifeq ($(DEB_HOST_ARCH),m68k)
+build_openmpi = no
 else ifeq ($(DEB_HOST_ARCH),mips)
 build_openmpi = no
 else ifeq ($(DEB_HOST_ARCH),mipsel)

-- 
Hierarchical Data Format 5 (HDF5)