[Reproducible-commits] [debhelper] 12/14: fix mtimes also for ddebs.

[Johannes Schauer]

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

josch pushed a commit to branch pu/reproducible_builds
in repository debhelper.

commit 51cfc99508fd59dbc13236768badb2d278cb24da
Author: Mattia Rizzolo <mattia at mapreri.org>
Date:   Sun Apr 5 15:19:41 2015 +0200

    fix mtimes also for ddebs.
    
    Conflicts:
    	dh_builddeb
---
 dh_builddeb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dh_builddeb b/dh_builddeb
index b6ae2ef..724398d 100755
--- a/dh_builddeb
+++ b/dh_builddeb
@@ -130,6 +130,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				foreach split(":", $ENV{DH_ALWAYS_EXCLUDE});
 		}
 	}
+
+	my $find_options='';
+	if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
+		$find_options="! \\( $dh{EXCLUDE_FIND} \\)";
+	}
+
 	if ( -d $ddeb_tmpdir) {
 		my $ddeb_filename = '/' . ddeb_filename($package);
 		# XXX: Should we blindly overrule the maintainer here?  It is
@@ -137,14 +143,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		# ddeb.
 		my @args = default_compressor_args(["-z1", "-Zxz", "-Sextreme"],
 										   @{$dh{U_PARAMS}});
+		complex_doit("find $ddeb_tmpdir -newermt '$dh{DATE}' $find_options -print0",
+			"2>/dev/null | xargs -0r touch --no-dereference --date='$dh{DATE}'");
 		doit("dpkg-deb", @args,
 			 "--build", $ddeb_tmpdir, $dh{DESTDIR}.$ddeb_filename);
 	}
 
-	my $find_options='';
-	if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
-		$find_options="! \\( $dh{EXCLUDE_FIND} \\)";
-	}
 	complex_doit("find $tmp -newermt '$dh{DATE}' $find_options -print0",
 		"2>/dev/null | xargs -0r touch --no-dereference --date='$dh{DATE}'");
 

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