[SCM] Debian package checker branch, master, updated. 2.0.0-35-g68f9119
The following commit has been merged in the master branch:
commit 68f91190ccbf89274926f99060334681f30b7e1a
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Fri Oct 31 19:24:38 2008 +0000
Don't count "## DP: " as a dpatch description.
Don't include dpatch comment lines containing no content when
determining whether the patch includes a description. (Closes: #503695)
diff --git a/checks/patch-systems b/checks/patch-systems
index 8a28e0e..4be2fe2 100644
--- a/checks/patch-systems
+++ b/checks/patch-systems
@@ -104,7 +104,7 @@ sub run {
#stop if something looking like a patch starts:
last if /^---/;
#note comment if we find a proper one
- $has_comment = 1 if (/^\#+\s*DP:\s*(.*)$/ && $1 !~ /^no description\.?$/i)
+ $has_comment = 1 if (/^\#+\s*DP:\s*(\S.*)$/ && $1 !~ /^no description\.?$/i)
}
close(PATCH_FILE);
unless ($has_comment) {
diff --git a/debian/changelog b/debian/changelog
index 3e5bbf5..d57119c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ lintian (2.1.0) unstable; urgency=low
+ [FL] Use $known_shells_regex from common_data.
* checks/menus:
+ [FL] Use $known_shells_regex from common_data.
+ * checks/patch-systems:
+ + [ADB] Don't include dpatch comment lines containing no content
+ when determining whether the patch includes a description.
+ (Closes: #503695)
* check/scripts:
+ [FL] Use $known_shells_regex from common_data.
diff --git a/testset/scripts/debian/patches/00list b/testset/scripts/debian/patches/00list
index fd3c7ee..3b9d37e 100644
--- a/testset/scripts/debian/patches/00list
+++ b/testset/scripts/debian/patches/00list
@@ -7,3 +7,5 @@
*/02_i_dont_have_a_description.patch 03_specified_without_dpatch
// and again a comment
+
+04_i_dont_have_a_description_either.patch
diff --git a/testset/scripts/debian/patches/03_specified_without_dpatch.dpatch b/testset/scripts/debian/patches/04_i_dont_have_a_description_either.patch
similarity index 52%
copy from testset/scripts/debian/patches/03_specified_without_dpatch.dpatch
copy to testset/scripts/debian/patches/04_i_dont_have_a_description_either.patch
index 8303ac6..b603f16 100644
--- a/testset/scripts/debian/patches/03_specified_without_dpatch.dpatch
+++ b/testset/scripts/debian/patches/04_i_dont_have_a_description_either.patch
@@ -1,5 +1,7 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_i_dont_have_a_description_either.patch by Adam D. Barratt <adam@adam-barratt.org.uk>
+##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Listed in 00list without .dpatch suffix.
+## DP:
@DPATCH@
diff --git a/testset/tags.scripts b/testset/tags.scripts
index 37f87f7..de83d2f 100644
--- a/testset/tags.scripts
+++ b/testset/tags.scripts
@@ -27,6 +27,7 @@ W: scripts source: ancient-standards-version 3.2.1 (current is 3.8.0)
W: scripts source: binary-arch-rules-but-pkg-is-arch-indep
W: scripts source: debian-watch-file-uses-deprecated-sf-redirector-method
W: scripts source: dpatch-missing-description 02_i_dont_have_a_description.patch
+W: scripts source: dpatch-missing-description 04_i_dont_have_a_description_either.patch
W: scripts source: maintainer-script-lacks-debhelper-token debian/postinst
W: scripts source: maintainer-script-lacks-debhelper-token debian/postrm
W: scripts source: package-uses-deprecated-debhelper-compat-version 1
--
Debian package checker
Reply to: