lintian: r72 - in trunk: checks debian testset testset/filenames/debian
Author: djpig
Date: 2004-02-27 01:01:59 +0100 (Fri, 27 Feb 2004)
New Revision: 72
Modified:
trunk/checks/files
trunk/checks/files.desc
trunk/debian/changelog
trunk/testset/filenames/debian/changelog
trunk/testset/filenames/debian/rules
trunk/testset/info_tags.filenames
trunk/testset/tags.filenames
Log:
only issue package-installs-nonbinary-perl-in-usr-lib-perl5 if
there is no binary perl file at all in the package, since this
reflects the way the Installer module behaves (Closes: #199898)
Modified: trunk/checks/files
===================================================================
--- trunk/checks/files 2004-02-26 23:03:42 UTC (rev 71)
+++ trunk/checks/files 2004-02-27 00:01:59 UTC (rev 72)
@@ -28,6 +28,8 @@
my $file;
my $is_python;
my $is_perl;
+my $has_binary_perl_file;
+my @nonbinary_perl_files_in_lib;
my %linked_against_libvga;
my %script = ();
@@ -199,8 +201,11 @@
print "E: $pkg $type: package-installs-packlist $file\n";
}
elsif ($file =~ m,^usr/lib/perl5/.*\.(pl|pm)$,) {
- print "W: $pkg $type: package-installs-nonbinary-perl-in-usr-lib-perl5 $file\n";
+ push @nonbinary_perl_files_in_lib, $file;
}
+ elsif ($file =~ m,^usr/lib/perl5/.*\.(bs|so)$,) {
+ $has_binary_perl_file = 1;
+ }
# ---------------- /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) {
@@ -554,6 +559,12 @@
}
close(IN);
+if (!$has_binary_perl_file && @nonbinary_perl_files_in_lib) {
+ foreach my $file (@nonbinary_perl_files_in_lib) {
+ print "W: $pkg $type: package-installs-nonbinary-perl-in-usr-lib-perl5 $file\n";
+ }
+}
+
exit 0;
# -----------------------------------
Modified: trunk/checks/files.desc
===================================================================
--- trunk/checks/files.desc 2004-02-26 23:03:42 UTC (rev 71)
+++ trunk/checks/files.desc 2004-02-27 00:01:59 UTC (rev 72)
@@ -426,4 +426,6 @@
Tag: package-installs-nonbinary-perl-in-usr-lib-perl5
Type: warning
Info: Architecture-independent Perl code should be placed in
- <tt>/usr/share/perl5</tt>, not <tt>/usr/lib/perl5</tt>.
+ <tt>/usr/share/perl5</tt>, not <tt>/usr/lib/perl5</tt>
+ unless there is at least one architecture-dependent file
+ in the module.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-02-26 23:03:42 UTC (rev 71)
+++ trunk/debian/changelog 2004-02-27 00:01:59 UTC (rev 72)
@@ -34,6 +34,10 @@
* checks/description:
+ fix description-is-dh_make-template check (Closes: #215125)
Fix suggested by Josip Rodin
+ * checks/files:
+ + only issue package-installs-nonbinary-perl-in-usr-lib-perl5 if
+ there is no binary perl file at all in the package, since this
+ reflects the way the Installer module behaves (Closes: #199898)
* unpack/unpack-binpkg-l1: tar uses now h to signal hardlinks which
breaks a lot of our code. so sed'ing it away (Closes: #234545)
Many many thanks to Theodore Y. Ts'o for bringing this to our
Modified: trunk/testset/filenames/debian/changelog
===================================================================
--- trunk/testset/filenames/debian/changelog 2004-02-26 23:03:42 UTC (rev 71)
+++ trunk/testset/filenames/debian/changelog 2004-02-27 00:01:59 UTC (rev 72)
@@ -1,3 +1,11 @@
+filenames (6) unstable; urgency=low
+
+ * Add perl files to check if
+ package-installs-nonbinary-perl-in-usr-lib-perl5 is correctly
+ issued even after attempting to suppress it in some cases
+
+ -- Frank Lichtenheld <djpig@debian.org> Fri, 27 Feb 2004 00:49:44 +0100
+
filenames (5) unstable; urgency=low
* Added check for too long symlink
Modified: trunk/testset/filenames/debian/rules
===================================================================
--- trunk/testset/filenames/debian/rules 2004-02-26 23:03:42 UTC (rev 71)
+++ trunk/testset/filenames/debian/rules 2004-02-27 00:01:59 UTC (rev 72)
@@ -38,6 +38,8 @@
mkdir debian/tmp/usr/lib/perl5/CVS
touch debian/tmp/usr/lib/perl5/foo/.packlist
chmod 644 debian/tmp/usr/lib/perl5/foo/.packlist
+ touch debian/tmp/usr/lib/perl5/foo/bar.pm
+ chmod 644 debian/tmp/usr/lib/perl5/foo/bar.pm
install -d debian/tmp/usr/share/doc/filenames
install -d debian/tmp/usr/share/doc/filenames/examples
touch debian/tmp/usr/share/doc/filenames/examples/__init__.py
Modified: trunk/testset/info_tags.filenames
===================================================================
--- trunk/testset/info_tags.filenames 2004-02-26 23:03:42 UTC (rev 71)
+++ trunk/testset/info_tags.filenames 2004-02-27 00:01:59 UTC (rev 72)
@@ -99,6 +99,13 @@
N:
N: Refer to Policy Manual, section 10.5 for details.
N:
+W: filenames: package-installs-nonbinary-perl-in-usr-lib-perl5 usr/lib/perl5/foo/bar.pm
+N:
+N: Architecture-independent Perl code should be placed in
+N: <tt>/usr/share/perl5</tt>, not <tt>/usr/lib/perl5</tt>
+N: unless there is at least one architecture-dependent file
+N: in the module.
+N:
E: filenames: bad-menu-file-name usr/lib/menu/menu
N:
N: The package installs a file /usr/lib/menu/menu, which is already in
Modified: trunk/testset/tags.filenames
===================================================================
--- trunk/testset/tags.filenames 2004-02-26 23:03:42 UTC (rev 71)
+++ trunk/testset/tags.filenames 2004-02-27 00:01:59 UTC (rev 72)
@@ -17,6 +17,7 @@
W: filenames: package-contains-CVS-dir usr/lib/perl5/CVS/
W: filenames: zero-byte-file-in-doc-directory usr/share/doc/filenames/examples/very_interesting_example
W: filenames: lengthy-symlink usr/share/doc/filenames/version.txt.gz ../filenames/doc/version6.txt.gz
+W: filenames: package-installs-nonbinary-perl-in-usr-lib-perl5 usr/lib/perl5/foo/bar.pm
E: filenames: bad-menu-file-name usr/lib/menu/menu
E: filenames: postinst-does-not-call-updatemenus usr/lib/menu/menu
E: filenames: postrm-does-not-call-updatemenus usr/lib/menu/menu
Reply to: