[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.8-12-g81386d4



The following commit has been merged in the master branch:
commit 81386d4fb0e48975bc86c56650bd5f2fa7c500f8
Author: Stephen M. Webb <stephen.webb@bregmasoft.ca>
Date:   Thu Jun 14 09:53:17 2012 +0200

    c/shared-libs: Correct patch fix for #675832
    
    Ammend commit 7af0a989f3ea35ec9add054c86943c59b074643b, which
    contains a bug not present in the original patch for #675832.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/shared-libs b/checks/shared-libs
index 40a7314..835e8c9 100644
--- a/checks/shared-libs
+++ b/checks/shared-libs
@@ -232,7 +232,7 @@ for my $shlib_file (keys %SONAME) {
     }
 
     # libtool "-release" variant
-    $link_file =~ s/-[\d\.]\.so.*$/.so/o;
+    $link_file =~ s/-[\d\.]\.so$/.so/o;
     # determine shlib link name (w/o version)
     $link_file =~ s/\.so.+$/.so/o;
 
diff --git a/debian/changelog b/debian/changelog
index 8d212ea..e28cfe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,9 @@ lintian (2.5.9) UNRELEASED; urgency=low
   * checks/shared-libs:
     + [NT] Reverse order of two subst expressions to prevent
       dev-pkg-without-shlib-symlink false positives.  Thanks to
-      Aurelien Jarno and Stephen M. Webb for the report and the
-      patch.  (Closes: #675826, #675832)
+      Aurelien Jarno, Yves-Alexis Perez and Stephen M. Webb for
+      the reports and the patch.
+      (Closes: #675826, #677310, #675832)
     + [NT] Clarify that dev-pkg-without-shlib-symlink is emitted
       on library and not "-dev" packages.
 

-- 
Debian package checker


Reply to: