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

Re: Review of new/changed lintian tag descriptions



Justin B Rye wrote:
> Sorry, no patch yet - I've found the git repository, but I ran out of
> time before I could work out how to check things out of it.

I think I've got the hang of it.  "git diff" patch attached (including
a general sweep for unhyphenated uses of "non").
-- 
JBR	with qualifications in linguistics, experience as a Debian
	sysadmin, and probably no clue about this particular package
diff --git a/checks/changelog-file.desc b/checks/changelog-file.desc
index 9330822..361b8bd 100644
--- a/checks/changelog-file.desc
+++ b/checks/changelog-file.desc
@@ -230,8 +230,8 @@ Info: The previous version of this package had a distribution of
  unstable" or "to sid", with or without quotation marks around the
  distribution name.
  .
- This may indicate a mistake in setting the distribution and accidentally
- uploading to unstable a package intended for experimental.
+ This may indicate a mistake in setting the distribution and an accidental
+ upload to unstable of a package intended for experimental.
 
 Tag: syntax-error-in-debian-changelog
 Severity: normal
diff --git a/checks/control-file.desc b/checks/control-file.desc
index 522d5f9..70edede 100644
--- a/checks/control-file.desc
+++ b/checks/control-file.desc
@@ -95,7 +95,7 @@ Certainty: certain
 Info: There is an XS-Testsuite field in the <tt>debian/control</tt> file.  As
  of dpkg 1.17.10, the XS- prefix is no longer necessary.  dpkg now
  recognizes this header and handles it correctly.  As of dpkg 1.17.11 the
- field is automatically added by dpkg-source with the "autopkgtest" value if
+ field is automatically added by dpkg-source with the value "autopkgtest" if
  there is a non-empty <tt>debian/tests/control</tt> file present.  Consider
  either removing the XS- prefix for this field or removing the field
  altogether if it contains just the "autopkgtest" value.
@@ -250,5 +250,5 @@ Severity: important
 Certainty: certain
 Ref: policy 5.6.8
 Info: The values of the Architecture field in debian/control must not
- be separated by anything else than spaces, i.e. must be single line
- and is not allowed to span multiple lines.
+ be separated by anything else than spaces; that is, they must form a
+ single line and are not allowed to span multiple lines.
diff --git a/checks/cruft.desc b/checks/cruft.desc
index 40ec733..dd7e3b4 100644
--- a/checks/cruft.desc
+++ b/checks/cruft.desc
@@ -600,7 +600,7 @@ Info: The given control file uses <tt>CRLF</tt> as line terminator
 Tag: license-problem-json-evil
 Severity: serious
 Certainty: possible
-Info: The given source file is copyrighted under the non free
+Info: The given source file is copyrighted under the non-free
  license of json and the infamous clause:
  The Software shall be used for Good, not Evil.
 Ref: https://wiki.debian.org/qa.debian.org/jsonevil
@@ -608,8 +608,8 @@ Ref: https://wiki.debian.org/qa.debian.org/jsonevil
 Tag: license-problem-cc-by-nc-sa
 Severity: serious
 Certainty: possible
-Info: The given source file is copyrighted under the non free
- license creative commons non commercial share alike.
+Info: The given source file is copyrighted under the non-free
+ license creative commons non-commercial share-alike.
 
 Tag: license-problem-bad-php-license
 Severity: serious
@@ -680,7 +680,7 @@ Info: The given source file is licensed under GFDL, but without any
  precision about the presence of invariant sections, front-cover or
  back-cover text.
  .
- GFDL license explicitly requests you to document this non presence.
+ GFDL license explicitly requests you to document this non-presence.
  .
 Ref: https://wiki.debian.org/qa.debian.org/gfdlinvariant,
  https://www.debian.org/vote/2006/vote_001
diff --git a/checks/dbus.desc b/checks/dbus.desc
index 2066f3d..1cf12bb 100644
--- a/checks/dbus.desc
+++ b/checks/dbus.desc
@@ -49,7 +49,7 @@ Info: The package contains D-Bus policy configuration that uses
  .
    &lt;deny send_interface="com.example.MyInterface"/&gt;
  .
- are redundant with the system bus' default-deny policy, and have
+ are redundant with the system bus's default-deny policy, and have
  unintended effects on other services.
  .
  This check ignores rules of the form
diff --git a/checks/deb-format.desc b/checks/deb-format.desc
index 418305e..85b9a7a 100644
--- a/checks/deb-format.desc
+++ b/checks/deb-format.desc
@@ -73,22 +73,22 @@ Tag: uses-no-compression-for-control-tarball
 Severity: important
 Certainty: certain
 Ref: deb(5)
-Info: The control portion of this binary package uses a non compressed
+Info: The control portion of this binary package uses a non-compressed
  format.  Although dpkg will support extracting such binary packages
  since dpkg 1.10.24, creating them is not advised except in special
  cases.
  .
- Except if data is non compressible use gzip for
+ Except if data is non-compressible, use gzip for
  maximum compatibility and speed, and xz for maximum compression ratio.
 
 Tag: uses-no-compression-for-data-tarball
 Severity: important
 Certainty: certain
 Ref: deb(5)
-Info: The data portion of this binary package uses a non compressed
+Info: The data portion of this binary package uses a non-compressed
  format.  Although dpkg will support extracting such binary packages
  since dpkg 1.10.24, creating them is not advised except in special
  cases.
  .
- Except if data is non compressible use gzip for
+ Except if data is non-compressible, use gzip for
  maximum compatibility and speed, and xz for maximum compression ratio.
diff --git a/checks/files.desc b/checks/files.desc
index b0a5e6b..be5d264 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -1181,7 +1181,7 @@ Tag: license-problem-font-adobe-copyrighted-fragment
 Severity: serious
 Certainty: possible
 Info: This type 1 font file includes some postscript fragment with a
- non free license of Adobe.  In order to check if this tag is genuine
+ non-free license of Adobe.  In order to check if this tag is genuine
  please follow the procedure described in the reference.
  .
  Should this be a false-positive, please override the tag.
@@ -1191,7 +1191,7 @@ Tag: license-problem-font-adobe-copyrighted-fragment-no-credit
 Severity: serious
 Certainty: possible
 Info: This type 1 font file includes some postscript fragment with a
- non free license of Adobe.  In order to check if this tag is genuine
+ non-free license of Adobe.  In order to check if this tag is genuine
  please follow the procedure described in the reference.
  .
  Moreover the fragment was likely verbatim copied from black
diff --git a/checks/rules.desc b/checks/rules.desc
index 67533dd..bea0e17 100644
--- a/checks/rules.desc
+++ b/checks/rules.desc
@@ -67,7 +67,7 @@ Ref: policy 4.9, devref 6.7.8.2
 Info: The <tt>debian/rules</tt> file for this package does not provide
  one of the good practice targets.
  .
- If your packaged is repacked from non dfsg source, you should add a
+ If your packaged is repacked from non-dfsg source, you should add a
  get-orig-source target.
 
 Tag: debian-rules-uses-deprecated-makefile
diff --git a/checks/scripts.desc b/checks/scripts.desc
index 9591a1b..5cfc757 100644
--- a/checks/scripts.desc
+++ b/checks/scripts.desc
@@ -659,7 +659,7 @@ Info: The indicated program run in a maintainer script has a prepended
  If the path is required to test a program for existence, one of the suggested
  workarounds in the developer's reference can be used.
  .
- See particularly function pathfind() of devref.
+ See particularly the function pathfind() in devref.
 Ref: policy 6.1, devref 6.4
 
 Tag: maintainer-script-should-not-use-ancient-dpkg-epoch-check
diff --git a/checks/source-copyright.desc b/checks/source-copyright.desc
index 98955f8..37302f7 100644
--- a/checks/source-copyright.desc
+++ b/checks/source-copyright.desc
@@ -244,20 +244,20 @@ Tag: dep5-file-paragraph-reference-header-paragraph
 Severity: normal
 Certainty: possible
 Ref: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Info: The Files paragraph uses a reference to a license, which is
+Info: The Files paragraph uses a reference to a license which is
  only defined in the Header paragraph.  The copyright specification
  requires that the Files paragraph either contains the full license
  itself or references a "stand-alone" License paragraph, and not the
- Header paragraph
+ Header paragraph.
 
 Tag: dep5-copyright-license-name-not-unique
 Severity: normal
 Certainty: possible
 Ref: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Info: This paragraph define an already defined license.
+Info: This paragraph defines an already defined license.
  .
- According to specification the short license name are guaranteed
- to be unique within a single copyright file.
+ According to the specification, short license names are required to be
+ unique within a single copyright file.
 
 Tag: invalid-escape-sequence-in-dep5-copyright
 Severity: normal
diff --git a/checks/testsuite.desc b/checks/testsuite.desc
index b00ba3d..1fad72d 100644
--- a/checks/testsuite.desc
+++ b/checks/testsuite.desc
@@ -84,7 +84,7 @@ Ref: http://anonscm.debian.org/gitweb/?p=autopkgtest/autopkgtest.git;a=blob_plai
 Tag: unknown-runtime-tests-feature
 Severity: pedantic
 Certainty: wild-guess
-Info: A paragraph in debian/tests/control mentions a non standard
+Info: A paragraph in debian/tests/control mentions a non-standard
  value for the Features field. Though allowed, this may indicate an
  error, as the value will be ignored.
 Ref: http://anonscm.debian.org/gitweb/?p=autopkgtest/autopkgtest.git;a=blob_plain;f=doc/README.package-tests.rst;hb=HEAD
@@ -92,7 +92,7 @@ Ref: http://anonscm.debian.org/gitweb/?p=autopkgtest/autopkgtest.git;a=blob_plai
 Tag: unknown-runtime-tests-field
 Severity: pedantic
 Certainty: wild-guess
-Info: A paragraph in debian/tests/control mentions a non standard
+Info: A paragraph in debian/tests/control mentions a non-standard
  field. Though allowed, this may indicate an error, as the whole
  paragraph will be ignored.
 Ref: http://anonscm.debian.org/gitweb/?p=autopkgtest/autopkgtest.git;a=blob_plain;f=doc/README.package-tests.rst;hb=HEAD
@@ -100,7 +100,7 @@ Ref: http://anonscm.debian.org/gitweb/?p=autopkgtest/autopkgtest.git;a=blob_plai
 Tag: unknown-runtime-tests-restriction
 Severity: pedantic
 Certainty: wild-guess
-Info: A paragraph in debian/tests/control mentions a non standard
+Info: A paragraph in debian/tests/control mentions a non-standard
  value for the Restrictions field. Though allowed, this may indicate an
  error, as the whole paragraph will be ignored.
 Ref: http://anonscm.debian.org/gitweb/?p=autopkgtest/autopkgtest.git;a=blob_plain;f=doc/README.package-tests.rst;hb=HEAD
diff --git a/checks/watch-file.desc b/checks/watch-file.desc
index ed6e6d5..10e2875 100644
--- a/checks/watch-file.desc
+++ b/checks/watch-file.desc
@@ -178,15 +178,15 @@ Info: The watch file contains a standard template included by dh_make.
 Tag: debian-watch-file-accesses-pypi-over-http
 Severity: wishlist
 Certainty: certain
-Info: The watch file is pointing at PyPI, using a http URL, not https.
- PyPI now has https enabled, you should be able to simply switch to
+Info: The watch file is pointing at PyPI, using an http URL, not https.
+ PyPI now has https enabled, so you should be able to simply switch to
  https.
 
 Tag: debian-watch-file-unsupported-pypi-url
 Severity: important
 Certainty: certain
 Ref: #776267, https://wiki.python.org/moin/PyPISimple
-Info: The watch file specifies a PyPI URL which is not a supported API.
+Info: The watch file specifies a PyPI URL, which is not a supported API.
  Instead, use either the pypi.debian.net redirector service or PyPI's
  Simple API:
  .

Reply to: