[debhelper-devel] [debhelper] 01/02: dh_makeshlibs: Find all unversioned SONAMES

Niels Thykier nthykier at moszumanska.debian.org
Sun Dec 31 17:21:38 UTC 2017


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

nthykier pushed a commit to branch master
in repository debhelper.

commit d93b022b51dd2433fc7118324314d3a58087653a
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Dec 31 17:19:36 2017 +0000

    dh_makeshlibs: Find all unversioned SONAMES
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 2 ++
 dh_makeshlibs    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1deb122..aab6432 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ debhelper (11.1) UNRELEASED; urgency=medium
     Jeremy Bicha for the suggestion.  (Closes: #873831)
   * dh_makeshlibs: Avoid forking a shell per line in the
     generated shlibs file.
+  * dh_makeshlibs: Find all libraries with an unversioned SONAME
+    field (and not just the unversioned ones containing ".so").
 
  -- Niels Thykier <niels at thykier.net>  Sun, 17 Dec 2017 07:59:18 +0000
 
diff --git a/dh_makeshlibs b/dh_makeshlibs
index a791af9..53b4c0a 100755
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -180,8 +180,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			# idiotic crap soname format
 			$library=$1;
 			$major=$2;
-		} elsif ($ret =~ m/\s+SONAME\s+(?:.*)\.so/) {
+		} elsif ($ret =~ m/\s+SONAME\s+(?:\S)/) {
 			$unversioned_so = 1;
+			push(@lib_files, $_);
 		}
 
 		if (defined($dh{M_PARAMS}) && $dh{M_PARAMS} ne '') {

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




More information about the debhelper-devel mailing list