[SCM] Debian package checker branch, master, updated. 2.3.2-26-gf6d6500

["Raphael Geissert" <atomo64@gmail.com>]

The following commit has been merged in the master branch:
commit c92063583b710d8319a884e203d0f28a38d5b39e
Author: Raphael Geissert <atomo64@gmail.com>
Date:   Sat Jan 30 23:02:21 2010 -0600

    Fix the paths to the locale generated for lintian's own use
    
    * debian/postinst:
      + [RG] Generate the locale under the correct directory.
    
    * frontend/lintian:
      + [RG] Fix path to the locale directory passed to LOCPATH.
        (Closes: #555408)

diff --git a/debian/changelog b/debian/changelog
index 5731332..a78b9ab 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,9 +43,15 @@ lintian (2.3.3) UNRELEASED; urgency=low
 
   * debian/control:
     + [RG] Update standards version to 3.8.4 (no changes required).
+  * debian/postinst:
+    + [RG] Generate the locale under the correct directory.
   * debian/prerm:
     + [RG] Don't ignore errors on shell commands failures.
 
+  * frontend/lintian:
+    + [RG] Fix path to the locale directory passed to LOCPATH.
+      (Closes: #555408)
+
   * private/refresh-archs:
     + [RG] Generate a list of triplet<->architecture relationships too.
 
diff --git a/debian/postinst b/debian/postinst
index c7f773e..769ffea 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -5,12 +5,14 @@
 
 set -e
 
-if [ ! -f '/var/lib/lintian/locale/LC_CTYPE' ] &&
+if [ ! -f '/var/lib/lintian/locale/en_US.UTF-8/LC_CTYPE' ] &&
    [ -f /usr/share/locale/locale.alias ]; then
     echo 'Generating en_US.UTF-8 locale for internal Lintian use....'
+    # handle upgrades from the previous, incorrect, directory
+    rm -rf /var/lib/lintian/locale
     mkdir -p /var/lib/lintian/locale
     if ! localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias \
-                --quiet /var/lib/lintian/locale ; then
+                --quiet /var/lib/lintian/locale/en_US.UTF-8 ; then
         rm -rf /var/lib/lintian/locale
         exit 1
     fi
diff --git a/frontend/lintian b/frontend/lintian
index 9a9a392..4144455 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -581,7 +581,7 @@ $ENV{'LINTIAN_DEBUG'} = $debug;
 if (-d "$LINTIAN_ROOT/locale/en_US.UTF-8") {
     $ENV{LOCPATH} = "$LINTIAN_ROOT/locale";
 } elsif (-d '/var/lib/lintian/locale/en_US.UTF-8') {
-    $ENV{LOCPATH} = '/var/lib/lintian/locale/en_US.UTF-8';
+    $ENV{LOCPATH} = '/var/lib/lintian/locale';
 }
 
 # }}}

-- 
Debian package checker