[SCM] Debian package checker branch, master, updated. 2.5.4-123-ga8e1617

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit a8e161783d20224e7a55e44af406b3ed57af5c7d
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Jan 28 20:09:42 2012 +0100

    Updated regex in lib_soname_path
    
    Recognise some libnss plugins are installed in {,usr/}lib{,32,64}.
    Remove unneeded check for leading "./" in paths.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/binaries b/checks/binaries
index 8eeb543..d9b8664 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -192,12 +192,11 @@ $madir = './!non-existant-path!/./' unless defined $madir;
 sub lib_soname_path {
     my ($dir, @paths) = @_;
     foreach my $path (@paths) {
-        next if $path =~ m%^(?:\.?/)?lib/libnss_[^.]+\.so(?:\.[0-9]+)$%;
-        return 1 if $path =~ m%^(?:\.?/)?lib/[^/]+$%;
-        return 1 if $path =~ m%^(?:\.?/)?usr/lib/[^/]+$%;
-        return 1 if $path =~ m%^(?:\.?/)?usr/X11R6/lib/[^/]+$%;
-        return 1 if defined $dir && $path =~ m%(?:\.?/)?lib/$dir/[^/]++$%;
-        return 1 if defined $dir && $path =~ m%(?:\.?/)?usr/lib/$dir/[^/]++$%;
+        next if $path =~ m%^(?:usr/)?lib(?:32|64)?/libnss_[^.]+\.so(?:\.[0-9]+)$%;
+        return 1 if $path =~ m%^lib/[^/]+$%;
+        return 1 if $path =~ m%^usr/lib/[^/]+$%;
+        return 1 if defined $dir && $path =~ m%lib/$dir/[^/]++$%;
+        return 1 if defined $dir && $path =~ m%usr/lib/$dir/[^/]++$%;
     }
     return 0;
 }
diff --git a/debian/changelog b/debian/changelog
index c2e0ff1..42ef5ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ lintian (2.5.5) UNRELEASED; urgency=low
     + [NT] Fixed assumptions about certain fields being present.
       Where needed, Lintian will make guesses to the most likely
       value (or the least "broken" value).
+  * checks/binaries:
+    + [NT] Allow libnss_* plugins in usr/lib.
   * checks/control-file{,.desc}:
     + [NT] Allow "pkg (= ${source:Version})" versioned dependency if
       pkg is architecture all.  This fixes a false-positive

-- 
Debian package checker