summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Thykier <niels@thykier.net>2019-09-08 06:13:33 +0000
committerNiels Thykier <niels@thykier.net>2019-09-08 06:13:33 +0000
commit6d66f6c0000b2885313e643593eeb85d0e9860da (patch)
tree30f440044fe3298ab2763c4dc419a71857ff8956
parentdb0cea3e844b1ccfcf2e81a7c7ad0741ba8b5faa (diff)
downloaddebhelper-6d66f6c0000b2885313e643593eeb85d0e9860da.tar.gz
dh_makeshlibs: Fix regression with automatic udeb detection
Signed-off-by: Niels Thykier <niels@thykier.net>
-rw-r--r--debian/changelog6
-rwxr-xr-xdh_makeshlibs2
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 0c3a0578..11f284e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
debhelper (12.6) UNRELEASED; urgency=medium
+ [ Niels Thykier ]
+ * dh_makeshlibs: Fix regression where versionless SONAMEs could
+ trigger a rejection of the "generated" shlibs file (despite
+ dh_makeshlibs not generating any "shlibs" files).
+ (Closes: #939635)
+
[ Sven Joachim ]
* Split debhelper into debhelper (the tools) and libdebhelper-perl
(the Perl libraries). (Closes: #821130)
diff --git a/dh_makeshlibs b/dh_makeshlibs
index cc32e308..33ed26b1 100755
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -293,6 +293,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if (defined($udeb_name) and not is_build_profile_active('noudeb')) {
for my $so_data (_all_so_files($udeb_name, tmpdir($udeb_name))) {
my (undef, $library, $major) = @{$so_data};
+ $major = $dh{M_PARAMS} if defined($dh{M_PARAMS}) and $dh{M_PARAMS} ne '';
+ next if not defined($library) or not defined($major);
$known_udeb_solibs{$udeb_name}{"${library}\x1f${major}"} = 1;
}
# If the udeb contains no SO files but there was an explicit --add-udeb, then