[Reproducible-commits] [debhelper] 11/17: Unconditionally enable ddeb-support

[Mattia Rizzolo]

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

mapreri-guest pushed a commit to branch pu/reproducible_builds
in repository debhelper.

commit 76ffebdec6c6b6bcf9f677cf2ffcfe4ddfb300f6
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Apr 4 08:45:21 2015 +0200

    Unconditionally enable ddeb-support
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
    
    Conflicts:
    	dh_strip
---
 debian/changelog | 3 +++
 dh_strip         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d3efbe4..eeb435d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ debhelper (9.20150101.0~reproducible1) UNRELEASED; urgency=low
   [ Andrew Ayer ]
   * Run dh_strip_nondeterminism before dh_compress
 
+  [ Niels Thykier ]
+  * Apply experimental automatic ".ddeb" support.
+
  -- Jérémy Bobbio <lunar at debian.org>  Thu, 01 Jan 2015 19:12:26 +0100
 
 debhelper (9.20150101.1) UNRELEASED; urgency=medium
diff --git a/dh_strip b/dh_strip
index e0e886b..f5b1335 100755
--- a/dh_strip
+++ b/dh_strip
@@ -218,7 +218,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			$debugtmp=tmpdir($package."-dbg");
 		}
 	}
-	if ($ENV{'DH_BUILD_DDEBS'} and not $keep_debug and package_arch($package) ne 'all') {
+	if (not $keep_debug and package_arch($package) ne 'all') {
 		$debugtmp = "debian/.debhelper/${package}/ddeb-root";
 		$keep_debug = 1;
 		$use_build_id = 2;

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