[Reproducible-commits] [debhelper] 05/14: dh_builddeb: Also build ddebs for udebs

[Jérémy Bobbio]

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

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

commit d7989df9ff06f407ae59da871ad210143ef8c493
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Apr 11 04:13:08 2015 +0200

    dh_builddeb: Also build ddebs for udebs
    
    As dh_gencontrol creates a control file for it and adds it to d/files,
    dh_builddeb needs to build it as well.  Otherwise, post-build tools
    might be confused by the absence of a (d)deb listed in d/files.
    
    Reported-by: Reiner Herrmann <reiner at reiner-h.de>
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 dh_builddeb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dh_builddeb b/dh_builddeb
index 7129627..cf51b19 100755
--- a/dh_builddeb
+++ b/dh_builddeb
@@ -93,6 +93,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	# child
 	my $tmp=tmpdir($package);
+	my $ddeb_tmpdir = "debian/.debhelper/${package}/ddeb-root";
 	if (exists $ENV{DH_ALWAYS_EXCLUDE} && length $ENV{DH_ALWAYS_EXCLUDE}) {
 		if (! compat(5)) {
 			complex_doit("find $tmp $dh{EXCLUDE_FIND} | xargs rm -rf");
@@ -104,13 +105,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				foreach split(":", $ENV{DH_ALWAYS_EXCLUDE});
 		}
 	}
+	if ( -d $ddeb_tmpdir) {
+		my $ddeb_filename = '/' . ddeb_filename($package);
+		doit("dpkg-deb", "-z1", "-Zxz", "-Sextreme",
+			 @{$dh{U_PARAMS}}, "--build", $ddeb_tmpdir, $dh{DESTDIR}.$ddeb_filename);
+	}
 	if (! is_udeb($package)) {
-		my $ddeb_tmpdir = "debian/.debhelper/${package}/ddeb-root";
-		if ( -d $ddeb_tmpdir) {
-			my $ddeb_filename = '/' . ddeb_filename($package);
-			doit("dpkg-deb", "-z1", "-Zxz", "-Sextreme",
-				@{$dh{U_PARAMS}}, "--build", $ddeb_tmpdir, $dh{DESTDIR}.$ddeb_filename);
-		}
 
 		doit("dpkg-deb", @{$dh{U_PARAMS}}, "--build", $tmp, $dh{DESTDIR}.$dh{FILENAME});
 	}

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