[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 1.24.2-4-g8f72771



The following commit has been merged in the master branch:
commit 8f72771b1b52acc9f4e7504b2f5984df673e071e
Author: Peter Pentchev <roam@ringlet.net>
Date:   Fri Jul 18 18:31:52 2008 +0100

    Don't flag the machine-readable copyright "Format-Specification" lines as over-long
    
      * checks/copyright:
        + [ADB] Exclude "Format-Specification" lines when checking for overly-long
          lines.  Patch from Peter Pentchev.  (Closes: #491302)

diff --git a/checks/copyright-file b/checks/copyright-file
index 3f87743..204641a 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -155,7 +155,8 @@ close(IN);
 # matter for the length check.
 my @lines = split ("\n", decode ('utf-8', $_));
 for my $i (0 .. $#lines) {
-    if (length ($lines[$i]) > 80) {
+    if (length ($lines[$i]) > 80 &&
+	$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 d97daea..3bd8891 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 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)
   * checks/debconf:
     + [ADB] Don't complain about unused debconf templates in udebs.
       (Closes: #491135)
diff --git a/testset/copyright/debian/copyright.no-errors b/testset/copyright/debian/copyright.no-errors
index 95aba66..ac71512 100644
--- a/testset/copyright/debian/copyright.no-errors
+++ b/testset/copyright/debian/copyright.no-errors
@@ -3,6 +3,8 @@ Thu, 20 Mar 2008 23:48:15 +0100
 
 It was downloaded from <http://www.example.org/>
 
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?recall=184
+
 Upstream Authors: 
 
     Tobias Toedter <t.toedter@gmx.net>

-- 
Debian package checker


Reply to: