diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | dh_makeshlibs | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index ed9d541b..4d106780 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ debhelper (12.5.3) UNRELEASED; urgency=medium * dh_builddeb: Revert removal of --destdir for now. It is in fact used to hardcode paths in some cases e.g. v4l2loopback's debian/rules.modules. + * dh_makeshlibs: Disable auto-filtering of udeb libraries. It + cannot be implemented without violating the requirements for + the noudeb build-profile. -- Niels Thykier <niels@thykier.net> Sun, 18 Aug 2019 18:33:50 +0000 diff --git a/dh_makeshlibs b/dh_makeshlibs index 87b46964..a588aea8 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -351,12 +351,15 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if (! $seen{$line}) { $seen{$line}=1; push(@deb_lines, $line); - if (defined($udeb_name) && (defined($shlibs_udeb) or exists($known_udeb_solibs{$udeb_name}{"${library}\x1f${major}"}))) { + if (defined($udeb_name)) { my $udeb_deps = $deps; $udeb_deps =~ s/\Q$package\E/$udeb_name/e; $line="udeb: $library $major $udeb_deps"; push @udeb_lines, $line; - delete($known_udeb_solibs{$udeb_name}{"${library}\x1f${major}"}); + # Track which libraries have been used in the udeb to ensure + # we spot missing libraries. + delete($known_udeb_solibs{$udeb_name}{"${library}\x1f${major}"}) + if defined($udeb_name); } } } |