packaging: rework dh_autoreconf invocation for deb builds

Reviewed, tested and merged the final iteration of proposed
solutions to #757455 - resolving configure-script-generation
for clean ppc64le builds, originally.  Many thanks to Andreas
Barth and Matthias Klose for coming up with this solution.

Signed-off-by: Nathan Scott <nathans@debian.org>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/debian/control b/debian/control
index 7deaf9a27dd67b55e48a84c5bcdcd12ce76e2086..74b9abcbccc2f89885013b038c624eb958315fb7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: XFS Development Team <xfs@oss.sgi.com>
 Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar <anibal@debian.org>
-Build-Depends: uuid-dev, autoconf, debhelper (>= 5), gettext, libtool, libreadline-gplv2-dev | libreadline5-dev, libblkid-dev (>= 2.17), linux-libc-dev, autotools-dev
+Build-Depends: uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libreadline-gplv2-dev | libreadline5-dev, libblkid-dev (>= 2.17), linux-libc-dev
 Standards-Version: 3.9.1
 Homepage: http://oss.sgi.com/projects/xfs/
 

diff --git a/debian/rules b/debian/rules
index 3e8fa234a6ea92a38a3fd5bf4c5eedc0e8983391..2be2773ce616393c848516487db7977ea7bbe548 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ config: .census
 .census:
        @echo "== dpkg-buildpackage: configure" 1>&2
        $(checkdir)
-       dh_autotools-dev_updateconfig
+       AUTOHEADER=/bin/true dh_autoreconf
        $(options) $(MAKE) include/platform_defs.h
        touch .census
 
@@ -58,7 +58,7 @@ clean:
        $(MAKE) distclean
        -rm -rf $(dirme) $(dirdev) $(dirdi)
        -rm -f debian/*substvars debian/files* debian/*.debhelper
-       dh_autotools-dev_restoreconfig
+       dh_autoreconf_clean
        dh_clean
 
 binary-indep: