This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository hdf5.
commit 8b8a954523f367d220cddcb9ab76672add7e829b Author: Gilles Filippini <p...@debian.org> Date: Mon Nov 16 14:45:32 2015 +0100 Refresh patches. --- debian/patches/flavor-configure-option.patch | 14 +++++++------- debian/patches/hurd-sigsetjmp.patch | 2 +- debian/patches/path_max.diff | 4 ++-- debian/patches/relax-version-check.patch | 2 +- debian/patches/ullong_force.diff | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/debian/patches/flavor-configure-option.patch b/debian/patches/flavor-configure-option.patch index 9d64467..a998516 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 -@@ -3036,6 +3036,24 @@ fi +@@ -2933,6 +2933,24 @@ fi ## AM_CONDITIONAL([HAVE_SHARED_CONDITIONAL], [test "X$enable_shared" = "Xyes"]) @@ -320,8 +320,8 @@ Index: hdf5/fortran/src/Makefile.am +lib_LTLIBRARIES=libhdf5@FLAVOR@_fortran.la # Add libtool numbers to the HDF5 Fortran library (from config/lt_vers.am) --libhdf5_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) -+libhdf5@FLAVOR@_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +-libhdf5_fortran_la_LDFLAGS= -version-info $(LT_F_VERS_INTERFACE):$(LT_F_VERS_REVISION):$(LT_F_VERS_AGE) $(AM_LDFLAGS) ++libhdf5@FLAVOR@_fortran_la_LDFLAGS= -version-info $(LT_F_VERS_INTERFACE):$(LT_F_VERS_REVISION):$(LT_F_VERS_AGE) $(AM_LDFLAGS) # Some Fortran compilers can't build shared libraries, so sometimes we # want to build a shared C library and a static Fortran library. If so, @@ -355,8 +355,8 @@ Index: hdf5/hl/fortran/src/Makefile.am +lib_LTLIBRARIES=libhdf5@FLAVOR@hl_fortran.la # Add libtool numbers to the HDF5 HL Fortran library (from config/lt_vers.am) --libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) -+libhdf5@FLAVOR@hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +-libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_HL_F_VERS_INTERFACE):$(LT_HL_F_VERS_REVISION):$(LT_HL_F_VERS_AGE) $(AM_LDFLAGS) ++libhdf5@FLAVOR@hl_fortran_la_LDFLAGS= -version-info $(LT_HL_F_VERS_INTERFACE):$(LT_HL_F_VERS_REVISION):$(LT_HL_F_VERS_AGE) $(AM_LDFLAGS) # Some Fortran compilers can't build shared libraries, so sometimes we # want to build a shared C library and a static Fortran library. If so, @@ -409,8 +409,8 @@ Index: hdf5/hl/src/Makefile.am +lib_LTLIBRARIES=libhdf5@FLAVOR@_hl.la # Add libtool numbers to the HDF5 hl library (from config/lt_vers.am) --libhdf5_hl_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) -+libhdf5@FLAVOR@_hl_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +-libhdf5_hl_la_LDFLAGS= -version-info $(LT_HL_VERS_INTERFACE):$(LT_HL_VERS_REVISION):$(LT_HL_VERS_AGE) $(AM_LDFLAGS) ++libhdf5@FLAVOR@_hl_la_LDFLAGS= -version-info $(LT_HL_VERS_INTERFACE):$(LT_HL_VERS_REVISION):$(LT_HL_VERS_AGE) $(AM_LDFLAGS) # List sources to include in the HDF5 HL Library. -libhdf5_hl_la_SOURCES=H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c diff --git a/debian/patches/hurd-sigsetjmp.patch b/debian/patches/hurd-sigsetjmp.patch index 2b20484..3e5fe29 100644 --- a/debian/patches/hurd-sigsetjmp.patch +++ b/debian/patches/hurd-sigsetjmp.patch @@ -8,7 +8,7 @@ Index: hdf5/configure.ac =================================================================== --- hdf5.orig/configure.ac +++ hdf5/configure.ac -@@ -1644,6 +1644,7 @@ AC_CHECK_FUNCS([alarm clock_gettime diff +@@ -1597,6 +1597,7 @@ AC_CHECK_FUNCS([alarm clock_gettime diff AC_CHECK_FUNCS([gethostname getpwuid getrusage gettimeofday]) AC_CHECK_FUNCS([lstat rand_r random setsysinfo]) AC_CHECK_FUNCS([signal longjmp setjmp siglongjmp sigsetjmp sigprocmask]) diff --git a/debian/patches/path_max.diff b/debian/patches/path_max.diff index 6d8adf3..5e96da3 100644 --- a/debian/patches/path_max.diff +++ b/debian/patches/path_max.diff @@ -9,7 +9,7 @@ Index: hdf5/src/H5Fint.c =================================================================== --- hdf5.orig/src/H5Fint.c +++ hdf5/src/H5Fint.c -@@ -1569,7 +1569,6 @@ H5F_build_actual_name(const H5F_t *f, co +@@ -1580,7 +1580,6 @@ H5F_build_actual_name(const H5F_t *f, co int *fd; /* POSIX I/O file descriptor */ h5_stat_t st; /* Stat info from stat() call */ h5_stat_t fst; /* Stat info from fstat() call */ @@ -17,7 +17,7 @@ Index: hdf5/src/H5Fint.c hbool_t want_posix_fd; /* Flag for retrieving file descriptor from VFD */ /* Perform a sanity check that the file or link wasn't switched -@@ -1606,12 +1605,8 @@ H5F_build_actual_name(const H5F_t *f, co +@@ -1617,12 +1616,8 @@ H5F_build_actual_name(const H5F_t *f, co HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "files' st_ino or st_dev fields changed!") /* Get the resolved path for the file name */ diff --git a/debian/patches/relax-version-check.patch b/debian/patches/relax-version-check.patch index 4fb869e..c273535 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 -@@ -720,8 +720,7 @@ H5check_version(unsigned majnum, unsigne +@@ -725,8 +725,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 235eb8b..282d50e 100644 --- a/debian/patches/ullong_force.diff +++ b/debian/patches/ullong_force.diff @@ -4,7 +4,7 @@ Index: hdf5/src/H5Tconv.c =================================================================== --- hdf5.orig/src/H5Tconv.c +++ hdf5/src/H5Tconv.c -@@ -7982,7 +7982,6 @@ H5T__conv_ullong_double (hid_t src_id, h +@@ -7981,7 +7981,6 @@ H5T__conv_ullong_double (hid_t src_id, h * *------------------------------------------------------------------------- */ @@ -12,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, -@@ -7991,7 +7990,6 @@ H5T__conv_ullong_ldouble (hid_t src_id, +@@ -7990,7 +7989,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