[SCM] Debian package checker branch, master, updated. 2.2.17-39-g981f182
The following commit has been merged in the master branch:
commit 981f182c8039e9565377f8b61a977b959b740fd7
Author: Russ Allbery <rra@debian.org>
Date: Thu Nov 12 21:25:15 2009 -0800
Don't consider Git's patch metadata to be a patch description
* checks/patch-systems:
+ [RA] Don't consider the "index <sha1>..<sha1>" line added by git
diff to be a patch description. (Closes: #553697)
diff --git a/checks/patch-systems b/checks/patch-systems
index 0a29cce..36bf55d 100644
--- a/checks/patch-systems
+++ b/checks/patch-systems
@@ -147,7 +147,7 @@ sub run {
last if /^---/;
next if /^\s*$/;
# Skip common "lead-in" lines
- $has_description = 1 unless (/^(Index: |=+$|diff .+)/);
+ $has_description = 1 unless (/^(Index: |=+$|diff .+|index )/);
}
close(PATCH_FILE);
unless ($has_description) {
diff --git a/debian/changelog b/debian/changelog
index 0fc1242..79b0e10 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -114,6 +114,8 @@ lintian (2.2.18) UNRELEASED; urgency=low
* checks/patch-systems:
+ [RA] Do not issue patch-system-but-no-source-readme for packages in
3.0 (quilt) format. Patch from Stéphane Glondu. (Closes: #553207)
+ + [RA] Don't consider the "index <sha1>..<sha1>" line added by git
+ diff to be a patch description. (Closes: #553697)
* checks/rules.desc:
+ [RA] missing-build-dependency is now serious/possible (ftpmaster
reject unless overridden).
diff --git a/t/tests/patch-systems-quilt-description/debian/debian/patches/03_a_git_patch b/t/tests/patch-systems-quilt-description/debian/debian/patches/03_a_git_patch
new file mode 100644
index 0000000..025656a
--- /dev/null
+++ b/t/tests/patch-systems-quilt-description/debian/debian/patches/03_a_git_patch
@@ -0,0 +1,8 @@
+diff --git a/a b/a
+index eb39593..7258d2f 100644
+--- a 2008-11-11 19:38:12.000000000 +0000
++++ a 2008-11-11 19:38:26.000000000 +0000
+@@ -1 +1,3 @@
+ sample text
+ and some more sample text
++and yet another line
diff --git a/t/tests/patch-systems-quilt-description/debian/debian/patches/series b/t/tests/patch-systems-quilt-description/debian/debian/patches/series
index 49780d7..5117566 100644
--- a/t/tests/patch-systems-quilt-description/debian/debian/patches/series
+++ b/t/tests/patch-systems-quilt-description/debian/debian/patches/series
@@ -1,2 +1,3 @@
01_this_patch_is_ok
02_this_one_has_no_description
+03_a_git_patch
diff --git a/t/tests/patch-systems-quilt-description/tags b/t/tests/patch-systems-quilt-description/tags
index 3485c4c..aa22e9e 100644
--- a/t/tests/patch-systems-quilt-description/tags
+++ b/t/tests/patch-systems-quilt-description/tags
@@ -1 +1,2 @@
I: patch-systems-quilt-description source: quilt-patch-missing-description 02_this_one_has_no_description
+I: patch-systems-quilt-description source: quilt-patch-missing-description 03_a_git_patch
--
Debian package checker
Reply to: