[nco] 31/32: Use dh-autoreconf for retooling. (closes: #744476)

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository nco.

commit cc2a7b725757c2840af36e7d8db9d008eb971e4d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jan 18 23:47:13 2015 +0100

    Use dh-autoreconf for retooling. (closes: #744476)
---
 debian/automake.sh |  3 +++
 debian/changelog   |  2 ++
 debian/control     |  1 +
 debian/rules       | 23 ++++++++++++++---------
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/debian/automake.sh b/debian/automake.sh
new file mode 100755
index 0000000..ba1916e
--- /dev/null
+++ b/debian/automake.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+# automake requires --foreign to not fail the autoreconf process
+automake --foreign "$@"
diff --git a/debian/changelog b/debian/changelog
index c1c7e3c..145a96f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ nco (4.4.7-1) UNRELEASED; urgency=medium
     (closes: #757323)
   * Add patch to fix hyphen-used-as-minus-sign issues in man pages.
   * Bump Standards-Version to 3.9.6, changes: copyright-format 1.0.
+  * Use dh-autoreconf for retooling.
+    (closes: #744476)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 18 Jan 2015 16:40:05 +0100
 
diff --git a/debian/control b/debian/control
index d5e3e6c..871e048 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
                autotools-dev,
                bison,
                flex,
diff --git a/debian/rules b/debian/rules
index 9e21263..befa05a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,23 @@
 #!/usr/bin/make -f
 
+# Use custom automake command to prevent autoreconf failure
+export AUTOMAKE = ./debian/automake.sh
+
 %:
-	dh $@ --with autotools_dev --buildsystem autoconf --parallel
+	dh $@ --with autoreconf \
+	      --buildsystem autoconf \
+	      --parallel
 
 override_dh_clean:
 	dh_clean data/big.nc \
-                 data/in_1.nc \
-                 data/in_2.nc \
-                 data/nco_bm.stderr \
-                 debian/rules.old \
-                 doc/nco.info \
-                 doc/nco.info-1 \
-                 doc/nco.info-2 \
-                 doc/nco.info-3
+	         data/in_1.nc \
+	         data/in_2.nc \
+	         data/nco_bm.stderr \
+	         debian/rules.old \
+	         doc/nco.info \
+	         doc/nco.info-1 \
+	         doc/nco.info-2 \
+	         doc/nco.info-3
 
 override_dh_auto_configure:
 	dh_auto_configure -- \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nco.git