The following commit has been merged in the master branch: commit 68a2939a54a32138b1b508c4edd488ea73fd0ff0 Author: Gilles Filippini <p...@debian.org> Date: Sat Nov 30 15:45:05 2013 +0100
Refresh patches and add description when missing. diff --git a/debian/changelog b/debian/changelog index 6a49b06..c23c49a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,12 @@ hdf5 (1.8.12-1) UNRELEASED; urgency=low * Drop patches (fixed upstream): + ftbfs-ia64.diff + 0001-Fix-long-double-detection.patch + * Refresh patches and add missing description: + + path_max.diff + + relax-version-check.patch + + skip_cxx_inclusion.diff + + soname.diff + + ullong_force.diff -- Gilles Filippini <p...@debian.org> Sat, 30 Nov 2013 14:35:04 +0100 diff --git a/debian/patches/path_max.diff b/debian/patches/path_max.diff index b8527f0..269bf54 100644 --- a/debian/patches/path_max.diff +++ b/debian/patches/path_max.diff @@ -1,3 +1,8 @@ +Description: avoid the issue of PATH_MAX not being available on Hurd. + Not really clean and suitable for upstream though, but can do the job + for making hdf5 compile and available in Debian. +Author: Pino Toscano <toscano.p...@tiscali.it> +Bug-Debian: http://bugs.debian.org/627896 Index: hdf5-1.8.11/src/H5F.c =================================================================== --- hdf5-1.8.11.orig/src/H5F.c 2013-07-02 16:40:55.621612700 +0200 diff --git a/debian/patches/relax-version-check.patch b/debian/patches/relax-version-check.patch index a32ed5b..63c17f0 100644 --- a/debian/patches/relax-version-check.patch +++ b/debian/patches/relax-version-check.patch @@ -5,12 +5,12 @@ Description: remove check on patch version The version check will be executed with compile time values on every file access see e.g. H5F_ACC_RDONLY in src/H5Fpublic.h Author: Julian Taylor <jtay...@ubuntu.com> - -Index: hdf5-1.8.11/src/H5.c +Bug-Debian: http://bugs.debian.org/693610 +Index: hdf5/src/H5.c =================================================================== ---- hdf5-1.8.11.orig/src/H5.c 2013-07-02 16:40:56.945612741 +0200 -+++ hdf5-1.8.11/src/H5.c 2013-07-02 16:40:56.941612742 +0200 -@@ -666,8 +666,7 @@ +--- hdf5.orig/src/H5.c 2013-11-30 15:09:12.000000000 +0100 ++++ hdf5/src/H5.c 2013-11-30 15:09:12.000000000 +0100 +@@ -668,8 +668,7 @@ disable_version_check = (unsigned int)HDstrtol (s, NULL, 0); } diff --git a/debian/patches/skip_cxx_inclusion.diff b/debian/patches/skip_cxx_inclusion.diff index 83293e0..f4fea7f 100644 --- a/debian/patches/skip_cxx_inclusion.diff +++ b/debian/patches/skip_cxx_inclusion.diff @@ -1,3 +1,6 @@ +Description: Skip the inclusion of C++ when dealing with parallel HDF5. + Thanks to Mike Miller, Rafael Laboissiere & Sebastien Villemot. +Author: Sylvestre Ledru <sylvestre.le...@scilab-enterprises.com> Index: hdf5-1.8.11/src/H5public.h =================================================================== --- hdf5-1.8.11.orig/src/H5public.h 2013-07-02 16:40:57.269612753 +0200 diff --git a/debian/patches/soname.diff b/debian/patches/soname.diff index aaccf10..5ae5250 100644 --- a/debian/patches/soname.diff +++ b/debian/patches/soname.diff @@ -1,91 +1,110 @@ -Index: hdf5-1.8.11/c++/src/Makefile.in +Description: Rollback upstream change from soname 7 => 8. + They only removed two functions which were unused and buggy. + I checked with them and they agree it was not worth changing the soname. + + Upstream mail: + --- + I checked with the developers to be sure it would be okay for you to plug + these functions back in and keep soname 7. The short answer is "yes". + + It seems that these APIs were broken and users would not or could not have + been using them. Therefore, adding them back in for the sake of distribution simplification should not have a negative effect on most (or all?) user + applications. + + Rather than removing those APIs outright, we should have deprecated them and + removed them from the documentation, but not actually removed them from the software until the next major release. :| + --- + + (I am not planning to put these two functions back) +Author: Sylvestre Ledru <sylvestre.le...@scilab-enterprises.com> +Index: hdf5/c++/src/Makefile.in =================================================================== ---- hdf5-1.8.11.orig/c++/src/Makefile.in 2013-07-02 16:40:57.605612763 +0200 -+++ hdf5-1.8.11/c++/src/Makefile.in 2013-07-02 16:40:57.601612763 +0200 +--- hdf5.orig/c++/src/Makefile.in 2013-11-30 15:18:23.000000000 +0100 ++++ hdf5/c++/src/Makefile.in 2013-11-30 15:18:23.000000000 +0100 @@ -466,7 +466,7 @@ # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. -LT_VERS_INTERFACE = 8 +LT_VERS_INTERFACE = 7 - LT_VERS_REVISION = 0 + LT_VERS_REVISION = 1 LT_VERS_AGE = 0 -Index: hdf5-1.8.11/config/lt_vers.am +Index: hdf5/config/lt_vers.am =================================================================== ---- hdf5-1.8.11.orig/config/lt_vers.am 2013-07-02 16:40:57.605612763 +0200 -+++ hdf5-1.8.11/config/lt_vers.am 2013-07-02 16:40:57.601612763 +0200 +--- hdf5.orig/config/lt_vers.am 2013-11-30 15:18:23.000000000 +0100 ++++ hdf5/config/lt_vers.am 2013-11-30 15:18:23.000000000 +0100 @@ -16,7 +16,7 @@ ## # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. -LT_VERS_INTERFACE = 8 +LT_VERS_INTERFACE = 7 - LT_VERS_REVISION = 0 + LT_VERS_REVISION = 1 LT_VERS_AGE = 0 -Index: hdf5-1.8.11/fortran/src/Makefile.in +Index: hdf5/fortran/src/Makefile.in =================================================================== ---- hdf5-1.8.11.orig/fortran/src/Makefile.in 2013-07-02 16:40:57.605612763 +0200 -+++ hdf5-1.8.11/fortran/src/Makefile.in 2013-07-02 16:40:57.601612763 +0200 +--- hdf5.orig/fortran/src/Makefile.in 2013-11-30 15:18:23.000000000 +0100 ++++ hdf5/fortran/src/Makefile.in 2013-11-30 15:18:23.000000000 +0100 @@ -517,7 +517,7 @@ # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. -LT_VERS_INTERFACE = 8 +LT_VERS_INTERFACE = 7 - LT_VERS_REVISION = 0 + LT_VERS_REVISION = 1 LT_VERS_AGE = 0 -Index: hdf5-1.8.11/hl/c++/src/Makefile.in +Index: hdf5/hl/c++/src/Makefile.in =================================================================== ---- hdf5-1.8.11.orig/hl/c++/src/Makefile.in 2013-07-02 16:40:57.605612763 +0200 -+++ hdf5-1.8.11/hl/c++/src/Makefile.in 2013-07-02 16:40:57.601612763 +0200 +--- hdf5.orig/hl/c++/src/Makefile.in 2013-11-30 15:18:23.000000000 +0100 ++++ hdf5/hl/c++/src/Makefile.in 2013-11-30 15:18:23.000000000 +0100 @@ -457,7 +457,7 @@ # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. -LT_VERS_INTERFACE = 8 +LT_VERS_INTERFACE = 7 - LT_VERS_REVISION = 0 + LT_VERS_REVISION = 1 LT_VERS_AGE = 0 -Index: hdf5-1.8.11/hl/fortran/src/Makefile.in +Index: hdf5/hl/fortran/src/Makefile.in =================================================================== ---- hdf5-1.8.11.orig/hl/fortran/src/Makefile.in 2013-07-02 16:40:57.605612763 +0200 -+++ hdf5-1.8.11/hl/fortran/src/Makefile.in 2013-07-02 16:40:57.601612763 +0200 +--- hdf5.orig/hl/fortran/src/Makefile.in 2013-11-30 15:18:23.000000000 +0100 ++++ hdf5/hl/fortran/src/Makefile.in 2013-11-30 15:18:23.000000000 +0100 @@ -473,7 +473,7 @@ # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. -LT_VERS_INTERFACE = 8 +LT_VERS_INTERFACE = 7 - LT_VERS_REVISION = 0 + LT_VERS_REVISION = 1 LT_VERS_AGE = 0 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \ -Index: hdf5-1.8.11/hl/src/Makefile.in +Index: hdf5/hl/src/Makefile.in =================================================================== ---- hdf5-1.8.11.orig/hl/src/Makefile.in 2013-07-02 16:40:57.605612763 +0200 -+++ hdf5-1.8.11/hl/src/Makefile.in 2013-07-02 16:40:57.601612763 +0200 +--- hdf5.orig/hl/src/Makefile.in 2013-11-30 15:18:23.000000000 +0100 ++++ hdf5/hl/src/Makefile.in 2013-11-30 15:18:23.000000000 +0100 @@ -456,7 +456,7 @@ # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. -LT_VERS_INTERFACE = 8 +LT_VERS_INTERFACE = 7 - LT_VERS_REVISION = 0 + LT_VERS_REVISION = 1 LT_VERS_AGE = 0 -Index: hdf5-1.8.11/src/Makefile.in +Index: hdf5/src/Makefile.in =================================================================== ---- hdf5-1.8.11.orig/src/Makefile.in 2013-07-02 16:40:57.605612763 +0200 -+++ hdf5-1.8.11/src/Makefile.in 2013-07-02 16:40:57.601612763 +0200 -@@ -516,7 +516,7 @@ +--- hdf5.orig/src/Makefile.in 2013-11-30 15:18:23.000000000 +0100 ++++ hdf5/src/Makefile.in 2013-11-30 15:18:23.000000000 +0100 +@@ -513,7 +513,7 @@ # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. -LT_VERS_INTERFACE = 8 +LT_VERS_INTERFACE = 7 - LT_VERS_REVISION = 0 + LT_VERS_REVISION = 1 LT_VERS_AGE = 0 - H5detect_CFLAGS = -g $(AM_CFLAGS) + diff --git a/debian/patches/ullong_force.diff b/debian/patches/ullong_force.diff index 574835e..4b09e0b 100644 --- a/debian/patches/ullong_force.diff +++ b/debian/patches/ullong_force.diff @@ -1,8 +1,10 @@ -Index: hdf5-1.8.11/src/H5Tconv.c +Description: force the ullong conversion anywhere. +Author: Sylvestre Ledru <sylvestre.le...@scilab-enterprises.com> +Index: hdf5/src/H5Tconv.c =================================================================== ---- hdf5-1.8.11.orig/src/H5Tconv.c 2013-07-02 16:40:56.473612726 +0200 -+++ hdf5-1.8.11/src/H5Tconv.c 2013-07-02 16:40:56.473612726 +0200 -@@ -7873,7 +7873,6 @@ +--- 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 @@ * *------------------------------------------------------------------------- */ @@ -10,7 +12,7 @@ Index: hdf5-1.8.11/src/H5Tconv.c 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, -@@ -7882,7 +7881,6 @@ +@@ -7961,7 +7960,6 @@ { H5T_CONV_xF(ULLONG, FLOAT, unsigned long long, float, -, -); } @@ -18,7 +20,7 @@ Index: hdf5-1.8.11/src/H5Tconv.c /*------------------------------------------------------------------------- -@@ -7900,7 +7898,6 @@ +@@ -7979,7 +7977,6 @@ * *------------------------------------------------------------------------- */ @@ -26,7 +28,7 @@ Index: hdf5-1.8.11/src/H5Tconv.c 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, -@@ -7909,7 +7906,6 @@ +@@ -7988,7 +7985,6 @@ { H5T_CONV_xF(ULLONG, DOUBLE, unsigned long long, double, -, -); } @@ -34,7 +36,7 @@ Index: hdf5-1.8.11/src/H5Tconv.c /*------------------------------------------------------------------------- -@@ -7927,7 +7923,6 @@ +@@ -8006,7 +8002,6 @@ * *------------------------------------------------------------------------- */ @@ -42,7 +44,7 @@ Index: hdf5-1.8.11/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, -@@ -7936,7 +7931,6 @@ +@@ -8015,7 +8010,6 @@ { H5T_CONV_xF(ULLONG, LDOUBLE, unsigned long long, long double, -, -); } -- 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