[xmltooling] 01/01: Refresh our patches

Ferenc Wágner wferi at moszumanska.debian.org
Thu Nov 16 15:10:45 UTC 2017 

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

wferi pushed a commit to branch debian/master
in repository xmltooling.

commit 360556eba6d160782c68e114af574c44a13daa63
Author: Ferenc Wágner <wferi at debian.org>
Date:   Thu Nov 16 16:09:36 2017 +0100

    Refresh our patches
---
 .../Add-more-forgotten-test-result-prints.patch        |  2 +-
 ...-separate-pkg-config-file-for-xmltooling-lite.patch |  2 +-
 debian/patches/Disable-forcing-of-libtool-silent.patch |  2 +-
 ...r-xerces-xmlsec-openssl-and-curl-via-pkg-conf.patch | 18 ++++++++----------
 debian/patches/Enable-the-dot-feature-of-Doxygen.patch |  2 +-
 .../Fail-configuration-if-dlopen-is-not-found.patch    |  2 +-
 .../patches/Finish-separating-flags-use-_LIBADD.patch  | 15 +++++++--------
 ...-new-pthread-checks-from-the-Autoconf-Archive.patch |  2 +-
 debian/patches/Make-pkgconfigdir-configurable.patch    |  2 +-
 debian/patches/Make-pkgxmldir-configurable.patch       |  2 +-
 .../Print-result-of-CURLINFO_TLS_SSL_PTR-test.patch    |  2 +-
 ...opagate-requirements-into-our-pkg-config-file.patch |  2 +-
 .../patches/Remove-.pl-extension-of-cxxtestgen.patch   |  2 +-
 .../patches/Use-pkg-config-for-log4shib-log4cpp.patch  |  8 ++++----
 14 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/debian/patches/Add-more-forgotten-test-result-prints.patch b/debian/patches/Add-more-forgotten-test-result-prints.patch
index 2fb449a..08d8c77 100644
--- a/debian/patches/Add-more-forgotten-test-result-prints.patch
+++ b/debian/patches/Add-more-forgotten-test-result-prints.patch
@@ -7,7 +7,7 @@ Subject: Add more forgotten test result prints
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 63b4c3c..e368fdd 100644
+index 931bab4..0702527 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -229,13 +229,15 @@ AS_IF([test "x$with_xmlsec" != xno],
diff --git a/debian/patches/Add-separate-pkg-config-file-for-xmltooling-lite.patch b/debian/patches/Add-separate-pkg-config-file-for-xmltooling-lite.patch
index 9d79ced..ec0e647 100644
--- a/debian/patches/Add-separate-pkg-config-file-for-xmltooling-lite.patch
+++ b/debian/patches/Add-separate-pkg-config-file-for-xmltooling-lite.patch
@@ -24,7 +24,7 @@ index be2f2bd..8be5fd5 100644
  GENFILES = @PACKAGE_NAME at .spec
  
 diff --git a/configure.ac b/configure.ac
-index 4de77d8..131e5ba 100644
+index aa75b9f..0d066a7 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -33,7 +33,7 @@ else
diff --git a/debian/patches/Disable-forcing-of-libtool-silent.patch b/debian/patches/Disable-forcing-of-libtool-silent.patch
index 1ee399c..0447082 100644
--- a/debian/patches/Disable-forcing-of-libtool-silent.patch
+++ b/debian/patches/Disable-forcing-of-libtool-silent.patch
@@ -8,7 +8,7 @@ Debian build log analysis wants verbose logs.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 9f3684d..f1cfa29 100644
+index 0df245e..4edc354 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -429,7 +429,8 @@ AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
diff --git a/debian/patches/Discover-xerces-xmlsec-openssl-and-curl-via-pkg-conf.patch b/debian/patches/Discover-xerces-xmlsec-openssl-and-curl-via-pkg-conf.patch
index b5ed7fd..4b45831 100644
--- a/debian/patches/Discover-xerces-xmlsec-openssl-and-curl-via-pkg-conf.patch
+++ b/debian/patches/Discover-xerces-xmlsec-openssl-and-curl-via-pkg-conf.patch
@@ -6,14 +6,14 @@ Subject: Discover xerces, xmlsec, openssl and curl via pkg-config
  configure.ac               | 171 ++++++++-------------------------------------
  m4/ax_restore_flags.m4     |  52 ++++++++++++++
  m4/ax_save_flags.m4        |  71 +++++++++++++++++++
- xmltooling/Makefile.am     |  12 ++--
+ xmltooling/Makefile.am     |  10 +--
  xmltoolingtest/Makefile.am |   3 +-
- 5 files changed, 160 insertions(+), 149 deletions(-)
+ 5 files changed, 159 insertions(+), 148 deletions(-)
  create mode 100644 m4/ax_restore_flags.m4
  create mode 100644 m4/ax_save_flags.m4
 
 diff --git a/configure.ac b/configure.ac
-index 1263cdb..78ce864 100644
+index 059d0c7..6f40fbe 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -122,32 +122,11 @@ PKG_CHECK_MODULES([log4shib], [log4shib],
@@ -359,17 +359,15 @@ index 0000000..39f45be
 +	      [_AX_SAVE_ONE_FLAG([$1],FLAG)])
 +])
 diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
-index 701c8fd..321e451 100644
+index c5ea5ff..6f84558 100644
 --- a/xmltooling/Makefile.am
 +++ b/xmltooling/Makefile.am
-@@ -206,17 +206,17 @@ common_sources = \
- libxmltooling_lite_la_SOURCES = \
+@@ -207,16 +207,16 @@ libxmltooling_lite_la_SOURCES = \
  	${common_sources}
  libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE
--libxmltooling_lite_la_LDFLAGS = -version-info 7:0:0
+ libxmltooling_lite_la_LDFLAGS = -version-info 7:1:0
 -libxmltooling_lite_la_CPPFLAGS += $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
 -libxmltooling_lite_la_LDFLAGS += $(log4shib_LIBS) $(log4cpp_LIBS)
-+libxmltooling_lite_la_LDFLAGS  = -version-info 7:0:0
 +libxmltooling_lite_la_CPPFLAGS += $(xerces_CFLAGS) $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
 +libxmltooling_lite_la_LDFLAGS  += $(xerces_LIBS)   $(log4shib_LIBS)   $(log4cpp_LIBS)
  
@@ -377,10 +375,10 @@ index 701c8fd..321e451 100644
  libxmltooling_la_SOURCES = \
  	${common_sources} \
  	${xmlsec_sources}
--libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 7:0:0
+-libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 7:1:0
 -libxmltooling_la_CFLAGS = $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
 -libxmltooling_la_LDFLAGS += $(log4shib_LIBS) $(log4cpp_LIBS)
-+libxmltooling_la_LDFLAGS = -version-info 7:0:0
++libxmltooling_la_LDFLAGS = -version-info 7:1:0
 +libxmltooling_la_CPPFLAGS = $(XMLSEC_CFLAGS) $(xerces_CFLAGS) $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
 +libxmltooling_la_LDFLAGS += $(XMLSEC_LIBS)   $(xerces_LIBS)   $(log4shib_LIBS)   $(log4cpp_LIBS)
  endif
diff --git a/debian/patches/Enable-the-dot-feature-of-Doxygen.patch b/debian/patches/Enable-the-dot-feature-of-Doxygen.patch
index a3cb206..e6b352b 100644
--- a/debian/patches/Enable-the-dot-feature-of-Doxygen.patch
+++ b/debian/patches/Enable-the-dot-feature-of-Doxygen.patch
@@ -7,7 +7,7 @@ Subject: Enable the dot feature of Doxygen
  1 file changed, 1 insertion(+)
 
 diff --git a/configure.ac b/configure.ac
-index 131e5ba..2f61eff 100644
+index 0d066a7..c61dbf2 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -11,6 +11,7 @@ PKG_INSTALLDIR
diff --git a/debian/patches/Fail-configuration-if-dlopen-is-not-found.patch b/debian/patches/Fail-configuration-if-dlopen-is-not-found.patch
index 0ee27f8..9fa7076 100644
--- a/debian/patches/Fail-configuration-if-dlopen-is-not-found.patch
+++ b/debian/patches/Fail-configuration-if-dlopen-is-not-found.patch
@@ -7,7 +7,7 @@ Subject: Fail configuration if dlopen() is not found
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 227b3b9..1263cdb 100644
+index cbe0680..059d0c7 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -70,7 +70,7 @@ AC_TYPE_SIZE_T
diff --git a/debian/patches/Finish-separating-flags-use-_LIBADD.patch b/debian/patches/Finish-separating-flags-use-_LIBADD.patch
index 4507869..2bfd805 100644
--- a/debian/patches/Finish-separating-flags-use-_LIBADD.patch
+++ b/debian/patches/Finish-separating-flags-use-_LIBADD.patch
@@ -5,11 +5,11 @@ Subject: Finish separating flags, use _LIBADD
 ---
  configure.ac           | 12 ++++++++----
  xmltooling.pc.in       |  4 ++--
- xmltooling/Makefile.am | 14 ++++++++------
- 3 files changed, 18 insertions(+), 12 deletions(-)
+ xmltooling/Makefile.am | 12 +++++++-----
+ 3 files changed, 17 insertions(+), 11 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 05ed466..63b4c3c 100644
+index 737837e..931bab4 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -71,7 +71,11 @@ AC_TYPE_SIZE_T
@@ -65,7 +65,7 @@ index a289acd..d4a4ea7 100644
  Requires: @AX_PACKAGE_REQUIRES@
  Requires.private: @AX_PACKAGE_REQUIRES_PRIVATE@
 diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
-index 321e451..5842d60 100644
+index 6f84558..3896bd5 100644
 --- a/xmltooling/Makefile.am
 +++ b/xmltooling/Makefile.am
 @@ -203,20 +203,22 @@ common_sources = \
@@ -78,18 +78,17 @@ index 321e451..5842d60 100644
  libxmltooling_lite_la_SOURCES = \
  	${common_sources}
 -libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE
--libxmltooling_lite_la_LDFLAGS  = -version-info 7:0:0
++libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE $(common_CPPFLAGS)
+ libxmltooling_lite_la_LDFLAGS = -version-info 7:1:0
 -libxmltooling_lite_la_CPPFLAGS += $(xerces_CFLAGS) $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
 -libxmltooling_lite_la_LDFLAGS  += $(xerces_LIBS)   $(log4shib_LIBS)   $(log4cpp_LIBS)
-+libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE $(common_CPPFLAGS)
-+libxmltooling_lite_la_LDFLAGS = -version-info 7:0:0
 +libxmltooling_lite_la_LIBADD = $(common_LIBADD)
  
  if BUILD_XMLSEC
  libxmltooling_la_SOURCES = \
  	${common_sources} \
  	${xmlsec_sources}
- libxmltooling_la_LDFLAGS = -version-info 7:0:0
+ libxmltooling_la_LDFLAGS = -version-info 7:1:0
 -libxmltooling_la_CPPFLAGS = $(XMLSEC_CFLAGS) $(xerces_CFLAGS) $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
 -libxmltooling_la_LDFLAGS += $(XMLSEC_LIBS)   $(xerces_LIBS)   $(log4shib_LIBS)   $(log4cpp_LIBS)
 +libxmltooling_la_CPPFLAGS = $(XMLSEC_CFLAGS) $(common_CPPFLAGS)
diff --git a/debian/patches/Get-new-pthread-checks-from-the-Autoconf-Archive.patch b/debian/patches/Get-new-pthread-checks-from-the-Autoconf-Archive.patch
index 7922da6..14633ed 100644
--- a/debian/patches/Get-new-pthread-checks-from-the-Autoconf-Archive.patch
+++ b/debian/patches/Get-new-pthread-checks-from-the-Autoconf-Archive.patch
@@ -12,7 +12,7 @@ GCC wants -pthread, not -lpthread as returned by the old ACX_PTHREAD.
  create mode 100644 m4/ax_pthread.m4
 
 diff --git a/configure.ac b/configure.ac
-index 2f61eff..27baf10 100644
+index c61dbf2..9b6488f 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -79,7 +79,7 @@ AC_SUBST([dlopen_LIBS],[$LIBS])
diff --git a/debian/patches/Make-pkgconfigdir-configurable.patch b/debian/patches/Make-pkgconfigdir-configurable.patch
index d068fcf..8da1823 100644
--- a/debian/patches/Make-pkgconfigdir-configurable.patch
+++ b/debian/patches/Make-pkgconfigdir-configurable.patch
@@ -20,7 +20,7 @@ index 89972c7..6bcdb1b 100644
  
  GENFILES = @PACKAGE_NAME at .spec
 diff --git a/configure.ac b/configure.ac
-index 19017c3..abc8836 100644
+index bbeee76..1131312 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -7,6 +7,7 @@ AC_CONFIG_MACRO_DIR(m4)
diff --git a/debian/patches/Make-pkgxmldir-configurable.patch b/debian/patches/Make-pkgxmldir-configurable.patch
index fe98b97..d747ca7 100644
--- a/debian/patches/Make-pkgxmldir-configurable.patch
+++ b/debian/patches/Make-pkgxmldir-configurable.patch
@@ -9,7 +9,7 @@ Subject: Make pkgxmldir configurable
  3 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 0050d2c..05ed466 100644
+index 8d2c399..737837e 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -274,5 +274,11 @@ AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
diff --git a/debian/patches/Print-result-of-CURLINFO_TLS_SSL_PTR-test.patch b/debian/patches/Print-result-of-CURLINFO_TLS_SSL_PTR-test.patch
index 8efe2f1..f20314d 100644
--- a/debian/patches/Print-result-of-CURLINFO_TLS_SSL_PTR-test.patch
+++ b/debian/patches/Print-result-of-CURLINFO_TLS_SSL_PTR-test.patch
@@ -7,7 +7,7 @@ Subject: Print result of CURLINFO_TLS_SSL_PTR test
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index abc8836..0050d2c 100644
+index 1131312..8d2c399 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -230,7 +230,8 @@ AS_IF([test "x$with_xmlsec" != xno],
diff --git a/debian/patches/Propagate-requirements-into-our-pkg-config-file.patch b/debian/patches/Propagate-requirements-into-our-pkg-config-file.patch
index 437a490..68f3516 100644
--- a/debian/patches/Propagate-requirements-into-our-pkg-config-file.patch
+++ b/debian/patches/Propagate-requirements-into-our-pkg-config-file.patch
@@ -31,7 +31,7 @@ index 5edea2e..89972c7 100644
  
  if DX_COND_doc
 diff --git a/configure.ac b/configure.ac
-index 78ce864..19017c3 100644
+index 6f40fbe..bbeee76 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -32,7 +32,7 @@ else
diff --git a/debian/patches/Remove-.pl-extension-of-cxxtestgen.patch b/debian/patches/Remove-.pl-extension-of-cxxtestgen.patch
index fab445b..8fb8d2c 100644
--- a/debian/patches/Remove-.pl-extension-of-cxxtestgen.patch
+++ b/debian/patches/Remove-.pl-extension-of-cxxtestgen.patch
@@ -7,7 +7,7 @@ Subject: Remove .pl extension of cxxtestgen
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index e368fdd..4de77d8 100644
+index 0702527..aa75b9f 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -261,7 +261,7 @@ AC_LINK_IFELSE(
diff --git a/debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch b/debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch
index 687fd32..31bf17c 100644
--- a/debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch
+++ b/debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch
@@ -8,7 +8,7 @@ Subject: Use pkg-config for log4shib/log4cpp
  2 files changed, 8 insertions(+), 49 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index f1cfa29..227b3b9 100644
+index 4edc354..cbe0680 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -117,55 +117,10 @@ AC_COMPILE_IFELSE(
@@ -72,13 +72,13 @@ index f1cfa29..227b3b9 100644
  # Xerces settings
  AC_ARG_WITH(xerces,
 diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
-index f265007..701c8fd 100644
+index 9b83d03..c5ea5ff 100644
 --- a/xmltooling/Makefile.am
 +++ b/xmltooling/Makefile.am
 @@ -207,12 +207,16 @@ libxmltooling_lite_la_SOURCES = \
  	${common_sources}
  libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE
- libxmltooling_lite_la_LDFLAGS = -version-info 7:0:0
+ libxmltooling_lite_la_LDFLAGS = -version-info 7:1:0
 +libxmltooling_lite_la_CPPFLAGS += $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
 +libxmltooling_lite_la_LDFLAGS += $(log4shib_LIBS) $(log4cpp_LIBS)
  
@@ -86,7 +86,7 @@ index f265007..701c8fd 100644
  libxmltooling_la_SOURCES = \
  	${common_sources} \
  	${xmlsec_sources}
- libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 7:0:0
+ libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 7:1:0
 +libxmltooling_la_CFLAGS = $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
 +libxmltooling_la_LDFLAGS += $(log4shib_LIBS) $(log4cpp_LIBS)
  endif

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

More information about the Pkg-shibboleth-devel mailing list