diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | dh_builddeb | 2 | ||||
| -rwxr-xr-x | dh_gencontrol | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 5c1c0226..557e8e6a 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 e36f0a3b..939ea241 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 a8e5826c..499dfae1 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); |