[SCM] Debian package checker branch, master, updated. 1.24.2-8-gc9a6d8b
The following commit has been merged in the master branch:
commit c9a6d8bb24b820bc2fab19121397f55379e5d2e5
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Fri Jul 18 23:45:32 2008 +0100
Only flag a copyright line as overly long if it contains multiple words.
* checks/copyright
+ [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)
diff --git a/checks/copyright-file b/checks/copyright-file
index 28cc769..d5271a4 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -156,6 +156,7 @@ close(IN);
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);
}
diff --git a/debian/changelog b/debian/changelog
index f70f209..baf80f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ 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] 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)
* checks/debconf:
+ [ADB] Don't complain about unused debconf templates in udebs.
(Closes: #491135)
diff --git a/testset/copyright/debian/copyright.misc-errors b/testset/copyright/debian/copyright.misc-errors
index 50c5213..d4cbc95 100644
--- a/testset/copyright/debian/copyright.misc-errors
+++ b/testset/copyright/debian/copyright.misc-errors
@@ -22,3 +22,5 @@ This line is overly long. It should be less than 80 characters so that it fits n
This line isn't too long, but ćōňţăĭņş a number of UTF-8 characters which
could make it appear to be if improperly decoded.
+The following line is too long, but may not be easily able to be shortened:
+http://foo.bar.baz.example.com/foobarmodule/someotherpath/which/is/really/rather/long/
--
Debian package checker
Reply to: