[lintian] 01/01: Apply patch from Maia Everett to avoid British spelling when using en_US locale. (Closes: #868897)
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit d666f636696d835ee25fbc17f46322edd76597c8
Author: Maia Everett <maia@lucidfox.org>
Date: Wed Jul 19 21:45:47 2017 +0700
Apply patch from Maia Everett to avoid British spelling when using en_US locale. (Closes: #868897)
Signed-off-by: Chris Lamb <lamby@debian.org>
---
commands/lintian.pm | 2 +-
debian/changelog | 4 ++++
man/lintian.pod.in | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/commands/lintian.pm b/commands/lintian.pm
index 37c0557..c25c37e 100755
--- a/commands/lintian.pm
+++ b/commands/lintian.pm
@@ -164,7 +164,7 @@ General options:
-q, --quiet suppress all informational messages
-v, --verbose verbose messages
-V, --version display Lintian version and exit
-Behaviour options:
+Behavior options:
--color never/always/auto disable, enable, or enable color for TTY
--default-display-level reset the display level to the default
--display-source X restrict displayed tags by source
diff --git a/debian/changelog b/debian/changelog
index fe36985..189f1a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ lintian (2.5.53) UNRELEASED; urgency=medium
XXX: generate tag summary
+ * commands/lintian.pm:
+ + [CL] Apply patch from Maia Everett to avoid British spelling when using
+ en_US locale. (Closes: #868897)
+
-- Niels Thykier <niels@thykier.net> Sun, 23 Jul 2017 10:16:35 +0000
lintian (2.5.52) unstable; urgency=medium
diff --git a/man/lintian.pod.in b/man/lintian.pod.in
index dc848ff..9ea5674 100644
--- a/man/lintian.pod.in
+++ b/man/lintian.pod.in
@@ -160,7 +160,7 @@ Print unadorned version number and exit.
=back
-Behaviour options for B<lintian>.
+Behavior options for B<lintian>.
=over 4
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: