[Reproducible-commits] [debhelper] 11/56: dh: Allow dh_strip_nondeterminism to be absent

[Mattia Rizzolo]

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

mapreri-guest pushed a commit to branch master
in repository debhelper.

commit be4ce1dbf1fc8ddc7064b3f7c235052a8980e396
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Aug 20 12:05:34 2015 +0200

    dh: Allow dh_strip_nondeterminism to be absent
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog |  7 +++++++
 dh               | 20 +++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5dc000..c6425a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,12 +21,19 @@ debhelper (9.20150811+unreleased) UNRELEASED; urgency=medium
     after talking with the glibc maintainer.  The is not the
     right place to make this change.
   * d/control: Remove the homepage field.
+  * dh: Make dh_strip_nondeterminism optional, so debhelper
+    does not need to build-depend on it.
 
   [ Paul Tagliamonte ]
   * dh_gencontrol: Put debug debs back in the "debug" section.
   * dh_strip/dh_gencontrol: Add a space separated list of
     build-ids.
 
+  [ Andrew Ayer ]
+  * d/control: Depend on dh-strip-nondeterminism
+  * dh: Call dh_strip_nondeterminism during build.
+    (Closes: #759895)
+
  -- Paul Tagliamonte <paultag at debian.org>  Fri, 14 Aug 2015 21:25:16 +0200
 
 debhelper (9.20150811) unstable; urgency=medium
diff --git a/dh b/dh
index dd68465..e86a2a1 100755
--- a/dh
+++ b/dh
@@ -355,7 +355,7 @@ my @bd = qw{
 	dh_auto_build
 	dh_auto_test
 };
-my @i = qw{
+my @i = (qw{
 	dh_testroot
 	dh_prep
 	dh_installdirs
@@ -394,10 +394,12 @@ my @i = qw{
 	dh_link
 	dh_installwm
 	dh_installxfonts
-	dh_strip_nondeterminism
+},
+	optional_command('dh_strip_nondeterminism'),
+qw{
 	dh_compress
 	dh_fixperms
-};
+});
 my @ba=qw{
 	dh_strip
 	dh_makeshlibs
@@ -964,6 +966,18 @@ 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 1;
+		}
+	}
+	return 0;
+}
+
 sub extract_skipinfo {
 	my $command=shift;
 

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