This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository hdf5.
commit 122ecaf6c2911e86bd3942ba7e413df19177164e Author: Gilles Filippini <p...@debian.org> Date: Mon May 18 14:51:58 2015 +0200 Refresh patches. Drop parts of patch ullong_force.diff which were applied upstream: r26596: Remove ULLONG_TO_FP_CAST_WORKS macro/define, as it only applies to older platforms we aren't supporting any longer. --- debian/changelog | 1 + debian/patches/flavor-configure-option.patch | 2 +- debian/patches/relax-version-check.patch | 2 +- debian/patches/ullong_force.diff | 40 +++------------------------- 4 files changed, 7 insertions(+), 38 deletions(-) diff --git a/debian/changelog b/debian/changelog index 10d449d..76ca030 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ hdf5 (1.8.15+docs-1) UNRELEASED; urgency=medium * Soname bump due to a non backward compatible C++ API change: two overloaded methods have been combined into a single method and one constructor has been deprecated. + * Drop parts of patch ullong_force.diff which were applied upstream. -- Gilles Filippini <p...@debian.org> Mon, 18 May 2015 14:20:41 +0200 diff --git a/debian/patches/flavor-configure-option.patch b/debian/patches/flavor-configure-option.patch index 33217f5..9d64467 100644 --- a/debian/patches/flavor-configure-option.patch +++ b/debian/patches/flavor-configure-option.patch @@ -10,7 +10,7 @@ Index: hdf5/configure.ac =================================================================== --- hdf5.orig/configure.ac +++ hdf5/configure.ac -@@ -4491,6 +4491,24 @@ fi +@@ -3036,6 +3036,24 @@ fi ## AM_CONDITIONAL([HAVE_SHARED_CONDITIONAL], [test "X$enable_shared" = "Xyes"]) diff --git a/debian/patches/relax-version-check.patch b/debian/patches/relax-version-check.patch index ec1d0c8..4fb869e 100644 --- a/debian/patches/relax-version-check.patch +++ b/debian/patches/relax-version-check.patch @@ -10,7 +10,7 @@ Index: hdf5/src/H5.c =================================================================== --- hdf5.orig/src/H5.c +++ hdf5/src/H5.c -@@ -678,8 +678,7 @@ H5check_version(unsigned majnum, unsigne +@@ -720,8 +720,7 @@ H5check_version(unsigned majnum, unsigne disable_version_check = (unsigned int)HDstrtol (s, NULL, 0); } diff --git a/debian/patches/ullong_force.diff b/debian/patches/ullong_force.diff index 4b09e0b..235eb8b 100644 --- a/debian/patches/ullong_force.diff +++ b/debian/patches/ullong_force.diff @@ -2,41 +2,9 @@ Description: force the ullong conversion anywhere. Author: Sylvestre Ledru <sylvestre.le...@scilab-enterprises.com> Index: hdf5/src/H5Tconv.c =================================================================== ---- hdf5.orig/src/H5Tconv.c 2013-11-30 15:03:56.000000000 +0100 -+++ hdf5/src/H5Tconv.c 2013-11-30 15:03:56.000000000 +0100 -@@ -7952,7 +7952,6 @@ - * - *------------------------------------------------------------------------- - */ --#if H5T_CONV_INTERNAL_ULLONG_FP - herr_t - H5T__conv_ullong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, - size_t nelmts, size_t buf_stride, -@@ -7961,7 +7960,6 @@ - { - H5T_CONV_xF(ULLONG, FLOAT, unsigned long long, float, -, -); - } --#endif /*H5T_CONV_INTERNAL_ULLONG_FP*/ - - - /*------------------------------------------------------------------------- -@@ -7979,7 +7977,6 @@ - * - *------------------------------------------------------------------------- - */ --#if H5T_CONV_INTERNAL_ULLONG_FP - herr_t - H5T__conv_ullong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, - size_t nelmts, size_t buf_stride, -@@ -7988,7 +7985,6 @@ - { - H5T_CONV_xF(ULLONG, DOUBLE, unsigned long long, double, -, -); - } --#endif /*H5T_CONV_INTERNAL_ULLONG_FP*/ - - - /*------------------------------------------------------------------------- -@@ -8006,7 +8002,6 @@ +--- hdf5.orig/src/H5Tconv.c ++++ hdf5/src/H5Tconv.c +@@ -7982,7 +7982,6 @@ H5T__conv_ullong_double (hid_t src_id, h * *------------------------------------------------------------------------- */ @@ -44,7 +12,7 @@ Index: hdf5/src/H5Tconv.c herr_t H5T__conv_ullong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, -@@ -8015,7 +8010,6 @@ +@@ -7991,7 +7990,6 @@ H5T__conv_ullong_ldouble (hid_t src_id, { H5T_CONV_xF(ULLONG, LDOUBLE, unsigned long long, long double, -, -); } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel