[SCM] Debian package checker branch, master, updated. 2.5.0-rc2-154-g42f022e

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

The following commit has been merged in the master branch:
commit cb19d92d6fc5abc2374eed47d82dccc3d9300eea
Author: Steve Langasek <steve.langasek@linaro.org>
Date:   Mon Apr 18 01:07:14 2011 -0700

    Drop wrong checks for multiarch directories
    
    Architecture: all packages and packages of a different architecture are not
    allowed to install libraries to the multiarch directories.  Drop these wrong
    exclusions.

diff --git a/checks/binaries b/checks/binaries
index eda994a..8c46be2 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -115,8 +115,6 @@ our %EMBEDDED_LIBRARIES = (
 	'libpcap'	=> qr'(?:pcap_activate: The "any" device isn\'t supported|corrupted frame on kernel ring mac offset)',
 );
 
-our $MULTIARCH;
-
 sub run {
 
 my $pkg = shift;
@@ -239,16 +237,9 @@ foreach my $file (@{$info->sorted_file_info}) {
     # binary or object file?
     next unless ($fileinfo =~ m/^[^,]*\bELF\b/) or ($fileinfo =~ m/\bcurrent ar archive\b/);
 
-    # Warn about Architecture: all packages that contain shared libraries, but
-    # only if those libraries aren't installed in a multiarch directory.  The
-    # package may be a support package for cross-compiles.
+    # Warn about Architecture: all packages that contain shared libraries.
     if ($arch eq 'all') {
-	my ($arch_path) = ($file =~ m,^(?:usr/)?lib/([^/]+)/,);
-	$MULTIARCH = Lintian::Data->new('binaries/multiarch')
-	    unless defined($MULTIARCH);
-	unless ($arch_path and $MULTIARCH->known($arch_path)) {
-	    tag 'arch-independent-package-contains-binary-or-object', $file;
-	}
+	tag 'arch-independent-package-contains-binary-or-object', $file;
     }
 
     # ELF?
@@ -273,10 +264,7 @@ foreach my $file (@{$info->sorted_file_info}) {
 	    and $file =~ m,^lib/modules/,) {
 	    # Allow amd64 kernel modules to be installed on i386.
 	} else {
-	    $MULTIARCH = Lintian::Data->new('binaries/multiarch')
-		unless defined($MULTIARCH);
-	    tag 'binary-from-other-architecture', $file
-		unless (grep { $file =~ m,/\Q$_\E/, } $MULTIARCH->all);
+	    tag 'binary-from-other-architecture', $file;
 	}
     }
 
diff --git a/data/binaries/multiarch b/data/binaries/multiarch
deleted file mode 100644
index 0efa0fd..0000000
--- a/data/binaries/multiarch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Known multiarch directories.  Binaries under one of these directories
-# under /lib or /usr/lib are permitted in Architecture: all packages since
-# the package may be for multiarch support in a related architecture.
-#
-# See Bug#469301 and Bug#464796 for more details.
-
-# Regular Debian ports.
-arm-linux-gnu
-arm-linux-gnueabi
-i486-linux-gnu
-hppa-linux-gnu
-m68k-linux-gnu
-mips-linux-gnu
-mipsel-linux-gnu
-powerpc-linux-gnu
-s390-linux-gnu
-sparc-linux-gnu
-x86_64-linux-gnu
diff --git a/debian/changelog b/debian/changelog
index 3012d31..0c0fb07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ lintian (2.5.0~rc3) UNRELEASED; urgency=low
   * checks/binaries:
     + [NT] Accepted patch from Loïc Minier to support the armhf
       architecture.  (Closes: #618587)
+    + [SRL] Drop wrong checks for multiarch directories.  Multiarch
+      directories are only allowed in packages of the given architecture.
   * checks/circular-deps{,.desc}:
     + [NT] Added to check for circular dependencies between
       binaries from the same source.  It requires all binaries
@@ -66,6 +68,8 @@ lintian (2.5.0~rc3) UNRELEASED; urgency=low
     + [NT] Accepted patch from Vincent Fourmond to implement
       Java related data collection.
 
+  * data/binaries/multiarch:
+    + [SRL] Drop.
   * data/debhelper/alt-dh_commands:
     + [NT] New file; contains alternative dependencies for
       dh_python2 and dh_python3.  (Closes: #614879)

-- 
Debian package checker