[SCM] hdf5 branch, master, updated. upstream/1.8.4-patch1-86-g7329e30

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit 7329e3026c96d9239bf33959291a9a0d3ce1fb52
Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
Date:   Fri Nov 18 15:36:10 2011 +0100

    Update of the patch

diff --git a/debian/patches/ullong_force.diff b/debian/patches/ullong_force.diff
index df87117..ab13c0e 100644
--- a/debian/patches/ullong_force.diff
+++ b/debian/patches/ullong_force.diff
@@ -1,8 +1,8 @@
-Index: hdf5.git/src/H5Tconv.c
-===================================================================
---- hdf5.git.orig/src/H5Tconv.c	2011-11-18 14:42:37.711729984 +0100
-+++ hdf5.git/src/H5Tconv.c	2011-11-18 15:07:49.687771586 +0100
-@@ -9537,7 +9537,7 @@
+diff --git a/src/H5Tconv.c b/src/H5Tconv.c
+index 927a9dc..b9fe85d 100644
+--- a/src/H5Tconv.c
++++ b/src/H5Tconv.c
+@@ -9537,7 +9537,7 @@ done:
   *
   *-------------------------------------------------------------------------
   */
@@ -11,7 +11,7 @@ Index: hdf5.git/src/H5Tconv.c
  herr_t
  H5T_conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  		       size_t nelmts, size_t buf_stride,
-@@ -9553,7 +9553,7 @@
+@@ -9553,7 +9553,7 @@ H5T_conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  done:
      FUNC_LEAVE_NOAPI(ret_value)
  }
@@ -20,18 +20,16 @@ Index: hdf5.git/src/H5Tconv.c
  
  
  /*-------------------------------------------------------------------------
-@@ -9605,9 +9605,7 @@
+@@ -9605,7 +9605,7 @@ done:
   *
   *-------------------------------------------------------------------------
   */
--#error "ICI____________________________________________________________"
--
 -#if H5T_CONV_INTERNAL_FP_ULLONG
 +//#if H5T_CONV_INTERNAL_FP_ULLONG
  herr_t
  H5T_conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  		       size_t nelmts, size_t buf_stride,
-@@ -9623,7 +9621,7 @@
+@@ -9621,7 +9621,7 @@ H5T_conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  done:
      FUNC_LEAVE_NOAPI(ret_value)
  }
@@ -40,7 +38,7 @@ Index: hdf5.git/src/H5Tconv.c
  
  
  /*-------------------------------------------------------------------------
-@@ -9675,7 +9673,7 @@
+@@ -9673,7 +9673,7 @@ done:
   *
   *-------------------------------------------------------------------------
   */
@@ -49,7 +47,7 @@ Index: hdf5.git/src/H5Tconv.c
  herr_t
  H5T_conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  		       size_t nelmts, size_t buf_stride,
-@@ -9691,7 +9689,7 @@
+@@ -9689,7 +9689,7 @@ H5T_conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  done:
      FUNC_LEAVE_NOAPI(ret_value)
  }

-- 
Hierarchical Data Format 5 (HDF5)