r489 - vdr/vdr/branches/sarge/debian

[Thomas Schmidt]

Author: tschmidt
Date: 2005-04-24 15:11:47 +0000 (Sun, 24 Apr 2005)
New Revision: 489

Modified:
   vdr/vdr/branches/sarge/debian/changelog
   vdr/vdr/branches/sarge/debian/runvdr
   vdr/vdr/branches/sarge/debian/vdr.default
Log:
vdr: ported r480 (NTPL configurable) from trunk


Modified: vdr/vdr/branches/sarge/debian/changelog
===================================================================
--- vdr/vdr/branches/sarge/debian/changelog	2005-04-24 15:00:36 UTC (rev 488)
+++ vdr/vdr/branches/sarge/debian/changelog	2005-04-24 15:11:47 UTC (rev 489)
@@ -1,3 +1,13 @@
+vdr (1.2.6-13) unstable; urgency=low
+
+  * NOT YET RELEASED
+
+  * Darren Salt <linux@youmustbejoking.demon.co.uk>
+    - Disable the usage of NTPL on amd64 in runvdr (this allways overrides 
+      the setting in /etc/default/vdr) (closes: #305098)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sun, 24 Apr 2005 17:09:01 +0200
+
 vdr (1.2.6-12) unstable; urgency=low
 
   * Tobias Grimm <tg@e-tobi.net>

Modified: vdr/vdr/branches/sarge/debian/runvdr
===================================================================
--- vdr/vdr/branches/sarge/debian/runvdr	2005-04-24 15:00:36 UTC (rev 488)
+++ vdr/vdr/branches/sarge/debian/runvdr	2005-04-24 15:11:47 UTC (rev 489)
@@ -5,7 +5,11 @@
 . /usr/lib/vdr/config-loader.sh
 
 OPTIONS="$*"
-VDRCMD="LD_ASSUME_KERNEL=2.4 /usr/bin/vdr $OPTIONS"
+if [ "$NONPTL" = "1" -a `uname -m` != x86_64 ]; then
+  VDRCMD="LD_ASSUME_KERNEL=2.4 /usr/bin/vdr $OPTIONS"
+else
+  VDRCMD="/usr/bin/vdr $OPTIONS"
+fi
 
 function get_modulenames ()
 {

Modified: vdr/vdr/branches/sarge/debian/vdr.default
===================================================================
--- vdr/vdr/branches/sarge/debian/vdr.default	2005-04-24 15:00:36 UTC (rev 488)
+++ vdr/vdr/branches/sarge/debian/vdr.default	2005-04-24 15:11:47 UTC (rev 489)
@@ -24,3 +24,8 @@
 # pressed after processing all shutdown hook scripts. Shutdown hooks
 # may override this command - see /usr/share/doc/vdr/README.Debian.
 SHUTDOWNCMD="/etc/init.d/vdr stop ; sleep 1 ; /sbin/shutdown -h now"
+
+# 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