Please consider vdr 1.2.6-13 for inclusion in sarge, it was uploaded on allmoast 2 weeks agon, but if forgot to ask about inclusion into sarge until now.
It fixes an important bug, which is affecting amd64 users (the
init-script would not work without modifications on amd64), the other
changes are very small and should not cause any problems - interdiff
between 1.2.6-12 and 1.2.6-13 is attached.
Here is the last entry from the changelog:
vdr (1.2.6-13) unstable; urgency=medium
.
* Darren Salt <[EMAIL PROTECTED]>
- Make the usage of NPTL configurable in /etc/default/vdr
- Disable the usage of NPTL on amd64 in runvdr (this allways
overrides the setting in /etc/default/vdr) (closes: #305098)
* Thomas Schmidt <[EMAIL PROTECTED]>
- Added psmisc to the depends of the package vdr (thanks to Martin
Langer <[EMAIL PROTECTED]> for the hint)
Best Regards,
Thomas Schmidt
--
Thomas Schmidt, Debian VDR Team
http://pkg-vdr-dvb.alioth.debian.org/
diff -u vdr-1.2.6/debian/control vdr-1.2.6/debian/control
--- vdr-1.2.6/debian/control
+++ vdr-1.2.6/debian/control
@@ -8,7 +8,7 @@
Package: vdr
Architecture: any
-Depends: ${misc:Depends}, makedev (>=2.3.1-66), adduser
+Depends: ${misc:Depends}, makedev (>=2.3.1-66), adduser, psmisc
Recommends: lirc
Provides: vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu
Conflicts: vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu
diff -u vdr-1.2.6/debian/config-loader.sh vdr-1.2.6/debian/config-loader.sh
--- vdr-1.2.6/debian/config-loader.sh
+++ vdr-1.2.6/debian/config-loader.sh
@@ -52,2 +52,7 @@
+# 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
+
test -f /etc/default/vdr && . /etc/default/vdr
diff -u vdr-1.2.6/debian/vdr.default vdr-1.2.6/debian/vdr.default
--- vdr-1.2.6/debian/vdr.default
+++ vdr-1.2.6/debian/vdr.default
@@ -26,0 +27,5 @@
+
+# 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
diff -u vdr-1.2.6/debian/runvdr vdr-1.2.6/debian/runvdr
--- vdr-1.2.6/debian/runvdr
+++ vdr-1.2.6/debian/runvdr
@@ -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 ()
{
diff -u vdr-1.2.6/debian/changelog vdr-1.2.6/debian/changelog
--- vdr-1.2.6/debian/changelog
+++ vdr-1.2.6/debian/changelog
@@ -1,3 +1,15 @@
+vdr (1.2.6-13) unstable; urgency=medium
+
+ * Darren Salt <[EMAIL PROTECTED]>
+ - Make the usage of NPTL configurable in /etc/default/vdr
+ - Disable the usage of NPTL on amd64 in runvdr (this allways
+ overrides the setting in /etc/default/vdr) (closes: #305098)
+ * Thomas Schmidt <[EMAIL PROTECTED]>
+ - Added psmisc to the depends of the package vdr (thanks to Martin
+ Langer <[EMAIL PROTECTED]> for the hint)
+
+ -- Debian VDR Team <[EMAIL PROTECTED]> Thu, 05 May 2005 21:47:56 +0200
+
vdr (1.2.6-12) unstable; urgency=low
* Tobias Grimm <[EMAIL PROTECTED]>
signature.asc
Description: Digital signature
