r3109 - vdr/vdr/trunk/debian

[Thomas Schmidt]

Author: tschmidt
Date: 2006-07-08 13:54:57 +0000 (Sat, 08 Jul 2006)
New Revision: 3109

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/config-loader.sh
   vdr/vdr/trunk/debian/copyright
   vdr/vdr/trunk/debian/runvdr
Log:
vdr: use LANG=C as default when starting vdr, to avoid problems on systems which use UTF8 as locale (default on etch); use new changelog-format

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2006-07-04 22:56:08 UTC (rev 3108)
+++ vdr/vdr/trunk/debian/changelog	2006-07-08 13:54:57 UTC (rev 3109)
@@ -1,23 +1,32 @@
 vdr (1.4.1-1) UNRELEASED; urgency=low
 
   * (NOT RELEASED YET)
+  
+  [ Thomas Günther ]
+    - Upgraded opt-24_jumpplay-0.8.dpatch to opt-24_jumpplay.dpatch version 0.9
+  
+  [ Tobias Grimm ]
   * New upstream release
-  * Thomas Günther <tom at toms-cafe.de>
-    - Upgraded opt-24_jumpplay-0.8.dpatch to opt-24_jumpplay.dpatch version 0.9
-  * Tobias Grimm <tg at e-tobi.net>
-    - Stripped default SHUTDOWNCMD to "shutdown -h now"
-    - SHUTDOWNCMD in vdr-shutdown is now executed detached, so that VDR does not
-      block and can cleanly shutdown when receiving SIGTERM
-      (Thanks to Hanno Müller for pointing this out!)
-    - Increased timeout for stopping the VDR daemon from 5 to 30 seconds, because
-      VDR may take pretty long to shut down gracefully
-    - Moved some of the default values in vdr.default to the config loader
-      and added description to README.Debian
+  * Stripped default SHUTDOWNCMD to "shutdown -h now"
+  * SHUTDOWNCMD in vdr-shutdown is now executed detached, so that VDR does not
+    block and can cleanly shutdown when receiving SIGTERM
+    (Thanks to Hanno Müller for pointing this out!)
+  * Increased timeout for stopping the VDR daemon from 5 to 30 seconds, because
+    VDR may take pretty long to shut down gracefully
+  * Moved some of the default values in vdr.default to the config loader
+    and added description to README.Debian
     - Added KEYB_TTY-option which may be overriden in /etc/default/vdr to make
       VDR switch to and accept input from the specified console
 
- -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun, 28 May 2006 21:03:39 +0200
+  [ Thomas Schmidt ]
+  * Using new changelog-format (closes: #343871)
+  * debian/runvdr: use LANG=C when starting vdr, to prevent vdr from exiting
+    on system which use UTF8 as default locale, this setting is also
+    configurable in /etc/default/vdr
+  * Added Tobias Grimm, Thomas Günther and myself to debian/copyright
 
+ -- Thomas Schmidt <tschmidt at debian.org>  Sat,  8 Jul 2006 15:49:59 +0200
+
 vdr (1.4.0-2) unstable; urgency=low
 
   * Thomas Günther <tom at toms-cafe.de>

Modified: vdr/vdr/trunk/debian/config-loader.sh
===================================================================
--- vdr/vdr/trunk/debian/config-loader.sh	2006-07-04 22:56:08 UTC (rev 3108)
+++ vdr/vdr/trunk/debian/config-loader.sh	2006-07-08 13:54:57 UTC (rev 3109)
@@ -63,4 +63,8 @@
 # change to this console. Empty means no console input.
 KEYB_TTY=""
 
+# 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)
+VDR_LANG=C
+
 test -f /etc/default/vdr && . /etc/default/vdr

Modified: vdr/vdr/trunk/debian/copyright
===================================================================
--- vdr/vdr/trunk/debian/copyright	2006-07-04 22:56:08 UTC (rev 3108)
+++ vdr/vdr/trunk/debian/copyright	2006-07-08 13:54:57 UTC (rev 3109)
@@ -21,7 +21,12 @@
                clocker at vdrportal.de, downloaded from 
                http://vdrportal.de/board/thread.php?postid=260715#post260715
 
+Debian Maintainers:
 
+  Tobias Grimm <tg at e-tobi.net>
+  Thomas Günther <tom at toms-cafe.de>
+  Thomas Schmidt <tschmidt at debian.org>
+
 Copyright:
 
    This package is free software; you can redistribute it and/or modify

Modified: vdr/vdr/trunk/debian/runvdr
===================================================================
--- vdr/vdr/trunk/debian/runvdr	2006-07-04 22:56:08 UTC (rev 3108)
+++ vdr/vdr/trunk/debian/runvdr	2006-07-08 13:54:57 UTC (rev 3109)
@@ -6,9 +6,9 @@
 
 OPTIONS="$*"
 if [ "$NONPTL" = "1" -a `uname -m` != x86_64 ]; then
-    VDRCMD="LD_ASSUME_KERNEL=2.4.1 /usr/bin/vdr $OPTIONS"
+    VDRCMD="LANG=$VDR_LANG LD_ASSUME_KERNEL=2.4.1 /usr/bin/vdr $OPTIONS"
 else
-    VDRCMD="/usr/bin/vdr $OPTIONS"
+    VDRCMD="LANG=$VDR_LANG /usr/bin/vdr $OPTIONS"
 fi
 
 function get_modulenames ()