[Pkg-kbd-commit] r167 - people/barbier/kbd/trunk/debian

[Denis Barbier]

Author: barbier
Date: 2006-04-05 21:08:42 +0000 (Wed, 05 Apr 2006)
New Revision: 167

Modified:
   people/barbier/kbd/trunk/debian/changelog
   people/barbier/kbd/trunk/debian/console-screen.kbd.sh
Log:
  * debian/console-screen.kbd.sh: Check for locale variables in both files
    /etc/environment and /etc/default/locale.


Modified: people/barbier/kbd/trunk/debian/changelog
===================================================================
--- people/barbier/kbd/trunk/debian/changelog	2006-04-05 15:02:11 UTC (rev 166)
+++ people/barbier/kbd/trunk/debian/changelog	2006-04-05 21:08:42 UTC (rev 167)
@@ -21,6 +21,9 @@
   * debian/control: Change Maintainer field to pkg-kbd-dev at l.a.d.o, and
     add myself to Uploaders.
 
+  * debian/console-screen.kbd.sh: Check for locale variables in both files
+    /etc/environment and /etc/default/locale.
+
   * Apply changes from console-tools:
     + debian/console-screen.kbd.sh:
       - Include LSB-formatted Init dependency info

Modified: people/barbier/kbd/trunk/debian/console-screen.kbd.sh
===================================================================
--- people/barbier/kbd/trunk/debian/console-screen.kbd.sh	2006-04-05 15:02:11 UTC (rev 166)
+++ people/barbier/kbd/trunk/debian/console-screen.kbd.sh	2006-04-05 21:08:42 UTC (rev 167)
@@ -138,11 +138,11 @@
 
     # Go to UTF-8 mode as necessary
     # 
-    if [ -f /etc/environment ]
+    if [ -f /etc/environment ] || [ -f /etc/default/locale ]
     then
         for var in LANG LC_CTYPE LC_ALL
         do
-            value=$(egrep "^[^#]*${var}=" /etc/environment | tail -n1 | cut -d= -f2)
+            value=$(egrep "^[^#]*${var}=" /etc/environment /etc/default/locale 2>/dev/null | tail -n1 | cut -d= -f2)
             eval $var=$value
         done
     fi