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

[SCM] Debian package checker branch, master, updated. 2.4.1-29-g95f0eac



The following commit has been merged in the master branch:
commit 95f0eacb59629255c847e8087b37e65addb9452a
Author: Russ Allbery <rra@debian.org>
Date:   Sun Jun 27 17:21:29 2010 -0700

    Run man page checks with en_US.UTF-8 locale
    
    * checks/manpages{,.desc}:
      + [RA] Run man page checks using the en_US.UTF-8 locale now that we
        guarantee it exists.  Should hopefully fix occasional problems with
        col complaining about bad multibyte characters.  (Closes: #575661)

diff --git a/checks/manpages b/checks/manpages
index 0b74ee6..0035bda 100644
--- a/checks/manpages
+++ b/checks/manpages
@@ -212,7 +212,7 @@ foreach my $file (sort keys %{$info->index}) {
 	    if (not defined $pid) {
 		fail("cannot run lexgrog: $!");
 	    } elsif ($pid == 0) {
-		my %newenv = (LANG => 'C', PATH => $ENV{PATH},
+		my %newenv = (LANG => 'en_US.UTF-8', PATH => $ENV{PATH},
 			      LOCPATH => $ENV{LOCPATH});
 		undef %ENV;
 		%ENV = %newenv;
@@ -246,8 +246,8 @@ foreach my $file (sort keys %{$info->index}) {
 	if (not defined $pid) {
 	    fail("cannot run man -E UTF-8 -l: $!");
 	} elsif ($pid == 0) {
-	    my %newenv = (LANG => 'C', PATH => $ENV{PATH}, MANWIDTH => 80,
-			  LOCPATH => $ENV{LOCPATH});
+	    my %newenv = (LANG => 'en_US.UTF8', PATH => $ENV{PATH},
+			  MANWIDTH => 80, LOCPATH => $ENV{LOCPATH});
 	    undef %ENV;
 	    %ENV = %newenv;
 	    exec "($cmd >/dev/null) 2>&1"
diff --git a/checks/manpages.desc b/checks/manpages.desc
index bc49b70..a31e3df 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=C MANWIDTH=80 man --warnings -E UTF-8 -l manpage-file &gt;/dev/null
+  LANG=en_US.UTF-8 MANWIDTH=80 man --warnings -E UTF-8 -l &lt;file&gt; &gt;/dev/null
 
 Tag: manpage-has-errors-from-pod2man
 Severity: normal
diff --git a/debian/changelog b/debian/changelog
index ceb922e..24bfeca 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,10 @@ lintian (2.4.2) UNRELEASED; urgency=low
   * checks/init.d{,.desc}:
     + [RG] Check for init.d scripts depending on unknown virtual
       facilities.
+  * checks/manpages{,.desc}:
+    + [RA] Run man page checks using the en_US.UTF-8 locale now that we
+      guarantee it exists.  Should hopefully fix occasional problems with
+      col complaining about bad multibyte characters.  (Closes: #575661)
   * checks/menu-format.desc:
     + [RA] Fix typo in long description of duplicated-key-in-desktop-entry.
       Thanks, Niels Thykier.  (Closes: #580700)

-- 
Debian package checker


Reply to: