r6456 - in /vdr/vdr/trunk/debian: README.Debian changelog control runvdr

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

Author: tiber-guest
Date: Sun Mar 16 17:53:38 2008
New Revision: 6456

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6456
Log:
* Added support for VDR_CHARSET_OVERRIDE=<CHARSET> in /etc/default/vdr

Modified:
    vdr/vdr/trunk/debian/README.Debian
    vdr/vdr/trunk/debian/changelog
    vdr/vdr/trunk/debian/control
    vdr/vdr/trunk/debian/runvdr

Modified: vdr/vdr/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/README.Debian?rev=6456&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/README.Debian (original)
+++ vdr/vdr/trunk/debian/README.Debian Sun Mar 16 17:53:38 2008
@@ -91,6 +91,16 @@
     Username under which vdr will run. All plugins and commands invoked by VDR
     will be executed with this users rights.
   
+VDR_CHARSET_OVERRIDE=<CHARSET>
+
+    Default: not set
+
+    Workaround for broadcasters not correctly implementing the standard.
+    According to "ETSI EN 300 468" the default character set is ISO6937. But
+    unfortunately some broadcasters actually use ISO-8859-9, but fail to
+    correctly announce that. If you set VDR_CHARSET_OVERRIDE=ISO-8859-9, then VDR
+    uses ISO-8859-9 as default.
+
 VDR_LANG=<LANG>
 
     Default: C

Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=6456&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Sun Mar 16 17:53:38 2008
@@ -1,4 +1,4 @@
-vdr (1.5.17-1) UNRELEASED; urgency=low
+vdr (1.5.18-1) UNRELEASED; urgency=low
 
   [ Tobias Grimm]
   * New upstream release (closes: #467512)
@@ -42,6 +42,7 @@
     when PLUGIN_CHECK_PATCHLEVEL=no (closes: #426921)
   * Added manpages for vdr-dbg, debugvdr, vdrleaktest, vdrdbg-buildpackage
     and pic2mpg
+  * Added support for VDR_CHARSET_OVERRIDE=<CHARSET> in /etc/default/vdr
 
   [ Thomas Günther ]
   * Adapted 04_newplugin.dpatch

Modified: vdr/vdr/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/control?rev=6456&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/control (original)
+++ vdr/vdr/trunk/debian/control Sun Mar 16 17:53:38 2008
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>= 5), dpatch, libjpeg62-dev, libcap-dev,
+Build-Depends: debhelper (>= 5), dpatch, xsltproc, docbook-xsl, libjpeg62-dev, libcap-dev,
  libncursesw5-dev, libfreetype6-dev, libfontconfig-dev, gettext
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr/trunk/

Modified: vdr/vdr/trunk/debian/runvdr
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/runvdr?rev=6456&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/runvdr (original)
+++ vdr/vdr/trunk/debian/runvdr Sun Mar 16 17:53:38 2008
@@ -1,10 +1,13 @@
-#!/bin/bash
-#
-#
+#!/bin/bash -p
 
 . /usr/lib/vdr/config-loader.sh
 
-VDRCMD="LANG=$VDR_LANG LC_ALL=$VDR_LANG /usr/bin/vdr $*"
+VDR_ENV="LANG=$VDR_LANG LC_ALL=$VDR_LANG"
+if [ -n $VDR_CHARSET_OVERRIDE ] ; then
+   VDR_ENV="$VDR_ENV VDR_CHARSET_OVERRIDE=$VDR_CHARSET_OVERRIDE"
+fi
+
+VDRCMD="$VDR_ENV /usr/bin/vdr $*"
 
 KVERS_2_6=`uname -r | grep -e '2.6'`
 
@@ -22,11 +25,14 @@
 # TODO: check if udev handles this on newer systems!?
 function set_permissions()
 {
-    for FILE in av7110_ir budget_ci_ir; do
-        if [ -e "/proc/$FILE" ]; then
-            chown $USER.$GROUP /proc/$FILE
-        fi
-    done
+    if [ "$USER" -o "$GROUP" ]; then
+        for FILE in av7110_ir budget_ci_ir; do
+            if [ -e "/proc/$FILE" ]; then
+                chown $USER.$GROUP /proc/$FILE
+            fi
+        done
+    fi
+    chmod o+r /dev/input/event*
 }
 
 function load_dvb_modules()
@@ -60,6 +66,7 @@
     done
 }
 
+
 VDR_ERR=`mktemp -p /tmp vdr-err.XXXXXX`
 
 get_modulenames
@@ -67,11 +74,10 @@
 [ -z "$MODULES" ] && load_dvb_modules
 
 while (true) do
-    
+
     set_permissions
-    
+
     eval $VDRCMD >/dev/null 2>"$VDR_ERR"
-    
 
     case $? in
         0)