lintian: r84 - in branches/1.22.11+udeb: branches/1.22.11+udeb/checks branches/1.22.11+udeb/debian
Author: djpig
Date: 2004-03-04 21:44:03 +0100 (Thu, 04 Mar 2004)
New Revision: 84
Modified:
branches/1.22.11+udeb/checks/binaries
branches/1.22.11+udeb/checks/control-files
branches/1.22.11+udeb/checks/control-files.desc
branches/1.22.11+udeb/checks/debconf
branches/1.22.11+udeb/checks/description
branches/1.22.11+udeb/checks/fields
branches/1.22.11+udeb/checks/files
branches/1.22.11+udeb/debian/changelog
Log:
Remove a bunch of false positives noted by Joey Hess
Modified: branches/1.22.11+udeb/checks/binaries
===================================================================
--- branches/1.22.11+udeb/checks/binaries 2004-03-04 19:50:25 UTC (rev 83)
+++ branches/1.22.11+udeb/checks/binaries 2004-03-04 20:44:03 UTC (rev 84)
@@ -156,6 +156,7 @@
# binary or shared object?
next unless ($info =~ m/executable/) or ($info =~ m/shared object/);
+ next if $type eq 'udeb';
# statically linked?
my %libc5_binary;
Modified: branches/1.22.11+udeb/checks/control-files
===================================================================
--- branches/1.22.11+udeb/checks/control-files 2004-03-04 19:50:25 UTC (rev 83)
+++ branches/1.22.11+udeb/checks/control-files 2004-03-04 20:44:03 UTC (rev 84)
@@ -51,6 +51,7 @@
);
my %ctrl = $type eq 'udeb' ? %ctrl_udeb : %ctrl_deb;
+my %ctrl_alt = $type eq 'udeb' ? %ctrl_deb : %ctrl_udeb;
# process control-index file
open(IN,"control-index") or fail("cannot open control-index file: $!");
@@ -70,8 +71,13 @@
# valid control file?
unless ( exists $ctrl{$file} ) {
- print "E: $pkg $type: unknown-control-file $file\n";
- next;
+ if ( exists $ctrl_alt{$file} ) {
+ print "E: $pkg $type: not-allowed-control-file $file\n";
+ next;
+ } else {
+ print "E: $pkg $type: unknown-control-file $file\n";
+ next;
+ }
}
# skip `control' control file (that's an exception: dpkg doesn't care and
Modified: branches/1.22.11+udeb/checks/control-files.desc
===================================================================
--- branches/1.22.11+udeb/checks/control-files.desc 2004-03-04 19:50:25 UTC (rev 83)
+++ branches/1.22.11+udeb/checks/control-files.desc 2004-03-04 20:44:03 UTC (rev 84)
@@ -1,7 +1,7 @@
Check-Script: control-files
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: ctl
-Standards-Version: 3.2.0
+Standards-Version: 3.6.1
Type: binary, udeb
Unpack-Level: 1
@@ -10,6 +10,13 @@
Info: The package contains an `unknown' control file, which should be
removed.
+Tag: not-allowed-control-file
+Type: error
+Info: The package contains a control file that is not allowed in this
+ type of package. Some control files are only allowed in either .deb
+ or .udeb packages and must not be included in packages of the other
+ type. You should probably just remove the file.
+
Tag: control-file-has-bad-permissions
Type: error
Info: The postinst, postrm, preinst, and prerm control files should use
Modified: branches/1.22.11+udeb/checks/debconf
===================================================================
--- branches/1.22.11+udeb/checks/debconf 2004-03-04 19:50:25 UTC (rev 83)
+++ branches/1.22.11+udeb/checks/debconf 2004-03-04 20:44:03 UTC (rev 84)
@@ -201,7 +201,7 @@
if ($file eq 'postinst' and not $db_input and m/db_input/) {
# TODO: Perl?
print "W: $pkg $type: postinst-uses-db-input\n"
- if $type ne 'udeb';
+ unless $type eq 'udeb';
$db_input=1;
}
if (not $isdefault and m/db_fset.*isdefault/) {
@@ -212,14 +212,16 @@
if (not $usesseen and m/db_f[sg]et\s+\S+\s+seen\s+/) {
unless (Dep::implies($alldependencies,
Dep::parse('debconf (>= 0.5)'))) {
- print "E: $pkg $type: seen-flag-requires-versioned-depends $file\n";
+ print "E: $pkg $type: seen-flag-requires-versioned-depends $file\n"
+ unless $type eq 'udeb';
}
$usesseen = 1;
}
}
unless ($usesconfmodule) {
- print "W: $pkg $type: $file-does-not-load-confmodule\n";
+ print "W: $pkg $type: $file-does-not-load-confmodule\n"
+ unless $type eq 'udeb';
}
close IN;
@@ -246,13 +248,15 @@
if ($usesmultiselect) {
unless (Dep::implies($alldependencies,
Dep::parse('debconf (>= 0.2.26)'))) {
- print "W: $pkg $type: multiselect-without-dependency\n";
+ print "W: $pkg $type: multiselect-without-dependency\n"
+ unless $type eq 'udeb';
}
} elsif ($usespreinst) {
unless (Dep::implies($dependencies{'pre-depends'},
Dep::parse('debconf (>= 0.2.17)'))
or Dep::implies($dependencies{'depends'}, Dep::parse('debconf'))) {
- print "W: $pkg $type: missing-debconf-dependency-for-preinst\n";
+ print "W: $pkg $type: missing-debconf-dependency-for-preinst\n"
+ unless $type eq 'udeb';
}
} else {
unless (Dep::implies($alldependencies, Dep::parse('debconf'))) {
Modified: branches/1.22.11+udeb/checks/description
===================================================================
--- branches/1.22.11+udeb/checks/description 2004-03-04 19:50:25 UTC (rev 83)
+++ branches/1.22.11+udeb/checks/description 2004-03-04 20:44:03 UTC (rev 84)
@@ -121,7 +121,7 @@
close(IN);
if ($lines == 0) {
- print "E: $pkg $type: extended-description-is-empty\n";
+ print "E: $pkg $type: extended-description-is-empty\n" unless $type eq 'udeb';
}
exit 0;
Modified: branches/1.22.11+udeb/checks/fields
===================================================================
--- branches/1.22.11+udeb/checks/fields 2004-03-04 19:50:25 UTC (rev 83)
+++ branches/1.22.11+udeb/checks/fields 2004-03-04 20:44:03 UTC (rev 84)
@@ -321,8 +321,7 @@
my $versioned;
if ($#alternates >= 1) {
- if ( ($type eq 'udeb') ||
- ($fld ne 'depends' and $fld ne 'recommends' and
+ if ( ($fld ne 'depends' and $fld ne 'recommends' and
$fld ne 'suggests' and $fld ne 'pre-depends')) {
tag_error("alternates-not-allowed", "$fld:", $conj);
}
Modified: branches/1.22.11+udeb/checks/files
===================================================================
--- branches/1.22.11+udeb/checks/files 2004-03-04 19:50:25 UTC (rev 83)
+++ branches/1.22.11+udeb/checks/files 2004-03-04 20:44:03 UTC (rev 84)
@@ -207,7 +207,7 @@
}
# ---------------- /usr/lib -- needs to go after the other usr/lib/*
elsif ($file =~ m,^usr/lib/,) {
- if ($file =~ m,\.(gif|jpeg|jpg|png|tiff|xpm|xbm)$, and not defined $link) {
+ if ($type ne 'udeb' and $file =~ m,\.(gif|jpeg|jpg|png|tiff|xpm|xbm)$, and not defined $link) {
print "W: $pkg $type: image-file-in-usr-lib $file\n"
}
}
@@ -241,7 +241,7 @@
}
}
# ---------------- /usr subdirs
- elsif ($file =~ m,^usr/[^/]+/$, ) { # FSSTND dirs
+ elsif ($type ne 'udeb' and $file =~ m,^usr/[^/]+/$, ) { # FSSTND dirs
if ( $file =~ m,^usr/(dict|doc|etc|info|man|adm|preserve)/,) {
print "E: $pkg $type: FSSTND-dir-in-usr $file\n";
}
@@ -259,7 +259,7 @@
}
}
# ---------------- /var subdirs
- elsif ($file =~ m,^var/[^/]+/$,) { # FSSTND dirs
+ elsif ($type ne 'udeb' and $file =~ m,^var/[^/]+/$,) { # FSSTND dirs
if ( $file =~ m,^var/(adm|catman|named|nis|preserve)/, ) {
print "W: $pkg $type: FSSTND-dir-in-var $file\n";
}
@@ -268,7 +268,7 @@
print "E: $pkg $type: non-standard-dir-in-var $file\n";
}
}
- elsif ($file =~ m,^var/lib/games/.,) {
+ elsif ($type ne 'udeb' and $file =~ m,^var/lib/games/.,) {
print "E: $pkg $type: non-standard-dir-in-var $file\n";
}
# ---------------- /opt
@@ -315,7 +315,8 @@
# ---------------- any files
if ($perm !~ m/^d/) {
- unless ($file =~ m,^usr/(bin|dict|doc|games|include|info|lib|man|sbin|share|src|X11R6)/, or
+ unless ($type eq 'udeb' or
+ $file =~ m,^usr/(bin|dict|doc|games|include|info|lib|man|sbin|share|src|X11R6)/, or
$file =~ m,^lib/(modules/|libc5-compat/)?, or
$file =~ m,^var/(games|lib|www|named)/, or
$file =~ m,^(bin|boot|dev|etc|sbin)/, or
@@ -503,7 +504,7 @@
$link =~ m,^/?([^/]+),;
my $linktop = $1;
- if ($filetop eq $linktop) {
+ if ($type ne 'udeb' and $filetop eq $linktop) {
# absolute links within one toplevel directory are _not_ ok!
print "E: $pkg $type: symlink-should-be-relative $file $link\n";
}
@@ -536,7 +537,7 @@
if ($#pathcomponents == -1) {
# we've reached the root directory
- if ($filetop ne $linktop) {
+ if ($type ne 'udeb' and $filetop ne $linktop) {
# relative link into other toplevel directory
print "E: $pkg $type: symlink-should-be-absolute $file $link\n";
}
Modified: branches/1.22.11+udeb/debian/changelog
===================================================================
--- branches/1.22.11+udeb/debian/changelog 2004-03-04 19:50:25 UTC (rev 83)
+++ branches/1.22.11+udeb/debian/changelog 2004-03-04 20:44:03 UTC (rev 84)
@@ -1,3 +1,10 @@
+lintian (1.22.11+udeb1) unstable; urgency=low
+
+ * Sync with final 1.22.11 version
+ * Remove many false positives noted by Joey Hess
+
+ -- Frank Lichtenheld <djpig@debian.org> Thu, 4 Mar 2004 21:43:13 +0100
+
lintian (1.22.11+udeb) unstable; urgency=low
* Add support for udeb packages
Reply to: