[SCM] Debian package checker branch, master, updated. 2.5.4-162-g3bfd302

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit 3bfd30272d468c1e7882675b43bcdc10a418ae78
Author: Niels Thykier <niels@thykier.net>
Date:   Fri Feb 10 10:03:23 2012 +0100

    p/runtests: Generate en_US.UTF-8 locale instead of C.UTF-8
    
    It is not possible to generate the C.UTF-8 locale on Squeeze systems
    and Lintian needs either C.UTF-8 or en_US.UTF-8 to pass the certain
    tests (like manpages-general).
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/private/runtests b/private/runtests
index a0f3418..27c1c5a 100755
--- a/private/runtests
+++ b/private/runtests
@@ -43,13 +43,15 @@ if [ ! -e "/usr/lib/locale/C.UTF-8" ] ; then
     LOCPATH="$(pwd)/debian/test.locale"
     export LOCPATH
 
-    if [ ! -e "$LOCPATH"/C.UTF-8 ] ; then
-        echo "Generating C.UTF-8 locale for the test suite"
+    # Apparently, it is not possible to generate a C.UTF-8 locale in
+    # Squeeze, so settle with an en_US.UTF-8 one.
+    if [ ! -e "$LOCPATH"/en_US.UTF-8 ] ; then
+        echo "Generating en_US.UTF-8 locale for the test suite"
         mkdir -p "$LOCPATH"
-        localedef -i C -c -f UTF-8 -A /usr/share/locale/locale.alias \
-            --quiet "$LOCPATH"/C.UTF-8 || fail "Locale generation failed"
+        localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias \
+            --quiet "$LOCPATH"/en_US.UTF-8 || fail "Locale generation failed"
     else
-        echo "Using pre-generated C.UTF-8 locale in $LOCPATH"
+        echo "Using pre-generated en_US.UTF-8 locale in $LOCPATH"
     fi
 else
     echo "Using C.UTF-8 locale from /usr/lib/locale"

-- 
Debian package checker