The following commit has been merged in the master branch:
commit 33b178f69b5fe2c3576433300afa70914ff470dc
Author: Gilles Filippini <p...@debian.org>
Date: Sun Dec 8 14:22:53 2013 +0100
Rework patch soname.diff to act on LT_VERS_AGE
instead of LT_VERS_INTERFACE.
diff --git a/debian/changelog b/debian/changelog
index c23c49a..d21e3a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ hdf5 (1.8.12-1) UNRELEASED; urgency=low
+ skip_cxx_inclusion.diff
+ soname.diff
+ ullong_force.diff
+ * soname:
+ - Rework patch soname.diff to act on LT_VERS_AGE instead of
+ LT_VERS_INTERFACE
-- Gilles Filippini <p...@debian.org> Sat, 30 Nov 2013 14:35:04 +0100
diff --git a/debian/patches/soname.diff b/debian/patches/soname.diff
index 5ae5250..74f076e 100644
--- a/debian/patches/soname.diff
+++ b/debian/patches/soname.diff
@@ -19,92 +19,92 @@ Description: Rollback upstream change from soname 7 => 8.
Author: Sylvestre Ledru <sylvestre.le...@scilab-enterprises.com>
Index: hdf5/c++/src/Makefile.in
===================================================================
---- 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
+--- hdf5.orig/c++/src/Makefile.in 2013-12-07 15:20:15.000000000 +0100
++++ hdf5/c++/src/Makefile.in 2013-12-07 15:22:18.000000000 +0100
+@@ -468,7 +468,7 @@
# See libtool versioning documentation online.
--LT_VERS_INTERFACE = 8
-+LT_VERS_INTERFACE = 7
+ LT_VERS_INTERFACE = 8
LT_VERS_REVISION = 1
- LT_VERS_AGE = 0
+-LT_VERS_AGE = 0
++LT_VERS_AGE = 1
+ # Include src directory
+ INCLUDES = -I$(top_srcdir)/src
Index: hdf5/config/lt_vers.am
===================================================================
---- 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
+--- hdf5.orig/config/lt_vers.am 2013-12-07 15:20:15.000000000 +0100
++++ hdf5/config/lt_vers.am 2013-12-07 15:22:32.000000000 +0100
+@@ -18,7 +18,7 @@
# See libtool versioning documentation online.
--LT_VERS_INTERFACE = 8
-+LT_VERS_INTERFACE = 7
+ LT_VERS_INTERFACE = 8
LT_VERS_REVISION = 1
- LT_VERS_AGE = 0
+-LT_VERS_AGE = 0
++LT_VERS_AGE = 1
+ ## If the API changes *at all*, increment LT_VERS_INTERFACE and
+ ## reset LT_VERS_REVISION to 0.
Index: hdf5/fortran/src/Makefile.in
===================================================================
---- 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
+--- hdf5.orig/fortran/src/Makefile.in 2013-12-07 15:20:15.000000000 +0100
++++ hdf5/fortran/src/Makefile.in 2013-12-07 15:22:42.000000000 +0100
+@@ -519,7 +519,7 @@
# See libtool versioning documentation online.
--LT_VERS_INTERFACE = 8
-+LT_VERS_INTERFACE = 7
+ LT_VERS_INTERFACE = 8
LT_VERS_REVISION = 1
- LT_VERS_AGE = 0
+-LT_VERS_AGE = 0
++LT_VERS_AGE = 1
+ # Include src directory in both Fortran and C flags (C compiler is used
+ # for linking).
Index: hdf5/hl/c++/src/Makefile.in
===================================================================
---- 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
+--- hdf5.orig/hl/c++/src/Makefile.in 2013-12-07 15:20:15.000000000 +0100
++++ hdf5/hl/c++/src/Makefile.in 2013-12-07 15:22:58.000000000 +0100
+@@ -459,7 +459,7 @@
# See libtool versioning documentation online.
--LT_VERS_INTERFACE = 8
-+LT_VERS_INTERFACE = 7
+ LT_VERS_INTERFACE = 8
LT_VERS_REVISION = 1
- LT_VERS_AGE = 0
+-LT_VERS_AGE = 0
++LT_VERS_AGE = 1
+ # Include src directory
+ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src
Index: hdf5/hl/fortran/src/Makefile.in
===================================================================
---- 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
+--- hdf5.orig/hl/fortran/src/Makefile.in 2013-12-07 15:20:15.000000000
+0100
++++ hdf5/hl/fortran/src/Makefile.in 2013-12-07 15:23:12.000000000 +0100
+@@ -475,7 +475,7 @@
# See libtool versioning documentation online.
--LT_VERS_INTERFACE = 8
-+LT_VERS_INTERFACE = 7
+ LT_VERS_INTERFACE = 8
LT_VERS_REVISION = 1
- LT_VERS_AGE = 0
+-LT_VERS_AGE = 0
++LT_VERS_AGE = 1
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src
-I$(top_builddir)/hl/src \
+ -I$(top_srcdir)/fortran/src -I$(top_builddir)/fortran/src
+
Index: hdf5/hl/src/Makefile.in
===================================================================
---- 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
+--- hdf5.orig/hl/src/Makefile.in 2013-12-07 15:20:15.000000000 +0100
++++ hdf5/hl/src/Makefile.in 2013-12-07 15:23:23.000000000 +0100
+@@ -458,7 +458,7 @@
# See libtool versioning documentation online.
--LT_VERS_INTERFACE = 8
-+LT_VERS_INTERFACE = 7
+ LT_VERS_INTERFACE = 8
LT_VERS_REVISION = 1
- LT_VERS_AGE = 0
+-LT_VERS_AGE = 0
++LT_VERS_AGE = 1
+ # This library is our main target.
+ lib_LTLIBRARIES = libhdf5_hl.la
Index: hdf5/src/Makefile.in
===================================================================
---- 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
+--- hdf5.orig/src/Makefile.in 2013-12-07 15:20:15.000000000 +0100
++++ hdf5/src/Makefile.in 2013-12-07 15:23:33.000000000 +0100
+@@ -515,7 +515,7 @@
# See libtool versioning documentation online.
--LT_VERS_INTERFACE = 8
-+LT_VERS_INTERFACE = 7
+ LT_VERS_INTERFACE = 8
LT_VERS_REVISION = 1
- LT_VERS_AGE = 0
+-LT_VERS_AGE = 0
++LT_VERS_AGE = 1
+ # Our main target, the HDF5 library
+ lib_LTLIBRARIES = libhdf5.la
--
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
