Control: tags -1 + patch Dear heartbeat maintainers,
On Mon, 15 Sep 2014 23:41:48 +0000 Matthias Klose <[email protected]> wrote: > Autoconf package autoconf found. > Automake package automake found. > > You must have libtool installed to compile the linux-ha package. > Download the appropriate package for your system, > or get the source tarball at: ftp://ftp.gnu.org/pub/gnu/libtool/ > > ./bootstrap exiting due to error (sorry!). > make: *** [build-stamp] Error 127 > debian/rules:28: recipe for target 'build-stamp' failed > dpkg-buildpackage: error: debian/rules build gave error exit status 2 heartbeat 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 heartbeat-3.0.5+hg12629/debian/changelog heartbeat-3.0.5+hg12629/debian/changelog --- heartbeat-3.0.5+hg12629/debian/changelog 2014-08-23 19:21:48.000000000 +0200 +++ heartbeat-3.0.5+hg12629/debian/changelog 2014-10-07 22:27:06.000000000 +0200 @@ -1,3 +1,10 @@ +heartbeat (1:3.0.5+hg12629-1.2) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Check for libtoolize rather than libtool. Closes: #761759 + + -- Johannes Schauer <[email protected]> Tue, 07 Oct 2014 22:26:43 +0200 + heartbeat (1:3.0.5+hg12629-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru heartbeat-3.0.5+hg12629/debian/patches/libtoolize_check.patch heartbeat-3.0.5+hg12629/debian/patches/libtoolize_check.patch --- heartbeat-3.0.5+hg12629/debian/patches/libtoolize_check.patch 1970-01-01 01:00:00.000000000 +0100 +++ heartbeat-3.0.5+hg12629/debian/patches/libtoolize_check.patch 2014-10-07 22:27:43.000000000 +0200 @@ -0,0 +1,59 @@ +Description: check for libtoolize rather than libtool +Author: Johannes Schauer <[email protected]> +Forwarded: no + +--- heartbeat-3.0.5+hg12629.orig/bootstrap ++++ heartbeat-3.0.5+hg12629/bootstrap +@@ -173,23 +173,19 @@ ln -s `which $automake` ./automake + + # Check for Libtool + pkg="libtool" +-for command in libtool libtool14 libtool15 glibtool +-do +- URL=$gnu/$pkg/ +- if +- testProgram $command +- then +- : OK $pkg is installed +- libtool=$command +- libtoolize=`echo "$libtool" | sed -e 's/libtool/libtoolize/'` +- fi +-done ++URL=$gnu/$pkg/ ++if ++ testProgram libtoolize ++then ++ : OK $pkg is installed ++ libtoolize=libtoolize ++fi + + # Check to see if we got a valid command. + if +- $libtool --version </dev/null >/dev/null 2>&1 ++ $libtoolize --version </dev/null >/dev/null 2>&1 + then +- echo "Libtool package $libtool found." ++ echo "Libtool package $libtoolize found." + else + RC=$? + cat <<-EOF >&2 +@@ -200,10 +196,6 @@ else + EOF + fi + +-# Create local copy so that the incremental updates will work. +-rm -f ./libtool +-ln -s `which $libtool` ./libtool +- + case $RC in + 0) ;; + *) exit $RC;; +@@ -217,7 +209,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].*%%'` diff -Nru heartbeat-3.0.5+hg12629/debian/patches/series heartbeat-3.0.5+hg12629/debian/patches/series --- heartbeat-3.0.5+hg12629/debian/patches/series 2014-02-21 14:58:01.000000000 +0100 +++ heartbeat-3.0.5+hg12629/debian/patches/series 2014-10-07 22:27:31.000000000 +0200 @@ -2,3 +2,4 @@ 01_docbook_path.dpatch fix-shlibdeps.patch heartbeat-init-script.patch +libtoolize_check.patch
