[lintian] 01/01: Rename the debian-watch-does-not-check-gpg-signature tag to debian-watch-does-not-check-gpg-signature to avoid confusion around the "may check" implying that the package in question does such checking and we disapprove of it. Thanks to Andreas Beckmann for the suggestion. (Closes: #735040)
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit 0cbebd4ba0b2a067383616e18981eeb9de5d7df2
Author: Chris Lamb <lamby@debian.org>
Date: Wed Jan 24 09:26:19 2018 +1100
Rename the debian-watch-does-not-check-gpg-signature tag to debian-watch-does-not-check-gpg-signature to avoid confusion around the "may check" implying that the package in question does such checking and we disapprove of it. Thanks to Andreas Beckmann for the suggestion. (Closes: #735040)
---
checks/watch-file.desc | 2 +-
checks/watch-file.pm | 3 ++-
debian/changelog | 6 ++++++
doc/lintianrc.example | 2 +-
t/tests/changelog-file-no-upstream-changelog/tags | 2 +-
t/tests/cruft-general-test-suite/desc | 2 +-
t/tests/cruft-general-test-suite/tags | 2 +-
t/tests/cruft-general-upstream/tags | 2 +-
t/tests/cruft-upstream-binaries/tags | 2 +-
t/tests/fields-no-homepage/tags | 2 +-
t/tests/lintian-display-level/tags | 2 +-
t/tests/lintian-output-colons/tags | 2 +-
t/tests/lintian-output-letter/tags | 2 +-
t/tests/lintian-output-xml/tags | 2 +-
t/tests/patch-systems-no-patch-system/tags | 2 +-
t/tests/watch-file-general/desc | 2 +-
t/tests/watch-file-general/tags | 2 +-
t/tests/watch-file-pgpmode-next/desc | 2 +-
t/tests/watch-file-pgpmode-none/desc | 2 +-
t/tests/watch-file-pgpmode-none/tags | 2 +-
20 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/checks/watch-file.desc b/checks/watch-file.desc
index 9677507..d3cfaac 100644
--- a/checks/watch-file.desc
+++ b/checks/watch-file.desc
@@ -151,7 +151,7 @@ Info: The watch file specifies an upstream version number which matches
upstream version. Otherwise, DEHS and similar projects will think the
package is out of date even when it may not be.
-Tag: debian-watch-may-check-gpg-signature
+Tag: debian-watch-does-not-check-gpg-signature
Severity: pedantic
Certainty: certain
Ref: uscan(1)
diff --git a/checks/watch-file.pm b/checks/watch-file.pm
index e464cdd..98d7f0c 100644
--- a/checks/watch-file.pm
+++ b/checks/watch-file.pm
@@ -183,7 +183,8 @@ sub run {
close($fd);
tag 'debian-watch-contains-dh_make-template' if ($template);
- tag 'debian-watch-may-check-gpg-signature' unless ($withgpgverification);
+ tag 'debian-watch-does-not-check-gpg-signature'
+ unless ($withgpgverification);
# Look for upstream signing key
my $key_found = 0;
diff --git a/debian/changelog b/debian/changelog
index 6409e06..818ffdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,12 @@ lintian (2.5.72) UNRELEASED; urgency=medium
* checks/source-copyright.desc:
+ [CL] Clarify that paragraph ordering matters in the description of
the unused-file-paragraph-in-dep5-copyright tag. (Closes: #762261)
+ * checks/watch-file.{desc,pm}:
+ + [CL] Rename the debian-watch-does-not-check-gpg-signature tag to
+ debian-watch-does-not-check-gpg-signature to avoid confusion around
+ the "may check" implying that the package in question does such
+ checking and we disapprove of it. Thanks to Andreas Beckmann for the
+ suggestion. (Closes: #735040)
* data/fields/name_section_mappings:
+ [CL] Ensure xfonts-foo are recognised as part of the "x11" section to
diff --git a/doc/lintianrc.example b/doc/lintianrc.example
index 1fd73a5..76f781e 100644
--- a/doc/lintianrc.example
+++ b/doc/lintianrc.example
@@ -45,7 +45,7 @@
#TMPDIR="/var/tmp"
# Suppress the listed tags (--suppress-tags)
-#suppress-tags = debian-watch-may-check-gpg-signature
+#suppress-tags = debian-watch-does-not-check-gpg-signature
# Specify "tag per package" display limit (--tag-display-limit)
#tag-display-limit = 42
diff --git a/t/tests/changelog-file-no-upstream-changelog/tags b/t/tests/changelog-file-no-upstream-changelog/tags
index c5950aa..7aaeeea 100644
--- a/t/tests/changelog-file-no-upstream-changelog/tags
+++ b/t/tests/changelog-file-no-upstream-changelog/tags
@@ -1,2 +1,2 @@
-P: changelog-file-no-upstream-changelog source: debian-watch-may-check-gpg-signature
+P: changelog-file-no-upstream-changelog source: debian-watch-does-not-check-gpg-signature
P: changelog-file-no-upstream-changelog: no-upstream-changelog
diff --git a/t/tests/cruft-general-test-suite/desc b/t/tests/cruft-general-test-suite/desc
index 4d84c98..2ffa60c 100644
--- a/t/tests/cruft-general-test-suite/desc
+++ b/t/tests/cruft-general-test-suite/desc
@@ -21,4 +21,4 @@ Test-Against:
source-contains-svn-conflict-file
source-contains-svn-control-dir
Test-For:
- debian-watch-may-check-gpg-signature
+ debian-watch-does-not-check-gpg-signature
diff --git a/t/tests/cruft-general-test-suite/tags b/t/tests/cruft-general-test-suite/tags
index d23dd06..fa40db6 100644
--- a/t/tests/cruft-general-test-suite/tags
+++ b/t/tests/cruft-general-test-suite/tags
@@ -1 +1 @@
-P: cruft-general-test-suite source: debian-watch-may-check-gpg-signature
+P: cruft-general-test-suite source: debian-watch-does-not-check-gpg-signature
diff --git a/t/tests/cruft-general-upstream/tags b/t/tests/cruft-general-upstream/tags
index 9396ac5..4adbf18 100644
--- a/t/tests/cruft-general-upstream/tags
+++ b/t/tests/cruft-general-upstream/tags
@@ -3,7 +3,7 @@ E: cruft-general-upstream source: source-contains-prebuilt-silverlight-object fa
E: cruft-general-upstream source: source-is-missing fake.min.js
E: cruft-general-upstream source: source-is-missing fakefla.fla
E: cruft-general-upstream source: source-is-missing fakeflash.swf
-P: cruft-general-upstream source: debian-watch-may-check-gpg-signature
+P: cruft-general-upstream source: debian-watch-does-not-check-gpg-signature
P: cruft-general-upstream source: source-contains-arch-control-dir {arch}
P: cruft-general-upstream source: source-contains-arch-inventory-file .arch-inventory
P: cruft-general-upstream source: source-contains-bts-control-dir .be
diff --git a/t/tests/cruft-upstream-binaries/tags b/t/tests/cruft-upstream-binaries/tags
index 6eebe9f..7f1a384 100644
--- a/t/tests/cruft-upstream-binaries/tags
+++ b/t/tests/cruft-upstream-binaries/tags
@@ -1,4 +1,4 @@
E: cruft-upstream-binaries source: source-is-missing notsourced
-P: cruft-upstream-binaries source: debian-watch-may-check-gpg-signature
+P: cruft-upstream-binaries source: debian-watch-does-not-check-gpg-signature
P: cruft-upstream-binaries source: source-contains-prebuilt-binary hello
P: cruft-upstream-binaries source: source-contains-prebuilt-binary notsourced
diff --git a/t/tests/fields-no-homepage/tags b/t/tests/fields-no-homepage/tags
index 8b3a450..95d102f 100644
--- a/t/tests/fields-no-homepage/tags
+++ b/t/tests/fields-no-homepage/tags
@@ -1,2 +1,2 @@
-P: fields-no-homepage source: debian-watch-may-check-gpg-signature
+P: fields-no-homepage source: debian-watch-does-not-check-gpg-signature
P: fields-no-homepage source: no-homepage-field
diff --git a/t/tests/lintian-display-level/tags b/t/tests/lintian-display-level/tags
index 0b42aa5..79a2762 100644
--- a/t/tests/lintian-display-level/tags
+++ b/t/tests/lintian-display-level/tags
@@ -7,7 +7,7 @@ I: lintian-display-level: description-synopsis-might-not-be-phrased-properly
I: lintian-display-level: desktop-entry-limited-to-environments usr/share/applications/script.desktop
I: lintian-display-level: package-contains-empty-directory usr/local/share/lintian/
P: lintian-display-level source: debian-control-has-unusual-field-spacing line 12
-P: lintian-display-level source: debian-watch-may-check-gpg-signature
+P: lintian-display-level source: debian-watch-does-not-check-gpg-signature
P: lintian-display-level source: direct-changes-in-diff-but-no-patch-system Changes
P: lintian-display-level source: no-homepage-field
P: lintian-display-level: example-unusual-interpreter usr/share/doc/lintian-display-level/examples/example #!/usr/bin/foo
diff --git a/t/tests/lintian-output-colons/tags b/t/tests/lintian-output-colons/tags
index 52ecd52..20987cc 100644
--- a/t/tests/lintian-output-colons/tags
+++ b/t/tests/lintian-output-colons/tags
@@ -9,7 +9,7 @@ tag:I:wishlist:certain::lintian-output-colons:1.0+dsfg-1.1:source:source:binary-
tag:I:wishlist:possible::lintian-output-colons:1.0+dsfg-1.1:all:binary:package-contains-empty-directory:usr/local/share/lintian/:
tag:I:wishlist:wild-guess::lintian-output-colons:1.0+dsfg-1.1:all:binary:description-possibly-contains-homepage:http\://www.example.com/.:
tag:P:pedantic:certain::lintian-output-colons:1.0+dsfg-1.1:source:source:debian-control-has-unusual-field-spacing:line 12:
-tag:P:pedantic:certain::lintian-output-colons:1.0+dsfg-1.1:source:source:debian-watch-may-check-gpg-signature::
+tag:P:pedantic:certain::lintian-output-colons:1.0+dsfg-1.1:source:source:debian-watch-does-not-check-gpg-signature::
tag:P:pedantic:certain::lintian-output-colons:1.0+dsfg-1.1:source:source:direct-changes-in-diff-but-no-patch-system:Changes:
tag:P:pedantic:possible::lintian-output-colons:1.0+dsfg-1.1:all:binary:example-unusual-interpreter:usr/share/doc/lintian-output-colons/examples/example #!/usr/bin/foo:
tag:P:pedantic:possible::lintian-output-colons:1.0+dsfg-1.1:source:source:no-homepage-field::
diff --git a/t/tests/lintian-output-letter/tags b/t/tests/lintian-output-letter/tags
index 24ced79..006e164 100644
--- a/t/tests/lintian-output-letter/tags
+++ b/t/tests/lintian-output-letter/tags
@@ -13,7 +13,7 @@ O[P?]: lintian-output-letter: no-upstream-changelog
P[P ]: lintian-output-letter source: no-homepage-field
P[P ]: lintian-output-letter: example-unusual-interpreter usr/share/doc/lintian-output-letter/examples/example #!/usr/bin/foo
P[P!]: lintian-output-letter source: debian-control-has-unusual-field-spacing line 12
-P[P!]: lintian-output-letter source: debian-watch-may-check-gpg-signature
+P[P!]: lintian-output-letter source: debian-watch-does-not-check-gpg-signature
P[P!]: lintian-output-letter source: direct-changes-in-diff-but-no-patch-system Changes
W[N ]: lintian-output-letter: binary-without-manpage usr/bin/script
W[N!]: lintian-output-letter source: maintainer-upload-has-incorrect-version-number 1.0+dsfg-1.1
diff --git a/t/tests/lintian-output-xml/tags b/t/tests/lintian-output-xml/tags
index 013edce..3af815d 100644
--- a/t/tests/lintian-output-xml/tags
+++ b/t/tests/lintian-output-xml/tags
@@ -11,7 +11,7 @@
<tag severity="normal" certainty="possible" name="binary-without-manpage">usr/bin/script</tag>
<tag severity="normal" certainty="wild-guess" name="desktop-entry-limited-to-environments">usr/share/applications/script.desktop</tag>
<tag severity="pedantic" certainty="certain" name="debian-control-has-unusual-field-spacing">line 12</tag>
-<tag severity="pedantic" certainty="certain" name="debian-watch-may-check-gpg-signature" />
+<tag severity="pedantic" certainty="certain" name="debian-watch-does-not-check-gpg-signature" />
<tag severity="pedantic" certainty="certain" name="direct-changes-in-diff-but-no-patch-system">Changes</tag>
<tag severity="pedantic" certainty="possible" name="example-unusual-interpreter">usr/share/doc/lintian-output-xml/examples/example #!/usr/bin/foo</tag>
<tag severity="pedantic" certainty="possible" name="no-homepage-field" />
diff --git a/t/tests/patch-systems-no-patch-system/tags b/t/tests/patch-systems-no-patch-system/tags
index e42ccbb..bb0f8f6 100644
--- a/t/tests/patch-systems-no-patch-system/tags
+++ b/t/tests/patch-systems-no-patch-system/tags
@@ -1,2 +1,2 @@
-P: patch-systems-no-patch-system source: debian-watch-may-check-gpg-signature
+P: patch-systems-no-patch-system source: debian-watch-does-not-check-gpg-signature
P: patch-systems-no-patch-system source: direct-changes-in-diff-but-no-patch-system README
diff --git a/t/tests/watch-file-general/desc b/t/tests/watch-file-general/desc
index ff1f1fd..84dc211 100644
--- a/t/tests/watch-file-general/desc
+++ b/t/tests/watch-file-general/desc
@@ -13,7 +13,7 @@ Test-For:
debian-watch-file-unknown-version
debian-watch-file-uses-deprecated-sf-redirector-method
debian-watch-file-uses-deprecated-githubredir
- debian-watch-may-check-gpg-signature
+ debian-watch-does-not-check-gpg-signature
debian-watch-uses-insecure-uri
debian-watch-could-verify-download
References: Debian Bug#510398
diff --git a/t/tests/watch-file-general/tags b/t/tests/watch-file-general/tags
index 91864a4..cb3f04c 100644
--- a/t/tests/watch-file-general/tags
+++ b/t/tests/watch-file-general/tags
@@ -1,7 +1,7 @@
E: watch-file-general source: debian-watch-file-uses-deprecated-githubredir line 24
I: watch-file-general source: debian-watch-file-should-dversionmangle-not-uversionmangle line 5
I: watch-file-general source: debian-watch-uses-insecure-uri http://insecure.com
-P: watch-file-general source: debian-watch-may-check-gpg-signature
+P: watch-file-general source: debian-watch-does-not-check-gpg-signature
W: watch-file-general source: debian-watch-could-verify-download debian/upstream/signing-key.asc
W: watch-file-general source: debian-watch-file-declares-multiple-versions line 18
W: watch-file-general source: debian-watch-file-declares-multiple-versions line 7
diff --git a/t/tests/watch-file-pgpmode-next/desc b/t/tests/watch-file-pgpmode-next/desc
index a765ee6..d889be6 100644
--- a/t/tests/watch-file-pgpmode-next/desc
+++ b/t/tests/watch-file-pgpmode-next/desc
@@ -4,7 +4,7 @@ Version: 2.0-1
Options: --pedantic
Skeleton: pedantic
Description: Watch file with pgpmode=next
-Test-Against: debian-watch-may-check-gpg-signature
+Test-Against: debian-watch-does-not-check-gpg-signature
References: #841000
Test-For:
orig-tarball-missing-upstream-signature
diff --git a/t/tests/watch-file-pgpmode-none/desc b/t/tests/watch-file-pgpmode-none/desc
index 8e01336..e7c2284 100644
--- a/t/tests/watch-file-pgpmode-none/desc
+++ b/t/tests/watch-file-pgpmode-none/desc
@@ -4,6 +4,6 @@ Version: 2.0-1
Options: --pedantic
Skeleton: pedantic
Description: Watch file with pgpmode=none
-Test-For: debian-watch-may-check-gpg-signature
+Test-For: debian-watch-does-not-check-gpg-signature
Test-Against: debian-watch-file-pubkey-file-is-missing
References: #841000
diff --git a/t/tests/watch-file-pgpmode-none/tags b/t/tests/watch-file-pgpmode-none/tags
index f66435b..149792e 100644
--- a/t/tests/watch-file-pgpmode-none/tags
+++ b/t/tests/watch-file-pgpmode-none/tags
@@ -1 +1 @@
-P: watch-file-pgpmode-none source: debian-watch-may-check-gpg-signature
+P: watch-file-pgpmode-none source: debian-watch-does-not-check-gpg-signature
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: