lintian: r591 - in trunk: checks debian

[rra@debian.org]

Author: rra
Date: 2006-03-27 02:19:55 +0200 (Mon, 27 Mar 2006)
New Revision: 591

Modified:
   trunk/checks/common_data.pm
   trunk/checks/fields.desc
   trunk/debian/changelog
Log:
* checks/common_data.pm:
  + [RA] Include all combinations of cpu and os from the dpkg cputable
    and ostable files (as of dpkg 1.13.16).  (Closes: #337034, #357433)
* checks/fields.desc:
  + [RA] Only list examples of non-standard architectures, since there
    are now too many combinations to list completely.

Modified: trunk/checks/common_data.pm
===================================================================
--- trunk/checks/common_data.pm	2006-03-26 14:19:08 UTC (rev 590)
+++ trunk/checks/common_data.pm	2006-03-27 00:19:55 UTC (rev 591)
@@ -7,7 +7,7 @@
 	   %known_obsolete_fields %known_essential %known_build_essential
 	   %known_obsolete_packages %known_virtual_packages
 	   %known_libstdcs %known_tcls %known_tclxs %known_tks %known_tkxs
-	   %known_libpngs %non_standard_archs
+	   %known_libpngs %non_standard_archs %all_cpus %all_oses
           );
 
 # simple defines for commonly needed data
@@ -16,8 +16,29 @@
     ('alpha', 'arm', 'hppa', 'hurd-i386', 'i386', 'ia64', 'mips', 'mipsel',
      'm68k', 'powerpc', 's390', 'sparc', 'any', 'all');
 
+# From /usr/share/dpkg/cputable, included here to make lintian results
+# consistent no matter what dpkg one has installed.
+%all_cpus = map { $_ => 1 }
+    ('i386', 'ia64', 'alpha', 'amd64', 'armeb', 'arm', 'hppa', 'm32r', 'm68k',
+     '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.
+%all_oses = map { $_ => 1 }
+    ('linux', 'darwin', 'freebsd', 'kfreebsd', 'knetbsd', 'netbsd', 'openbsd',
+     'hurd');
+
+# 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.
 %non_standard_archs = map { $_ => 1 }
-    ('amd64', 'armeb', 'ppc64', 'sh', 'kfreebsd-i386', 'knetbsd-i386');
+    grep { !$known_archs{$_} }
+        (keys %all_cpus,
+         map { my $os = $_; map { "$os-$_" } keys %all_cpus } keys %all_oses);
 
 
 %known_sections = map { $_ => 1 }

Modified: trunk/checks/fields.desc
===================================================================
--- trunk/checks/fields.desc	2006-03-26 14:19:08 UTC (rev 590)
+++ trunk/checks/fields.desc	2006-03-27 00:19:55 UTC (rev 591)
@@ -79,8 +79,8 @@
 Info: In addition to the special values `all', `any' and the names of the
  architectures already in the archive (alpha, arm, hppa, hurd-386, i386, 
  ia64, m68k, mips, mipsel, powerpc, s390, sparc), there are some 
- architectures still waiting to be included in the archive. At the moment,
- these are amd64, kfreebsd-i386, knetbsd-i386, ppc64 and sh. 
+ architectures still waiting to be included in the archive. Examples
+ include kfreebsd-i386 and ppc64.
 
 Tag: too-many-architectures
 Type: error

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-03-26 14:19:08 UTC (rev 590)
+++ trunk/debian/changelog	2006-03-27 00:19:55 UTC (rev 591)
@@ -1,3 +1,14 @@
+lintian (1.23.17) UNRELEASED; urgency=low
+
+  * checks/common_data.pm:
+    + [RA] Include all combinations of cpu and os from the dpkg cputable
+      and ostable files (as of dpkg 1.13.16).  (Closes: #337034, #357433)
+  * checks/fields.desc:
+    + [RA] Only list examples of non-standard architectures, since there
+      are now too many combinations to list completely.
+
+ -- Russ Allbery <rra@debian.org>  Sun, 26 Mar 2006 16:16:55 -0800
+
 lintian (1.23.16) unstable; urgency=low
 
   The "What's this Russ guy up to?" release