diff options
author | Niels Thykier <niels@thykier.net> | 2016-04-03 07:55:58 +0000 |
---|---|---|
committer | Niels Thykier <niels@thykier.net> | 2016-04-03 07:55:58 +0000 |
commit | f3daf8b16060fb10a14865e508aa6d441d2d782e (patch) | |
tree | 1988ea7ab88d4a43474617e5f1700a4188cbe1fa | |
parent | e81b248f60f17ad0845ca1a8dcc934a314407f87 (diff) | |
download | debhelper-f3daf8b16060fb10a14865e508aa6d441d2d782e.tar.gz |
dh_makeshlibs: Use the same SONAME regex as dpkg-shlibdeps
Signed-off-by: Niels Thykier <niels@thykier.net>
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | dh_makeshlibs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index e0f3be34..339ceaf5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ debhelper (9.20160402+unreleased) UNRELEASED; urgency=medium * debhelper.pod: Use DEB_HOST_ARCH instead of the incorrect "build architecture". Thanks to Helmut Grohne for the report. + * dh_makeshlibs: Use same regex for extracting SONAME as + dpkg-shlibdeps. (Closes: #509931) -- Niels Thykier <niels@thykier.net> Sat, 02 Apr 2016 20:57:18 +0000 diff --git a/dh_makeshlibs b/dh_makeshlibs index e72c5de0..0f1f6755 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -167,12 +167,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) { my ($library, $major); push @lib_files, $_; my $ret=`$objdump -p $_`; - if ($ret=~m/\s+SONAME\s+(.+)\.so\.(.+)/) { + if ($ret=~m/\s+SONAME\s+(.*)\.so\.(.*)/) { # proper soname format $library=$1; $major=$2; } - elsif ($ret=~m/\s+SONAME\s+(.+)-(.+)\.so/) { + elsif ($ret=~m/\s+SONAME\s+(.*)-(\d.*)\.so/) { # idiotic crap soname format $library=$1; $major=$2; |