[SCM] Debian package checker branch, master, updated. 2.5.6-82-g70e0a10
The following commit has been merged in the master branch:
commit 70e0a10d838dec24b86d3c90cd1094541af652ac
Author: Niels Thykier <niels@thykier.net>
Date: Wed Apr 11 09:49:54 2012 +0200
cruft: check for .pc in debian/
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/cruft b/checks/cruft
index c97901e..ece468f 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -65,6 +65,9 @@ my @directory_checks =
[ qr,^(.+/)?\.hg$, => 'hg-control-dir' ],
[ qr,^(.+/)?\.be$, => 'bts-control-dir' ],
[ qr,^(.+/)?\.ditrack$, => 'bts-control-dir' ],
+
+ # Special case (can only be triggered for diffs)
+ [ qr,^(.+/)?\.pc$, => 'quilt-control-dir' ],
);
# File checks. These regexes match files that shouldn't be in the source
@@ -325,6 +328,9 @@ sub find_cruft {
# Ignore the .pc directory and its contents, created as part of the
# unpacking of a 3.0 (quilt) source package.
if (-d and $_ eq '.pc') {
+ # NB: this catches all .pc dirs (regardless of depth). If you
+ # change that, please check we have a
+ # "source-contains-quilt-control-dir" tag.
$File::Find::prune = 1;
return;
}
diff --git a/checks/cruft.desc b/checks/cruft.desc
index 7ed6828..a42acd4 100644
--- a/checks/cruft.desc
+++ b/checks/cruft.desc
@@ -190,6 +190,16 @@ Info: The Debian diff or native package contains files in a directory
respectively.
Ref: dpkg-source(1)
+Tag: diff-contains-quilt-control-dir
+Severity: normal
+Certainty: certain
+Info: The Debian diff or native package contains files in a directory
+ used by quilt, which are not useful in a diff or native package.
+ <tt>dpkg-source</tt> will automatically exclude these if it is passed
+ <tt>-I</tt> or <tt>-i</tt> for native and non-native packages
+ respectively.
+Ref: dpkg-source(1)
+
Tag: source-contains-bts-control-dir
Severity: pedantic
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 8fd61c8..1e728b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ lintian (2.5.7) UNRELEASED; urgency=low
* Summary of tag changes:
+ Added:
+ - diff-contains-quilt-control-dir
- rc-version-greater-than-expected-version
- udeb-uses-unsupported-compression-for-data-tarball
+ Removed:
@@ -41,6 +42,8 @@ lintian (2.5.7) UNRELEASED; urgency=low
Instead replace it with a more generalized one that derivatives
can reuse by extending vendor specific data files. Thanks to
Daniel Dehennin for the suggestion. (Closes: #648777)
+ * checks/cruft{,.desc}:
+ + [NT] Check for quilt control dirs in the debian packaging files.
* checks/deb-format{,.desc}:
+ [NT] Replace old udeb compression tag with a more general
one. (Closes: #664600)
diff --git a/t/tests/cruft-general-diff/desc b/t/tests/cruft-general-diff/desc
index bad829d..e234f48 100644
--- a/t/tests/cruft-general-diff/desc
+++ b/t/tests/cruft-general-diff/desc
@@ -17,6 +17,7 @@ Test-For:
diff-contains-hg-control-dir
diff-contains-hg-tags-file
diff-contains-patch-failure-file
+ diff-contains-quilt-control-dir
diff-contains-substvars
diff-contains-svk-commit-file
diff-contains-svn-commit-file
diff --git a/t/tests/cruft-general-diff/pre_build b/t/tests/cruft-general-diff/pre_build
index c594074..537b323 100755
--- a/t/tests/cruft-general-diff/pre_build
+++ b/t/tests/cruft-general-diff/pre_build
@@ -20,6 +20,8 @@ mkdir "${dir}/.hg"
echo 'diff-contains-hg-control-dir' > "${dir}/.hg/foo"
mkdir "${dir}/.be"
echo 'diff-contains-bts-control-dir' > "${dir}/.be/foo"
+mkdir "${dir}/.pc"
+echo 'diff-contains-quilt-control-dir' > "${dir}/.pc/foo"
echo 'diff-contains-cmake-cache-file' > "${dir}/CMakeCache.txt"
echo 'diff-contains-svn-commit-file' > "${dir}/svn-commit.tmp"
diff --git a/t/tests/cruft-general-diff/tags b/t/tests/cruft-general-diff/tags
index 212d326..1067251 100644
--- a/t/tests/cruft-general-diff/tags
+++ b/t/tests/cruft-general-diff/tags
@@ -11,6 +11,7 @@ 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-quilt-control-dir .pc
W: cruft-general-diff source: diff-contains-substvars debian/somepackage.substvars
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-quilt/desc b/t/tests/cruft-general-quilt/desc
index ec26a3d..370bd7c 100644
--- a/t/tests/cruft-general-quilt/desc
+++ b/t/tests/cruft-general-quilt/desc
@@ -16,6 +16,7 @@ Test-For:
diff-contains-hg-control-dir
diff-contains-hg-tags-file
diff-contains-patch-failure-file
+ diff-contains-quilt-control-dir
diff-contains-substvars
diff-contains-svk-commit-file
diff-contains-svn-commit-file
diff --git a/t/tests/cruft-general-quilt/pre_build b/t/tests/cruft-general-quilt/pre_build
index 78f359c..53e0ddd 100755
--- a/t/tests/cruft-general-quilt/pre_build
+++ b/t/tests/cruft-general-quilt/pre_build
@@ -20,6 +20,8 @@ mkdir "${dir}/.hg"
echo 'diff-contains-hg-control-dir' > "${dir}/.hg/foo"
mkdir "${dir}/.be"
echo 'diff-contains-bts-control-dir' > "${dir}/.be/foo"
+mkdir "${dir}/.pc"
+echo 'diff-contains-quilt-control-dir' > "${dir}/.pc/foo"
echo 'diff-contains-cmake-cache-file' > "${dir}/CMakeCache.txt"
echo 'diff-contains-svn-commit-file' > "${dir}/svn-commit.tmp"
diff --git a/t/tests/cruft-general-quilt/tags b/t/tests/cruft-general-quilt/tags
index e26ae3c..1362016 100644
--- a/t/tests/cruft-general-quilt/tags
+++ b/t/tests/cruft-general-quilt/tags
@@ -10,6 +10,7 @@ W: cruft-general-quilt source: diff-contains-git-control-dir debian/.git
W: cruft-general-quilt source: diff-contains-hg-control-dir debian/.hg
W: cruft-general-quilt source: diff-contains-hg-tags-file debian/.hgtags
W: cruft-general-quilt source: diff-contains-patch-failure-file debian/foo.rej
+W: cruft-general-quilt source: diff-contains-quilt-control-dir debian/.pc
W: cruft-general-quilt source: diff-contains-substvars debian/somepackage.substvars
W: cruft-general-quilt source: diff-contains-substvars debian/substvars
W: cruft-general-quilt source: diff-contains-svk-commit-file debian/svk-commit444.tmp
--
Debian package checker
Reply to: