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

[SCM] Debian package checker branch, master, updated. 1.24.4-79-g19ea75c



The following commit has been merged in the master branch:
commit 841930a1166a2002f8cd60b56faffd9f9b592b26
Author: Frank Lichtenheld <djpig@debian.org>
Date:   Sat Aug 30 23:34:11 2008 +0200

    checks/description{,.desc}: Warn about left-over dh-make-perl statement

diff --git a/checks/description b/checks/description
index 3e8c530..025917b 100644
--- a/checks/description
+++ b/checks/description
@@ -115,6 +115,10 @@ foreach (split /\n/, $description) {
         tag "description-contains-homepage";
     }
 
+    if (m,This description was automagically extracted from the module by dh-make-perl,i) {
+	tag "description-contains-dh-make-perl-template";
+    }
+
     my $wo_quotes = $_;
     $wo_quotes =~ s,(\"|\')(.*?)(\1),,;
     while ($wo_quotes =~ m,(?:\W|^)((\w+)(\s+(\2))+)(?:\W|$),i) {
diff --git a/checks/description.desc b/checks/description.desc
index 842eabb..5a3c04d 100644
--- a/checks/description.desc
+++ b/checks/description.desc
@@ -95,6 +95,15 @@ Certainty: certain
 Info: The synopsis or the extended description has not been changed
  from the template provided by dh_make.
 
+Tag: description-contains-dh-make-perl-template
+Type: warning
+Severity: normal
+Certainty: certain
+Info: The extended description contains the statement that it was
+ automagically extracted by dh-make-perl.  Please check the description
+ for correctness and usefulness and remove the dh-make-perl statement
+ to signal that you have done so. 
+
 Tag: description-synopsis-might-not-be-phrased-properly
 Type: warning
 Severity: normal
diff --git a/debian/changelog b/debian/changelog
index 3a85ee8..f6d6aa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ lintian (1.25.0) unstable; urgency=low
       anymore.  Sarge is not supported anymore.  (Closes: #496826)
     + [FL] Drop package-needs-python-policy-debhelper.  Sarge is not
       supported anymore.
+  * checks/description{,.desc}:
+    + [FL] Warn about left-over dh-make-perl statement.
   * checks/fields{,.desc}:
     + [RA] Check for a maintainer also listed in uploaders.  Patch from
       Raphael Geissert.
diff --git a/testset/description/debian/control b/testset/description/debian/control
index 5def4b2..1b89754 100644
--- a/testset/description/debian/control
+++ b/testset/description/debian/control
@@ -17,6 +17,10 @@ Description: description is a package which tests lintian's description checks.
  .control statements are not allowed as well.
  .
  All all all of of these these should be matched matched matched
+ .
+ This description was automagically extracted from the module by dh-make-perl
+ .
+ No, not really...
 
 Package: description-foo
 Architecture: all
diff --git a/testset/tags.description b/testset/tags.description
index c0021c3..46fed18 100644
--- a/testset/tags.description
+++ b/testset/tags.description
@@ -24,6 +24,7 @@ W: description-foo: description-starts-with-leading-spaces
 W: description-foo: possible-unindented-list-in-extended-description
 W: description: changelog-not-compressed-with-max-compression changelog.Debian.gz
 W: description: debian-changelog-file-contains-obsolete-user-emacs-settings
+W: description: description-contains-dh-make-perl-template
 W: description: description-contains-duplicated-word All all all
 W: description: description-contains-duplicated-word The the
 W: description: description-contains-duplicated-word matched matched matched

-- 
Debian package checker


Reply to: