diff options
-rw-r--r-- | debian/changelog | 4 | ||||
-rwxr-xr-x | dh_makeshlibs | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index a32b3bc4..0b4adc00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ debhelper (12.5.4) UNRELEASED; urgency=medium * dh_installxfonts: Remove version in dependency on xfonts-utils added to ${misc:Depends}. The version requirement has been satisfied for the past 3-4 releases. + * dh_makeshlibs: Correct a control check that was only intended + for automatic udeb detection, which incorrectly also checked + when --add-udeb was passed. Thanks to Andreas Metzler for + reporting the issue. (Closes: #935577) -- Niels Thykier <niels@thykier.net> Tue, 20 Aug 2019 14:14:47 +0000 diff --git a/dh_makeshlibs b/dh_makeshlibs index 9284b4c3..cc32e308 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -365,7 +365,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { } } - if (defined($udeb_name)) { + if (defined($udeb_name) and not $shlibs_udeb) { my $issues = 0; for my $lib_key (sort(keys(%{$known_udeb_solibs{$udeb_name}}))) { my ($library, $major) = split(qr/\x1f/, $lib_key); |