[Reproducible-commits] [debhelper] 24/56: Skip building ddebs for udebs temporarily
Mattia Rizzolo
mattia at mapreri.org
Sun Oct 4 17:06:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
mapreri-guest pushed a commit to branch master
in repository debhelper.
commit f15878d1b81fee001d63a09dc31e43663a9185c6
Author: Niels Thykier <niels at thykier.net>
Date: Sun Aug 30 16:07:41 2015 +0200
Skip building ddebs for udebs temporarily
Signed-off-by: Niels Thykier <niels at thykier.net>
---
debian/changelog | 3 +++
dh_builddeb | 2 +-
dh_gencontrol | 5 ++++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5c1c022..557e8e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ debhelper (9.20150811+unreleased) UNRELEASED; urgency=medium
* d/control: Remove the homepage field.
* dh: Make dh_strip_nondeterminism optional, so debhelper
does not need to build-depend on it.
+ * dh_gencontrol/dh_builddeb: Temporarily stop building ddebs
+ for udebs as dpkg-gencontrol and dpkg-deb does not agree
+ the default file extension for these.
[ Paul Tagliamonte ]
* dh_gencontrol: Put debug debs back in the "debug" section.
diff --git a/dh_builddeb b/dh_builddeb
index e36f0a3..939ea24 100755
--- a/dh_builddeb
+++ b/dh_builddeb
@@ -130,7 +130,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
@{$dh{U_PARAMS}});
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 a8e5826..499dfae 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -84,7 +84,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
$build_ids = read_ddeb_build_ids($ddeb_info_dir);
}
- 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
More information about the Reproducible-commits
mailing list