[debhelper-devel] [debhelper] 01/03: dh, d/rules: Use override targets to avoid B-Ds

[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 c7fcec35a3124cd0bde4e6a144dec8d423c17af4
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Apr 2 13:59:28 2016 +0000

    dh,d/rules: Use override targets to avoid B-Ds
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog |  3 +++
 debian/rules     |  4 ++++
 dh               | 16 +---------------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 94ce5b6..1350bc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ debhelper (9.20160313+unreleased) UNRELEASED; urgency=medium
     was ignored if another file was matched for the same
     destination dir.  Thanks to Ben Hutchings for reporting
     the issue.  (Closes: #818834)
+  * d/rules: Use overrides to disable unnecessary helpers
+    (for which debhelper does not Build-Depend on the
+    necessary packages to run the tools).
 
  -- Niels Thykier <niels at thykier.net>  Thu, 31 Mar 2016 21:09:07 +0000
 
diff --git a/debian/rules b/debian/rules
index 43fdd00..1240a35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,3 +10,7 @@
 
 %:
 	./run dh $@ --no-parallel
+
+# Disable as they are unneeded (and we can then be sure debhelper
+# builds without needing autotools-dev, dh-strip-nondetermism etc.)
+override_dh_update_autotools_config override_dh_strip_nondeterminism:
diff --git a/dh b/dh
index 10b2933..1505ce4 100755
--- a/dh
+++ b/dh
@@ -408,9 +408,7 @@ my @i = (qw{
 	dh_link
 	dh_installwm
 	dh_installxfonts
-},
-	optional_command('dh_strip_nondeterminism'),
-qw{
+	dh_strip_nondeterminism
 	dh_compress
 	dh_fixperms
 });
@@ -1031,18 +1029,6 @@ sub can_skip {
 	return 1;
 }
 
-sub optional_command {
-	my ($command) = @_;
-
-	foreach my $dir (split(':', $ENV{'PATH'})) {
-		if (open(my $h, '<', "$dir/$command")) {
-			close($h);
-			return ($command);
-		}
-	}
-	return;
-}
-
 sub extract_skipinfo {
 	my $command=shift;
 

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