[SCM] hdf5 branch, master, updated. upstream/1.8.7-132-gf45f819

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit f45f819c948f1252150e589b353cd97ae88fab87
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Thu Jun 14 17:43:27 2012 +0200

    Update of the patches for 1.8.9

diff --git a/debian/changelog b/debian/changelog
index d5a5226..03924d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hdf5 (1.8.9-1~exp1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 14 Jun 2012 17:08:45 +0200
+
 hdf5 (1.8.8-9) unstable; urgency=low
 
   * Force the dependency on the serpack for hdf5-tools & hdf5-helpers.
diff --git a/debian/patches/comment.diff b/debian/patches/comment.diff
deleted file mode 100644
index f07b480..0000000
--- a/debian/patches/comment.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: hdf5.git/tools/lib/h5diff.c
-===================================================================
---- hdf5.git.orig/tools/lib/h5diff.c	2011-11-16 11:37:53.586381170 +0100
-+++ hdf5.git/tools/lib/h5diff.c	2012-01-18 22:15:34.655737853 +0100
-@@ -635,7 +635,7 @@
-     char         filenames[2][MAX_FILENAME];
-     hsize_t      nfound = 0;
-     int i;
--    //int i1, i2;
-+
-     int l_ret;
-     const char * obj1fullname = NULL;
-     const char * obj2fullname = NULL;
diff --git a/debian/patches/series b/debian/patches/series
index 1ca0af8..6ceccb5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 mpi.diff
 path_max.diff
 ullong_force.diff
-comment.diff
diff --git a/debian/patches/ullong_force.diff b/debian/patches/ullong_force.diff
index baf69ce..ab42fac 100644
--- a/debian/patches/ullong_force.diff
+++ b/debian/patches/ullong_force.diff
@@ -1,8 +1,8 @@
 diff --git a/src/H5Tconv.c b/src/H5Tconv.c
-index 927a9dc..2e2b776 100644
+index cdfaa0d..a871b64 100644
 --- a/src/H5Tconv.c
 +++ b/src/H5Tconv.c
-@@ -9537,7 +9537,6 @@ done:
+@@ -8514,7 +8514,6 @@ H5T_conv_float_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
   *
   *-------------------------------------------------------------------------
   */
@@ -10,15 +10,15 @@ index 927a9dc..2e2b776 100644
  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 +9552,6 @@ H5T_conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- done:
-     FUNC_LEAVE_NOAPI(ret_value)
+@@ -8523,7 +8522,6 @@ H5T_conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ {
+     H5T_CONV_Fx(FLOAT, ULLONG, float, unsigned long long, 0, ULLONG_MAX);
  }
 -#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/
  
  
  /*-------------------------------------------------------------------------
-@@ -9605,7 +9603,6 @@ done:
+@@ -8568,7 +8566,6 @@ H5T_conv_double_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
   *
   *-------------------------------------------------------------------------
   */
@@ -26,15 +26,15 @@ index 927a9dc..2e2b776 100644
  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,
-@@ -9621,7 +9618,6 @@ H5T_conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- done:
-     FUNC_LEAVE_NOAPI(ret_value)
+@@ -8577,7 +8574,6 @@ H5T_conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ {
+     H5T_CONV_Fx(DOUBLE, ULLONG, double, unsigned long long, 0, ULLONG_MAX);
  }
 -#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/
  
  
  /*-------------------------------------------------------------------------
-@@ -9673,7 +9669,6 @@ done:
+@@ -8622,7 +8618,6 @@ H5T_conv_ldouble_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
   *
   *-------------------------------------------------------------------------
   */
@@ -42,9 +42,9 @@ index 927a9dc..2e2b776 100644
  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,
-@@ -9689,7 +9684,6 @@ H5T_conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- done:
-     FUNC_LEAVE_NOAPI(ret_value)
+@@ -8631,7 +8626,6 @@ H5T_conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ {
+     H5T_CONV_Fx(LDOUBLE, ULLONG, long double, unsigned long long, 0, ULLONG_MAX);
  }
 -#endif /*H5T_CONV_INTERNAL_LDOUBLE_ULLONG*/
  

-- 
Hierarchical Data Format 5 (HDF5)