[SCM] Debian package checker branch, master, updated. 1.24.2-92-gb9e47a1
The following commit has been merged in the master branch:
commit b9e47a18e89f2fb729bbfef8e903967daabccd0f
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Fri Aug 8 23:03:04 2008 +0100
Apply wording, grammar and punctuation fix to some tag descriptions.
Replace references to the GPL in the descriptions of GFDL and LGPL
related tags with the appropriate license. Remove a couple of
misplaced words from tag descriptions and add a missing word to
one. Also make a few minor punctuation / layout fixes.
diff --git a/checks/changelog-file.desc b/checks/changelog-file.desc
index cb2e7bc..f75e417 100644
--- a/checks/changelog-file.desc
+++ b/checks/changelog-file.desc
@@ -130,7 +130,7 @@ Info: The changelog file contains an email address (<..@unknown>)
Tag: debian-changelog-file-contains-invalid-email-address
Type: error
Info: The changelog file contains an invalid email address: the domain
- needs at least one dot. This is looks like a mistake.
+ needs at least one dot. This looks like a mistake.
Tag: debian-changelog-file-uses-obsolete-national-encoding
Type: error
diff --git a/checks/copyright-file.desc b/checks/copyright-file.desc
index 1977198..f409e54 100644
--- a/checks/copyright-file.desc
+++ b/checks/copyright-file.desc
@@ -133,7 +133,7 @@ Tag: copyright-refers-to-incorrect-directory
Type: error
Ref: policy 12.5
Info: In the directory name /usr/share/common-licenses, licenses is spelled
- with an `s', not with as licences with a `c'.
+ with an `s', not as licences with a `c'.
Tag: copyright-file-lacks-pointer-to-perl-license
Type: error
@@ -165,7 +165,7 @@ Info: The strings "GNU Free Documentation License" or "GFDL" appear in the
.
If the package uses some other license that just mentions the GFDL and
that Lintian should detect as an exception, please file a Lintian bug.
- If the copyright file must mention the GPL for reasons other than stating
+ If the copyright file must mention the GFDL for reasons other than stating
the license of the package, please add a Lintian override.
Tag: copyright-should-refer-to-common-license-file-for-lgpl
@@ -179,7 +179,7 @@ Info: The strings "GNU Lesser General Public License", "GNU Library
.
If the package uses some other license that just mentions the LGPL and
that Lintian should detect as an exception, please file a Lintian bug.
- If the copyright file must mention the GPL for reasons other than stating
+ If the copyright file must mention the LGPL for reasons other than stating
the license of the package, please add a Lintian override.
Tag: copyright-lists-upstream-authors-with-dh_make-boilerplate
diff --git a/checks/debconf.desc b/checks/debconf.desc
index 8265413..1acbecf 100644
--- a/checks/debconf.desc
+++ b/checks/debconf.desc
@@ -295,10 +295,10 @@ Info: Templates which are not used by the package should be removed from
This will reduce the size of the templates database and prevent
translators from unnecessarily translating the template's text.
.
- In some cases, the template is used but lintian is unable to determine
+ In some cases, the template is used but Lintian is unable to determine
this. Common causes are:
.
- - the maintainer scripts embed a variable in to the template name in
+ - the maintainer scripts embed a variable in the template name in
order to allow a template to be selected from a range of similar
templates (e.g. 'db_input low start_$service_at_boot')
.
@@ -308,4 +308,4 @@ Info: Templates which are not used by the package should be removed from
- the maintainer scripts are written in perl. lintian currently only
understands the shell script debconf functions.
.
- If any of the above applies, please install an override.
+ If any of the above apply, please install an override.
diff --git a/checks/fields.desc b/checks/fields.desc
index a0fa3fd..356e2ec 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -43,7 +43,7 @@ Tag: debian-revision-not-well-formed
Type: warning
Info: The debian version part (the part after the -) should consist of one
or two dot-separated parts: one for a regular maintainer release or two
- for a source-NMU,
+ for a source-NMU.
Tag: debian-revision-should-not-be-zero
Type: warning
@@ -375,13 +375,13 @@ Info: The name of this package suggests that it is a documentation package.
Tag: depends-on-obsolete-package
Type: error
Info: The package depends on a package that has been superseded.
- If the superseded package is part of an ORed group, it should not be
- the first package in the group.
+ If the superseded package is part of an ORed group, it should not be
+ the first package in the group.
Tag: ored-depends-on-obsolete-package
Type: info
Info: The package depends on an ORed group of packages which includes
- a package that has been superseded.
+ a package that has been superseded.
Tag: build-depends-on-obsolete-package
Type: error
diff --git a/checks/files.desc b/checks/files.desc
index f7f3245..ac97f50 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -9,10 +9,10 @@ Info: This script checks if a binary package conforms to policy
Tag: package-contains-ancient-file
Type: error
-Info: Your package contains a file that claims to been generated more
- than 20 years ago. This is most probably an error. Your package will
- be rejected by the Debian archive scripts if it contains a file with
- such a timestamp.
+Info: Your package contains a file that claims to have been generated
+ more than 20 years ago. This is most probably an error. Your package
+ will be rejected by the Debian archive scripts if it contains a file
+ with such a timestamp.
Tag: old-app-defaults-directory
Type: error
diff --git a/debian/changelog b/debian/changelog
index fc598dd..3a3a629 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,11 @@ lintian (1.24.3) unstable; urgency=low
* checks/binaries:
+ [ADB] Use Lintian::Collect throughout rather than reparsing file-info
and objdump-info.
- * checks/changelog-file:
+ * checks/changelog-file{,.desc}:
+ [ADB] Use Lintian::Collect instead of reading the fields/*, file-info
and objdump-info files.
+ + [ADB] Remove a misplaced word from the description of the tag
+ "debian-changelog-file-contains-invalid-email-address".
* checks/copyright-file{,.desc}:
+ [ADB] Drop the "copyright line too long" check. Most of the issues
it flags aren't easily fixable, particularly where the copyright file
@@ -15,6 +17,8 @@ lintian (1.24.3) unstable; urgency=low
+ [ADB] Don't flag use of version 1 of the GPL, or licenses using phrases
such as "compatible with the GPL" (for example, the W3C Software
License) as missing a reference to common-licenses
+ + [ADB] Replace references to the GPL in GFDL and LGPL related tags
+ with the appropriate license. Also remove a misplaced word.
* checks/cruft:
+ [ADB] Use Lintian::Collect for accessing control fields
* checks/debconf:
@@ -40,6 +44,7 @@ lintian (1.24.3) unstable; urgency=low
from control files rather than reading the fields/* files. This and
similar changes to other scripts should improve performance as the
Collect object caches the lookup result.
+ + [ADB] Reformat a couple of tags' descriptions.
* checks/files{,.desc}:
+ [ADB] Switch to using Lintian::Collect.
+ [ADB] Fix a couple of bugs in the parsing of the list of scripts
@@ -50,6 +55,8 @@ lintian (1.24.3) unstable; urgency=low
Patch from Chris Lamb. (Closes: #493156)
+ [FL, ADB] Don't issue tag file-in-unusal-dir for files where we already
issued one of the specific dir-or-file-in-* tags. (Closes: #493921)
+ + [ADB] Add a missing "have" to package-contains-ancient-file's
+ description.
* checks/huge-usr-share:
+ [ADB] Replace (the single) direct access to fields/* with ::field()
+ [ADB] Replace an outdated link to the Developer's Reference.
--
Debian package checker
Reply to: