r7413 - in /vdr/vdr/trunk/debian: README.Debian changelog config-loader.sh

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Fri Sep 19 16:16:39 2008
New Revision: 7413

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7413
Log:
* Fixed detection of default LANG setting to be used for VDR
* Updated README.Debian (Closes: #499047)

Modified:
    vdr/vdr/trunk/debian/README.Debian
    vdr/vdr/trunk/debian/changelog
    vdr/vdr/trunk/debian/config-loader.sh

Modified: vdr/vdr/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/README.Debian?rev=7413&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/README.Debian (original)
+++ vdr/vdr/trunk/debian/README.Debian Fri Sep 19 16:16:39 2008
@@ -86,10 +86,10 @@
 
 VDR_LANG=<LANG>
 
-    Default: C
-
-    Locale which is used when running vdr (Default is C, because vdr does 
-    not run on systems where the default is UTF8 like on Etch)
+    Default: read from LANG or LC_ALL in /etc/default/locale or /etc/environment,
+             falling back to C, if no locale is specified
+
+    Locale which is used when running vdr.
 
 VFAT=<0|1>
 

Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=7413&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Fri Sep 19 16:16:39 2008
@@ -6,8 +6,10 @@
   * Added opt-53_dvbsetup.dpatch
   * Added opt-54_deltimeshiftrec.dpatch
   * Replaced libcap-dev build dependency by libcap2-dev | libcap-dev (Closes: #492681)
-
- -- Tobias Grimm <tg at e-tobi.net>  Wed, 10 Sep 2008 19:59:07 +0200
+  * Fixed detection of default LANG setting to be used for VDR
+  * Updated README.Debian (Closes: #499047)
+
+ -- Tobias Grimm <tg at e-tobi.net>  Fri, 19 Sep 2008 18:12:43 +0200
 
 vdr (1.6.0-7) unstable; urgency=medium
 

Modified: vdr/vdr/trunk/debian/config-loader.sh
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/config-loader.sh?rev=7413&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/config-loader.sh (original)
+++ vdr/vdr/trunk/debian/config-loader.sh Fri Sep 19 16:16:39 2008
@@ -65,7 +65,10 @@
 [ -r /etc/environment ] && ENV_FILE="/etc/environment"
 [ -r /etc/default/locale ] && ENV_FILE="/etc/default/locale"
 [ $ENV_FILE = none ] || \
-  VDR_LANG=$(egrep "^[^#]*${var}=" $ENV_FILE | tail -n1 | cut -d= -f2)
+  for var in LANG LC_ALL; do
+    eval VDR_LANG=$(egrep "^[^#]*${var}=" $ENV_FILE | tail -n1 | cut -d= -f2)
+    [ -z "$VDR_LANG" ] || break
+  done
 [ -z "$VDR_LANG" ] && VDR_LANG="C"
 
 # Enable VFAT file system support by default