[xmltooling] 03/03: Refresh our patches
Ferenc Wágner
wferi at moszumanska.debian.org
Wed Jan 17 14:15:41 UTC 2018
This is an automated email from the git hooks/post-receive script.
wferi pushed a commit to branch debian/master
in repository xmltooling.
commit c0bccbb4eaabf6e6232b9a52acc336cdd3057380
Author: Ferenc Wágner <wferi at debian.org>
Date: Tue Jan 16 15:31:30 2018 +0100
Refresh our patches
---
debian/patches/Add-more-forgotten-test-result-prints.patch | 2 +-
debian/patches/Add-separate-pkg-config-file-for-xmltooling-lite.patch | 2 +-
debian/patches/Disable-forcing-of-libtool-silent.patch | 2 +-
.../patches/Discover-xerces-xmlsec-openssl-and-curl-via-pkg-conf.patch | 2 +-
debian/patches/Enable-the-dot-feature-of-Doxygen.patch | 2 +-
debian/patches/Fail-configuration-if-dlopen-is-not-found.patch | 2 +-
debian/patches/Finish-separating-flags-use-_LIBADD.patch | 2 +-
debian/patches/Get-new-pthread-checks-from-the-Autoconf-Archive.patch | 2 +-
debian/patches/Make-pkgconfigdir-configurable.patch | 2 +-
debian/patches/Make-pkgxmldir-configurable.patch | 2 +-
debian/patches/Print-result-of-CURLINFO_TLS_SSL_PTR-test.patch | 2 +-
debian/patches/Propagate-requirements-into-our-pkg-config-file.patch | 2 +-
debian/patches/Remove-.pl-extension-of-cxxtestgen.patch | 2 +-
debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/debian/patches/Add-more-forgotten-test-result-prints.patch b/debian/patches/Add-more-forgotten-test-result-prints.patch
index e561965..4a866f7 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 03a1e7b..01b392f 100644
+index fbc3ecd..677868e 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 1e70901..64898c7 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 6095445..38ca309 100644
+index 978e23f..8cb1d7e 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 7526ac9..c0b8d35 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 814893f..de8eba5 100644
+index cdad767..ae3c62d 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 baac58d..443acd3 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
@@ -13,7 +13,7 @@ Subject: Discover xerces, xmlsec, openssl and curl via pkg-config
create mode 100644 m4/ax_save_flags.m4
diff --git a/configure.ac b/configure.ac
-index bc1e5f3..1801040 100644
+index 324b7a2..7604363 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,32 +122,11 @@ PKG_CHECK_MODULES([log4shib], [log4shib],
diff --git a/debian/patches/Enable-the-dot-feature-of-Doxygen.patch b/debian/patches/Enable-the-dot-feature-of-Doxygen.patch
index bef2f9a..4127c01 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 38ca309..a73f710 100644
+index 8cb1d7e..5159660 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 280dd21..def4b6a 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 168143c..bc1e5f3 100644
+index f96f74a..324b7a2 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 f60ae70..d87c298 100644
--- a/debian/patches/Finish-separating-flags-use-_LIBADD.patch
+++ b/debian/patches/Finish-separating-flags-use-_LIBADD.patch
@@ -9,7 +9,7 @@ Subject: Finish separating flags, use _LIBADD
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 499d9bc..03a1e7b 100644
+index af8c2b4..fbc3ecd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,11 @@ AC_TYPE_SIZE_T
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 43e1af9..7460e14 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 a73f710..e36a08c 100644
+index 5159660..96da370 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 c103e93..51538a7 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 6e68852..53372e9 100644
+index 333e0e4..00dce20 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 3d65052..3116a77 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 d3a462a..499d9bc 100644
+index 1826b8a..af8c2b4 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 dae4fe3..88ec2a1 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 53372e9..d3a462a 100644
+index 00dce20..1826b8a 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 204932c..2466f22 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 1801040..6e68852 100644
+index 7604363..333e0e4 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 7eea868..b498db4 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 01b392f..6095445 100644
+index 677868e..978e23f 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 14ea07a..27bc95c 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 de8eba5..168143c 100644
+index ae3c62d..f96f74a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,55 +117,10 @@ AC_COMPILE_IFELSE(
--
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