diff options
| author | Niels Thykier <niels@thykier.net> | 2015-08-30 16:01:14 +0200 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2015-08-30 16:01:14 +0200 |
| commit | a677d8763e4b62e63bfecbb050f3f6861834ca61 (patch) | |
| tree | a33cd720b99560bbbad9a657c71697a1a00972ec /dh_builddeb | |
| parent | b418f73de540dcc3c050c935dab90eed23fe610c (diff) | |
| download | debhelper-a677d8763e4b62e63bfecbb050f3f6861834ca61.tar.gz | |
Revert "dh_builddeb: Let dpkg determine the udeb filename by default"
This reverts commit b418f73de540dcc3c050c935dab90eed23fe610c.
While dpkg-gencontrol does the right thing, dpkg-deb does not realise
it is building a udeb.
Diffstat (limited to 'dh_builddeb')
| -rwxr-xr-x | dh_builddeb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/dh_builddeb b/dh_builddeb index cf35c077..e36f0a3b 100755 --- a/dh_builddeb +++ b/dh_builddeb @@ -139,9 +139,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) { doit("dpkg-deb", @{$dh{U_PARAMS}}, "--build", $tmp, $dh{DESTDIR}.$dh{FILENAME}); } else { - my @dpkg_args = default_compressor_args(["-z1", "-Zxz", "-Sextreme"], - @{$dh{U_PARAMS}}); - doit("dpkg-deb", @dpkg_args, "--build", $tmp, $dh{DESTDIR}.$dh{FILENAME}); + my $filename=$dh{FILENAME}; + if (! $filename) { + $filename="/".udeb_filename($package); + } + doit("dpkg-deb", "-z1", "-Zxz", "-Sextreme", + @{$dh{U_PARAMS}}, "--build", $tmp, $dh{DESTDIR}.$filename); } exit 0; } |