[zookeeper] 01/01: use PKG_CHECK_MDOULES instead of AM_PATH_CPPUNIT

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository zookeeper.

commit 11d0ead9e54c98893466044d4e313c4216026a80
Author: Rene Engelhard <rene at debian.org>
Date:   Mon May 15 19:41:37 2017 +0200

    use PKG_CHECK_MDOULES instead of AM_PATH_CPPUNIT
---
 debian/changelog                           |  8 ++++++
 debian/patches/10-cppunit-pkg-config.patch | 39 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 48 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 956fdd1..188f4c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+zookeeper (3.4.9-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+
+  * use PKG_CHECK_MDOULES instead of AM_PATH_CPPUNIT (closes: #862135)
+
+ -- Rene Engelhard <rene at debian.org>  Mon, 15 May 2017 19:46:30 +0200
+
 zookeeper (3.4.9-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/10-cppunit-pkg-config.patch b/debian/patches/10-cppunit-pkg-config.patch
new file mode 100644
index 0000000..9c013d0
--- /dev/null
+++ b/debian/patches/10-cppunit-pkg-config.patch
@@ -0,0 +1,39 @@
+diff --git a/src/c/configure.ac b/src/c/configure.ac
+index be00af9..8193511 100644
+--- a/src/c/configure.ac
++++ b/src/c/configure.ac
+@@ -34,7 +34,7 @@ if test "$with_cppunit" = "no" ; then
+    CPPUNIT_INCLUDE=
+    CPPUNIT_LIBS=
+ else
+-   AM_PATH_CPPUNIT(1.10.2)
++   PKG_CHECK_MODULES(CPPUNIT, cppunit >= 1.10.2)
+ fi
+ 
+ if test "$CALLER" = "ANT" ; then
+diff --git a/src/recipes/lock/src/c/configure.ac b/src/recipes/lock/src/c/configure.ac
+index 3954123..bc86461 100644
+--- a/src/recipes/lock/src/c/configure.ac
++++ b/src/recipes/lock/src/c/configure.ac
+@@ -72,7 +72,7 @@ AC_C_VOLATILE
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ #check for cppunit 
+-AM_PATH_CPPUNIT(1.10.2)
++PKG_CHECK_MODULES(CPPUNIT, cppunit >= 1.10.2)
+ # Checks for library functions.
+ AC_FUNC_UTIME_NULL
+ AC_CHECK_FUNCS([gettimeofday memset mkdir rmdir strdup strerror strstr strtol strtoul strtoull utime])
+diff --git a/src/recipes/queue/src/c/configure.ac b/src/recipes/queue/src/c/configure.ac
+index a9fb7b1..32fdf94 100644
+--- a/src/recipes/queue/src/c/configure.ac
++++ b/src/recipes/queue/src/c/configure.ac
+@@ -72,7 +72,7 @@ AC_C_VOLATILE
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ #check for cppunit 
+-AM_PATH_CPPUNIT(1.10.2)
++PKG_CHECK_MODULES(CPPUNIT, cppunit >= 1.10.2)
+ # Checks for library functions.
+ AC_FUNC_UTIME_NULL
+ AC_CHECK_FUNCS([gettimeofday memset mkdir rmdir strdup strerror strstr strtol strtoul strtoull utime])
diff --git a/debian/patches/series b/debian/patches/series
index c0388bf..bca415e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 07-remove-non-reproducible-manifest-entries.patch
 08-reproducible-javadoc.patch
 09-spell-check.patch
+10-cppunit-pkg-config.patch

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