[SCM] Debian package checker branch, master, updated. 2.5.10-130-g8e0baff

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

The following commit has been merged in the master branch:
commit 8e0baff9eff3132ebf8f7348c26933165d1a317b
Author: Jakub Wilk <jwilk@debian.org>
Date:   Fri Sep 7 12:29:40 2012 +0200

    c/binaries: Any path with the GNU M-A triplet is M-A safe
    
    Consider any path containing the GNU Multi-arch triplet as
    "Multi-Arch: same" safe.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/binaries b/checks/binaries
index 867b54f..28edbd7 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -227,7 +227,7 @@ foreach my $file ($info->sorted_index) {
     }
 
     if ($multiarch eq 'same') {
-        unless ($file =~ m,/(?:$gnu_triplet_re|$ruby_triplet_re|java-\d+-openjdk-\Q$arch\E|\.build-id)/,) {
+        unless ($file =~ m,\b$gnu_triplet_re\b|/(?:$ruby_triplet_re|java-\d+-openjdk-\Q$arch\E|\.build-id)/,) {
             tag 'arch-dependent-file-not-in-arch-specific-directory', $file;
         }
     }
diff --git a/debian/changelog b/debian/changelog
index eb5dac4..52949d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ lintian (2.5.11) UNRELEASED; urgency=low
       as Lintian uses readelf.
     + [JW,NT] Update the "extract SONAME" shell snippet to properly
       handle SONAMEs with uppercase letters.
+    + [JW] Recognise any path with matching the GNU multi-arch
+      triplet as a "Multi-arch: same"-safe directory.  Thanks to
+      Matthias Klose for the report.  (Closes: #681410)
   * checks/changelog-file:
     + [NT] Emit "missing changelog" for packages that are missing
       their usr/share/doc/<pkg>/ dir and do not have a doc symlink.

-- 
Debian package checker