[SCM] Debian package checker branch, master, updated. 2.2.6-4-gdf18dbe

["Colin Watson" <cjwatson@canonical.com>]

The following commit has been merged in the master branch:
commit df18dbe9daebc4e5a5005aeca864b73394b380aa
Author: Colin Watson <cjwatson@canonical.com>
Date:   Tue Feb 24 00:38:13 2009 +0000

    * checks/manpages:
      + [CW] Run man with '-E UTF-8' to avoid producing bogus warnings on
        localised manual pages due to attempting to recode through ASCII.
    * debian/control:
      + [CW] Depend on man-db (>= 2.4.0) for '-E UTF-8'.

diff --git a/checks/manpages b/checks/manpages
index ce15f0e..47d994d 100644
--- a/checks/manpages
+++ b/checks/manpages
@@ -252,19 +252,19 @@ foreach my $file (sort keys %{$info->index}) {
 	my $cmd;
 	my $warnings = $MAN_WARNINGS ? ' --warnings' : '';
 	if ($file =~ m,^(.*)/(man\d/.*)$,) {
-	    $cmd = "cd unpacked/\Q$1\E && man$warnings -l \Q$2\E";
+	    $cmd = "cd unpacked/\Q$1\E && man$warnings -E UTF-8 -l \Q$2\E";
 	} else {
-	    $cmd = "man$warnings -l unpacked/\Q$file\E";
+	    $cmd = "man$warnings -E UTF-8 -l unpacked/\Q$file\E";
 	}
 	my $pid = open MANERRS, '-|';
 	if (not defined $pid) {
-	    fail("cannot run man -l: $!");
+	    fail("cannot run man -E UTF-8 -l: $!");
 	} elsif ($pid == 0) {
 	    my %newenv = (LANG => 'C', PATH => $ENV{PATH});
 	    undef %ENV;
 	    %ENV = %newenv;
 	    exec "($cmd >/dev/null) 2>&1"
-		or fail("cannot run man -l: $!");
+		or fail("cannot run man -E UTF-8 -l: $!");
 	}
 	while (<MANERRS>) {
 	    # ignore progress information from man
diff --git a/debian/changelog b/debian/changelog
index c6a3c4b..2f7fa3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,12 @@ lintian (2.2.7) UNRELEASED; urgency=low
     + [RA] Check for embedded copies of zlib in ELF binaries by looking
       for the inflate and deflate copyright strings.  Patch from Raphael
       Geissert.  (Closes: #318104)
+  * checks/manpages:
+    + [CW] Run man with '-E UTF-8' to avoid producing bogus warnings on
+      localised manual pages due to attempting to recode through ASCII.
+
+  * debian/control:
+    + [CW] Depend on man-db (>= 2.4.0) for '-E UTF-8'.
 
  -- Russ Allbery <rra@debian.org>  Sun, 22 Feb 2009 13:24:23 -0800
 
diff --git a/debian/control b/debian/control
index b23b22b..21c5106 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Vcs-Browser: http://git.debian.org/?p=lintian/lintian.git
 Package: lintian
 Architecture: all
 Depends: perl, libdigest-md5-perl | perl (>> 5.8), dpkg-dev (>= 1.13.17),
- file, binutils, diffstat (>= 1.27-1), man-db (>= 2.3.20-1), gettext (>= 0.16),
+ file, binutils, diffstat (>= 1.27-1), man-db (>= 2.4.0), gettext (>= 0.16),
  intltool-debian, libdigest-sha-perl, libparse-debianchangelog-perl (>= 0.6),
  libtimedate-perl, liburi-perl, libipc-run-perl
 Suggests: binutils-multiarch, libtext-template-perl, man-db (>= 2.5.1-1)

-- 
Debian package checker