lintian: r885 - in trunk: checks debian

[rra@debian.org]

Author: rra
Date: 2007-05-09 20:48:14 +0200 (Wed, 09 May 2007)
New Revision: 885

Modified:
   trunk/checks/common_data.pm
   trunk/debian/changelog
Log:
* checks/common_data.pm:
  + [RA] Update architectures to dpkg 1.14.1.  Remove all linux-*
    architectures and add armel.  (Closes: #421995)

Modified: trunk/checks/common_data.pm
===================================================================
--- trunk/checks/common_data.pm	2007-05-03 04:05:47 UTC (rev 884)
+++ trunk/checks/common_data.pm	2007-05-09 18:48:14 UTC (rev 885)
@@ -43,22 +43,24 @@
      'mips', 'mipsel', 'powerpc', 'ppc64', 's390', 's390x', 'sh3', 'sh3eb',
      'sh4', 'sh4eb', 'sparc');
 
-# From /usr/share/dpkg/ostable, included here to make lintian results
-# consistent no matter what dpkg one has installed.
+# From /usr/share/dpkg/triplettable, included here to make lintian results
+# consistent no matter what dpkg one has installed.  This lists all of the
+# foo-<cpu> rules.  Note that linux is not present in the current dpkg and
+# hence is not present here.
 %all_oses = map { $_ => 1 }
-    ('linux', 'darwin', 'freebsd', 'kfreebsd', 'knetbsd', 'netbsd', 'openbsd',
-     'hurd');
+    ('kfreebsd', 'knetbsd', 'hurd', 'freebsd', 'openbsd', 'netbsd', 'darwin');
 
 # Yes, this includes combinations that are rather unlikely to ever exist, like
 # hurd-sh3, but the chances of those showing up as errors are rather low and
 # this reduces the necessary updating.
 #
-# For right now, linux-* are non-standard architectures.  This probably isn't
-# strictly correct and will need to be revisited later.
+# armel is a special case, so handle it separately here.  (It's handled
+# separately in /usr/share/dpkg/triplettable.)
 %non_standard_archs = map { $_ => 1 }
     grep { !$known_archs{$_} }
         (keys %all_cpus,
-         map { my $os = $_; map { "$os-$_" } keys %all_cpus } keys %all_oses);
+         map { my $os = $_; map { "$os-$_" } keys %all_cpus } keys %all_oses),
+    ('armel');
 
 
 %known_sections = map { $_ => 1 }

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-05-03 04:05:47 UTC (rev 884)
+++ trunk/debian/changelog	2007-05-09 18:48:14 UTC (rev 885)
@@ -1,5 +1,8 @@
 lintian (1.23.31) UNRELEASED; urgency=low
 
+  * checks/common_data.pm:
+    + [RA] Update architectures to dpkg 1.14.1.  Remove all linux-*
+      architectures and add armel.  (Closes: #421995)
   * checks/control-files.desc:
     + [RA] Change unknown-control-file to a warning, since Policy only
       discourages it and doesn't outlaw it.  (Closes: #287209)
@@ -16,7 +19,7 @@
     + [RA] Diagnose removal of device files in maintainer scripts per
       Policy 10.6.  (Closes: #268688)
 
- -- Russ Allbery <rra@debian.org>  Wed,  2 May 2007 21:05:30 -0700
+ -- Russ Allbery <rra@debian.org>  Wed,  9 May 2007 11:44:52 -0700
 
 lintian (1.23.30) unstable; urgency=low