[SCM] Debian package checker branch, master, updated. 1.24.2-3-gd44bcc4
The following commit has been merged in the master branch:
commit d44bcc467394d2be6f5c5ef102b7b02985b0ce24
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Thu Jul 17 23:16:57 2008 -0700
Don't warn about a synopsis that ends in "etc."
* checks/description:
+ [RA] Don't warn about a synopsis that ends in "etc." Patch from
Chris Lamb. (Closes: #491252)
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/debian/changelog b/debian/changelog
index 9e440d1..d97daea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ lintian (1.24.3) unstable; urgency=low
* checks/debconf:
+ [ADB] Don't complain about unused debconf templates in udebs.
(Closes: #491135)
+ * checks/description:
+ + [RA] Don't warn about a synopsis that ends in "etc." Patch from
+ Chris Lamb. (Closes: #491252)
* checks/shared-libs.desc:
+ [ADB] Improve the description of no-symbols-control-file.
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
--
Debian package checker
Reply to: