Control: tags -1 + patch

Dear cluster-glue maintainers,

On Mon, 15 Sep 2014 23:41:24 +0000 Matthias Klose <[email protected]> wrote:
> dh_testdir
> test -x ./configure || ./autogen.sh
> You must have libtool installed to compile the cluster-glue package.
> Download the appropriate package for your system,
> or get the source tarball at: ftp://ftp.gnu.org/pub/gnu/libtool/
> make: *** [configure-stamp] Error 1
> dpkg-buildpackage: error: debian/rules build gave error exit status 2

cluster-glue 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.

cheers, josch
diff -Nru cluster-glue-1.0.12~rc1+hg2777/debian/changelog cluster-glue-1.0.12~rc1+hg2777/debian/changelog
--- cluster-glue-1.0.12~rc1+hg2777/debian/changelog	2014-02-21 13:07:38.000000000 +0100
+++ cluster-glue-1.0.12~rc1+hg2777/debian/changelog	2014-10-07 22:16:03.000000000 +0200
@@ -1,3 +1,10 @@
+cluster-glue (1.0.12~rc1+hg2777-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Check for libtoolize rather than libtool. Closes: #761737
+
+ -- Johannes Schauer <[email protected]>  Tue, 07 Oct 2014 22:15:49 +0200
+
 cluster-glue (1.0.12~rc1+hg2777-1) unstable; urgency=medium
 
   * New upstream release, upload to unstable
diff -Nru cluster-glue-1.0.12~rc1+hg2777/debian/patches/libtoolize_check.patch cluster-glue-1.0.12~rc1+hg2777/debian/patches/libtoolize_check.patch
--- cluster-glue-1.0.12~rc1+hg2777/debian/patches/libtoolize_check.patch	1970-01-01 01:00:00.000000000 +0100
+++ cluster-glue-1.0.12~rc1+hg2777/debian/patches/libtoolize_check.patch	2014-10-07 22:15:45.000000000 +0200
@@ -0,0 +1,56 @@
+Description: check for libtoolize rather than libtool
+Author: Johannes Schauer <[email protected]>
+Forwarded: no
+
+--- cluster-glue-1.0.12~rc1+hg2777.orig/autogen.sh
++++ cluster-glue-1.0.12~rc1+hg2777/autogen.sh
+@@ -91,16 +91,11 @@ do
+   fi
+ done
+ 
+-for command in libtool14 libtool15 libtool glibtool 
+-do
+-  URL=$gnu/$pkg/
+-  if
+-    testProgram $command
+-  then
+-    libtool=$command
+-    libtoolize=`echo  "$libtool" | sed -e 's/libtool/libtoolize/'`
+-  fi
+-done
++if
++  testProgram libtoolize
++then
++  libtoolize=libtoolize
++fi
+ 
+ if [ -z $autoconf ]; then 
+     echo You must have autoconf installed to compile the cluster-glue package.
+@@ -114,7 +109,7 @@ elif [ -z $automake ]; then
+     echo or get the source tarball at: $gnu/automake/
+     exit 1
+ 
+-elif [ -z $libtool ]; then 
++elif [ -z $libtoolize ]; then 
+     echo You must have libtool installed to compile the cluster-glue package.
+     echo Download the appropriate package for your system,
+     echo or get the source tarball at: $gnu/libtool/
+@@ -125,7 +120,7 @@ oneline() {
+   read x; echo "$x"
+ }
+ 
+-LT_version=`$libtool --version | oneline | sed -e 's%^[^0-9]*%%' -e s'% .*%%'`
++LT_version=`$libtoolize --version | oneline | sed -e 's%^[^0-9]*%%' -e s'% .*%%'`
+ LT_majvers=`echo "$LT_version" | sed -e 's%\..*%%'`
+ LT_minvers=`echo "$LT_version" | sed -e 's%^[^.]*\.%%' `
+ LT_minnum=`echo  "$LT_minvers" | sed -e 's%[^0-9].*%%'`
+@@ -138,8 +133,7 @@ then
+ fi
+ 
+ # Create local copies so that the incremental updates will work.
+-rm -f ./autoconf ./automake ./autoheader ./libtool
+-ln -s `which $libtool` ./libtool
++rm -f ./autoconf ./automake ./autoheader
+ ln -s `which $autoconf` ./autoconf
+ ln -s `which $automake` ./automake
+ ln -s `which $autoheader` ./autoheader
diff -Nru cluster-glue-1.0.12~rc1+hg2777/debian/patches/series cluster-glue-1.0.12~rc1+hg2777/debian/patches/series
--- cluster-glue-1.0.12~rc1+hg2777/debian/patches/series	2014-02-21 13:06:57.000000000 +0100
+++ cluster-glue-1.0.12~rc1+hg2777/debian/patches/series	2014-10-07 22:15:31.000000000 +0200
@@ -0,0 +1 @@
+libtoolize_check.patch

Reply via email to