Control: tags -1 + patch

Dear apr maintainer,

On Mon, Sep 15, 2014 at 11:41:19PM +0000, Matthias Klose wrote:
> ./buildconf
> buildconf: checking installation...
> buildconf: python version 2.7.8 (ok)
> buildconf: autoconf version 2.69 (ok)
> buildconf: libtool not found.
>            You need libtool version 1.4 or newer installed
>            to build APR from SVN.
> make[1]: *** [override_dh_auto_configure] Error 1
> debian/rules:76: recipe for target 'override_dh_auto_configure' failed
> make[1]: Leaving directory '/«PKGBUILDDIR»'
> make: *** [binary] Error 2
> debian/rules:18: recipe for target 'binary' failed
> dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 
> 2

apr only uses libtoolize but checks for libtool which is now in package
libtool-bin. I am attaching a patch that fixes the libtoolize check to
look for the correct tool. Please speak up, if you do not want your
package to get NMUed.

Helmut
diff -Nru apr-1.5.1/debian/changelog apr-1.5.1/debian/changelog
--- apr-1.5.1/debian/changelog  2014-05-12 23:21:06.000000000 +0200
+++ apr-1.5.1/debian/changelog  2014-09-19 12:34:28.000000000 +0200
@@ -1,3 +1,10 @@
+apr (1.5.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Check for libtoolize rather than libtool. Closes: #761732
+
+ -- Helmut Grohne <hel...@subdivi.de>  Fri, 19 Sep 2014 12:34:05 +0200
+
 apr (1.5.1-2) unstable; urgency=medium
 
   * Backport build fix from upstream SVN to avoid building some parts
diff -Nru apr-1.5.1/debian/patches/libtoolize_check.patch 
apr-1.5.1/debian/patches/libtoolize_check.patch
--- apr-1.5.1/debian/patches/libtoolize_check.patch     1970-01-01 
01:00:00.000000000 +0100
+++ apr-1.5.1/debian/patches/libtoolize_check.patch     2014-09-19 
12:34:00.000000000 +0200
@@ -0,0 +1,26 @@
+From: Helmut Grohne <hel...@subdivi.de>
+Subject: check for libtoolize rather than libtool
+Last-Update: 2014-09-19
+
+libtool is now in package libtool-bin, but apr only needs libtoolize.
+
+Index: apr-1.5.1/build/buildcheck.sh
+===================================================================
+--- apr-1.5.1.orig/build/buildcheck.sh 2009-11-13 01:27:16.000000000 +0100
++++ apr-1.5.1/build/buildcheck.sh      2014-09-19 12:33:14.000000000 +0200
+@@ -37,11 +37,11 @@
+ # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
+ # output is multiline from 1.5 onwards
+ 
+-# Require libtool 1.4 or newer
+-libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
+-lt_pversion=`$libtool --version 2>/dev/null|sed -e 
's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
++# Require libtoolize 1.4 or newer
++libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 
libtoolize14`
++lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 
's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
+ if test -z "$lt_pversion"; then
+-echo "buildconf: libtool not found."
++echo "buildconf: libtoolize not found."
+ echo "           You need libtool version 1.4 or newer installed"
+ echo "           to build APR from SVN."
+ exit 1
diff -Nru apr-1.5.1/debian/patches/series apr-1.5.1/debian/patches/series
--- apr-1.5.1/debian/patches/series     2014-05-12 23:14:11.000000000 +0200
+++ apr-1.5.1/debian/patches/series     2014-09-19 12:31:35.000000000 +0200
@@ -7,3 +7,4 @@
 hurd_shm_flock.patch
 dont_override_external_buildflags
 buildfix_r1589984
+libtoolize_check.patch

Reply via email to