[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

lintian: r1205 - in trunk: checks debian testset testset/filenames/debian



Author: rra
Date: 2008-02-10 19:28:00 +0100 (Sun, 10 Feb 2008)
New Revision: 1205

Modified:
   trunk/checks/files
   trunk/checks/files.desc
   trunk/debian/changelog
   trunk/testset/filenames/debian/rules
   trunk/testset/tags.filenames
Log:
Merge the arch-inventory file in with the other VCS ignore files and
update some of the long descriptions for the tags about VCS files in
an installed package.  Based on a patch by Chris Lamb.


Modified: trunk/checks/files
===================================================================
--- trunk/checks/files	2008-02-10 18:22:41 UTC (rev 1204)
+++ trunk/checks/files	2008-02-10 18:28:00 UTC (rev 1205)
@@ -595,16 +595,11 @@
 	    tag "nfs-temporary-file-in-package", "$file";
 	}
 
-	# ---------------- ignore files
-	if ($file =~ m/\.(cvs|git|hg)ignore$/) {
-	    tag "vcs-ignore-file-in-package", "$file";
+	# ---------------- vcs control files
+	if ($file =~ m/\.((cvs|git|hg)ignore|arch-inventory|hgtags|hg_archival\.txt)$/) {
+	    tag "package-contains-vcs-control-file", "$file";
 	}
 
-	# ---------------- arch-inventory files
-	if ($file =~ m/\.arch-inventory$/) {
-	    tag "arch-inventory-file-in-package", "$file";
-	}
-
 	# ---------------- subversion and svk commit message backups
 	if ($file =~ m/svn-commit.*\.tmp$/) {
 	    tag "svn-commit-file-in-package", "$file";

Modified: trunk/checks/files.desc
===================================================================
--- trunk/checks/files.desc	2008-02-10 18:22:41 UTC (rev 1204)
+++ trunk/checks/files.desc	2008-02-10 18:28:00 UTC (rev 1205)
@@ -570,7 +570,7 @@
 
 Tag: package-contains-vcs-control-dir
 Type: warning
-Info: Package contains a control directory for a version control system.
+Info: The package contains a control directory for a version control system.
  It was most likely installed by accident, since version control directories
  usually don't belong in packages.
 
@@ -579,29 +579,25 @@
 Info: Package contains a .xvpics directory. It was most likely installed by
  accident, since thumbnails usually don't belong in packages.
 
-Tag: vcs-ignore-file-in-package
+Tag: package-contains-vcs-control-file
 Type: warning
-Info: Package contains a .(cvs|git|hg)ignore file.  This file is used by
- the revision control system to specify untracked files that it should ignore.
- This file is generally useless in an installed package and was probably
- installed by accident.
+Info: The package contains a VCS control file such as .(cvs|git|hg)ignore.
+ Files such as these are used by revision control systems to, for example,
+ specify untracked files it should ignore or inventory files.  This file
+ is generally useless in an installed package and was probably 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
- certainly a left-over from a failed Subversion commit, and does not belong
- in a Debian package.
+Info: The package contains an svn-commit(.NNN).tmp file.  This file is
+ almost certainly a left-over from a failed Subversion commit, and does
+ not belong in a Debian package.
 
 Tag: svk-commit-file-in-package
 Type: warning
-Info: Package contains a 'svk-commitNNN.tmp' file.  This file is almost
- certainly a left-over from a failed Subversion commit, and does not belong
- in a Debian package.
+Info: The package contains an svk-commitNNN.tmp file.  This file is almost
+ certainly a left-over from a failed Subversion commit, and does not
+ belong in a Debian package.
 
 Tag: nested-examples-directory
 Type: error

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-02-10 18:22:41 UTC (rev 1204)
+++ trunk/debian/changelog	2008-02-10 18:28:00 UTC (rev 1205)
@@ -7,10 +7,11 @@
     + [RA] Tests for copyright notices must be case-insensitive.  Patch
       from Chris Lamb.  (Closes: #464992)
   * checks/files{.desc,}:
-    + [FL] Merge all the tags for vcs ignore files and vcs control
-      dirs. Since the explanations don't actually differ, different
-      tags make no sense. While at it, add the mercurial equivalents
-      as well.
+    + [FL,RA] Merge all the tags for vcs ignore files, inventory files,
+      and vcs control dirs. Since the explanations don't actually differ,
+      different tags make no sense. While at it, add the mercurial
+      equivalents as well and update some of the tag descriptions. Partly
+      based on a patch by Chris Lamb.
   * checks/cruft{.desc,}:
     + [FL] Add hg to the list of <vcs>-control-dir tags.
   * checks/md5sums{.desc,}:

Modified: trunk/testset/filenames/debian/rules
===================================================================
--- trunk/testset/filenames/debian/rules	2008-02-10 18:22:41 UTC (rev 1204)
+++ trunk/testset/filenames/debian/rules	2008-02-10 18:28:00 UTC (rev 1205)
@@ -54,6 +54,9 @@
 	mkdir debian/tmp/usr/lib/perl5/.bzr
 	install -d debian/tmp/usr/share/perl5
 	echo foo > debian/tmp/usr/lib/perl5/foo/.gitignore
+	echo foo > debian/tmp/usr/lib/perl5/foo/.hgignore
+	echo foo > debian/tmp/usr/lib/perl5/foo/.hgtags
+	echo foo > debian/tmp/usr/lib/perl5/foo/.hg_archival.txt
 
 	touch debian/tmp/usr/lib/perl5/foo/.packlist
 	chmod 644 debian/tmp/usr/lib/perl5/foo/.packlist

Modified: trunk/testset/tags.filenames
===================================================================
--- trunk/testset/tags.filenames	2008-02-10 18:22:41 UTC (rev 1204)
+++ trunk/testset/tags.filenames	2008-02-10 18:28:00 UTC (rev 1205)
@@ -48,7 +48,6 @@
 W: filenames source: diff-contains-svn-conflict-file files/Maelstrom Sound.mine
 W: filenames source: diff-contains-svn-control-dir .svn
 W: filenames source: no-section-field-for-source
-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 usr/X11R6/bin/testxbin2
 W: filenames: binary-without-manpage usr/bin/X11/testxbin
@@ -92,6 +91,12 @@
 W: filenames: package-contains-vcs-control-dir usr/lib/perl5/.svn/
 W: filenames: package-contains-vcs-control-dir usr/lib/perl5/CVS/
 W: filenames: package-contains-vcs-control-dir usr/lib/perl5/{arch}/
+W: filenames: package-contains-vcs-control-file files/.arch-inventory
+W: filenames: package-contains-vcs-control-file files/.cvsignore
+W: filenames: package-contains-vcs-control-file usr/lib/perl5/foo/.gitignore
+W: filenames: package-contains-vcs-control-file usr/lib/perl5/foo/.hg_archival.txt
+W: filenames: package-contains-vcs-control-file usr/lib/perl5/foo/.hgignore
+W: filenames: package-contains-vcs-control-file usr/lib/perl5/foo/.hgtags
 W: filenames: package-installs-into-etc-gconf-schemas etc/gconf/schemas/test.schema
 W: filenames: package-installs-nonbinary-perl-in-usr-lib-perl5 usr/lib/perl5/foo/ancient.pm
 W: filenames: package-installs-nonbinary-perl-in-usr-lib-perl5 usr/lib/perl5/foo/bar.pm
@@ -102,8 +107,6 @@
 W: filenames: symlink-is-self-recursive usr/lib/filenames/symlink6ok+warn .
 W: filenames: symlink-is-self-recursive usr/lib/filenames/symlink7ok+warn /
 W: filenames: symlink-should-be-relative usr/lib/filenames/symlink3wrong /usr/lib/filenames/symlink2
-W: filenames: vcs-ignore-file-in-package files/.cvsignore
-W: filenames: vcs-ignore-file-in-package usr/lib/perl5/foo/.gitignore
 W: filenames: windows-thumbnail-database-in-package usr/share/doc/filenames/Thumbs.db
 W: filenames: wrong-name-for-debian-news-file usr/share/doc/filenames/news.debian.gz
 W: filenames: zero-byte-file-in-doc-directory usr/share/doc/filenames/NEWS.Debian


Reply to: