[SCM] hdf5 branch, master, updated. upstream/1.8.7-143-g797b41d

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit 797b41ddc470c54e9d19c55e601e77e434dc0c56
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Sat Jan 26 12:28:22 2013 +0100

    refresh of the patches

diff --git a/debian/patches/path_max.diff b/debian/patches/path_max.diff
index 367bf9b..68d9ca5 100644
--- a/debian/patches/path_max.diff
+++ b/debian/patches/path_max.diff
@@ -1,8 +1,10 @@
---- 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);
+Index: hdf5-1.8.10-patch1/src/H5F.c
+===================================================================
+--- hdf5-1.8.10-patch1.orig/src/H5F.c	2013-01-22 20:12:27.000000000 +0100
++++ hdf5-1.8.10-patch1/src/H5F.c	2013-01-26 09:48:33.814192347 +0100
+@@ -129,6 +129,10 @@
+ }};
+ 
  
 +#ifndef PATH_MAX
 +#define PATH_MAX    4096
@@ -11,8 +13,10 @@
  
  /*-------------------------------------------------------------------------
   * Function:	H5F_init
---- a/testpar/t_cache.c
-+++ b/testpar/t_cache.c
+Index: hdf5-1.8.10-patch1/testpar/t_cache.c
+===================================================================
+--- hdf5-1.8.10-patch1.orig/testpar/t_cache.c	2013-01-22 20:12:26.000000000 +0100
++++ hdf5-1.8.10-patch1/testpar/t_cache.c	2013-01-26 09:48:33.814192347 +0100
 @@ -35,6 +35,10 @@
  
  #include "H5Fpkg.h"
diff --git a/debian/patches/relax-version-check.patch b/debian/patches/relax-version-check.patch
index 02d5d16..0e12a69 100644
--- a/debian/patches/relax-version-check.patch
+++ b/debian/patches/relax-version-check.patch
@@ -6,8 +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>
 
---- a/src/H5.c
-+++ b/src/H5.c
+Index: hdf5-1.8.10-patch1/src/H5.c
+===================================================================
+--- hdf5-1.8.10-patch1.orig/src/H5.c	2013-01-22 20:12:27.000000000 +0100
++++ hdf5-1.8.10-patch1/src/H5.c	2013-01-26 09:48:39.714192215 +0100
 @@ -665,8 +665,7 @@
              disable_version_check = (unsigned int)HDstrtol (s, NULL, 0);
      }
diff --git a/debian/patches/ullong_force.diff b/debian/patches/ullong_force.diff
index ab42fac..1d7b7fa 100644
--- a/debian/patches/ullong_force.diff
+++ b/debian/patches/ullong_force.diff
@@ -1,16 +1,16 @@
-diff --git a/src/H5Tconv.c b/src/H5Tconv.c
-index cdfaa0d..a871b64 100644
---- a/src/H5Tconv.c
-+++ b/src/H5Tconv.c
-@@ -8514,7 +8514,6 @@ H5T_conv_float_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+Index: hdf5-1.8.10-patch1/src/H5Tconv.c
+===================================================================
+--- hdf5-1.8.10-patch1.orig/src/H5Tconv.c	2013-01-22 20:12:27.000000000 +0100
++++ hdf5-1.8.10-patch1/src/H5Tconv.c	2013-01-26 09:48:37.898192256 +0100
+@@ -8514,7 +8514,6 @@
   *
   *-------------------------------------------------------------------------
   */
 -#if H5T_CONV_INTERNAL_FP_ULLONG
  herr_t
- H5T_conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  		       size_t nelmts, size_t buf_stride,
-@@ -8523,7 +8522,6 @@ H5T_conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+@@ -8523,7 +8522,6 @@
  {
      H5T_CONV_Fx(FLOAT, ULLONG, float, unsigned long long, 0, ULLONG_MAX);
  }
@@ -18,15 +18,15 @@ index cdfaa0d..a871b64 100644
  
  
  /*-------------------------------------------------------------------------
-@@ -8568,7 +8566,6 @@ H5T_conv_double_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+@@ -8568,7 +8566,6 @@
   *
   *-------------------------------------------------------------------------
   */
 -#if H5T_CONV_INTERNAL_FP_ULLONG
  herr_t
- H5T_conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  		       size_t nelmts, size_t buf_stride,
-@@ -8577,7 +8574,6 @@ H5T_conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+@@ -8577,7 +8574,6 @@
  {
      H5T_CONV_Fx(DOUBLE, ULLONG, double, unsigned long long, 0, ULLONG_MAX);
  }
@@ -34,15 +34,15 @@ index cdfaa0d..a871b64 100644
  
  
  /*-------------------------------------------------------------------------
-@@ -8622,7 +8618,6 @@ H5T_conv_ldouble_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+@@ -8622,7 +8618,6 @@
   *
   *-------------------------------------------------------------------------
   */
 -#if H5T_CONV_INTERNAL_LDOUBLE_ULLONG
  herr_t
- H5T_conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  		       size_t nelmts, size_t buf_stride,
-@@ -8631,7 +8626,6 @@ H5T_conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+@@ -8631,7 +8626,6 @@
  {
      H5T_CONV_Fx(LDOUBLE, ULLONG, long double, unsigned long long, 0, ULLONG_MAX);
  }

-- 
Hierarchical Data Format 5 (HDF5)