[SCM] Debian package checker branch, master, updated. 2.5.2-8-g551bc00
The following commit has been merged in the master branch:
commit 551bc0092810a67ff57fd78a7c8fe3926aed4f51
Author: Jakub Wilk <jwilk@debian.org>
Date: Sat Aug 13 17:01:22 2011 +0200
Use LC_ALL rather than LANG, since LC_ALL overrules LANG
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/infofiles b/checks/infofiles
index b1917cf..709b15f 100644
--- a/checks/infofiles
+++ b/checks/infofiles
@@ -89,7 +89,7 @@ foreach my $file (@{$info->sorted_index}) {
fail("cannot fork: $!");
} elsif ($pid == 0) {
my $f = quotemeta($info->unpacked($file));
- my %newenv = (LANG => 'C', PATH => $ENV{PATH},
+ my %newenv = (LC_ALL => 'C', PATH => $ENV{PATH},
LOCPATH => $ENV{LOCPATH});
undef %ENV;
%ENV = %newenv;
diff --git a/checks/manpages b/checks/manpages
index 39e3ba4..0c63688 100644
--- a/checks/manpages
+++ b/checks/manpages
@@ -218,7 +218,7 @@ foreach my $file (@{$info->sorted_index}) {
if (not defined $pid) {
fail("cannot run lexgrog: $!");
} elsif ($pid == 0) {
- my %newenv = (LANG => 'en_US.UTF-8', PATH => $ENV{PATH},
+ my %newenv = (LC_ALL => 'en_US.UTF-8', PATH => $ENV{PATH},
LOCPATH => $ENV{LOCPATH});
undef %ENV;
%ENV = %newenv;
@@ -252,7 +252,7 @@ foreach my $file (@{$info->sorted_index}) {
if (not defined $pid) {
fail("cannot run man -E UTF-8 -l: $!");
} elsif ($pid == 0) {
- my %newenv = (LANG => 'en_US.UTF-8', PATH => $ENV{PATH},
+ my %newenv = (LC_ALL => 'en_US.UTF-8', PATH => $ENV{PATH},
MANWIDTH => 80, LOCPATH => $ENV{LOCPATH});
undef %ENV;
%ENV = %newenv;
diff --git a/checks/manpages.desc b/checks/manpages.desc
index 50fce12..d7d1443 100644
--- a/checks/manpages.desc
+++ b/checks/manpages.desc
@@ -174,7 +174,7 @@ Info: This man page provokes warnings or errors from man.
"Debugging" in the groff manual.
.
To test this for yourself you can use the following command:
- LANG=en_US.UTF-8 MANWIDTH=80 man --warnings -E UTF-8 -l <file> >/dev/null
+ LC_ALL=en_US.UTF-8 MANWIDTH=80 man --warnings -E UTF-8 -l <file> >/dev/null
Tag: manpage-has-errors-from-pod2man
Severity: normal
diff --git a/checks/po-debconf b/checks/po-debconf
index 103a72e..1eb8bfe 100644
--- a/checks/po-debconf
+++ b/checks/po-debconf
@@ -170,7 +170,7 @@ while (defined(my $file=readdir(DEBIAN))) {
system_env("msgfmt -o /dev/null \Q$debfiles/po/$file\E 2>/dev/null") == 0
or tag 'invalid-po-file', "debian/po/$file";
- my $stats = `LANG=C msgfmt -o /dev/null --statistics \Q$debfiles/po/$file\E 2>&1`;
+ my $stats = `LC_ALL=C msgfmt -o /dev/null --statistics \Q$debfiles/po/$file\E 2>&1`;
if (!$full_translation && $stats =~ m/^\w+ \w+ \w+\.$/) {
$full_translation = 1;
}
diff --git a/debian/changelog b/debian/changelog
index 6c70c25..66fc2e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
lintian (2.5.3) UNRELEASED; urgency=low
- * checks/*.desc:
+ * checks/*:
+ [NT] Dropped fields from Needs-Info, it is no longer needed.
+ + [JW] Use LC_ALL rather than LANG, since LC_ALL overrules
+ LANG. (Closes: #637595)
* checks/{conffile,etcfiles}{,.desc}:
+ [JW] Merged etcfiles into conffile. (Closes: #637590)
@@ -17,14 +19,24 @@ lintian (2.5.3) UNRELEASED; urgency=low
* debian/copyright:
+ [NT] Added Jakub Wilk to maintainers.
+ * debian/rules:
+ + [JW] Use LC_ALL rather than LANG, since LC_ALL overrules
+ LANG.
* doc/README.developers:
+ [NT] New file. Thanks to Jeremiah C. Foster for the initial
contribution.
+ * lib/Util.pm:
+ + [JW] Use LC_ALL rather than LANG, since LC_ALL overrules
+ LANG.
* lib/Lintian/Collect/Source.pm:
+ [NT] Removed a requirement for fields that was not needed.
+ * private/*:
+ + [JW] Use LC_ALL rather than LANG, since LC_ALL overrules
+ LANG.
+
-- Niels Thykier <niels@thykier.net> Wed, 10 Aug 2011 21:09:24 +0200
lintian (2.5.2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 69a1fc4..e5b3359 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,8 +61,8 @@ build-arch build-indep build: build-stamp
build-stamp: $(neededfiles) $(docsource) $(testtarget)
@echo .... running build ....
dh_testdir
- cd doc && LANG=C docbook2html -V "%use-id-as-filename%" -o lintian.html lintian.xml
- cd doc && LANG=C jw -b txt lintian.xml
+ cd doc && LC_ALL=C docbook2html -V "%use-id-as-filename%" -o lintian.html lintian.xml
+ cd doc && LC_ALL=C jw -b txt lintian.xml
mkdir man/man1/
private/generate-lintian-pod | \
pod2man --name lintian --center "Debian Package Checker" --section=1 > man/man1/lintian.1
diff --git a/lib/Util.pm b/lib/Util.pm
index 08b5a8e..7d37965 100644
--- a/lib/Util.pm
+++ b/lib/Util.pm
@@ -235,7 +235,7 @@ sub file_is_encoded_in_non_utf8 {
my ($file, $type, $pkg) = @_;
my $non_utf8 = 0;
- open (ICONV, '-|', "env LANG=C iconv -f utf8 -t utf8 \Q$file\E 2>&1")
+ open (ICONV, '-|', "env LC_ALL=C iconv -f utf8 -t utf8 \Q$file\E 2>&1")
or fail("failure while checking encoding of $file for $type package $pkg");
my $line = 1;
while (<ICONV>) {
diff --git a/private/refresh-archs b/private/refresh-archs
index fe6e8cb..dd6bc9c 100755
--- a/private/refresh-archs
+++ b/private/refresh-archs
@@ -26,7 +26,7 @@ if [ -z "$1" ]; then
exit 0
fi
-export LANG=C
+export LC_ALL=C
dpkg_version="$(dpkg-architecture --version | head -n1)"
diff --git a/private/refresh-locale-codes b/private/refresh-locale-codes
index e69f7d1..5ae542a 100755
--- a/private/refresh-locale-codes
+++ b/private/refresh-locale-codes
@@ -54,7 +54,7 @@ cat > "$tmpfile" <<EOF
EOF
-export LANG=C
+export LC_ALL=C
{
isoquery -i 639
diff --git a/private/runtests b/private/runtests
index 320102b..7fc118f 100755
--- a/private/runtests
+++ b/private/runtests
@@ -15,8 +15,7 @@ if [ "$1" = "-t" ] ; then
TAG=yes
fi
-LANG="en_US.UTF-8"
-LC_COLLATE="C"
+LC_ALL="en_US.UTF-8"
LINTIAN_ROOT=""
LINTIAN_PROFILE=debian
LINTIAN_INTERNAL_TESTSUITE=1
@@ -25,8 +24,7 @@ NO_PKG_MANGLE=true
[ "$TEST_WORK_DIR" ] || TEST_WORK_DIR="debian/test-out"
-export LANG
-export LC_COLLCATE
+export LC_ALL
export LINTIAN_ROOT
export LINTIAN_PROFILE
export LINTIAN_INTERNAL_TESTSUITE
--
Debian package checker
Reply to: