[SCM] hdf5 branch, master, updated. upstream/1.8.7-168-gd234454

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit d2344548466bdb19f648750b6bc50486dcff9338
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Wed Jul 3 13:21:32 2013 +0200

    Missing close bug + refresh of the patch

diff --git a/debian/changelog b/debian/changelog
index 27bd5d4..a69da25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 hdf5 (1.8.11-2) unstable; urgency=low
 
-  * Fix the FTBFS under ia64 (Closes: #711777)
+  * Fix the FTBFS under ia64 (Closes: #711777, #711561)
   * Update the symbol list under PowerPC
   * Disable openmpi on m68k, too (Closes: #695607)
 
diff --git a/debian/patches/ftbfs-ia64.diff b/debian/patches/ftbfs-ia64.diff
index e520eee..5099f8d 100644
--- a/debian/patches/ftbfs-ia64.diff
+++ b/debian/patches/ftbfs-ia64.diff
@@ -1,5 +1,7 @@
---- 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
+Index: hdf5-1.8.11/tools/lib/h5tools_dump.c
+===================================================================
+--- hdf5-1.8.11.orig/tools/lib/h5tools_dump.c	2013-07-03 11:59:53.059821858 +0200
++++ hdf5-1.8.11/tools/lib/h5tools_dump.c	2013-07-03 11:59:53.055821859 +0200
 @@ -632,7 +632,7 @@
  {
          HERROR(H5E_tools_g, H5E_tools_min_id_g, "Could not allocate buffer for ptdata");
@@ -9,8 +11,10 @@
  }
  
      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
+Index: hdf5-1.8.11/tools/lib/h5tools_str.c
+===================================================================
+--- hdf5-1.8.11.orig/tools/lib/h5tools_str.c	2013-07-03 11:59:53.059821858 +0200
++++ hdf5-1.8.11/tools/lib/h5tools_str.c	2013-07-03 11:59:53.055821859 +0200
 @@ -632,7 +632,6 @@
          h5tools_str_append(str, "%s", OPT(info->line_indent, ""));
      }
@@ -19,8 +23,10 @@
  }
  
  /*-------------------------------------------------------------------------
---- 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
+Index: hdf5-1.8.11/tools/h5dump/h5dump_ddl.c
+===================================================================
+--- hdf5-1.8.11.orig/tools/h5dump/h5dump_ddl.c	2013-07-03 11:59:53.059821858 +0200
++++ hdf5-1.8.11/tools/h5dump/h5dump_ddl.c	2013-07-03 11:59:53.059821858 +0200
 @@ -1341,8 +1341,7 @@
      string_dataformat.do_escape = display_escape;
      outputformat = &string_dataformat;

-- 
Hierarchical Data Format 5 (HDF5)