[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 11422440dd843eda2a7ccdf3cffbe1062de8ec09
Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
Date:   Fri Feb 25 10:40:21 2011 +0100

      [ Sylvestre Ledru ]
      * New upstream release (Closes: #586232)
      * Default to 1.8 interface instead of 1.6 (Closes: #537414)
      * Remove dependency on libjpeg62-dev (Closes: #569234)
      * Dependency on LAM/MPI and/or MPICH dropped (Closes: #571453)
      * MPICH2 packages provided
      * Optimisation flags plugged back (Closes: #604906)
      * Fix a bad usage of sscanf in the hdf5 code which was introducing
        a dependency on the glibc 2.7 (Closes: #599541)
      * Patch sigbus.diff removed (upstream)
      * Patch autotools.diff removed (hdf5 1.8.6 is using autoconf 2.67)

diff --git a/debian/patches/allowthreadsafe.diff b/debian/patches/allowthreadsafe.diff
new file mode 100644
index 0000000..f583457
--- /dev/null
+++ b/debian/patches/allowthreadsafe.diff
@@ -0,0 +1,22 @@
+Index: hdf5-1.8.6/configure.in
+===================================================================
+--- hdf5-1.8.6.orig/configure.in	2011-02-24 11:19:42.000000000 +0100
++++ hdf5-1.8.6/configure.in	2011-02-24 11:19:51.000000000 +0100
+@@ -1876,17 +1876,6 @@
+                               [Enable thread safe capability])],
+               THREADSAFE=$enableval)
+ 
+-dnl The --enable-threadsafe flag is not compatible with --enable-cxx.
+-dnl If the user tried to specify both flags, throw an error.
+-if test "X${HDF_CXX}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
+-  AC_MSG_ERROR([--enable-cxx and --enable-threadsafe flags are incompatible])
+-fi
+-
+-dnl --enable-threadsafe is also incompatible with --enable-fortran.
+-if test "X${HDF_FORTRAN}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
+-  AC_MSG_ERROR([--enable-fortran and --enable-threadsafe flags are incompatible])
+-fi
+-
+ case "X-$THREADSAFE" in
+   X-|X-no)
+     AC_MSG_RESULT([no])
diff --git a/debian/patches/sscanf.diff b/debian/patches/sscanf.diff
new file mode 100644
index 0000000..1d00a76
--- /dev/null
+++ b/debian/patches/sscanf.diff
@@ -0,0 +1,23 @@
+diff -ur hdf5-1.8.4-patch1.orig/src/H5Epublic.h hdf5-1.8.4-patch1/src/H5Epublic.h
+--- hdf5-1.8.4-patch1.orig/src/H5Epublic.h	2010-02-22 22:31:54.000000000 +0100
++++ hdf5-1.8.4-patch1/src/H5Epublic.h	2010-10-08 20:23:55.000000000 +0200
+@@ -18,7 +18,7 @@
+  */
+ #ifndef _H5Epublic_H
+ #define _H5Epublic_H
+-
++#define _GNU_SOURCE
+ #include <stdio.h>              /*FILE arg of H5Eprint()                     */
+ 
+ /* Public headers needed by this file */
+diff -ur hdf5-1.8.4-patch1.orig/src/H5private.h hdf5-1.8.4-patch1/src/H5private.h
+--- hdf5-1.8.4-patch1.orig/src/H5private.h	2010-02-22 22:31:54.000000000 +0100
++++ hdf5-1.8.4-patch1/src/H5private.h	2010-10-08 20:24:16.000000000 +0200
+@@ -25,6 +25,7 @@
+ 
+ #ifndef _H5private_H
+ #define _H5private_H
++#define _GNU_SOURCE
+ 
+ #include "H5public.h"		/* Include Public Definitions		*/
+ 

-- 
Hierarchical Data Format 5 (HDF5)