On Mon, Dec 17, 2012 at 07:40:00PM -0800, Steve Langasek wrote:
> -     autoreconf
> +     autoreconf -f

You actually need to use autoreconf -fi, otherwise you get things like
this, seen in the Ubuntu ppc64el bootstrap:

  configure.ac:16: error: required file './compile' not found
  configure.ac:16:   'automake --add-missing' can install 'compile'
  autoreconf: automake failed with exit status: 1

But it's better to just use dh_autoreconf, which is more complete than
most of the previous ad-hoc methods.  I applied this on top of Steve and
Dimitri's changes, which hopefully you can massage into the Debian
package if and when you apply all this:

diff -Nru acct-6.5.5/debian/changelog acct-6.5.5/debian/changelog
--- acct-6.5.5/debian/changelog 2013-09-19 16:25:28.000000000 +0100
+++ acct-6.5.5/debian/changelog 2013-12-18 12:19:44.000000000 +0000
@@ -1,3 +1,9 @@
+acct (6.5.5-1ubuntu5) trusty; urgency=medium
+
+  * Use dh-autoreconf rather than various other less-complete methods.
+
+ -- Colin Watson <cjwat...@ubuntu.com>  Wed, 18 Dec 2013 12:19:43 +0000
+
 acct (6.5.5-1ubuntu4) saucy; urgency=low
 
   * Fix FTBFS with new texinfo.
diff -Nru acct-6.5.5/debian/control acct-6.5.5/debian/control
--- acct-6.5.5/debian/control   2012-12-17 23:47:07.000000000 +0000
+++ acct-6.5.5/debian/control   2013-12-18 12:17:34.000000000 +0000
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
 XSBC-Original-Maintainer: Mathieu Trudel-Lapierre <mathieu...@gmail.com>
-Build-Depends: debhelper (>= 7), autotools-dev, autoconf, automake,
- libtool, texi2html, texinfo
+Build-Depends: debhelper (>= 7), dh-autoreconf, texi2html, texinfo
 Standards-Version: 3.9.1
 Homepage: http://www.gnu.org/software/acct/
 
diff -Nru acct-6.5.5/debian/rules acct-6.5.5/debian/rules
--- acct-6.5.5/debian/rules     2012-12-18 02:54:16.000000000 +0000
+++ acct-6.5.5/debian/rules     2013-12-18 12:17:10.000000000 +0000
@@ -12,24 +12,18 @@
        dh_testdir
        dh_testroot
        rm -f build-stamp
-       rm -f config.guess config.sub
 
        [ ! -f Makefile ] || $(MAKE) distclean
        rm -f accounting.html
        rm -f accounting.info
 
+       dh_autoreconf_clean
        dh_clean
 
 config.status: configure
        dh_testdir
 
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-       cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-       cp -f /usr/share/misc/config.guess config.guess
-endif
-       autoreconf -f
+       dh_autoreconf
        ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man 
--infodir=\$${prefix}/share/info $(shell dpkg-buildflags --export=configure)
 
 build: build-stamp

Thanks,

-- 
Colin Watson                                       [cjwat...@ubuntu.com]


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to