[SCM] Debian package checker branch, master, updated. 2.5.4-17-ga00acdb

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

The following commit has been merged in the master branch:
commit a00acdb2d6524135c7bb7f1967ff663f7b743216
Author: Niels Thykier <niels@thykier.net>
Date:   Fri Dec 2 22:30:33 2011 +0100

    Skip "gz-in-m-a-same-safe" if the file path contains arch
    
    Presumabily the architecture part of the name will cause it to be
    coinstallable.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/files b/checks/files
index e171d70..9a7ccca 100644
--- a/checks/files
+++ b/checks/files
@@ -175,6 +175,7 @@ my %linked_against_libvga;
 my $py_support_nver = undef;
 
 my $arch_dep_files = 0;
+my $arch = $info->field ('architecture')//'';
 my $isma_same = ($info->field ('multi-arch')//'') eq 'same';
 
 # read data from objdump-info file
@@ -748,7 +749,7 @@ foreach my $file (@{$info->sorted_index}) {
             unless defined($TRIPLETS);
         if ($TRIPLETS->known($subdir)) {
             tag 'triplet-dir-and-architecture-mismatch', "$file is for", $TRIPLETS->value($subdir)
-                if (($info->field('architecture')//'') ne $TRIPLETS->value($subdir));
+                unless ($arch eq $TRIPLETS->value($subdir));
         }
     }
 
@@ -759,7 +760,7 @@ foreach my $file (@{$info->sorted_index}) {
         next unless ($info->file_info->{$file}//'') =~ m/\bELF\b/o;
         $TRIPLETS = Lintian::Data->new('files/triplets', qr/\s++/o)
             unless defined($TRIPLETS);
-        if ($TRIPLETS->known($subdir) && ($info->field('architecture')//'') eq $TRIPLETS->value($subdir)) {
+        if ($TRIPLETS->known($subdir) && $arch eq $TRIPLETS->value($subdir)) {
             my $dep = $info->relation('pre-depends');
             tag 'missing-pre-dependency-on-multiarch-support' unless ($dep->implies('multiarch-support'));
         }
@@ -1058,7 +1059,7 @@ foreach my $file (@{$info->sorted_index}) {
             my $finfo = $info->file_info->{$file} || '';
             if ($finfo !~ m/gzip compressed/) {
                 tag 'gz-file-not-gzip', $file;
-            } elsif ($isma_same) {
+            } elsif ($isma_same && $file !~ m/\Q$arch\E/o) {
                 my $path = $info->unpacked ($file);
                 open my $fd, '<', $path or fail "opening $file: $!";
                 my $buff;
@@ -1353,7 +1354,7 @@ foreach my $file (@{$info->sorted_index}) {
     }
 }
 
-if (!$is_dummy && !$arch_dep_files && ($info->field('architecture')//'') ne 'all') {
+if (!$is_dummy && !$arch_dep_files && $arch ne 'all') {
     tag 'package-contains-no-arch-dependent-files' unless $type eq 'udeb';
 }
 
diff --git a/debian/changelog b/debian/changelog
index 14e7b65..636c4aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ lintian (2.5.5) UNRELEASED; urgency=low
     + [NT] Added dh-autoreconf as a build-depends alternative to
       libtool for suppressing ancient-libtool warning.  Thanks to
       Felix Geyer for the report.  (Closes: #650325)
+  * checks/files:
+    + [JW,NT] Skip "Multi-Arch: same" check of gzip files if their
+      install path contains the architecture.  (Closes: #650665)
 
   * collection/index:
     + [NT] Use Lintian::Processable::Package to determine source

-- 
Debian package checker