[SCM] Debian package checker branch, master, updated. 2.1.5-7-ge286baf
The following commit has been merged in the master branch:
commit e286baf6a895a08206057eee541e728adb4c700c
Author: Russ Allbery <rra@debian.org>
Date: Sun Jan 11 11:23:00 2009 -0800
Warn about .hgtags files in the diff and source
* checks/cruft{,.desc}:
+ [RA] Warn about .hgtags files in the diff and source. Thanks,
Holger Levsen and Chris Lamb. (Closes: #464837)
Also reorganize the cruft.desc file a bit to keep like things grouped.
diff --git a/checks/cruft b/checks/cruft
index 4fcaab0..6710b28 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -66,6 +66,7 @@ my @file_checks =
([ qr,^(.+/)?svn-commit\.(.+\.)?tmp$, => 'svn-commit-file' ],
[ qr,^(.+/)?svk-commit.+\.tmp$, => 'svk-commit-file' ],
[ qr,^(.+/)?\.arch-inventory$, => 'arch-inventory-file' ],
+ [ qr,^(.+/)?\.hgtags$, => 'hg-tags-file' ],
[ qr,^(.+/)?\.\#(.+?)\.\d+(\.\d+)*$, => 'cvs-conflict-copy' ],
[ qr,^(.+/)?(.+?)\.(r\d+)$, => 'svn-conflict-file' ],
[ qr,\.(orig|rej)$, => 'patch-failure-file', 1 ],
diff --git a/checks/cruft.desc b/checks/cruft.desc
index d32076c..1dfff4d 100644
--- a/checks/cruft.desc
+++ b/checks/cruft.desc
@@ -156,6 +156,21 @@ Info: The upstream source contains a .hg directory. It was most likely
an upstream release tarball contains .hg directories, you should usually
report this as a bug upstream.
+Tag: diff-contains-bts-control-dir
+Severity: normal
+Certainty: certain
+Info: The Debian diff or native package contains files in a directory
+ used by a bug tracking system, which are not useful in a diff or native
+ package. Passing <tt>-i</tt> to <tt>dpkg-buildpackage</tt> or the
+ equivalent will automatically exclude them.
+
+Tag: source-contains-bts-control-dir
+Severity: wishlist
+Certainty: certain
+Info: The upstream source contains a directory used by a bug tracking
+ system. It was most likely included by accident since bug tracking system
+ directories usually don't belong in releases.
+
Tag: diff-contains-svn-commit-file
Severity: minor
Certainty: certain
@@ -198,6 +213,23 @@ Info: The upstream source contains an <tt>.arch-inventory</tt> file. This
is Arch metadata that should normally not be distributed. You may want
to report this as an upstream bug.
+Tag: diff-contains-hg-tags-file
+Severity: normal
+Certainty: certain
+Info: The Debian diff or native package contains an <tt>.htgags</tt>
+ file. This file is Mercurial metadata that should normally not be
+ distributed. It stores hashes of tagged commits in a Mercurial
+ repository and isn't therefore useful without the repository.
+
+Tag: source-contains-hg-tags-file
+Severity: wishlist
+Certainty: certain
+Info: The upstream source contains an <tt>.htgags</tt> file. This file is
+ Mercurial metadata that should normally not be distributed. It stores
+ hashes of tagged commits in a Mercurial repository and isn't therefore
+ useful without the repository. You may want to report this as an
+ upstream bug.
+
Tag: diff-contains-cvs-conflict-copy
Severity: normal
Certainty: certain
@@ -308,18 +340,3 @@ Info: The referenced file seems to be from a libtool version
If you have not updated the file but fixed architecture-specific
issues with minimal patches and verified that it builds correctly
please override this tag. lintian will not be able to verify that.
-
-Tag: diff-contains-bts-control-dir
-Severity: normal
-Certainty: certain
-Info: The Debian diff or native package contains files in a directory
- used by a bug tracking system, which are not useful in a diff or native
- package. Passing <tt>-i</tt> to <tt>dpkg-buildpackage</tt> or the
- equivalent will automatically exclude them.
-
-Tag: source-contains-bts-control-dir
-Severity: wishlist
-Certainty: certain
-Info: The upstream source contains a directory used by a bug tracking
- system. It was most likely included by accident since bug tracking system
- directories usually don't belong in releases.
diff --git a/debian/changelog b/debian/changelog
index 39f9b73..4694cc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,15 @@ lintian (2.1.6) UNRELEASED; urgency=low
* Summary of tag changes:
+ Added
- diff-contains-cmake-cache-file
+ - diff-contains-hg-tags-file
- malformed-changes-file
+ - source-contains-hg-tags-file
* checks/cruft{,.desc}:
+ [RA] Error on CMakeCache.txt files added or modified in the diff.
Thanks, Joerg Jaspert. (Closes: #510957)
+ + [RA] Warn about .hgtags files in the diff and source. Thanks,
+ Holger Levsen and Chris Lamb. (Closes: #464837)
* checks/lintian.desc:
+ [RA] Add tag description for malformed-changes-file.
diff --git a/t/tests/6000_cruft-general-diff.desc b/t/tests/6000_cruft-general-diff.desc
index 3208df6..75fc346 100644
--- a/t/tests/6000_cruft-general-diff.desc
+++ b/t/tests/6000_cruft-general-diff.desc
@@ -14,6 +14,7 @@ Test-For:
diff-contains-editor-backup-file
diff-contains-git-control-dir
diff-contains-hg-control-dir
+ diff-contains-hg-tags-file
diff-contains-patch-failure-file
diff-contains-substvars
diff-contains-svk-commit-file
diff --git a/t/tests/6000_cruft-general-upstream.desc b/t/tests/6000_cruft-general-upstream.desc
index fad1d66..6890663 100644
--- a/t/tests/6000_cruft-general-upstream.desc
+++ b/t/tests/6000_cruft-general-upstream.desc
@@ -12,6 +12,7 @@ Test-For:
source-contains-cvs-control-dir
source-contains-git-control-dir
source-contains-hg-control-dir
+ source-contains-hg-tags-file
source-contains-svk-commit-file
source-contains-svn-commit-file
source-contains-svn-conflict-file
diff --git a/t/tests/cruft-general-diff/pre_build b/t/tests/cruft-general-diff/pre_build
index 6d34e47..c594074 100755
--- a/t/tests/cruft-general-diff/pre_build
+++ b/t/tests/cruft-general-diff/pre_build
@@ -25,6 +25,7 @@ echo 'diff-contains-cmake-cache-file' > "${dir}/CMakeCache.txt"
echo 'diff-contains-svn-commit-file' > "${dir}/svn-commit.tmp"
echo 'diff-contains-svk-commit-file' > "${dir}/svk-commit444.tmp"
echo 'diff-contains-arch-inventory-file' > "${dir}/.arch-inventory"
+echo 'diff-contains-hg-tags-file' > "${dir}/.hgtags"
echo 'diff-contains-cvs-conflict-copy' > "${dir}/.#foo.1.1"
echo 'diff-contains-svn-conflict-file' > "${dir}/foo.r1352"
echo 'diff-contains-patch-failure-file' > "${dir}/foo.rej"
diff --git a/t/tests/cruft-general-diff/tags b/t/tests/cruft-general-diff/tags
index 66337aa..fb885b4 100644
--- a/t/tests/cruft-general-diff/tags
+++ b/t/tests/cruft-general-diff/tags
@@ -9,6 +9,7 @@ W: cruft-general-diff source: diff-contains-cvs-control-dir CVS
W: cruft-general-diff source: diff-contains-editor-backup-file foo~
W: cruft-general-diff source: diff-contains-git-control-dir .git
W: cruft-general-diff source: diff-contains-hg-control-dir .hg
+W: cruft-general-diff source: diff-contains-hg-tags-file .hgtags
W: cruft-general-diff source: diff-contains-patch-failure-file foo.rej
W: cruft-general-diff source: diff-contains-substvars debian/substvars
W: cruft-general-diff source: diff-contains-svk-commit-file svk-commit444.tmp
diff --git a/t/tests/cruft-general-upstream/pre_upstream b/t/tests/cruft-general-upstream/pre_upstream
index 775778b..f8e75e7 100755
--- a/t/tests/cruft-general-upstream/pre_upstream
+++ b/t/tests/cruft-general-upstream/pre_upstream
@@ -25,6 +25,7 @@ echo 'source-contains-bts-control-dir' > "${dir}/.be/foo"
echo 'source-contains-svn-commit-file' > "${dir}/svn-commit.tmp"
echo 'source-contains-svk-commit-file' > "${dir}/svk-commit444.tmp"
echo 'source-contains-arch-inventory-file' > "${dir}/.arch-inventory"
+echo 'source-contains-hg-tags-file' > "${dir}/.hgtags"
echo 'source-contains-cvs-conflict-copy' > "${dir}/.#foo.1.1"
echo 'source-contains-svn-conflict-file' > "${dir}/foo.r1352"
diff --git a/t/tests/cruft-general-upstream/tags b/t/tests/cruft-general-upstream/tags
index cba0fd2..07a6e7e 100644
--- a/t/tests/cruft-general-upstream/tags
+++ b/t/tests/cruft-general-upstream/tags
@@ -6,6 +6,7 @@ I: cruft-general-upstream source: source-contains-cvs-conflict-copy .#foo.1.1
I: cruft-general-upstream source: source-contains-cvs-control-dir CVS
I: cruft-general-upstream source: source-contains-git-control-dir .git
I: cruft-general-upstream source: source-contains-hg-control-dir .hg
+I: cruft-general-upstream source: source-contains-hg-tags-file .hgtags
I: cruft-general-upstream source: source-contains-svk-commit-file svk-commit444.tmp
I: cruft-general-upstream source: source-contains-svn-commit-file svn-commit.tmp
I: cruft-general-upstream source: source-contains-svn-conflict-file foo.r1352
--
Debian package checker
Reply to: