[lintian] 01/01: Apply patch from Ville Skyttä <ville.skytta@iki.fi> to fix a number of spelling mistakes. (Closes: #878446)
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit 4e4d496a65861f74030f107ea6ecae5c94f0b72b
Author: Ville Skyttä <ville.skytta@iki.fi>
Date: Fri Oct 13 21:34:39 2017 +0300
Apply patch from Ville Skyttä <ville.skytta@iki.fi> to fix a number of spelling mistakes. (Closes: #878446)
Signed-off-by: Chris Lamb <lamby@debian.org>
---
checks/conffiles.pm | 2 +-
checks/debconf.desc | 2 +-
checks/files.desc | 6 +++---
checks/scripts.desc | 2 +-
debian/changelog | 4 ++++
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/checks/conffiles.pm b/checks/conffiles.pm
index 90db315..180a11c 100644
--- a/checks/conffiles.pm
+++ b/checks/conffiles.pm
@@ -83,7 +83,7 @@ sub run {
}
next unless $file =~ m{\A etc/ }xsm and $file->is_file;
- # If there is a /etc/foo, it must be a conffile (with a few exceptions).
+ # If there is an /etc/foo, it must be a conffile (with a few exceptions).
if ( not exists($conffiles{$file})
and $file !~ m{ /README $}xsm
and $file ne 'etc/init.d/skeleton'
diff --git a/checks/debconf.desc b/checks/debconf.desc
index d5d3ac1..6bf8138 100644
--- a/checks/debconf.desc
+++ b/checks/debconf.desc
@@ -309,7 +309,7 @@ Tag: template-uses-unsplit-choices
Severity: normal
Certainty: possible
Info: The use of _Choices in templates is deprecated.
- An _Choices field must be translated as a single string.
+ A _Choices field must be translated as a single string.
.
Using __Choices allows each choice to be translated separately, easing
translation and is therefore recommended.
diff --git a/checks/files.desc b/checks/files.desc
index 4f575b8..4ba0d7d 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -82,7 +82,7 @@ Tag: package-installs-apt-preferences
Severity: serious
Certainty: possible
Ref: apt_preferences(5)
-Info: Debian packages should not install files under <tt>/etc/apt/preferences.d/</tt> or install a /etc/apt/preferences file.
+Info: Debian packages should not install files under <tt>/etc/apt/preferences.d/</tt> or install an /etc/apt/preferences file.
This directory is under the control of the local administrator.
.
Package should not override local administrator choices.
@@ -92,7 +92,7 @@ Severity: serious
Certainty: possible
Ref: sources.list(5)
Info: Debian packages should not install files under <tt>/etc/apt/sources.list.d/</tt>
- or install a /etc/apt/sources.list file.
+ or install an /etc/apt/sources.list file.
This directory is under the control of the local administrator.
.
Package should not override local administrator choices.
@@ -1741,7 +1741,7 @@ Info: The package is architecture-dependent, ships a shared library in
a public library search path and is marked <tt>Multi-Arch:
foreign</tt>. Typically, shared libraries are marked <tt>Multi-Arch:
same</tt> when possible. Sometimes, private shared libraries are put
- into the public library search path to accomodate programs in the
+ into the public library search path to accommodate programs in the
same package, but this package does not contain any programs.
.
Please remove the <tt>Multi-Arch: foreign</tt> stanza.
diff --git a/checks/scripts.desc b/checks/scripts.desc
index aa2fb0d..8d02ec4 100644
--- a/checks/scripts.desc
+++ b/checks/scripts.desc
@@ -737,7 +737,7 @@ Info: Lintian has detected the presence of a #DEBHELPER# token in the
Tag: debhelper-autoscript-in-maintainer-scripts
Severity: classification
Certainty: possible
-Info: The maintainer scripts of the package contians one or more
+Info: The maintainer scripts of the package contain one or more
auto-generated shell snippets inserted by the listed debhelper tool.
Tag: unconditional-use-of-dpkg-statoverride
diff --git a/debian/changelog b/debian/changelog
index 0694ef5..a65920b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ lintian (2.5.56) UNRELEASED; urgency=medium
XXX: generate tag summary
+ * checks/conffiles.pm, checks/{debconf,files,scripts}.desc:
+ + [CL] Apply patch from Ville Skyttä <ville.skytta@iki.fi> to fix a
+ number of spelling mistakes. (Closes: #878446)
+
-- Chris Lamb <lamby@debian.org> Thu, 12 Oct 2017 14:08:44 -0400
lintian (2.5.55) unstable; urgency=medium
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: