The following commit has been merged in the master branch: commit dd085b64a57d365d0c1ce0340099ae479f018db5 Author: Sylvestre Ledru <sylvestre.le...@scilab-enterprises.com> Date: Fri Jun 21 13:50:45 2013 +0200
New upstream release diff --git a/debian/changelog b/debian/changelog index 579f339..a3a8cb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hdf5 (1.8.11-1) unstable; urgency=low + + * New upstream release + + -- Sylvestre Ledru <sylves...@debian.org> Fri, 21 Jun 2013 13:50:29 +0200 + hdf5 (1.8.10-patch1-1) unstable; urgency=low [ Helmut Grohne ] diff --git a/debian/patches/path_max.diff b/debian/patches/path_max.diff index 68d9ca5..11e2849 100644 --- a/debian/patches/path_max.diff +++ b/debian/patches/path_max.diff @@ -1,7 +1,7 @@ -Index: hdf5-1.8.10-patch1/src/H5F.c +Index: hdf5/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 +--- hdf5.orig/src/H5F.c 2013-06-21 11:31:48.731964519 +0200 ++++ hdf5/src/H5F.c 2013-06-21 11:31:48.723964517 +0200 @@ -129,6 +129,10 @@ }}; @@ -13,13 +13,13 @@ Index: hdf5-1.8.10-patch1/src/H5F.c /*------------------------------------------------------------------------- * Function: H5F_init -Index: hdf5-1.8.10-patch1/testpar/t_cache.c +Index: hdf5/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" +--- hdf5.orig/testpar/t_cache.c 2013-06-21 11:31:48.731964519 +0200 ++++ hdf5/testpar/t_cache.c 2013-06-21 11:31:48.727964518 +0200 +@@ -39,6 +39,10 @@ + #define PATH_MAX 512 + #endif /* !PATH_MAX */ +#ifndef PATH_MAX +#define PATH_MAX 512 diff --git a/debian/patches/relax-version-check.patch b/debian/patches/relax-version-check.patch index 0e12a69..1efaa82 100644 --- a/debian/patches/relax-version-check.patch +++ b/debian/patches/relax-version-check.patch @@ -6,11 +6,11 @@ Description: remove check on patch version access see e.g. H5F_ACC_RDONLY in src/H5Fpublic.h Author: Julian Taylor <jtay...@ubuntu.com> -Index: hdf5-1.8.10-patch1/src/H5.c +Index: hdf5/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 @@ +--- hdf5.orig/src/H5.c 2013-06-21 11:33:22.055966938 +0200 ++++ hdf5/src/H5.c 2013-06-21 11:33:22.055966938 +0200 +@@ -666,8 +666,7 @@ disable_version_check = (unsigned int)HDstrtol (s, NULL, 0); } diff --git a/debian/patches/series b/debian/patches/series index 205b9e9..206d1b8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -mpi.diff +#mpi.diff path_max.diff ullong_force.diff relax-version-check.patch diff --git a/debian/patches/skip_cxx_inclusion.diff b/debian/patches/skip_cxx_inclusion.diff index cf4c481..7760f6e 100644 --- a/debian/patches/skip_cxx_inclusion.diff +++ b/debian/patches/skip_cxx_inclusion.diff @@ -1,7 +1,7 @@ -Index: hdf5.git/src/H5public.h +Index: hdf5/src/H5public.h =================================================================== ---- hdf5.git.orig/src/H5public.h 2012-09-30 14:59:47.443402440 +0200 -+++ hdf5.git/src/H5public.h 2012-11-25 11:14:18.767333174 +0100 +--- hdf5.orig/src/H5public.h 2013-06-21 11:33:40.383967414 +0200 ++++ hdf5/src/H5public.h 2013-06-21 11:33:40.379967414 +0200 @@ -58,6 +58,8 @@ # include <stddef.h> #endif diff --git a/debian/patches/ullong_force.diff b/debian/patches/ullong_force.diff index 1d7b7fa..9791890 100644 --- a/debian/patches/ullong_force.diff +++ b/debian/patches/ullong_force.diff @@ -1,52 +1,52 @@ -Index: hdf5-1.8.10-patch1/src/H5Tconv.c +Index: hdf5/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 @@ +--- hdf5.orig/src/H5Tconv.c 2013-06-21 11:25:27.000000000 +0200 ++++ hdf5/src/H5Tconv.c 2013-06-21 11:33:14.571966744 +0200 +@@ -7873,7 +7873,6 @@ * *------------------------------------------------------------------------- */ --#if H5T_CONV_INTERNAL_FP_ULLONG +-#if H5T_CONV_INTERNAL_ULLONG_FP herr_t - H5T__conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + H5T__conv_ullong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, -@@ -8523,7 +8522,6 @@ +@@ -7882,7 +7881,6 @@ { - H5T_CONV_Fx(FLOAT, ULLONG, float, unsigned long long, 0, ULLONG_MAX); + H5T_CONV_xF(ULLONG, FLOAT, unsigned long long, float, -, -); } --#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/ +-#endif /*H5T_CONV_INTERNAL_ULLONG_FP*/ /*------------------------------------------------------------------------- -@@ -8568,7 +8566,6 @@ +@@ -7900,7 +7898,6 @@ * *------------------------------------------------------------------------- */ --#if H5T_CONV_INTERNAL_FP_ULLONG +-#if H5T_CONV_INTERNAL_ULLONG_FP herr_t - H5T__conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + H5T__conv_ullong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, -@@ -8577,7 +8574,6 @@ +@@ -7909,7 +7906,6 @@ { - H5T_CONV_Fx(DOUBLE, ULLONG, double, unsigned long long, 0, ULLONG_MAX); + H5T_CONV_xF(ULLONG, DOUBLE, unsigned long long, double, -, -); } --#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/ +-#endif /*H5T_CONV_INTERNAL_ULLONG_FP*/ /*------------------------------------------------------------------------- -@@ -8622,7 +8618,6 @@ +@@ -7927,7 +7923,6 @@ * *------------------------------------------------------------------------- */ --#if H5T_CONV_INTERNAL_LDOUBLE_ULLONG +-#if H5T_CONV_INTERNAL_ULLONG_LDOUBLE herr_t - H5T__conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, + H5T__conv_ullong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, -@@ -8631,7 +8626,6 @@ +@@ -7936,7 +7931,6 @@ { - H5T_CONV_Fx(LDOUBLE, ULLONG, long double, unsigned long long, 0, ULLONG_MAX); + H5T_CONV_xF(ULLONG, LDOUBLE, unsigned long long, long double, -, -); } --#endif /*H5T_CONV_INTERNAL_LDOUBLE_ULLONG*/ +-#endif /*H5T_CONV_INTERNAL_ULLONG_LDOUBLE*/ /*------------------------------------------------------------------------- -- Hierarchical Data Format 5 (HDF5) _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel