[SCM] hdf5 branch, master, updated. upstream/1.8.7-157-g6fc6370

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit 6fc637044dbfb34074435bbab62295e0bc3f7927
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Fri Jun 21 14:06:59 2013 +0200

    final refresh

diff --git a/debian/patches/path_max.diff b/debian/patches/path_max.diff
index 11bff97..d8d3466 100644
--- a/debian/patches/path_max.diff
+++ b/debian/patches/path_max.diff
@@ -1,7 +1,7 @@
-Index: hdf5/src/H5F.c
+Index: hdf5-1.8.11/src/H5F.c
 ===================================================================
---- hdf5.orig/src/H5F.c	2013-06-21 13:54:31.976186569 +0200
-+++ hdf5/src/H5F.c	2013-06-21 13:54:31.972186569 +0200
+--- hdf5-1.8.11.orig/src/H5F.c	2013-06-21 14:04:50.332202606 +0200
++++ hdf5-1.8.11/src/H5F.c	2013-06-21 14:04:50.332202606 +0200
 @@ -129,6 +129,10 @@
  }};
  
@@ -13,13 +13,13 @@ Index: hdf5/src/H5F.c
  

  /*-------------------------------------------------------------------------
   * Function:	H5F_init
-Index: hdf5/testpar/t_cache.c
+Index: hdf5-1.8.11/testpar/t_cache.c
 ===================================================================
---- hdf5.orig/testpar/t_cache.c	2013-06-21 13:54:31.976186569 +0200
-+++ hdf5/testpar/t_cache.c	2013-06-21 13:54:31.976186569 +0200
-@@ -39,6 +39,10 @@
- #define PATH_MAX    512
- #endif  /* !PATH_MAX */
+--- hdf5-1.8.11.orig/testpar/t_cache.c	2013-06-21 14:04:50.332202606 +0200
++++ hdf5-1.8.11/testpar/t_cache.c	2013-06-21 14:04:50.332202606 +0200
+@@ -35,6 +35,10 @@
+ 
+ #include "H5Fpkg.h"
  
 +#ifndef PATH_MAX
 +#define PATH_MAX    512
diff --git a/debian/patches/relax-version-check.patch b/debian/patches/relax-version-check.patch
index e978529..49da78d 100644
--- a/debian/patches/relax-version-check.patch
+++ b/debian/patches/relax-version-check.patch
@@ -6,10 +6,10 @@ Description: remove check on patch version
  access see e.g. H5F_ACC_RDONLY in src/H5Fpublic.h
 Author: Julian Taylor <jtaylor at ubuntu.com>
 
-Index: hdf5/src/H5.c
+Index: hdf5-1.8.11/src/H5.c
 ===================================================================
---- hdf5.orig/src/H5.c	2013-06-21 13:54:32.932186597 +0200
-+++ hdf5/src/H5.c	2013-06-21 13:54:32.932186597 +0200
+--- hdf5-1.8.11.orig/src/H5.c	2013-06-21 14:04:51.464202633 +0200
++++ hdf5-1.8.11/src/H5.c	2013-06-21 14:04:51.464202633 +0200
 @@ -666,8 +666,7 @@
              disable_version_check = (unsigned int)HDstrtol (s, NULL, 0);
      }
diff --git a/debian/patches/skip_cxx_inclusion.diff b/debian/patches/skip_cxx_inclusion.diff
index 7ae8e03..adba680 100644
--- a/debian/patches/skip_cxx_inclusion.diff
+++ b/debian/patches/skip_cxx_inclusion.diff
@@ -1,7 +1,7 @@
-Index: hdf5/src/H5public.h
+Index: hdf5-1.8.11/src/H5public.h
 ===================================================================
---- hdf5.orig/src/H5public.h	2013-06-21 13:54:33.196186601 +0200
-+++ hdf5/src/H5public.h	2013-06-21 13:54:33.196186601 +0200
+--- hdf5-1.8.11.orig/src/H5public.h	2013-06-21 14:04:51.860202643 +0200
++++ hdf5-1.8.11/src/H5public.h	2013-06-21 14:04:51.860202643 +0200
 @@ -58,6 +58,8 @@
  #   include <stddef.h>
  #endif
@@ -9,5 +9,5 @@ Index: hdf5/src/H5public.h
 +#   define MPICH_SKIP_MPICXX 1
 +#   define OMPI_SKIP_MPICXX 1
  #   include <mpi.h>
- #endif
- 
+ #ifndef MPI_FILE_NULL		/*MPIO may be defined in mpi.h already       */
+ #   include <mpio.h>
diff --git a/debian/patches/ullong_force.diff b/debian/patches/ullong_force.diff
index 4807310..e1feeb9 100644
--- a/debian/patches/ullong_force.diff
+++ b/debian/patches/ullong_force.diff
@@ -1,7 +1,7 @@
-Index: hdf5/src/H5Tconv.c
+Index: hdf5-1.8.11/src/H5Tconv.c
 ===================================================================
---- hdf5.orig/src/H5Tconv.c	2013-06-21 13:54:32.536186580 +0200
-+++ hdf5/src/H5Tconv.c	2013-06-21 13:54:32.532186579 +0200
+--- hdf5-1.8.11.orig/src/H5Tconv.c	2013-06-21 14:04:50.992202620 +0200
++++ hdf5-1.8.11/src/H5Tconv.c	2013-06-21 14:04:50.992202620 +0200
 @@ -7873,7 +7873,6 @@
   *
   *-------------------------------------------------------------------------

-- 
Hierarchical Data Format 5 (HDF5)