r4753 - in /vdr/vdr/trunk/debian: changelog config-loader.sh plugin-loader.sh runvdr

[tschmidt at users.alioth.debian.org]

Author: tschmidt
Date: Sun Jun 10 20:11:44 2007
New Revision: 4753

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=4753
Log:

* Removed support for starting vdr without NTPL-support as glibc 2.5 does 
  not support this anymore

Modified:
    vdr/vdr/trunk/debian/changelog
    vdr/vdr/trunk/debian/config-loader.sh
    vdr/vdr/trunk/debian/plugin-loader.sh
    vdr/vdr/trunk/debian/runvdr

Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=4753&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Sun Jun 10 20:11:44 2007
@@ -1,4 +1,11 @@
-vdr (1.4.7-1) unstable; urgency=low
+vdr (1.4.7-2) UNRELEASED; urgency=low
+  
+  * Removed support for starting vdr without NTPL-support as glibc 2.5 does 
+    not support this anymore
+
+ -- Thomas Schmidt <tschmidt at debian.org>  Sun, 10 Jun 2007 21:58:32 +0200
+
+ vdr (1.4.7-1) unstable; urgency=low
 
   [ Tobias Grimm ]
   * Added opt-42-x_MainMenuHooks.dpatch

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=4753&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/config-loader.sh (original)
+++ vdr/vdr/trunk/debian/config-loader.sh Sun Jun 10 20:11:44 2007
@@ -45,9 +45,6 @@
 # Enable / Disable automatic shutdown
 ENABLE_SHUTDOWN=0
 
-# Change this to 1 if you want to VDR to not use NPTL.
-NONPTL=0
-
 # Video-Directory
 VIDEO_DIR="/var/lib/video.00"
 

Modified: vdr/vdr/trunk/debian/plugin-loader.sh
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/plugin-loader.sh?rev=4753&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/plugin-loader.sh (original)
+++ vdr/vdr/trunk/debian/plugin-loader.sh Sun Jun 10 20:11:44 2007
@@ -19,10 +19,6 @@
     local version
 
     vdrcmd="/usr/bin/vdr -u $USER $OPTIONS"
-
-    if [ "$NONPTL" = "1" -a `uname -m` != x86_64 ]; then
-        vdrcmd="LD_ASSUME_KERNEL=2.4.1 $vdrcmd"
-    fi
 
     version=`eval "$vdrcmd -V -L/usr/bin/vdr 2>/dev/null | sed 's/.*(\(.*\)).*/\1/'"`
     test "$version" || version="unknown version"

Modified: vdr/vdr/trunk/debian/runvdr
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/runvdr?rev=4753&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/runvdr (original)
+++ vdr/vdr/trunk/debian/runvdr Sun Jun 10 20:11:44 2007
@@ -5,11 +5,8 @@
 . /usr/lib/vdr/config-loader.sh
 
 OPTIONS="$*"
-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"
-fi
+
+VDRCMD="LANG=$VDR_LANG LC_ALL=$VDR_LANG /usr/bin/vdr $OPTIONS"
 
 function get_modulenames ()
 {