[xmltooling] 57/65: Remove unnecessary patch, refresh the rest

[Ferenc Wágner]

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

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

commit f55fef029d499240f36970d5d85c763e87d3435b
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Wed Jun 29 21:46:24 2016 +0200

    Remove unnecessary patch, refresh the rest
    
    The forward incompatibility warnings from Automake were suppressed by upstream
    commit de4ae70 in a different way.
---
 ...rd-incompatibility-warnings-from-Automake.patch | 21 -----------------
 .../Disable-forcing-of-libtool-silent.patch        |  4 ++--
 .../Use-pkg-config-for-log4shib-log4cpp.patch      | 26 ++++++++++------------
 debian/patches/series                              |  1 -
 4 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/debian/patches/Avoid-forward-incompatibility-warnings-from-Automake.patch b/debian/patches/Avoid-forward-incompatibility-warnings-from-Automake.patch
deleted file mode 100644
index 14ef152..0000000
--- a/debian/patches/Avoid-forward-incompatibility-warnings-from-Automake.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
-Date: Fri, 27 Nov 2015 14:49:16 +0100
-Subject: Avoid forward-incompatibility warnings from Automake
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index fa94b67..ed4b044 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,7 +4,7 @@ AC_INIT([xmltooling],[1.5.6],[https://issues.shibboleth.net/],[xmltooling])
- AC_CONFIG_SRCDIR(xmltooling)
- AC_CONFIG_AUX_DIR(build-aux)
- AC_CONFIG_MACRO_DIR(m4)
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([subdir-objects])
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
- 
diff --git a/debian/patches/Disable-forcing-of-libtool-silent.patch b/debian/patches/Disable-forcing-of-libtool-silent.patch
index 73bd18a..1ee399c 100644
--- a/debian/patches/Disable-forcing-of-libtool-silent.patch
+++ b/debian/patches/Disable-forcing-of-libtool-silent.patch
@@ -8,10 +8,10 @@ Debian build log analysis wants verbose logs.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 35938e2..fa94b67 100644
+index 9f3684d..f1cfa29 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -426,7 +426,8 @@ AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
+@@ -429,7 +429,8 @@ AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
  
  AX_CREATE_PKGCONFIG_INFO(,,[$XMLSEC_LIBS -lxmltooling],[OpenSAML XMLTooling-C library])
  
diff --git a/debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch b/debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch
index b844e08..687fd32 100644
--- a/debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch
+++ b/debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch
@@ -4,15 +4,15 @@ Subject: Use pkg-config for log4shib/log4cpp
 
 ---
  configure.ac           | 53 ++++----------------------------------------------
- xmltooling/Makefile.am |  7 ++++---
- 2 files changed, 8 insertions(+), 52 deletions(-)
+ xmltooling/Makefile.am |  4 ++++
+ 2 files changed, 8 insertions(+), 49 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index ed4b044..8fece15 100644
+index f1cfa29..227b3b9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -117,55 +117,10 @@ AC_COMPILE_IFELSE(
-     [AC_LANG_PROGRAM([[]],[[const char* ptr = nullptr;]])],
+     [AC_LANG_PROGRAM([[#include <cstddef>]],[[const char* ptr = nullptr;]])],
      [AC_DEFINE([HAVE_NULLPTR],[1],[Define to 1 if C++ compiler supports nullptr keyword.])])
  
 -# log4shib settings (favor this version over the log4cpp code)
@@ -72,25 +72,23 @@ index ed4b044..8fece15 100644
  # Xerces settings
  AC_ARG_WITH(xerces,
 diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
-index 39cfa0d..f834221 100644
+index f265007..701c8fd 100644
 --- a/xmltooling/Makefile.am
 +++ b/xmltooling/Makefile.am
-@@ -203,14 +203,15 @@ common_sources = \
- 
- libxmltooling_lite_la_SOURCES = \
+@@ -207,12 +207,16 @@ libxmltooling_lite_la_SOURCES = \
  	${common_sources}
--libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE
--libxmltooling_lite_la_LDFLAGS = -version-info 6:6:0
-+libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
-+libxmltooling_lite_la_LDFLAGS = -version-info 6:6:0 $(log4shib_LIBS) $(log4cpp_LIBS)
+ libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE
+ libxmltooling_lite_la_LDFLAGS = -version-info 7:0:0
++libxmltooling_lite_la_CPPFLAGS += $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
++libxmltooling_lite_la_LDFLAGS += $(log4shib_LIBS) $(log4cpp_LIBS)
  
  if BUILD_XMLSEC
  libxmltooling_la_SOURCES = \
  	${common_sources} \
  	${xmlsec_sources}
--libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 6:6:0
+ libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 7:0:0
 +libxmltooling_la_CFLAGS = $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
-+libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 6:6:0 $(log4shib_LIBS) $(log4cpp_LIBS)
++libxmltooling_la_LDFLAGS += $(log4shib_LIBS) $(log4cpp_LIBS)
  endif
  
  install-exec-hook:
diff --git a/debian/patches/series b/debian/patches/series
index a62baff..b735d92 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 Disable-forcing-of-libtool-silent.patch
-Avoid-forward-incompatibility-warnings-from-Automake.patch
 Use-pkg-config-for-log4shib-log4cpp.patch

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