[SCM] Debian package checker branch, master, updated. 2.5.0-rc3-22-ga8f3191
The following commit has been merged in the master branch:
commit a8f319108623951d5f81c4f58aa40a97d33d46ec
Author: Gerfried Fuchs <rhonda@debian.org>
Date: Wed Apr 27 00:56:31 2011 +0200
Check for empty paragraphs in extended description
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/description b/checks/description
index 30b1d30..2a08102 100644
--- a/checks/description
+++ b/checks/description
@@ -176,6 +176,8 @@ if ($type ne 'udeb') {
tag 'extended-description-is-empty';
} elsif ($lines <= 2 and not $synopsis =~ /(dummy|transition)/i) {
tag 'extended-description-is-probably-too-short';
+ } elsif ($description =~ /^ \.\s*\n|\n \.\s*\n \.\s*\n|\n \.\s*\n?$/) {
+ tag 'extended-description-contains-empty-paragraph';
}
}
diff --git a/checks/description.desc b/checks/description.desc
index 2caf187..e8391d8 100644
--- a/checks/description.desc
+++ b/checks/description.desc
@@ -17,6 +17,12 @@ Severity: serious
Certainty: certain
Info: The first line in the "Description:" is empty.
+Tag: extended-description-contains-empty-paragraph
+Severity: normal
+Certainty: certain
+Info: The extended description (the lines after the first line of the
+ "Description:" field) contains an empty paragraph.
+
Tag: extended-description-is-empty
Severity: serious
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 5e5e927..79707b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,11 +4,15 @@ lintian (2.5.0~rc4) UNRELEASED; urgency=low
+ Added:
- duplicate-files
- format-3.0-but-debian-changes-patch
+ - extended-description-contains-empty-paragraph
* checks/copyright-file.desc:
+ [ADB] Correct a spelling mistake ("coypright" -> "copyright") in the
description of copyright-refers-to-deprecated-bsd-license-file;
thanks, Kees Cook. (Closes: #623780)
+ * checks/description{,.desc}:
+ + [NT] Check for empty paragraphs in extended description. Thanks to
+ Gerfried Fuchs for the patch.
* checks/duplicate-files{,.desc}:
+ [NT] Added to check for duplicate files in usr/share/doc. Thanks to
Axel Beckert for the suggestion. (Closes: #614715)
diff --git a/debian/copyright b/debian/copyright
index a60e0dd..f5fb30d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -47,6 +47,7 @@ Portions Copyright (C) 2008-2010 Adam D. Barratt
Portions Copyright (C) 2009 Stéphane Glondu
Portions Copyright (C) 2010 Raphaël Hertzog
Portions Copyright (C) 2010 Niels Thykier
+Portions Copyright (C) 2011 Gerfried Fuchs
This program is free software; you may redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/t/tests/description-empty-paragraph/debian/debian/control.in b/t/tests/description-empty-paragraph/debian/debian/control.in
new file mode 100644
index 0000000..05533ed
--- /dev/null
+++ b/t/tests/description-empty-paragraph/debian/debian/control.in
@@ -0,0 +1,40 @@
+Source: {$srcpkg}
+Priority: extra
+Section: {$section}
+Maintainer: {$author}
+Standards-Version: {$standards_version}
+Build-Depends: debhelper (>= 7)
+
+Package: {$srcpkg}
+Architecture: {$architecture}
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: package to test empty first paragraph
+ .
+ The first paragraph
+ of this description
+ is empty. It is also an empty package.
+
+Package: {$srcpkg}-2
+Architecture: {$architecture}
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: package to test empty last paragraph
+ The last paragraph
+ of this description
+ is empty. It is also an empty package.
+ .
+ Unfortunately this doesn't trigger the warning, an empty last paragraph
+ seems to get stripped out already before it is handed over.
+ .
+
+Package: {$srcpkg}-3
+Architecture: {$architecture}
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: package to test empty paragraph in the middle
+ There is an
+ empty paragraph
+ in between. It is also an empty package.
+ .
+ .
+ There is an
+ empty paragraph
+ in between. It is also an empty package.
diff --git a/t/tests/description-empty-paragraph/desc b/t/tests/description-empty-paragraph/desc
new file mode 100644
index 0000000..279cd9b
--- /dev/null
+++ b/t/tests/description-empty-paragraph/desc
@@ -0,0 +1,5 @@
+Testname: description-empty-paragraph
+Sequence: 6000
+Version: 1.0
+Description: Tests of empty paragraphs in descriptions
+Test-For: extended-description-contains-empty-paragraph
diff --git a/t/tests/description-empty-paragraph/tags b/t/tests/description-empty-paragraph/tags
new file mode 100644
index 0000000..a57cb17
--- /dev/null
+++ b/t/tests/description-empty-paragraph/tags
@@ -0,0 +1,2 @@
+W: description-empty-paragraph-3: extended-description-contains-empty-paragraph
+W: description-empty-paragraph: extended-description-contains-empty-paragraph
--
Debian package checker
Reply to: