[SCM] Debian package checker branch, master, updated. 2.2.6-65-g69bc0fc

["Russ Allbery" <rra@debian.org>]

The following commit has been merged in the master branch:
commit 057f02a937928cf4d0ac066a421879f2d72ea118
Author: Russ Allbery <rra@debian.org>
Date:   Sun Mar 8 17:26:00 2009 -0700

    Adjust description checks for new whitespace handling
    
    * checks/description{,.desc}:
      + [RA] Remove description-synopsis-has-leading-spaces.  Policy
        explicitly says this is not a bug.  Adjust for the changes to Util
        that preserve leading whitespace in continued fields.

diff --git a/checks/description b/checks/description
index c390251..bc9686d 100644
--- a/checks/description
+++ b/checks/description
@@ -30,7 +30,6 @@ my $pkg = shift;
 my $type = shift;
 my $info = shift;
 
-my $ppkg = quotemeta($pkg);
 my $tabs = 0;
 my $lines = 0;
 my $template = 0;
@@ -55,12 +54,7 @@ unless (defined $synopsis) {
 if ($synopsis =~ m/^\s*$/) {
     tag "description-synopsis-is-empty", "";
 } else {
-    # Current dpkg-gencontrol appears to fix this automatically so this
-    # tag will never trigger with a current dpkg-dev.
-    if ($synopsis =~ m/^\s/) {
-	tag "description-synopsis-has-leading-spaces", "";
-    }
-    if ($synopsis =~ m/^\s*$ppkg\b/i) {
+    if ($synopsis =~ m/^\Q$pkg\E\b/i) {
 	tag "description-starts-with-package-name", "";
     }
     if ($synopsis =~ m/(?<!etc)\.\s*$/i) {
@@ -72,7 +66,7 @@ if ($synopsis =~ m/^\s*$/) {
     if (length($synopsis) >= 80) {
 	tag "description-too-long", "";
     }
-    if ($synopsis =~ m/^\s*missing\s*$/i) {
+    if ($synopsis =~ m/^missing\s*$/i) {
 	tag "description-is-debmake-template", "" unless $template++;
     } elsif ($synopsis =~ m/<insert up to 60 chars description>/) {
 	tag "description-is-dh_make-template", "" unless $template++;
@@ -82,8 +76,7 @@ if ($synopsis =~ m/^\s*$/) {
 my $flagged_homepage;
 my $is_dummy;
 foreach (split /\n/, $description) {
-    next if m/^\s*$/o;
-    next if m/^\.\s*$/o;
+    next if m/^ \.\s*$/o;
 
     if ($lines == 0) {
 	my $firstline = lc $_;
@@ -101,9 +94,9 @@ foreach (split /\n/, $description) {
 
     $lines++;
 
-    if (m/^\.\s*\S/o) {
+    if (m/^ \.\s*\S/o) {
 	tag "description-contains-invalid-control-statement", "";
-    } elsif (m/^[\-\*]/o) {
+    } elsif (m/^ [\-\*]/o) {
 	# Print it only the second time.  Just one is not enough to be sure that
 	# it's a list, and after the second there's no need to repeat it.
 	tag "possible-unindented-list-in-extended-description", "" if $unindented_list++ == 2;
@@ -141,7 +134,7 @@ foreach (split /\n/, $description) {
 
     if ($lines == 1) {
 	# checks for the first line of the extended description:
-	if (m/^\s/o) {
+	if (m/^ \s/o) {
 	    tag "description-starts-with-leading-spaces", "";
 	}
 	if (m/^\s*missing\s*$/oi) {
@@ -151,7 +144,7 @@ foreach (split /\n/, $description) {
 	}
     }
 
-    if (length($_) >= 80) {
+    if (length($_) > 80) {
 	tag "extended-description-line-too-long", "";
     }
 }
diff --git a/checks/description.desc b/checks/description.desc
index 3fb368e..668bfe2 100644
--- a/checks/description.desc
+++ b/checks/description.desc
@@ -46,12 +46,6 @@ Certainty: certain
 Info: The first line of the "Description:" must not exceed 80 characters.
 Ref: policy 3.4.1
 
-Tag: description-synopsis-has-leading-spaces
-Severity: important
-Certainty: certain
-Status: untested
-Info: The first line of the "Description:" should not have leading spaces.
-
 Tag: description-starts-with-package-name
 Severity: important
 Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 50856e3..48a469b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ lintian (2.2.7) UNRELEASED; urgency=low
       - copyright-refers-to-nonexistent-license-file
       - embedded-zlib
       - incorrect-libdir-in-la-file
+    + Removed
+      - description-synopsis-has-leading-spaces
 
   * checks/binaries{,.desc}:
     + [RA] Check for embedded copies of zlib in ELF binaries by looking
@@ -38,6 +40,10 @@ lintian (2.2.7) UNRELEASED; urgency=low
     + [ADB] Use Lintian::Relation rather than Dep.
   * checks/debhelper:
     + [ADB] Use Lintian::Relation rather than Dep.
+  * checks/description{,.desc}:
+    + [RA] Remove description-synopsis-has-leading-spaces.  Policy
+      explicitly says this is not a bug.  Adjust for the changes to Util
+      that preserve leading whitespace in continued fields.
   * checks/fields:
     + [RA] Precompile constant regexes with qr.  Patch from Raphael
       Geissert.
diff --git a/t/debs/description-synopsis-spaces/tags b/t/debs/description-synopsis-spaces/tags
index 8d33380..e69de29 100644
--- a/t/debs/description-synopsis-spaces/tags
+++ b/t/debs/description-synopsis-spaces/tags
@@ -1 +0,0 @@
-E: description-synopsis-spaces: description-synopsis-has-leading-spaces

-- 
Debian package checker