r456: * dh_makeshlibs: more support for nasty soname formats, Closes: #90520

diff --git a/debian/changelog b/debian/changelog
index 6faf5ef5fcf963783973e4b1e3476e064cbf9a2c..868c699eb7c2912f83dafbc86e951894789ec904 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (3.0.13) unstable; urgency=low
+
+  * dh_makeshlibs: more support for nasty soname formats, Closes: #90520
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 21 Mar 2001 15:00:42 -0800
+
 debhelper (3.0.12) unstable; urgency=low
 
   * Applied a patch from Anton Zinoviev <anton@lml.bas.bg> to pass -e

diff --git a/dh_makeshlibs b/dh_makeshlibs
index e80066887583a6a4370413cf52353f29884675b2..346a5f5aefea27ba23e763e1f7fa1bc071d553c2 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -91,8 +91,18 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        # objdump is anything actually added.
        open (FIND, "find $tmp -type f -name '*.so*' |");
        while (<FIND>) {
-               my ($library, $major) = 
-                       `objdump -p $_` =~ m/\s+SONAME\s+(.+)\.so\.(.+)/;
+               my ($library, $major);
+               my $objdump=`objdump -p $_`;
+               if ($objdump=~m/\s+SONAME\s+(.+)\.so\.(.+)/) {
+                       # proper soname format
+                       $library=$1;
+                       $major=$2;
+               }
+               elsif ($objdump=~m/\s+SONAME\s+(.+)-(.+)\.so/) {
+                       # idiotic crap soname format
+                       $library=$1;
+                       $major=$2;
+               }
 
                if (defined($dh{M_PARAMS}) && $dh{M_PARAMS} ne '') {
                        $major=$dh{M_PARAMS};