r9249 - in /vdr/vdradmin-am/trunk/debian: changelog patches/Fixed-LSTR-for-VDR-1.7.21.patch patches/series

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

Author: tiber-guest
Date: Sat Dec 24 20:56:41 2011
New Revision: 9249

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=9249
Log:
Added Fixed-LSTR-for-VDR-1.7.21.patch (Closes: #653136)

Added:
    vdr/vdradmin-am/trunk/debian/patches/Fixed-LSTR-for-VDR-1.7.21.patch
Modified:
    vdr/vdradmin-am/trunk/debian/changelog
    vdr/vdradmin-am/trunk/debian/patches/series

Modified: vdr/vdradmin-am/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/changelog?rev=9249&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/changelog (original)
+++ vdr/vdradmin-am/trunk/debian/changelog Sat Dec 24 20:56:41 2011
@@ -1,3 +1,9 @@
+vdradmin-am (3.6.9-2) unstable; urgency=low
+
+  * Added Fixed-LSTR-for-VDR-1.7.21.patch (Closes: #653136)
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 24 Dec 2011 21:52:03 +0100
+
 vdradmin-am (3.6.9-1) unstable; urgency=low
 
   * New upstream release

Added: vdr/vdradmin-am/trunk/debian/patches/Fixed-LSTR-for-VDR-1.7.21.patch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/Fixed-LSTR-for-VDR-1.7.21.patch?rev=9249&op=file
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/Fixed-LSTR-for-VDR-1.7.21.patch (added)
+++ vdr/vdradmin-am/trunk/debian/patches/Fixed-LSTR-for-VDR-1.7.21.patch Sat Dec 24 20:56:41 2011
@@ -1,0 +1,31 @@
+From c2bed581bb0cffa49941e64d357048c2043b5db0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?David=20R=C3=BCtti?= <d_ruetti at hotmail.com>
+Date: Sat, 24 Dec 2011 21:41:27 +0100
+Subject: [PATCH] Fixed LSTR for VDR >= 1.7.21 when executing recording
+ commands
+
+---
+ HISTORY      |    1 +
+ vdradmind.pl |    6 +++++-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/vdradmind.pl b/vdradmind.pl
+index 60fe3fa..1299565 100755
+--- a/vdradmind.pl
++++ b/vdradmind.pl
+@@ -6438,7 +6438,11 @@ sub recRunCmd {
+     my ($day,    $month, $hour, $minute, $newtitle, $c, $folder);
+ 
+     for (SendCMD("lstr")) {
+-        ($rec_id, $date, $time, $title) = split(/ +/, $_, 4);
++        if ($FEATURES{VDRVERSION} < 10721) {
++            ($rec_id, $date, $time, $title) = split(/ +/, $_, 4);
++        } else {
++            ($rec_id, $date, $time, undef, $title) = split(/ +/, $_, 5);
++        }
+         last if ($rec_id == $id);
+     }
+ 
+-- 
+1.7.7.3
+

Modified: vdr/vdradmin-am/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/series?rev=9249&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/series (original)
+++ vdr/vdradmin-am/trunk/debian/patches/series Sat Dec 24 20:56:41 2011
@@ -1,3 +1,4 @@
 01_dist-var.patch
 02_search-path.patch
 03_cfgfiles-fhs.patch
+Fixed-LSTR-for-VDR-1.7.21.patch