[Reproducible-commits] [debhelper] 01/01: Cherry-pick f15878d1b81fee001d63a09dc31e43663a9185c6 ("Skip building ddebs for udebs temporarily").

[Chris Lamb]

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

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

commit 2a39328e567100caf7a56952fcc66a2b892b91d7
Author: Chris Lamb <lamby at debian.org>
Date:   Fri Sep 11 23:18:50 2015 +0100

    Cherry-pick f15878d1b81fee001d63a09dc31e43663a9185c6 ("Skip building ddebs for udebs temporarily").
---
 debian/changelog | 7 +++++++
 dh_builddeb      | 2 +-
 dh_gencontrol    | 5 ++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c526a8a..17a4c73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (9.20150811.0~reproducible4) UNRELEASED; urgency=medium
+
+  * Cherry-pick f15878d1b81fee001d63a09dc31e43663a9185c6 ("Skip building ddebs
+    for udebs temporarily").
+
+ -- Chris Lamb <lamby at debian.org>  Fri, 11 Sep 2015 23:17:06 +0100
+
 debhelper (9.20150811.0~reproducible3) UNRELEASED; urgency=medium
 
   * Dh_Lib: We only need the latest changelog entry.
diff --git a/dh_builddeb b/dh_builddeb
index ebbabf9..1c45868 100755
--- a/dh_builddeb
+++ b/dh_builddeb
@@ -152,7 +152,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 			doit("dpkg-deb", @args,
 				 "--build", $ddeb_tmpdir, $dh{DESTDIR});
-		} else {
+		} elsif (not is_udeb($package)) {
 			warning("Not building ddeb for ${package} as it has no control file");
 			warning("Please use dh_gencontrol to avoid this issue");
 		}
diff --git a/dh_gencontrol b/dh_gencontrol
index d05cd6d..f55de3d 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -80,7 +80,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	}
 	
 
-	if ( -d $ddeb_tmp) {
+	# Temporary workaround: Do not build ddebs for udebs as
+	# dpkg-gencontrol and dpkg-deb does not agree on the file
+	# extension.
+	if ( -d $ddeb_tmp and not is_udeb($package)) {
 		my $multiarch = package_multiarch($package);
 		my $replaces = read_ddeb_migration($ddeb_info_dir);
 

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