lintian: r1201 - in trunk: checks debian
Author: djpig
Date: 2008-02-09 20:03:58 +0100 (Sat, 09 Feb 2008)
New Revision: 1201
Modified:
trunk/checks/files
trunk/checks/files.desc
trunk/debian/changelog
Log:
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.
Modified: trunk/checks/files
===================================================================
--- trunk/checks/files 2008-02-09 17:23:23 UTC (rev 1200)
+++ trunk/checks/files 2008-02-09 19:03:58 UTC (rev 1201)
@@ -595,16 +595,11 @@
tag "nfs-temporary-file-in-package", "$file";
}
- # ---------------- cvsignore files
- if ($file =~ m/\.cvsignore$/) {
- tag "cvsignore-file-in-package", "$file";
+ # ---------------- ignore files
+ if ($file =~ m/\.(cvs|git|hg)ignore$/) {
+ tag "vcs-ignore-file-in-package", "$file";
}
- # ---------------- .gitignore files
- if ($file =~ m/\.gitignore$/) {
- tag "gitignore-file-in-package", "$file";
- }
-
# ---------------- arch-inventory files
if ($file =~ m/\.arch-inventory$/) {
tag "arch-inventory-file-in-package", "$file";
@@ -737,21 +732,15 @@
sprintf("%04o != 0755", $operm);
}
if ($file =~ m,/CVS/?$,) {
- tag "package-contains-CVS-dir", "$file";
+ tag "package-contains-vcs-control-dir", "$file";
}
- if ($file =~ m,/\.svn/?$,) {
- tag "package-contains-svn-control-dir", "$file";
+ if ($file =~ m,/\.(svn|bzr|git|hg)/?$,) {
+ tag "package-contains-vcs-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";
+ tag "package-contains-vcs-control-dir", "$file";
}
- if ($file =~ m,/\.git/?$,) {
- tag "package-contains-git-control-dir", "$file";
- }
if ($file =~ m,/.xvpics/?$,) {
tag "package-contains-xvpics-dir", "$file";
}
Modified: trunk/checks/files.desc
===================================================================
--- trunk/checks/files.desc 2008-02-09 17:23:23 UTC (rev 1200)
+++ trunk/checks/files.desc 2008-02-09 19:03:58 UTC (rev 1201)
@@ -568,54 +568,24 @@
.
A better solution might be using symlinks here.
-Tag: package-contains-CVS-dir
+Tag: package-contains-vcs-control-dir
Type: warning
-Info: Package contains a CVS directory. It was most likely installed by
- accident, since transient CVS data usually doesn't belong in packages.
+Info: 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.
-Tag: package-contains-svn-control-dir
-Type: warning
-Info: Package contains a .svn directory. It was most likely installed by
- 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-git-control-dir
-Type: warning
-Info: Package contains a .git directory. It was most likely included by
- accident, since GIT 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
accident, since thumbnails usually don't belong in packages.
-Tag: cvsignore-file-in-package
+Tag: vcs-ignore-file-in-package
Type: warning
-Info: Package contains a .cvsignore file. This file is used by the CVS
- revision control system to specify untracked files that it should ignore.
+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.
-Tag: gitignore-file-in-package
-Type: error
-Info: Package contains a .gitignore file. This file is used by the Git
- 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.
-
Tag: arch-inventory-file-in-package
Type: warning
Info: Package contains a '.arch-inventory' file. It may have been
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-02-09 17:23:23 UTC (rev 1200)
+++ trunk/debian/changelog 2008-02-09 19:03:58 UTC (rev 1201)
@@ -3,6 +3,11 @@
* checks/control-files{.desc,}:
+ [FL] Warn about empty control files. I can't see any use for
them. Exclude udebs though, since they might differ there.
+ * 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.
* checks/cruft{.desc,}:
+ [FL] Add hg to the list of <vcs>-control-dir tags.
* checks/md5sums{.desc,}:
Reply to: