The following commit has been merged in the master branch:
commit 3c3c00dd57393c4916ef85b757432e8211ac6d03
Author: Niels Thykier <ni...@thykier.net>
Date: Thu Dec 23 18:31:34 2010 +0100
Extended diff-contains-substvars check to also catch <package>.substvars.
(not closing #598251, since there is still no d/*.debhelper(.log)?
check)
* checks/cruft{,.desc}:
+ [NT] Extended the diff-contains-substvars check to also catch files
prefixed with a package name.
diff --git a/checks/cruft b/checks/cruft
index 34ab8d9..859ba82 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -237,7 +237,7 @@ sub check_diffstat {
}
# Additional special checks only for the diff, not the full source.
- if ($file eq 'debian/substvars') {
+ if ($file =~ m...@^debian/(?:.+\.)?substvars$@) {
tag 'diff-contains-substvars', $file;
}
}
@@ -275,7 +275,7 @@ sub check_debfiles {
}
# Additional special checks only for the diff, not the full source.
- if ($name eq 'substvars') {
+ if ($name =~ m@(?:.+\.)?substvars$@) {
tag 'diff-contains-substvars', "debian/$name";
}
}
diff --git a/checks/cruft.desc b/checks/cruft.desc
index 12923a6..31198fc 100644
--- a/checks/cruft.desc
+++ b/checks/cruft.desc
@@ -303,9 +303,9 @@ Tag: diff-contains-substvars
Severity: normal
Certainty: certain
Info: Lintian found a substvars file in the Debian diff for this source
- package. The debian/substvars file is usually generated and modified
- dynamically by debian/rules targets, in which case it must be removed by
- the clean target.
+ package. The debian/substvars (or debian/<package>.substvars) file is
+ usually generated and modified dynamically by debian/rules targets, in
+ which case it must be removed by the clean target.
Ref: policy 4.9
Tag: empty-debian-diff
diff --git a/debian/changelog b/debian/changelog
index 1ad605c..54c2559 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ lintian (2.4.4) UNRELEASED; urgency=low
+ [RA] Exclude kfreebsd-kernel-di-{amd64,i386} from the
embedded-zlib check since it's in the kernel. (Closes: #593397)
+ [RG] Add swipl to the list of known interpreters. (Closes: #591316)
+ * checks/cruft{,.desc}:
+ + [NT] Extended the diff-contains-substvars check to also catch files
+ prefixed with a package name.
* checks/debhelper:
+ [NT] Fix dependency check for dh_nativejava, default-jdk has never
provided dh_nativejava. (Closes: #606506)
diff --git a/t/tests/cruft-general-diff/debian/debian/substvars
b/t/tests/cruft-general-diff/debian/debian/somepackage.substvars
similarity index 100%
copy from t/tests/cruft-general-diff/debian/debian/substvars
copy to t/tests/cruft-general-diff/debian/debian/somepackage.substvars
diff --git a/t/tests/cruft-general-diff/desc b/t/tests/cruft-general-diff/desc
index df2634d..bad829d 100644
--- a/t/tests/cruft-general-diff/desc
+++ b/t/tests/cruft-general-diff/desc
@@ -22,3 +22,4 @@ Test-For:
diff-contains-svn-commit-file
diff-contains-svn-conflict-file
diff-contains-svn-control-dir
+References: Debian Bug#598251
diff --git a/t/tests/cruft-general-diff/tags b/t/tests/cruft-general-diff/tags
index fb885b4..212d326 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-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
W: cruft-general-diff source: diff-contains-svn-commit-file svn-commit.tmp
diff --git a/t/tests/cruft-general-diff/debian/debian/substvars
b/t/tests/cruft-general-quilt/debian/debian/somepackage.substvars
similarity index 100%
copy from t/tests/cruft-general-diff/debian/debian/substvars
copy to t/tests/cruft-general-quilt/debian/debian/somepackage.substvars
diff --git a/t/tests/cruft-general-quilt/desc b/t/tests/cruft-general-quilt/desc
index 0d99b05..ec26a3d 100644
--- a/t/tests/cruft-general-quilt/desc
+++ b/t/tests/cruft-general-quilt/desc
@@ -21,3 +21,4 @@ Test-For:
diff-contains-svn-commit-file
diff-contains-svn-conflict-file
diff-contains-svn-control-dir
+References: Debian Bug#598251
diff --git a/t/tests/cruft-general-quilt/tags b/t/tests/cruft-general-quilt/tags
index c5fb443..e26ae3c 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-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
W: cruft-general-quilt source: diff-contains-svn-commit-file
debian/svn-commit.tmp
--
Debian package checker
--
To UNSUBSCRIBE, email to debian-lint-maint-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pvp3a-0001di...@alioth.debian.org
