[debhelper-devel] [debhelper] 01/01: dh_makeshlibs: Use the same SONAME regex as dpkg-shlibdeps

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit f3daf8b16060fb10a14865e508aa6d441d2d782e
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Apr 3 07:55:58 2016 +0000

    dh_makeshlibs: Use the same SONAME regex as dpkg-shlibdeps
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 2 ++
 dh_makeshlibs    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0f3be3..339ceaf 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 at thykier.net>  Sat, 02 Apr 2016 20:57:18 +0000
 
diff --git a/dh_makeshlibs b/dh_makeshlibs
index e72c5de..0f1f675 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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git