[SCM] Debian package checker branch, master, updated. 2.2.18-76-g497084a
The following commit has been merged in the master branch:
commit 497084aae267eeb0fafb330a2cc2eebd5f9d0b05
Author: Russ Allbery <rra@debian.org>
Date: Fri Dec 25 16:32:12 2009 -0800
Allow DEP-3 headers in dpatch patches
* checks/patch-systems{,.desc}:
+ [RA] Allow DEP-3 headers in dpatch patches to satisfy the
description requirement. Thanks, Paul Gevers. (Closes: #548640)
Also reference DEP-3 in the dpatch-patch-missing-description long
description and add a test suite for some dpatch issues.
diff --git a/checks/patch-systems b/checks/patch-systems
index 4a22b8a..0f5b060 100644
--- a/checks/patch-systems
+++ b/checks/patch-systems
@@ -94,7 +94,8 @@ 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*(\S.*)$/ && $1 !~ /^no description\.?$/i)
+ $has_comment = 1 if (/^\#+\s*DP:\s*(\S.*)$/ && $1 !~ /^no description\.?$/i);
+ $has_comment = 1 if (/^\# (?:Description|Subject)/);
}
close(PATCH_FILE);
unless ($has_comment) {
diff --git a/checks/patch-systems.desc b/checks/patch-systems.desc
index 48abc8f..b65c0d9 100644
--- a/checks/patch-systems.desc
+++ b/checks/patch-systems.desc
@@ -35,7 +35,9 @@ Info: dpatch files should carry a description of the included patch.
report (if any), Debian or upstream bugs fixed by it, upstream status,
the Debian version and date the patch was first included, and any other
information that would be useful if someone were investigating the
- patch and underlying problem.
+ patch and underlying problem. Please consider using the DEP-3 format for
+ this information.
+Ref: http://dep.debian.net/deps/dep3/
Tag: quilt-build-dep-but-no-series-file
Severity: normal
diff --git a/debian/changelog b/debian/changelog
index 72684d2..16f2853 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,9 +69,11 @@ lintian (2.3.0) UNRELEASED; urgency=low
* checks/ocaml{,.desc}:
+ [RA] New checks for OCaml packaging. Contributed by Stéphane
Glondu. (Closes: #528367)
- * checks/patch-systems.desc:
- + [RA] Recommend DEP-3 format in quilt-patch-missing-description and
+ * checks/patch-systems{,.desc}:
+ + [RA] Recommend DEP-3 in {dpatch,quilt}-patch-missing-description and
reference the document. Thanks, Raphaël Hertzog. (Closes: #554025)
+ + [RA] Allow DEP-3 headers in dpatch patches to satisfy the
+ description requirement. Thanks, Paul Gevers. (Closes: #548640)
* checks/rules{,.desc}:
+ [RA] Remove build-depends-without-arch-dep. If the package only
builds architecture-independent packages, the distinction between
diff --git a/t/tests/patch-systems-dpatch-description/debian/debian/README.source b/t/tests/patch-systems-dpatch-description/debian/debian/README.source
new file mode 100644
index 0000000..4ff54b4
--- /dev/null
+++ b/t/tests/patch-systems-dpatch-description/debian/debian/README.source
@@ -0,0 +1 @@
+I am using dpatch.
diff --git a/t/tests/debhelper-dh-clean-k-ok/debian/debian/control.in b/t/tests/patch-systems-dpatch-description/debian/debian/control.in
similarity index 90%
copy from t/tests/debhelper-dh-clean-k-ok/debian/debian/control.in
copy to t/tests/patch-systems-dpatch-description/debian/debian/control.in
index 76b52f1..626e982 100644
--- a/t/tests/debhelper-dh-clean-k-ok/debian/debian/control.in
+++ b/t/tests/patch-systems-dpatch-description/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 6)
+Build-Depends: debhelper (>= 7.0.50~), dpatch
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/testset/scripts/debian/patches/00list b/t/tests/patch-systems-dpatch-description/debian/debian/patches/00list
similarity index 95%
copy from testset/scripts/debian/patches/00list
copy to t/tests/patch-systems-dpatch-description/debian/debian/patches/00list
index 3b9d37e..52ee366 100644
--- a/testset/scripts/debian/patches/00list
+++ b/t/tests/patch-systems-dpatch-description/debian/debian/patches/00list
@@ -9,3 +9,4 @@
// and again a comment
04_i_dont_have_a_description_either.patch
+05_dep3.diff
diff --git a/testset/scripts/debian/patches/00list.sparc b/t/tests/patch-systems-dpatch-description/debian/debian/patches/00list.sparc
similarity index 100%
copy from testset/scripts/debian/patches/00list.sparc
copy to t/tests/patch-systems-dpatch-description/debian/debian/patches/00list.sparc
diff --git a/testset/scripts/debian/patches/00options b/t/tests/patch-systems-dpatch-description/debian/debian/patches/00options
similarity index 100%
copy from testset/scripts/debian/patches/00options
copy to t/tests/patch-systems-dpatch-description/debian/debian/patches/00options
diff --git a/testset/scripts/debian/patches/02_i_dont_have_a_description.patch b/t/tests/patch-systems-dpatch-description/debian/debian/patches/02_i_dont_have_a_description.patch
similarity index 100%
copy from testset/scripts/debian/patches/02_i_dont_have_a_description.patch
copy to t/tests/patch-systems-dpatch-description/debian/debian/patches/02_i_dont_have_a_description.patch
diff --git a/testset/scripts/debian/patches/03_specified_without_dpatch.dpatch b/t/tests/patch-systems-dpatch-description/debian/debian/patches/03_specified_without_dpatch.dpatch
similarity index 100%
copy from testset/scripts/debian/patches/03_specified_without_dpatch.dpatch
copy to t/tests/patch-systems-dpatch-description/debian/debian/patches/03_specified_without_dpatch.dpatch
diff --git a/testset/scripts/debian/patches/04_i_dont_have_a_description_either.patch b/t/tests/patch-systems-dpatch-description/debian/debian/patches/04_i_dont_have_a_description_either.patch
similarity index 100%
copy from testset/scripts/debian/patches/04_i_dont_have_a_description_either.patch
copy to t/tests/patch-systems-dpatch-description/debian/debian/patches/04_i_dont_have_a_description_either.patch
diff --git a/t/tests/patch-systems-dpatch-description/debian/debian/patches/05_dep3.diff b/t/tests/patch-systems-dpatch-description/debian/debian/patches/05_dep3.diff
new file mode 100644
index 0000000..51d8417
--- /dev/null
+++ b/t/tests/patch-systems-dpatch-description/debian/debian/patches/05_dep3.diff
@@ -0,0 +1,7 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_dep3.diff by Russ Allbery <rra@debian.org>
+#
+# Description: Patch using the DEP-3 patch header
+# Author: Russ Allbery <rra@debian.org>
+
+@DPATCH@
diff --git a/t/tests/patch-systems-dpatch-description/desc b/t/tests/patch-systems-dpatch-description/desc
new file mode 100644
index 0000000..939e7d1
--- /dev/null
+++ b/t/tests/patch-systems-dpatch-description/desc
@@ -0,0 +1,7 @@
+Testname: patch-systems-dpatch-description
+Sequence: 6000
+Version: 1.0
+Description: Test patch-system tags for a dpatch package
+Test-For:
+ dpatch-index-references-non-existent-patch
+ dpatch-missing-description
diff --git a/t/tests/patch-systems-dpatch-description/tags b/t/tests/patch-systems-dpatch-description/tags
new file mode 100644
index 0000000..6734827
--- /dev/null
+++ b/t/tests/patch-systems-dpatch-description/tags
@@ -0,0 +1,4 @@
+E: patch-systems-dpatch-description source: dpatch-index-references-non-existent-patch 01_not_here_right_now.dpatch
+E: patch-systems-dpatch-description source: dpatch-index-references-non-existent-patch 01_some_other_patch_thats_not_in_the_package.dpatch
+I: patch-systems-dpatch-description source: dpatch-missing-description 02_i_dont_have_a_description.patch
+I: patch-systems-dpatch-description source: dpatch-missing-description 04_i_dont_have_a_description_either.patch
--
Debian package checker
Reply to: