[SCM] Debian package checker branch, wheezy, updated. 2.5.10.1-4-g6f801f0
The following commit has been merged in the wheezy branch:
commit 1292bf707fc78fbf1a8841d0bcdb4e30c1781482
Author: Niels Thykier <niels@thykier.net>
Date: Tue Aug 7 11:57:50 2012 +0200
c/source-copyright: Use correct line number
Use the correct line number for
comma-separated-files-in-dep5-copyright.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/source-copyright b/checks/source-copyright
index fea9e44..c805590 100644
--- a/checks/source-copyright
+++ b/checks/source-copyright
@@ -199,7 +199,7 @@ if (@dep5) {
}
}
if ($commas_in_files) {
- tag 'comma-separated-files-in-dep5-copyright', 'paragraph at line', $lines[$i]
+ tag 'comma-separated-files-in-dep5-copyright', 'paragraph at line', $lines[$commas_in_files]
unless grep(/,/, $info->sorted_index);
}
while ((my $license, $i) = each %required_standalone_licenses) {
diff --git a/debian/changelog b/debian/changelog
index f8f3cba..b05fa9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
lintian (2.5.10.2) UNRELEASED; urgency=low
* checks/source-copyright{,.desc}:
+ + [NT] Report the correct line number for the use of commas in
+ the "Files" field in DEP-5 copyright files. Thanks to Faheem
+ Mitha for the report. (Closes: #683946)
+ [NT] Mention that syntax-error-in-dep5-copyright may hide
other issues as Lintian skips some DEP-5 checks in this case.
Thanks to Faheem Mitha for the report.
diff --git a/t/tests/source-copyright-dep5-general/tags b/t/tests/source-copyright-dep5-general/tags
index 3f1e1a7..9d43682 100644
--- a/t/tests/source-copyright-dep5-general/tags
+++ b/t/tests/source-copyright-dep5-general/tags
@@ -1,5 +1,5 @@
I: source-copyright-dep5-general source: unused-license-paragraph-in-dep5-copyright expat (paragraph at line 40)
-W: source-copyright-dep5-general source: comma-separated-files-in-dep5-copyright paragraph at line 40
+W: source-copyright-dep5-general source: comma-separated-files-in-dep5-copyright paragraph at line 8
W: source-copyright-dep5-general source: missing-field-in-dep5-copyright copyright (paragraph at line 15)
W: source-copyright-dep5-general source: missing-field-in-dep5-copyright license (paragraph at line 12)
W: source-copyright-dep5-general source: missing-license-paragraph-in-dep5-copyright mit (paragraph at line 18)
--
Debian package checker
Reply to: