[SCM] Debian package checker branch, master, updated. 1.24.2-15-g4b52a88

["Adam D. Barratt" <adam@adam-barratt.org.uk>]

The following commit has been merged in the master branch:
commit 4b52a883ec06200e3b10d6fa90bd9b075c4799aa
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Tue Jul 22 18:42:11 2008 +0100

    Drop debian-copyright-line-too-long
    
     * checks/copyright-file{,.desc}:
       + [ADB] Drop the "copyright line too long" check.  Most of the issues
         it flags aren't easily fixable, particularly where the copyright file
         is (semi)automatically generated.  (Closes: #491302, #491365, #491685)

diff --git a/checks/copyright-file b/checks/copyright-file
index cb2e175..78849c7 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -149,26 +149,6 @@ local $/ = undef;
 $_ = <IN>;
 close(IN);
 
-# We have to decode into UTF-8 to get the right length for the length
-# check.  For some reason, use open ':utf8' isn't sufficient.  If the
-# file uses a non-UTF-8 encoding, this will mangle it, but it doesn't
-# matter for the length check.
-my @lines = split ("\n", decode ('utf-8', $_));
-my $longcount = 0;
-for my $i (0 .. $#lines) {
-    if (length ($lines[$i]) > 80
-	and $lines[$i] !~ m/^[\s.o*+-]*\S+$/
-	and $lines[$i] !~ m/^[^:]+:\s+\S+$/) {
-	$longcount++;
-	tag "debian-copyright-line-too-long", "line " . ($i + 1)
-	    if ($longcount <= 5 or $ENV{LINTIAN_DEBUG});
-    }
-}
-if ($longcount > 5) {
-    tag "debian-copyright-line-too-long", ($longcount - 5),
-	"more occurrences not shown";
-}
-
 my $wrong_directory_detected = 0;
 
 if (m,\<fill in (http/)?ftp site\>, or m/\<Must follow here\>/) {
diff --git a/checks/copyright-file.desc b/checks/copyright-file.desc
index 4481595..1977198 100644
--- a/checks/copyright-file.desc
+++ b/checks/copyright-file.desc
@@ -267,10 +267,3 @@ Info: This package appears to be covered by the GNU GPL but depends on
  override for this tag.  Lintian currently has no good way of
  distinguishing between that case and problematic packages.
 
-Tag: debian-copyright-line-too-long
-Type: warning
-Info: One or more lines in the copyright file contain more than 80 characters.
- For the benefit of users of 80x25 terminals, it is recommended that the
- lines do not exceed 80 characters.
-Ref: policy 12.5
-
diff --git a/debian/changelog b/debian/changelog
index ad0a61d..18dc2f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,9 @@
 lintian (1.24.3) unstable; urgency=low
 
-  * checks/copyright-file:
-    + [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)
-    + [RA] Suppress warnings about long lines beyond the first five to cut
-      down on volume from badly formatted files.
+  * checks/copyright-file{,.desc}:
+    + [ADB] Drop the "copyright line too long" check.  Most of the issues
+      it flags aren't easily fixable, particularly where the copyright file
+      is (semi)automatically generated.  (Closes: #491302, #491365, #491685)
   * checks/debconf:
     + [ADB] Don't complain about unused debconf templates in udebs.
       (Closes: #491135)

-- 
Debian package checker