[debhelper-devel] [debhelper] 02/03: RUn dh-autoreconf seq. by default in compat 10

[Niels Thykier]

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

nthykier pushed a commit to branch master
in repository debhelper.

commit d97912243ff7955cf3831ad41bf7ecacc70783d6
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Apr 2 14:20:39 2016 +0000

    RUn dh-autoreconf seq. by default in compat 10
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debhelper.pod    | 6 ++++++
 debian/changelog | 4 ++++
 debian/control   | 2 +-
 debian/rules     | 4 +++-
 dh               | 5 +++++
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debhelper.pod b/debhelper.pod
index e4f4899..c46798f 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -603,6 +603,12 @@ The B<dh_installinit> command now defaults to
 B<--restart-after-upgrade>.  For packages needing the previous
 behaviour, please use B<--no-restart-after-upgrade>.
 
+=item -
+
+The B<autoreconf> sequence is now enabled by default.  Please pass
+B<--without autoreconf> to B<dh> if this is not desirable for a given
+package
+
 =back
 
 =back
diff --git a/debian/changelog b/debian/changelog
index 1350bc0..c02a8be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ debhelper (9.20160313+unreleased) UNRELEASED; urgency=medium
   * d/rules: Use overrides to disable unnecessary helpers
     (for which debhelper does not Build-Depend on the
     necessary packages to run the tools).
+  * dh: Enable "autoreconf" sequence by default in compat
+    10 (or higher).  (Closes: #480576)
+  * d/control: Add a dependency on dh-autoreconf due to
+    the above.
 
  -- Niels Thykier <niels at thykier.net>  Thu, 31 Mar 2016 21:09:07 +0000
 
diff --git a/debian/control b/debian/control
index ddb7ac6..521899f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: https://anonscm.debian.org/git/debhelper/debhelper.git
 
 Package: debhelper
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.18.2~), binutils, po-debconf, man-db (>= 2.5.1-1), libdpkg-perl (>= 1.17.14), dh-strip-nondeterminism, autotools-dev
+Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.18.2~), binutils, po-debconf, man-db (>= 2.5.1-1), libdpkg-perl (>= 1.17.14), dh-strip-nondeterminism, autotools-dev, dh-autoreconf
 Suggests: dh-make
 Multi-Arch: foreign
 Description: helper programs for debian/rules
diff --git a/debian/rules b/debian/rules
index 1240a35..addfbff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,11 @@
 # rather than the installed ones.
 #
 # We use --no-parallel because the test suite is not thread safe.
+# We disable autoreconf to avoid build-depending on it (it does
+# nothing for debhelper and it keeps the set of B-D smaller)
 
 %:
-	./run dh $@ --no-parallel
+	./run dh $@ --no-parallel --without autoreconf
 
 # Disable as they are unneeded (and we can then be sure debhelper
 # builds without needing autotools-dev, dh-strip-nondetermism etc.)
diff --git a/dh b/dh
index 1505ce4..fdeee46 100755
--- a/dh
+++ b/dh
@@ -287,6 +287,11 @@ if (compat(8, 1)) {
 	# (and comes first so python-central loads later and can disable it).
 	unshift @ARGV, "--with=python-support";
 }
+if (not compat(10, 1)) {
+	# Enable autoreconf'ing by default in compat 10 or later.  Use the
+	# sequence add-on so existing --without=autoreconf
+	unshift(@ARGV, "--with=autoreconf");
+}
 		
 init(options => {
 		"until=s" => \$dh{UNTIL},

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