rev 14762 - trunk/packages/kdebase-workspace/debian

[Armin Berres]

Author: trigger-guest
Date: 2009-05-31 23:07:47 +0000 (Sun, 31 May 2009)
New Revision: 14762

Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/kdm.init
Log:
If readable, source /etc/default/locale in KDM's init script to make it
aware of the user's locale. (Closes: #528937)

Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2009-05-31 22:10:16 UTC (rev 14761)
+++ trunk/packages/kdebase-workspace/debian/changelog	2009-05-31 23:07:47 UTC (rev 14762)
@@ -32,8 +32,10 @@
   +++ Changes by Armin Berres:
 
   * Call update-alternatives without absolute path.
+  * If readable, source /etc/default/locale in KDM's init script to make it
+    aware of the user's locale. (Closes: #528937)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 28 May 2009 23:14:07 -0400
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 31 May 2009 19:03:39 -0400
 
 kdebase-workspace (4:4.2.2-2) unstable; urgency=low
 

Modified: trunk/packages/kdebase-workspace/debian/kdm.init
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdm.init	2009-05-31 22:10:16 UTC (rev 14761)
+++ trunk/packages/kdebase-workspace/debian/kdm.init	2009-05-31 23:07:47 UTC (rev 14762)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 ### BEGIN INIT INFO
 # Provides:          kdm
 # Required-Start:    $local_fs $remote_fs
@@ -15,11 +15,16 @@
 #
 # description: K Display Manager
 #
-set -e
 
 # Import the LSB init functions
 . /lib/lsb/init-functions
 
+# set the locale
+if [ -r /etc/default/locale ]; then
+  . /etc/default/locale
+  export LANG LANGUAGE
+fi
+
 # To start kdm even if it is not the default display manager, change
 # HEED_DEFAULT_DISPLAY_MANAGER to "false."
 HEED_DEFAULT_DISPLAY_MANAGER=true