diff -Nru isdnutils-3.25+dfsg1/debian/changelog isdnutils-3.25+dfsg1/debian/changelog --- isdnutils-3.25+dfsg1/debian/changelog 2012-07-07 03:10:13.000000000 +0200 +++ isdnutils-3.25+dfsg1/debian/changelog 2012-08-02 16:46:51.000000000 +0200 @@ -1,3 +1,14 @@ +isdnutils (1:3.25+dfsg1-2) unstable; urgency=low + + [ Rolf Leggewie ] + * deactivate watch file until upstream starts releasing tarballs again + + [ Peter Marschall ] + * simplify autotools stuff and drop dependency on obsolete automake + version 1.7. Closes: #549137 + + -- Rolf Leggewie Mon, 30 Jul 2012 03:53:00 +0800 + isdnutils (1:3.25+dfsg1-1) unstable; urgency=low * debian/init.d.functions: reintroduce cd-command lost in 985a74cd63. diff -Nru isdnutils-3.25+dfsg1/debian/control isdnutils-3.25+dfsg1/debian/control --- isdnutils-3.25+dfsg1/debian/control 2012-07-07 03:10:13.000000000 +0200 +++ isdnutils-3.25+dfsg1/debian/control 2012-08-02 16:46:51.000000000 +0200 @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9), bzip2, libncurses5-dev | libncurses-dev, xutils-dev | imake, tcl-dev, linuxdoc-tools (>=0.9.20), groff, libtool, libxaw7-dev, libreadline-dev, libpcap0.8-dev, autotools-dev, - automake1.7, automake1.9, autoconf2.13, autoconf, libssl-dev, psutils, + automake, autoconf, libssl-dev, psutils, lsb-release, po-debconf, ppp-dev Homepage: http://www.isdn4linux.de Vcs-Git: git://git.debian.org/git/collab-maint/isdnutils.git diff -Nru isdnutils-3.25+dfsg1/debian/patches/capiinfo-autotools.patch isdnutils-3.25+dfsg1/debian/patches/capiinfo-autotools.patch --- isdnutils-3.25+dfsg1/debian/patches/capiinfo-autotools.patch 1970-01-01 01:00:00.000000000 +0100 +++ isdnutils-3.25+dfsg1/debian/patches/capiinfo-autotools.patch 2012-08-02 16:46:51.000000000 +0200 @@ -0,0 +1,36 @@ +Author: Peter Marschall +Description: make sure autoreconf works +Applied-Upstream: commit:e23cdd55623a7c4f91a +Forwarded: Yes +Last-Update: 2012-07-30 + +diff --git a/capiinfo/acconfig.h b/capiinfo/acconfig.h +deleted file mode 100644 +--- a/capiinfo/acconfig.h ++++ /dev/null +@@ -1,5 +0,0 @@ +- +-#undef VERSION +-#undef PACKAGE +-#undef CONFIG_SBINDIR +-#undef CONFIG_MANDIR +diff --git a/capiinfo/configure.in b/capiinfo/configure.in +--- a/capiinfo/configure.in ++++ b/capiinfo/configure.in +@@ -27,14 +27,14 @@ dnl Optional sbin directory + AC_ARG_WITH(sbin, + [ --with-sbin=DIR Set dir where binary is istalled. [/sbin]], + CONFIG_SBINDIR="${withval}" +- AC_DEFINE(CONFIG_SBINDIR,"${withval}"), ++ AC_DEFINE(CONFIG_SBINDIR,"${withval}", [capiinfo sbin directory]), + ) + + dnl Optional man directory + AC_ARG_WITH(man, + [ --with-man=DIR Set manpage dir. [/usr/man]], + CONFIG_MANDIR="${withval}" +- AC_DEFINE(CONFIG_MANDIR,"${withval}"), ++ AC_DEFINE(CONFIG_MANDIR,"${withval}", [capiinfo manual directory]), + ) + + AC_SUBST(INSTALL) diff -Nru isdnutils-3.25+dfsg1/debian/patches/series isdnutils-3.25+dfsg1/debian/patches/series --- isdnutils-3.25+dfsg1/debian/patches/series 2012-07-07 03:10:14.000000000 +0200 +++ isdnutils-3.25+dfsg1/debian/patches/series 2012-08-02 16:46:51.000000000 +0200 @@ -4,3 +4,4 @@ capiinit-fwpath.patch libtool.patch ipppd-replace-gpl-code.patch +capiinfo-autotools.patch diff -Nru isdnutils-3.25+dfsg1/debian/rules isdnutils-3.25+dfsg1/debian/rules --- isdnutils-3.25+dfsg1/debian/rules 2012-07-07 03:10:14.000000000 +0200 +++ isdnutils-3.25+dfsg1/debian/rules 2012-08-03 12:54:55.000000000 +0200 @@ -12,55 +12,13 @@ done @set -e; \ - for d in capi20; do \ + for d in capi20 capifax capiinfo capiinit rcapid vbox eicon ipppd; do \ echo "Regenerating autotools files in $$d ..."; \ cd $$d; \ - echo " libtool"; libtoolize -c -f ; \ - echo " aclocal-1.9"; aclocal-1.9; \ - echo " automake-1.9"; automake-1.9 --add-missing; \ + echo " autoreconf"; autoreconf -if; \ cd ..; \ done - @set -e; \ - for d in capifax capiinfo capiinit rcapid; do \ - echo "Regenerating autotools files in $$d ..."; \ - cd $$d; \ - echo " aclocal"; aclocal; \ - echo " autoconf"; autoconf; \ - case "$$d" in rcapid);; *) echo " autoheader"; autoheader; esac; \ - echo " automake"; automake --add-missing; \ - touch configure.in; \ - touch aclocal.m4; \ - touch configure; \ - cd ..; \ - done - - @set -e; \ - for d in vbox; do \ - echo "Regenerating autotools files in $$d ..."; \ - cd $$d; \ - echo " aclocal-1.7"; aclocal-1.7; \ - echo " autoconf"; autoconf; \ - echo " automake-1.7"; automake-1.7 -c --add-missing; \ - touch configure.in; \ - touch aclocal.m4; \ - touch configure; \ - cd ..; \ - done - - @set -e; \ - for d in eicon; do \ - echo "Regenerating autotools files in $$d ..."; \ - cd $$d; \ - echo " autoconf2.13"; autoconf2.13; \ - cd ..; \ - done - -# autoheader doesn't work in vbox ... is it needed? -# echo " autoheader"; autoheader; \ - - cd ipppd && autoconf - #### normal MAKE process continues here ### # we need a .config file. Try isdnutils.config in parent directory first diff -Nru isdnutils-3.25+dfsg1/debian/watch isdnutils-3.25+dfsg1/debian/watch --- isdnutils-3.25+dfsg1/debian/watch 2012-07-07 03:10:14.000000000 +0200 +++ isdnutils-3.25+dfsg1/debian/watch 2012-08-02 16:46:51.000000000 +0200 @@ -3,6 +3,6 @@ # Upstream tags releases in git for the moment, proper tarball releases # are scheduled to follow. -version=3 -opts="dversionmangle=s/.*(2[[:digit:]]+).dfsg.*/$1/,uversionmangle=s/-//g" \ - ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/isdn4k-utils-CVS-([-\d\.]*)\.tar\.bz2 +#version=3 +#opts="dversionmangle=s/.*(2[[:digit:]]+).dfsg.*/$1/,uversionmangle=s/-//g" \ +# ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/isdn4k-utils-CVS-([-\d\.]*)\.tar\.bz2