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

[SCM] Debian package checker branch, master, updated. 2.5.8-2-g7af0a98



The following commit has been merged in the master branch:
commit 7af0a989f3ea35ec9add054c86943c59b074643b
Author: Stephen M. Webb <stephen.webb@bregmasoft.ca>
Date:   Sun Jun 3 17:47:57 2012 +0200

    c/shared-libs: Fix dev-pkg-without-shlib-symlink FP
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/shared-libs b/checks/shared-libs
index c832448..ace9bb2 100644
--- a/checks/shared-libs
+++ b/checks/shared-libs
@@ -231,10 +231,10 @@ for my $shlib_file (keys %SONAME) {
         }
     }
 
-    # determine shlib link name (w/o version)
-    $link_file =~ s/\.so.*$/.so/o;
     # 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;
 
     # shlib symlink may not exist.
     # if shlib doesn't _have_ a version, then $link_file and $shlib_file will
diff --git a/debian/changelog b/debian/changelog
index 9e2f4ca..abe3fce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 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)
   * debian/changelog:
     + [NT] raster-image-in-scalable-directory was added in 2.5.7,
       not removed.

-- 
Debian package checker


Reply to: