r4840 - in /vdr/vdr-plugin-live/trunk/debian: changelog patches/00list patches/01_tnt-1.6.0.dpatch patches/90_clean.dpatch patches/91_timer-delete-fix.dpatch patches/92_live-0.1.0-1.5.3.dpatch

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

Author: tom-guest
Date: Wed Jun 27 23:42:53 2007
New Revision: 4840

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=4840
Log:
Release for vdrdevel 1.5.5

Added:
    vdr/vdr-plugin-live/trunk/debian/patches/92_live-0.1.0-1.5.3.dpatch
Modified:
    vdr/vdr-plugin-live/trunk/debian/changelog
    vdr/vdr-plugin-live/trunk/debian/patches/00list
    vdr/vdr-plugin-live/trunk/debian/patches/01_tnt-1.6.0.dpatch   (props changed)
    vdr/vdr-plugin-live/trunk/debian/patches/90_clean.dpatch   (props changed)
    vdr/vdr-plugin-live/trunk/debian/patches/91_timer-delete-fix.dpatch   (props changed)

Modified: vdr/vdr-plugin-live/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-live/trunk/debian/changelog?rev=4840&op=diff
==============================================================================
--- vdr/vdr-plugin-live/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-live/trunk/debian/changelog Wed Jun 27 23:42:53 2007
@@ -1,3 +1,10 @@
+vdr-plugin-live (0.1.0-3) unstable; urgency=low
+
+  * Release for vdrdevel 1.5.5
+  * Added 92_live-0.1.0-1.5.3.dpatch
+
+ -- Thomas Günther <tom at toms-cafe.de>  Wed, 27 Jun 2007 23:54:29 +0200
+
 vdr-plugin-live (0.1.0-2) unstable; urgency=low
 
   * Added patch for new version of libtntnet-dev in Sid

Modified: vdr/vdr-plugin-live/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-live/trunk/debian/patches/00list?rev=4840&op=diff
==============================================================================
--- vdr/vdr-plugin-live/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-live/trunk/debian/patches/00list Wed Jun 27 23:42:53 2007
@@ -1,3 +1,4 @@
 01_tnt-1.6.0
 90_clean
 91_timer-delete-fix
+92_live-0.1.0-1.5.3

Propchange: vdr/vdr-plugin-live/trunk/debian/patches/01_tnt-1.6.0.dpatch
            ('svn:executable' removed)

Propchange: vdr/vdr-plugin-live/trunk/debian/patches/90_clean.dpatch
            ('svn:executable' removed)

Propchange: vdr/vdr-plugin-live/trunk/debian/patches/91_timer-delete-fix.dpatch
            ('svn:executable' removed)

Added: vdr/vdr-plugin-live/trunk/debian/patches/92_live-0.1.0-1.5.3.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-live/trunk/debian/patches/92_live-0.1.0-1.5.3.dpatch?rev=4840&op=file
==============================================================================
--- vdr/vdr-plugin-live/trunk/debian/patches/92_live-0.1.0-1.5.3.dpatch (added)
+++ vdr/vdr-plugin-live/trunk/debian/patches/92_live-0.1.0-1.5.3.dpatch Wed Jun 27 23:42:53 2007
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 92_live-0.1.0-1.5.3.dpatch by Thomas Günther <tom at toms-cafe.de>
+## http://toms-cafe.de/vdr/download/live-0.1.0-1.5.3.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.3.
+
+ at DPATCH@
+--- live-0.1.0/pages/timers.ecpp
++++ live-0.1.0/pages/timers.ecpp
+@@ -59,7 +59,11 @@ using namespace vdrlive;
+ 			<table class="timers" cellspacing="0" cellpadding="0">
+ <%cpp>
+ 				for (SortedTimers::iterator timer = timers.begin(); timer != timers.end(); ++timer) {
++#if VDRVERSNUM >= 10503
++					string currentDay = timer->WeekDays() > 0 ? *cTimer::PrintDay(0, timer->WeekDays(), true) : 							FormatDateTime(tr("%A, %x"), timer->Day());
++#else
+ 					string currentDay = timer->WeekDays() > 0 ? *cTimer::PrintDay(0, timer->WeekDays()) : 							FormatDateTime(tr("%A, %x"), timer->Day());
++#endif
+ 					if (previousDay != currentDay) {
+ 						if (!previousDay.empty()) {
+ </%cpp>
+@@ -73,7 +77,7 @@ using namespace vdrlive;
+ 				<tr class="head">
+ 					<td colspan="10">
+ 						<div class="boxheader"><div><div>
+-							<$ timer->WeekDays() > 0 ? *cTimer::PrintDay(0, timer->WeekDays()) : FormatDateTime(tr("%A, %x"), timer->Day()) $>
++							<$ currentDay $>
+ 						</div></div></div>
+ 					</td>
+ 				</tr>