diff -Nru acct-6.5.4/debian/changelog acct-6.5.4/debian/changelog --- acct-6.5.4/debian/changelog 2010-08-06 23:20:20.000000000 +0000 +++ acct-6.5.4/debian/changelog 2010-10-18 14:38:26.000000000 +0000 @@ -1,3 +1,20 @@ +acct (6.5.4-2.1ubuntu1) natty; urgency=low + + * Merge from Debian unstable (LP: #661056), remaining changes: + - Remove stop links from rc0 and rc6. + + -- Artur Rona Thu, 14 Oct 2010 17:20:42 +0200 + +acct (6.5.4-2.1) unstable; urgency=low + + * NMU with maintainer's blessing. + * Call autoreconf in debian/rules, add autoconf and automake to + build-dependencies. + Thanks to Mats Erik Andersson for the hint to how to solve this. + (closes: #579483). + + -- Ralf Treinen Mon, 27 Sep 2010 22:06:24 +0200 + acct (6.5.4-2ubuntu1) maverick; urgency=low * Merge from Debian testing, remaining changes: (LP: #609754) diff -Nru acct-6.5.4/debian/control acct-6.5.4/debian/control --- acct-6.5.4/debian/control 2010-08-06 23:20:20.000000000 +0000 +++ acct-6.5.4/debian/control 2010-10-18 14:36:51.000000000 +0000 @@ -3,7 +3,8 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Mathieu Trudel -Build-Depends: debhelper (>= 7), autotools-dev, texi2html, quilt, texinfo +Build-Depends: debhelper (>= 7), autotools-dev, autoconf, automake, + texi2html, quilt, texinfo Standards-Version: 3.9.0 Homepage: http://www.gnu.org/software/acct/ diff -Nru acct-6.5.4/debian/rules acct-6.5.4/debian/rules --- acct-6.5.4/debian/rules 2010-08-06 23:20:20.000000000 +0000 +++ acct-6.5.4/debian/rules 2010-10-18 14:36:51.000000000 +0000 @@ -32,7 +32,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - + autoreconf ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" build: build-stamp