r1708 - in vdr/vdradmin/trunk/debian: . patches

[Thomas Schmidt]

Author: tschmidt
Date: 2006-01-10 19:15:51 +0000 (Tue, 10 Jan 2006)
New Revision: 1708

Added:
   vdr/vdradmin/trunk/debian/patches/05_vdr-1.3.38-fix.dpatch
Modified:
   vdr/vdradmin/trunk/debian/changelog
   vdr/vdradmin/trunk/debian/patches/00list
Log:
vdradmin: Added 05_vdr-1.3.36-fix.dpatch (i do not know if this still works with vdr < 1.3.38), TODO: patch to get screenshots directly via SVDRP, base64-encoded

Modified: vdr/vdradmin/trunk/debian/changelog
===================================================================
--- vdr/vdradmin/trunk/debian/changelog	2006-01-10 17:51:50 UTC (rev 1707)
+++ vdr/vdradmin/trunk/debian/changelog	2006-01-10 19:15:51 UTC (rev 1708)
@@ -1,3 +1,12 @@
+vdradmin (0.97-am3.4.2-3) unstable; urgency=low
+
+  * NOT RELEASED YET
+  
+  * Thomas Schmidt <tschmidt at debian.org>
+    - Added 05_vdr-1.3.38-fix.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue, 10 Jan 2006 19:59:02 +0100
+
 vdradmin (0.97-am3.4.2-2) unstable; urgency=medium
 
   * Tobias Grimm <tg at e-tobi.net>

Modified: vdr/vdradmin/trunk/debian/patches/00list
===================================================================
--- vdr/vdradmin/trunk/debian/patches/00list	2006-01-10 17:51:50 UTC (rev 1707)
+++ vdr/vdradmin/trunk/debian/patches/00list	2006-01-10 19:15:51 UTC (rev 1708)
@@ -2,3 +2,4 @@
 02_sectmpfiles
 03_cfgfiles-fhs
 04_epg_filename
+05_vdr-1.3.38-fix

Added: vdr/vdradmin/trunk/debian/patches/05_vdr-1.3.38-fix.dpatch
===================================================================
--- vdr/vdradmin/trunk/debian/patches/05_vdr-1.3.38-fix.dpatch	2006-01-10 17:51:50 UTC (rev 1707)
+++ vdr/vdradmin/trunk/debian/patches/05_vdr-1.3.38-fix.dpatch	2006-01-10 19:15:51 UTC (rev 1708)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 05_vdr-1.3.38-fix.dpatch by Dave P <vdr at pickles.me.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes vdradmin when used with vdr 1.3.38
+
+ at DPATCH@
+diff -urNad vdradmin-0.97-am3.4.2/vdradmind.pl /tmp/dpep.DiXvyv/vdradmin-0.97-am3.4.2/vdradmind.pl
+--- vdradmin-0.97-am3.4.2/vdradmind.pl	2005-12-06 14:18:01.000000000 +0100
++++ /tmp/dpep.DiXvyv/vdradmin-0.97-am3.4.2/vdradmind.pl	2006-01-10 19:56:30.269870250 +0100
+@@ -735,7 +735,7 @@
+ 			else {
+ 				$bc++;
+ 				while($_ = $SVDRP->readoneline) {
+-					if(/^E (.*) (.*) (.*) (.*)/ || /^E (.*) (.*) (.*)/) {
++                                        if(/^E (.*?) (.*?) (.*?) /) {
+ 						my($event_id, $time, $duration) = ($1, $2, $3);
+ 						my($title, $subtitle, $summary);
+ 						while($_ = $SVDRP->readoneline) {


Property changes on: vdr/vdradmin/trunk/debian/patches/05_vdr-1.3.38-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *