r4082 - vdr/vdr/trunk/debian

[Tobias Grimm]

Author: tiber-guest
Date: 2007-01-20 01:41:21 +0100 (Sat, 20 Jan 2007)
New Revision: 4082

Modified:
   vdr/vdr/trunk/debian/README.Debian
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/config-loader.sh
   vdr/vdr/trunk/debian/runvdr
   vdr/vdr/trunk/debian/vdr.init
Log:
* NOT RELEASED YET
* Set NONPTL=0 by default - since version 1.3.27 VDR should work with the
  Native Posix Threading Library without problems. NONPTL can now be
  enabled for AMD64 systems again, even if this should not be necessary.
* Added KEYB_TTY_SWITCH option which, when set to "1", makes VDR switch to
  the console specified in KEYB_TTY on startup. Before this version, this
  was the default behaviour when KEYB_TTY was specified. Now it's optional
  and disabled by default.

Modified: vdr/vdr/trunk/debian/README.Debian
===================================================================
--- vdr/vdr/trunk/debian/README.Debian	2007-01-18 21:34:51 UTC (rev 4081)
+++ vdr/vdr/trunk/debian/README.Debian	2007-01-20 00:41:21 UTC (rev 4082)
@@ -34,13 +34,18 @@
     Console for controlling VDR by keyboard (e.g. /dev/tty8). On startup VDR
     will automatically switch to this console.
 
+KEYB_TTY_SWITCH=<0|1>
+
+    Default: 0
+
+    Set this to 1, to make VDR switch to the console specified in KEYB_TTY
+    on startup.
+
 NONPTL=<0|1>
 
-    Default: 1
+    Default: 0
 
-    Change this to 0 if you want to allow VDR to use NPTL (if available). This is
-    disabled by default, although it should be safe to enable it.
-    (This has no effect on AMD64 machines.)
+    Change this to 1, if you want VDR to not use NPTL.
 
 PLUGIN_CHECK_PATCHLEVEL="<yes|no>"
 

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2007-01-18 21:34:51 UTC (rev 4081)
+++ vdr/vdr/trunk/debian/changelog	2007-01-20 00:41:21 UTC (rev 4082)
@@ -1,3 +1,16 @@
+vdr (1.4.5-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Set NONPTL=0 by default - since version 1.3.27 VDR should work with the
+    Native Posix Threading Library without problems. NONPTL can now be
+    enabled for AMD64 systems again, even if this should not be necessary.
+  * Added KEYB_TTY_SWITCH option which, when set to "1", makes VDR switch to
+    the console specified in KEYB_TTY on startup. Before this version, this
+    was the default behaviour when KEYB_TTY was specified. Now it's optional
+    and disabled by default.
+
+ -- Tobias Grimm <tg at e-tobi.net>  Sat, 20 Jan 2007 01:38:33 +0100
+
 vdr (1.4.5-1) experimental; urgency=low
 
   [ Tobias Grimm ]

Modified: vdr/vdr/trunk/debian/config-loader.sh
===================================================================
--- vdr/vdr/trunk/debian/config-loader.sh	2007-01-18 21:34:51 UTC (rev 4081)
+++ vdr/vdr/trunk/debian/config-loader.sh	2007-01-20 00:41:21 UTC (rev 4082)
@@ -45,10 +45,8 @@
 # Enable / Disable automatic shutdown
 ENABLE_SHUTDOWN=0
 
-# Change this to 0 if you want to allow VDR to use NPTL (if available).
-# This is disabled by default, although it should be safe to enable it.
-# (This has no effect on AMD64 machines.)
-NONPTL=1
+# Change this to 1 if you want to VDR to not use NPTL.
+NONPTL=0
 
 # Video-Directory
 VIDEO_DIR="/var/lib/video.00"
@@ -59,10 +57,14 @@
 # Set this to load only startable plugins (check with "vdr -V -P plugin")
 PLUGIN_CHECK_STARTABLE="yes"
 
-# Default Console for controlling VDR by keyboard. On startup VDR will
-# change to this console. Empty means no console input.
+# Default Console for controlling VDR by keyboard. Empty means no console
+# input.
 KEYB_TTY=""
 
+# Set this to 1 to make VDR switch to the console specified in KEYB_TTY
+# on startup
+KEYB_TTY_SWITCH=0
+
 # 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

Modified: vdr/vdr/trunk/debian/runvdr
===================================================================
--- vdr/vdr/trunk/debian/runvdr	2007-01-18 21:34:51 UTC (rev 4081)
+++ vdr/vdr/trunk/debian/runvdr	2007-01-20 00:41:21 UTC (rev 4082)
@@ -5,7 +5,7 @@
 . /usr/lib/vdr/config-loader.sh
 
 OPTIONS="$*"
-if [ "$NONPTL" = "1" -a `uname -m` != x86_64 ]; then
+if [ "$NONPTL" = "1" ]; then
     VDRCMD="LANG=$VDR_LANG LC_ALL=$VDR_LANG LD_ASSUME_KERNEL=2.4.1 /usr/bin/vdr $OPTIONS"
 else
     VDRCMD="LANG=$VDR_LANG LC_ALL=$VDR_LANG /usr/bin/vdr $OPTIONS"

Modified: vdr/vdr/trunk/debian/vdr.init
===================================================================
--- vdr/vdr/trunk/debian/vdr.init	2007-01-18 21:34:51 UTC (rev 4081)
+++ vdr/vdr/trunk/debian/vdr.init	2007-01-20 00:41:21 UTC (rev 4082)
@@ -48,8 +48,10 @@
         clean_console
         echo -e "This tty is currently mapped to VDR, keypresses aren't echoed.\r" > $KEYB_TTY
         echo -n "For a login prompt switch to another console." > $KEYB_TTY
-        chvt `echo "$KEYB_TTY" | sed "s/\/dev\/tty//"`
         REDIRECT="< $KEYB_TTY"
+        if [ "$KEYB_TTY_SWITCH" = "1" ]; then
+            chvt `echo "$KEYB_TTY" | sed "s/\/dev\/tty//"`
+        fi
     fi
 }