Control: tags -1 + patch

On Mon, Sep 15, 2014 at 11:42:20PM +0000, Matthias Klose wrote:
> ./autogen.sh
> buildcheck: checking installation...
> buildcheck: autoconf version 2.69 (ok)
> buildcheck: autoheader version 2.69 (ok)
> buildcheck: libtool not found.
>             You need libtool version 1.4 or newer installed
> make: *** [debian/stamp-autogen] Error 1
> dpkg-buildpackage: error: debian/rules build gave error exit status 2

libtool is not really used during build of subversion, only libtoolize
is. I am attaching a patch that fixes buildcheck to test for libtoolize
rather than libtool. The patch should be suitable for upstream
inclusion. Please speak up, if you do not want to see subversion NMUed.
This bug will get its severity bumped when libtool gets uploaded.

Helmut
diff -u subversion-1.8.10/debian/changelog subversion-1.8.10/debian/changelog
--- subversion-1.8.10/debian/changelog
+++ subversion-1.8.10/debian/changelog
@@ -1,3 +1,10 @@
+subversion (1.8.10-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Check for libtoolize rather than libtool. (Closes: #761789)
+
+ -- Helmut Grohne <[email protected]>  Tue, 23 Sep 2014 14:33:52 +0200
+
 subversion (1.8.10-1) unstable; urgency=medium
 
   * New upstream release.  Refresh patches.
diff -u subversion-1.8.10/debian/patches/series 
subversion-1.8.10/debian/patches/series
--- subversion-1.8.10/debian/patches/series
+++ subversion-1.8.10/debian/patches/series
@@ -18,0 +19 @@
+libtoolize-check
only in patch2:
unchanged:
--- subversion-1.8.10.orig/debian/patches/libtoolize-check
+++ subversion-1.8.10/debian/patches/libtoolize-check
@@ -0,0 +1,29 @@
+From: Helmut Grohne <[email protected]>
+Subject: check for libtoolize rather than libtool
+Last-Modified: 2014-09-23
+
+libtool now resides in the package libtool-bin, so checking for libtool
+produces a useless failure when all we need is libtoolize.
+
+Index: subversion-1.8.10/build/buildcheck.sh
+===================================================================
+--- subversion-1.8.10.orig/build/buildcheck.sh 2014-09-23 14:30:51.000000000 
+0200
++++ subversion-1.8.10/build/buildcheck.sh      2014-09-23 14:32:24.000000000 
+0200
+@@ -97,14 +97,14 @@
+   esac
+ fi
+ 
+-libtool=${LIBTOOL:-`./build/PrintPath glibtool libtool libtool15`}
++libtoolize=${LIBTOOLIZE:-`./build/PrintPath glibtoolize libtoolize 
libtoolize15`}
+ # Extract the libtool version number: everything from the first number in
+ # the version text until a hyphen or space.
+-lt_pversion=`$libtool --version 2>/dev/null |
++lt_pversion=`$libtoolize --version 2>/dev/null |
+   sed -e 's/^[^0-9]*//' -e 's/[- ].*//' -e '/^$/d' |
+   sed -e 1q`
+ if test -z "$lt_pversion"; then
+-  echo "buildcheck: libtool not found."
++  echo "buildcheck: libtoolize not found."
+   echo "            You need libtool version $LIBTOOL_WANTED_VERSION or newer 
installed"
+   exit 1
+ fi

Reply via email to