lintian: r480 - in trunk: checks debian testset testset/filenames/debian
Author: djpig
Date: 2005-08-27 01:26:20 +0200 (Sat, 27 Aug 2005)
New Revision: 480
Modified:
trunk/checks/cruft
trunk/checks/cruft.desc
trunk/checks/files
trunk/checks/files.desc
trunk/debian/changelog
trunk/testset/filenames/debian/rules
trunk/testset/tags.filenames
Log:
Also check for .arch-ids/ {arch}/ .arch-inventory and .bzr/
in packages and sources (Closes: #324255)
Modified: trunk/checks/cruft
===================================================================
--- trunk/checks/cruft 2005-08-26 22:35:50 UTC (rev 479)
+++ trunk/checks/cruft 2005-08-26 23:26:20 UTC (rev 480)
@@ -76,6 +76,12 @@
tag "source-contains-CVS-dir", "$name";
} elsif ($name =~ m,^(.+/)?\.svn$,) {
tag "source-contains-svn-control-dir", "$name";
+ } elsif ($name =~ m,^(.+/)?\.bzr$,) {
+ tag "source-contains-bzr-control-dir", "$name";
+ } elsif ($name =~ m,^(.+/)?\{arch\}$,) {
+ tag "source-contains-arch-control-dir", "$name";
+ } elsif ($name =~ m,^(.+/)?\.arch-ids$,) {
+ tag "source-contains-arch-control-dir", "$name";
}
}
@@ -86,6 +92,8 @@
tag "svn-commit-file-in-source", "$name";
} elsif ($name =~ m,^(.+/)?\.cvsignore$,) {
tag "cvsignore-file-in-source", "$name";
+ } elsif ($name =~ m,^(.+/)?\.arch-inventory$,) {
+ tag "arch-inventory-file-in-source", "$name";
} elsif ($name =~ m,^(.+/)?\.\#(.+?)\.\d+(\.\d+)*$,) {
tag "source-contains-cvs-conflict-copy", "$name";
} elsif ($name =~ m,^(.+/)?(.+?)\.(r\d+|mine)$,) {
Modified: trunk/checks/cruft.desc
===================================================================
--- trunk/checks/cruft.desc 2005-08-26 22:35:50 UTC (rev 479)
+++ trunk/checks/cruft.desc 2005-08-26 23:26:20 UTC (rev 480)
@@ -56,12 +56,30 @@
distributed normally. However, since upstream tarball often still contain
those, it's only an informational tag.
+Tag: arch-inventory-file-in-source
+Type: info
+Info: Package contains a '.arch-inventory' file. It may have been included by
+ accident. It is Version Control System metadata that should not be
+ distributed normally.
+
Tag: source-contains-svn-control-dir
Type: warning
Info: Source contains a .svn directory. It was most likely included by
accident, since Subversion version control directories usually don't belong
in packages. Export from subversion rather than checkout.
+Tag: source-contains-bzr-control-dir
+Type: warning
+Info: Source contains a .bzr directory. It was most likely included by
+ accident, since bazaar-ng version control directories usually don't belong
+ in packages.
+
+Tag: source-contains-arch-control-dir
+Type: warning
+Info: Source contains a {arch} or .arch-ids directory. It was most likely
+ included by accident, since Arch version control directories usually don't
+ belong in packages.
+
Tag: source-contains-CVS-dir
Type: warning
Info: Package contains a CVS directory. It was most likely included by
Modified: trunk/checks/files
===================================================================
--- trunk/checks/files 2005-08-26 22:35:50 UTC (rev 479)
+++ trunk/checks/files 2005-08-26 23:26:20 UTC (rev 480)
@@ -468,6 +468,11 @@
tag "cvsignore-file-in-package", "$file";
}
+ # ---------------- arch-inventory files
+ if ($file =~ m/\.arch-inventory$/) {
+ tag "arch-inventory-file-in-package", "$file";
+ }
+
# ---------------- subversion commit message backups
if ($file =~ m/svn-commit.*\.tmp$/) {
tag "svn-commit-file-in-package", "$file";
@@ -576,6 +581,13 @@
if ($file =~ m,/\.svn/?$,) {
tag "package-contains-svn-control-dir", "$file";
}
+ if ($file =~ m,/\.bzr/?$,) {
+ tag "package-contains-bzr-control-dir", "$file";
+ }
+ if (($file =~ m,/\.arch-ids/?$,)
+ || ($file =~ m,/\{arch\}/?$,)) {
+ tag "package-contains-arch-control-dir", "$file";
+ }
if ($file =~ m,/.xvpics/?$,) {
tag "package-contains-xvpics-dir", "$file";
}
Modified: trunk/checks/files.desc
===================================================================
--- trunk/checks/files.desc 2005-08-26 22:35:50 UTC (rev 479)
+++ trunk/checks/files.desc 2005-08-26 23:26:20 UTC (rev 480)
@@ -434,6 +434,18 @@
accident, since Subversion version control directories usually don't belong
in packages.
+Tag: package-contains-bzr-control-dir
+Type: warning
+Info: Package contains a .bzr directory. It was most likely installed by
+ accident, since bazaar-ng version control directories usually don't belong
+ in packages.
+
+Tag: package-contains-arch-control-dir
+Type: warning
+Info: Package contains a {arch} or .arch-ids directory. It was most likely
+ installed by accident, since Arch version control directories usually don't
+ belong in packages.
+
Tag: package-contains-xvpics-dir
Type: error
Info: Package contains a .xvpics directory. It was most likely installed by
@@ -444,6 +456,11 @@
Info: Package contains a '.cvsignore' file. It may have been installed by
accident.
+Tag: arch-inventory-file-in-package
+Type: warning
+Info: Package contains a '.arch-inventory' file. It may have been installed by
+ accident.
+
Tag: svn-commit-file-in-package
Type: warning
Info: Package contains a 'svn-commit(.NNN).tmp' file. This file is almost
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-08-26 22:35:50 UTC (rev 479)
+++ trunk/debian/changelog 2005-08-26 23:26:20 UTC (rev 480)
@@ -25,6 +25,9 @@
* checks/changelog-file:
+ [FL] Detect old FSF address additionally to the even older
one
+ * checks/{cruft,files}{,.desc}:
+ + [FL] Also check for .arch-ids/ {arch}/ .arch-inventory and .bzr/
+ in packages and sources (Closes: #324255)
* checks/debhelper{,.desc}:
+ [FL] Warn about using debhelper compat version lower than 3
like debhelper itself
Modified: trunk/testset/filenames/debian/rules
===================================================================
--- trunk/testset/filenames/debian/rules 2005-08-26 22:35:50 UTC (rev 479)
+++ trunk/testset/filenames/debian/rules 2005-08-26 23:26:20 UTC (rev 480)
@@ -19,8 +19,9 @@
# MA 02110-1301, USA.
clean:
- mkdir -p .svn CVS
+ mkdir -p .svn CVS "{arch}" .arch-ids .bzr
touch files/.cvsignore files/svn-commit.tmp
+ touch files/.arch-inventory
touch 'files/.#Maelstrom Sound.1.1.1' 'files/Maelstrom Sounce.r121'
touch 'files/Maelstrom Sound.mine'
@@ -48,6 +49,10 @@
install -d debian/tmp/usr/lib/perl5/foo
mkdir debian/tmp/usr/lib/perl5/.svn
mkdir debian/tmp/usr/lib/perl5/CVS
+ mkdir "debian/tmp/usr/lib/perl5/{arch}"
+ mkdir debian/tmp/usr/lib/perl5/.arch-ids
+ mkdir debian/tmp/usr/lib/perl5/.bzr
+
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
Modified: trunk/testset/tags.filenames
===================================================================
--- trunk/testset/tags.filenames 2005-08-26 22:35:50 UTC (rev 479)
+++ trunk/testset/tags.filenames 2005-08-26 23:26:20 UTC (rev 480)
@@ -21,14 +21,19 @@
E: filenames: symlink-should-be-relative usr/lib/filenames/symlink3wrong /usr/lib/filenames/symlink2
E: filenames: use-of-compat-symlink usr/bin/X11/
E: filenames: use-of-compat-symlink usr/bin/X11/testxbin
+I: filenames source: arch-inventory-file-in-source files/.arch-inventory
I: filenames source: cvsignore-file-in-source files/.cvsignore
W: filenames source: ancient-standards-version 3.1.1
W: filenames source: source-contains-CVS-dir CVS
+W: filenames source: source-contains-arch-control-dir .arch-ids
+W: filenames source: source-contains-arch-control-dir {arch}
+W: filenames source: source-contains-bzr-control-dir .bzr
W: filenames source: source-contains-cvs-conflict-copy files/.#Maelstrom Sound.1.1.1
W: filenames source: source-contains-svn-conflict-copy files/Maelstrom Sounce.r121
W: filenames source: source-contains-svn-conflict-copy files/Maelstrom Sound.mine
W: filenames source: source-contains-svn-control-dir .svn
W: filenames source: svn-commit-file-in-source files/svn-commit.tmp
+W: filenames: arch-inventory-file-in-package files/.arch-inventory
W: filenames: bad-permissions-for-ali-file usr/lib/ada/adalib/test.ali
W: filenames: binary-without-manpage testxbin
W: filenames: binary-without-manpage testxbin2
@@ -37,6 +42,7 @@
W: filenames: file-in-unusual-dir files/".tif
W: filenames: file-in-unusual-dir files/'\\
W: filenames: file-in-unusual-dir files/.#Maelstrom Sound.1.1.1
+W: filenames: file-in-unusual-dir files/.arch-inventory
W: filenames: file-in-unusual-dir files/.cvsignore
W: filenames: file-in-unusual-dir files/Maelstrom Sounce.r121
W: filenames: file-in-unusual-dir files/Maelstrom Sound
@@ -47,6 +53,9 @@
W: filenames: no-section-field
W: filenames: non-standard-dir-perm usr/lib/filenames/readonly/ 0555 != 0755
W: filenames: package-contains-CVS-dir usr/lib/perl5/CVS/
+W: filenames: package-contains-arch-control-dir usr/lib/perl5/.arch-ids/
+W: filenames: package-contains-arch-control-dir usr/lib/perl5/{arch}/
+W: filenames: package-contains-bzr-control-dir usr/lib/perl5/.bzr/
W: filenames: package-contains-readme-for-other-platform-or-distro usr/share/doc/filenames/README.macosx
W: filenames: package-contains-svn-control-dir usr/lib/perl5/.svn/
W: filenames: package-installs-nonbinary-perl-in-usr-lib-perl5 usr/lib/perl5/foo/ancient.pm
Reply to: