Control: tags -1 + patch Dear ntop maintainers,
On Mon, 15 Sep 2014 23:42:11 +0000 Matthias Klose <[email protected]> wrote: > 1. Testing gnu tools.... > > You must have libtool installed to compile ntop. > Download the appropriate package for your distribution, or get the > source tarball from ftp://ftp.gnu.org/pub/gnu/libtool > We require version 1.4 or higher > We recommend version 1.5 or higher > make[1]: *** [override_dh_auto_configure] Error 1 > debian/rules:11: recipe for target 'override_dh_auto_configure' failed > make[1]: Leaving directory '/«BUILDDIR»/ntop-5.0.1+dfsg1' > make: *** [build] Error 2 > dpkg-buildpackage: error: debian/rules build gave error exit status 2 ntop 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 ntop-5.0.1+dfsg1/debian/changelog ntop-5.0.1+dfsg1/debian/changelog --- ntop-5.0.1+dfsg1/debian/changelog 2014-03-01 10:29:34.000000000 +0100 +++ ntop-5.0.1+dfsg1/debian/changelog 2014-10-07 21:47:30.000000000 +0200 @@ -1,3 +1,10 @@ +ntop (3:5.0.1+dfsg1-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Check for libtoolize rather than libtool. Closes: #761781 + + -- Johannes Schauer <[email protected]> Tue, 07 Oct 2014 21:47:07 +0200 + ntop (3:5.0.1+dfsg1-2) unstable; urgency=medium * Use system jquery js and css (Closes: #737444). diff -Nru ntop-5.0.1+dfsg1/debian/patches/libtoolize_check.patch ntop-5.0.1+dfsg1/debian/patches/libtoolize_check.patch --- ntop-5.0.1+dfsg1/debian/patches/libtoolize_check.patch 1970-01-01 01:00:00.000000000 +0100 +++ ntop-5.0.1+dfsg1/debian/patches/libtoolize_check.patch 2014-10-07 21:48:22.000000000 +0200 @@ -0,0 +1,24 @@ +Description: check for libtoolize rather than libtool +Author: Johannes Schauer <[email protected]> +Forwarded: no + +--- ntop-5.0.1+dfsg1.orig/autogen.sh ++++ ntop-5.0.1+dfsg1/autogen.sh +@@ -169,7 +169,7 @@ done + + echo "1. Testing gnu tools...." + +-($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || ++($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || + { + echo + echo "You must have libtool installed to compile $NAME." +@@ -211,7 +211,7 @@ if test "$GNU_OR_DIE" -eq 0; then + fi + + # Check versions... +-libtoolversion=`$LIBTOOL --version < /dev/null 2>&1 | grep libtool | cut -d " " -f 4` ++libtoolversion=`$LIBTOOLIZE --version < /dev/null 2>&1 | grep libtool | cut -d " " -f 4` + echo " libtool ..... ${libtoolversion}" + case "${libtoolversion}" in + *1\.3\.[[45]]\-freebsd\-ports*) diff -Nru ntop-5.0.1+dfsg1/debian/patches/series ntop-5.0.1+dfsg1/debian/patches/series --- ntop-5.0.1+dfsg1/debian/patches/series 2014-03-01 10:29:34.000000000 +0100 +++ ntop-5.0.1+dfsg1/debian/patches/series 2014-10-07 21:47:56.000000000 +0200 @@ -10,3 +10,4 @@ kfreebsd-ftbfs.patch do-not-require-svn.patch versioncheck.patch +libtoolize_check.patch
