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

Bug#491252: description-synopsis-might-not-be-phrased-properly should not be triggered with "etc."



Package: lintian
Version: 1.24.2
Severity: wishlist
Tags: patch

"description-synopsis-might-not-be-phrased-properly" should probably not be
triggered when description ends with "etc.". For example:

  GUI frontend to create Debian LiveCDs, netboot images, etc.

The period in "etc." is required, even though I am not actually intending to
end the sentence.

Patch attached.


Regards,

-- 
Chris Lamb, UK                                       chris@chris-lamb.co.uk
                                                            GPG: 0x634F9A20
commit fcd0b4d299547df90ebaede6ed596a415932e377
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date:   Fri Jul 18 01:09:46 2008 +0100

    description-synopsis-might-not-be-phrased-properly should not be tagged when description ends with "etc."
    
    Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>

diff --git a/checks/description b/checks/description
index 9fc049d..1d0396f 100644
--- a/checks/description
+++ b/checks/description
@@ -62,7 +62,7 @@ if ($synopsis =~ m/^\s*$/) {
     if ($synopsis =~ m/^\s*$ppkg\b/i) {
 	tag "description-starts-with-package-name", "";
     }
-    if ($synopsis =~ m/\.\s*$/) {
+    if ($synopsis =~ m/(?<!etc)\.\s*$/i) {
 	tag "description-synopsis-might-not-be-phrased-properly", "";
     }
     if ($synopsis =~ m/\t/) {
diff --git a/testset/description/debian/control b/testset/description/debian/control
index 0a88f05..1ecf5a6 100644
--- a/testset/description/debian/control
+++ b/testset/description/debian/control
@@ -42,3 +42,8 @@ Package: description-baz
 Architecture: all
 Description:    the synopsis starts with spaces
  This is a real Lintian bug which has been discovered with this testset.
+
+Package: description-qux
+Architecture: all
+Description: This description ends, etc.
+ This is a real Lintian bug which has been discovered with this testset.
diff --git a/testset/description/debian/rules b/testset/description/debian/rules
index 855170c..0392a92 100755
--- a/testset/description/debian/rules
+++ b/testset/description/debian/rules
@@ -4,6 +4,7 @@ description=debian/description
 description-foo=debian/description-foo
 description-bar=debian/description-bar
 description-baz=debian/description-baz
+description-qux=debian/description-qux
 
 build:
 
@@ -48,10 +49,19 @@ binary-indep:
 	dpkg-gencontrol -pdescription-baz -P$(description-baz)
 	dpkg --build $(description-baz) ..
 
+	# Create package description-qux
+	install -d $(description-qux)
+	install -d $(description-qux)/DEBIAN
+	install -d $(description-qux)/usr/share/doc/description
+	install -m 644 debian/changelog \
+	  $(description-qux)/usr/share/doc/description/changelog.Debian
+	gzip -9 $(description-qux)/usr/share/doc/description/changelog.Debian
+	dpkg-gencontrol -pdescription-qux -P$(description-qux)
+	dpkg --build $(description-qux) ..
 binary: binary-indep
 
 clean:
 	rm -rf debian/files $(description) $(description-foo) \
-	  $(description-bar) $(description-baz) debian/substvars
+	  $(description-bar) $(description-baz) $(description-qux) debian/substvars
 
 .PHONY: build binary-indep binary clean
diff --git a/testset/tags.description b/testset/tags.description
index 150012a..0d0c0fc 100644
--- a/testset/tags.description
+++ b/testset/tags.description
@@ -6,6 +6,7 @@ E: description-baz: no-copyright-file
 E: description-foo: description-contains-tabs
 E: description-foo: description-too-long
 E: description-foo: no-copyright-file
+E: description-qux: no-copyright-file
 E: description: description-contains-invalid-control-statement
 E: description: description-contains-tabs
 E: description: description-is-debmake-template
@@ -14,6 +15,7 @@ E: description: no-copyright-file
 I: description-bar: no-md5sums-control-file
 I: description-baz: no-md5sums-control-file
 I: description-foo: no-md5sums-control-file
+I: description-qux: no-md5sums-control-file
 I: description: no-md5sums-control-file
 W: description source: native-package-with-dash-version
 W: description-bar: extended-description-line-too-long

Attachment: signature.asc
Description: PGP signature


Reply to: