[hdf5] 12/12: Refresh patches for release 1.10.0~pre2+docs-1

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch master-1.10
in repository hdf5.

commit 67919255791946192e0ddf99c02a7bee88ab13ee
Author: Gilles Filippini <pini at debian.org>
Date:   Tue Mar 29 20:38:57 2016 +0200

    Refresh patches for release 1.10.0~pre2+docs-1
---
 debian/changelog                             |  2 +-
 debian/patches/flavor-configure-option.patch | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 433bc39..632bc56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hdf5 (1.10.0~pre1+docs-1) UNRELEASED; urgency=medium
+hdf5 (1.10.0~pre2+docs-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Integration of Java HDF5 JNI into the source tree (not enabled in
diff --git a/debian/patches/flavor-configure-option.patch b/debian/patches/flavor-configure-option.patch
index 655ea5c..7fdab33 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
-@@ -3490,6 +3490,24 @@ fi
+@@ -3507,6 +3507,24 @@ fi
  ##
  AM_CONDITIONAL([HAVE_SHARED_CONDITIONAL], [test "X$enable_shared" = "Xyes"])
  
@@ -335,8 +335,8 @@ Index: hdf5/fortran/src/Makefile.am
 +lib_LTLIBRARIES=libhdf5 at 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 at 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 at 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,
@@ -370,8 +370,8 @@ Index: hdf5/hl/fortran/src/Makefile.am
 +lib_LTLIBRARIES=libhdf5 at 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 at FLAVOR@hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_HL_S_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 at 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,
@@ -401,8 +401,8 @@ Index: hdf5/hl/src/Makefile.am
 +lib_LTLIBRARIES=libhdf5 at 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 at 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 at 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 H5LD.c

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git