r1726 - vdr/vdradmin/trunk/debian/patches

[Thomas Schmidt]

Author: tschmidt
Date: 2006-01-14 21:51:19 +0000 (Sat, 14 Jan 2006)
New Revision: 1726

Modified:
   vdr/vdradmin/trunk/debian/patches/05_vdr-1.3.38-fix.dpatch
Log:
vdradmin: updated 05_vdr-1.3.38-fix to the version from Dominique Dumont

Modified: 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-14 21:27:38 UTC (rev 1725)
+++ vdr/vdradmin/trunk/debian/patches/05_vdr-1.3.38-fix.dpatch	2006-01-14 21:51:19 UTC (rev 1726)
@@ -1,20 +1,20 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 
-## 05_vdr-1.3.38-fix.dpatch by Dave P <vdr at pickles.me.uk>
+## 05_vdr-1.3.38-fix.dpatch by Dominique Dumont <domi.dumont at free.fr>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Fixes vdradmin when used with vdr 1.3.38
 
 @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
+diff -urNad vdradmin-0.97-am3.4.2/vdradmind.pl /tmp/dpep.Nsh19g/vdradmin-0.97-am3.4.2/vdradmind.pl
+--- vdradmin-0.97-am3.4.2/vdradmind.pl	2006-01-14 22:31:12.805101500 +0100
++++ /tmp/dpep.Nsh19g/vdradmin-0.97-am3.4.2/vdradmind.pl	2006-01-14 22:33:28.705619000 +0100
 @@ -735,7 +735,7 @@
  			else {
  				$bc++;
  				while($_ = $SVDRP->readoneline) {
 -					if(/^E (.*) (.*) (.*) (.*)/ || /^E (.*) (.*) (.*)/) {
-+                                        if(/^E (.*?) (.*?) (.*?) /) {
++                                        if(/^E ([^\s]*) ([^\s]*) ([^\s]*) /) {
  						my($event_id, $time, $duration) = ($1, $2, $3);
  						my($title, $subtitle, $summary);
  						while($_ = $SVDRP->readoneline) {