lintian: r1363 - in trunk: checks debian testset testset/relations/debian
Author: rra
Date: 2008-06-07 11:00:44 +0200 (Sat, 07 Jun 2008)
New Revision: 1363
Modified:
trunk/checks/common_data.pm
trunk/checks/fields
trunk/checks/fields.desc
trunk/debian/changelog
trunk/testset/relations/debian/control
trunk/testset/tags.debug
Log:
+ [RA] Merge %non_standard_archs into %known_archs.
+ [RA] Remove non-standard-architecture-in-source-relation and
non-standard-architecture. These aren't bugs.
Modified: trunk/checks/common_data.pm
===================================================================
--- trunk/checks/common_data.pm 2008-06-07 08:44:14 UTC (rev 1362)
+++ trunk/checks/common_data.pm 2008-06-07 09:00:44 UTC (rev 1363)
@@ -21,21 +21,15 @@
%known_archs %known_sections %known_non_us_parts %known_archive_parts
%known_prios %known_source_fields %known_binary_fields %known_udeb_fields
%known_obsolete_fields %known_essential %known_build_essential
- %known_obsolete_packages %known_obsolete_emacs %known_virtual_packages
+ %known_obsolete_emacs %known_virtual_packages
%known_libstdcs %known_tcls %known_tclxs %known_tks %known_tkxs
%known_libpngs %known_x_metapackages
- %non_standard_archs %all_cpus %all_oses
+ %all_cpus %all_oses
%known_doc_base_formats
);
# simple defines for commonly needed data
-# From /usr/share/dpkg/archtable, included here to make lintian results
-# consistent no matter what dpkg one has installed.
-%known_archs = map { $_ => 1 }
- ('i386', 'ia64', 'alpha', 'amd64', 'arm', 'armel', 'hppa', 'm68k', 'mips',
- 'mipsel', 'powerpc', 's390', 'sparc', 'hurd-i386', '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 }
@@ -56,14 +50,14 @@
# this reduces the necessary updating.
#
# armel and lpia are special cases, so handle them separately here. (They're
-# handled separately in /usr/share/dpkg/triplettable.)
-%non_standard_archs = map { $_ => 1 }
+# handled separately in /usr/share/dpkg/triplettable.) any and all are also
+# special cases.
+%known_archs = map { $_ => 1 }
grep { !$known_archs{$_} }
(keys %all_cpus,
map { my $os = $_; map { "$os-$_" } keys %all_cpus } keys %all_oses),
- ('armel', 'lpia');
+ ('armel', 'lpia', 'any', 'all');
-
%known_sections = map { $_ => 1 }
('admin', 'comm', 'devel', 'doc', 'editors', 'electronics',
'embedded', 'games', 'gnome', 'graphics', 'hamradio', 'interpreters',
Modified: trunk/checks/fields
===================================================================
--- trunk/checks/fields 2008-06-07 08:44:14 UTC (rev 1362)
+++ trunk/checks/fields 2008-06-07 09:00:44 UTC (rev 1363)
@@ -201,11 +201,7 @@
}
for my $arch (@archs) {
- if ($non_standard_archs{$arch}) {
- tag "non-standard-architecture", "$arch";
- } elsif (! $known_archs{$arch}) {
- tag "unknown-architecture", "$arch";
- }
+ tag "unknown-architecture", "$arch" unless $known_archs{$arch};
}
if ($type eq "binary") {
@@ -672,9 +668,7 @@
my ($d_pkg, $d_version, $d_arch, $rest, $part_d_orig) = @$part_d;
for my $arch (@{$d_arch->[0]}) {
- if ($non_standard_archs{$arch}) {
- tag "non-standard-arch-in-source-relation", "$arch [$field: $part_d_orig]";
- } elsif (!$known_archs{$arch} && $arch ne "any" && $arch ne "all") {
+ if (!$known_archs{$arch}) {
tag "invalid-arch-string-in-source-relation", "$arch [$field: $part_d_orig]"
}
}
Modified: trunk/checks/fields.desc
===================================================================
--- trunk/checks/fields.desc 2008-06-07 08:44:14 UTC (rev 1362)
+++ trunk/checks/fields.desc 2008-06-07 09:00:44 UTC (rev 1363)
@@ -67,20 +67,12 @@
Tag: unknown-architecture
Type: warning
-Info: In addition to the special values `all' and `any', the architecture
- names alpha, arm, hppa, hurd-i386, i386, ia64, m68k, mips, mipsel, powerpc,
- s390, and sparc are currently in use. The special value `source' is only
- used in .changes files and does not make sense in a binary package or a
- .dsc file.
+Info: This package claims to be for an unknown architecture. The
+ architecture should be one of the values supported by dpkg or one of the
+ special values "all" or "any". The special value "source" is only used
+ in *.changes files and does not make sense in a binary package or a *.dsc
+ file.
-Tag: non-standard-architecture
-Type: info
-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. Examples
- include kfreebsd-i386 and ppc64.
-
Tag: too-many-architectures
Type: error
Info: A binary package should list exactly one architecture (the one it is
@@ -457,11 +449,6 @@
A common cause of this is a comma in the arch, i.e. [i386, m68k], it should
be [i386 m68k].
-Tag: non-standard-arch-in-source-relation
-Type: info
-Info: The architecture string in the source relation is one of the
- architectures still waiting to be included in the archive.
-
Tag: depends-on-build-essential-package-without-using-version
Type: error
Ref: policy 4.2
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-06-07 08:44:14 UTC (rev 1362)
+++ trunk/debian/changelog 2008-06-07 09:00:44 UTC (rev 1363)
@@ -10,6 +10,7 @@
* checks/common_data.pm:
+ [RA] armel is now a standard architecture.
+ [RA] Remove %known_obsolete_packages, now handled via data.
+ + [RA] Merge %non_standard_archs into %known_archs.
* checks/control-file{.desc,}:
+ [RA] Check for self-dependencies in the source package since the
current dpkg-gencontrol silently fixes them but they may indicate
@@ -34,6 +35,8 @@
allow a dependency on any package name that starts the same as the
debug package up to the first dash. This will hopefully produce
fewer false positives. Thanks, Josselin Mouette. (Closes: #476587)
+ + [RA] Remove non-standard-architecture-in-source-relation and
+ non-standard-architecture. These aren't bugs.
* checks/filenames{.desc,}:
+ [RA] Warn about BTS data directories in packages (.be and
.ditrack). Patch by Ben Finney. (Closes: #481787)
Modified: trunk/testset/relations/debian/control
===================================================================
--- trunk/testset/relations/debian/control 2008-06-07 08:44:14 UTC (rev 1362)
+++ trunk/testset/relations/debian/control 2008-06-07 09:00:44 UTC (rev 1363)
@@ -4,7 +4,7 @@
Build-Depends: mail-transport-agent, libc6-dev, findutils, foo (= 3) [!amd64 !i386], bar, arch-test1 [i386], arch-test2 [!i386], quilt (>= 0.40), perl, python-all-dev
Build-Depends-Indep: make, bash, debmake, build-essential, baz (= 2.0),
car (>= 1.0), car (<= 2.0), caz (= 1.0) [amd64], caz (>= 2.0) [i386],
- caz (= 2.0) [powerpc], perl (>= 5.0), foo (<< 4) [!amd64 !i386], libfoo (>= 1.2-1)
+ caz (= 2.0) [powerpc], perl (>= 5.0), foo (<< 4) [!amd64 !i386], libfoo (>= 1.2-1), bozzle [kfreebsd-i386]
Build-Conflicts: foo [amd64 i386], bar [alpha test], xlibs-dev, arch-test1 [powerpc], arch-test2 [!sparc]
Build-Conflicts-Indep: debmake [!powerpc]
Maintainer: Debian QA Group <packages@qa.debian.org>
Modified: trunk/testset/tags.debug
===================================================================
--- trunk/testset/tags.debug 2008-06-07 08:44:14 UTC (rev 1362)
+++ trunk/testset/tags.debug 2008-06-07 09:00:44 UTC (rev 1363)
@@ -5,8 +5,6 @@
E: libhello0-dbg: binary-with-bad-dynamic-table ./usr/lib/libhello.so.dbg
E: libhello0-dbg: missing-dependency-on-libc needed by ./usr/lib/debug/lib/libhello.so.0.0 and 1 others
E: libhello0-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libhello.so.dbg
-I: debug source: non-standard-architecture kfreebsd-i386
-I: debug source: non-standard-architecture ppc64
W: debug source: ancient-standards-version 3.7.0 (current is 3.8.0)
W: debug source: changelog-should-not-mention-nmu
W: debug source: debhelper-script-needs-versioned-build-depends dh_icons (>= 5.0.51~)
Reply to: