[SCM] Debian package checker branch, master, updated. 1.24.2-11-gcced3c4
The following commit has been merged in the master branch:
commit ccbf6090b2e01f62f5c71c3ecbb51f3ca537c0c3
Author: Russ Allbery <rra@debian.org>
Date: Sun Jul 20 21:21:28 2008 -0700
Exclude single words on header lines from copyright long line
Modify the fix to exclude Format-Specification headers from the long
line check in copyright files to exclude any case with something like
a header followed by a single word.
diff --git a/checks/copyright-file b/checks/copyright-file
index d5271a4..b9edf10 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -155,10 +155,10 @@ close(IN);
# matter for the length check.
my @lines = split ("\n", decode ('utf-8', $_));
for my $i (0 .. $#lines) {
- if (length ($lines[$i]) > 80 &&
- $lines[$i] !~ m/^[\s.o*+-]*\S+$/ &&
- $lines[$i] !~ m{^Format-Specification:\s*http://wiki.debian.org/Proposals/CopyrightFormat}) {
- tag "debian-copyright-line-too-long", "line " . ($i+1);
+ if (length ($lines[$i]) > 80
+ and $lines[$i] !~ m/^[\s.o*+-]*\S+$/
+ and $lines[$i] !~ m/^[^:]+:\s+\S+$/) {
+ tag "debian-copyright-line-too-long", "line " . ($i + 1);
}
}
diff --git a/debian/changelog b/debian/changelog
index 94a860b..419a5d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
lintian (1.24.3) unstable; urgency=low
* checks/copyright:
- + [ADB] Exclude "Format-Specification" lines when checking for overly-long
- lines. Patch from Peter Pentchev. (Closes: #491302)
+ + [ADB,RA] Exclude header-like lines where the value has no whitespace
+ when checking for long lines. This will avoid false positives for
+ the Format-Specification: line and similar cases. Based on a patch
+ from Peter Pentchev. (Closes: #491302)
+ [ADB] Don't flag lines only containing one word as overly long. They're
likely to be URLs and may not be easily shortenable to under 80
characters. (Closes: #491365)
--
Debian package checker
Reply to: