r4902 - in /vdr/vdr-plugin-timeline/trunk/debian: changelog patches/00list patches/92_timeline-1.0.141-vdr-1.5.3.dpatch

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

Author: tom-guest
Date: Wed Jun 27 23:49:53 2007
New Revision: 4902

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

Added:
    vdr/vdr-plugin-timeline/trunk/debian/patches/92_timeline-1.0.141-vdr-1.5.3.dpatch
Modified:
    vdr/vdr-plugin-timeline/trunk/debian/changelog
    vdr/vdr-plugin-timeline/trunk/debian/patches/00list

Modified: vdr/vdr-plugin-timeline/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-timeline/trunk/debian/changelog?rev=4902&op=diff
==============================================================================
--- vdr/vdr-plugin-timeline/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-timeline/trunk/debian/changelog Wed Jun 27 23:49:53 2007
@@ -1,8 +1,13 @@
-vdr-plugin-timeline (1.0.141-9) UNRELEASED; urgency=low
-
+vdr-plugin-timeline (1.0.141-9) experimental; urgency=low
+
+  [ Thomas Schmidt ]
   * Added XS-Vcs-Svn and XS-Vcs-Browser fields to debian/control
 
- -- Thomas Schmidt <tschmidt at debian.org>  Wed, 16 May 2007 23:40:57 +0200
+  [ Thomas Günther ]
+  * Release for vdrdevel 1.5.5
+  * Added 92_timeline-1.0.141-vdr-1.5.3.dpatch
+
+ -- Thomas Günther <tom at toms-cafe.de>  Thu, 28 Jun 2007 00:37:15 +0200
 
 vdr-plugin-timeline (1.0.141-8) experimental; urgency=low
 

Modified: vdr/vdr-plugin-timeline/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-timeline/trunk/debian/patches/00list?rev=4902&op=diff
==============================================================================
--- vdr/vdr-plugin-timeline/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-timeline/trunk/debian/patches/00list Wed Jun 27 23:49:53 2007
@@ -1,1 +1,2 @@
 91_timeline-1.0.141-1.5.0
+92_timeline-1.0.141-vdr-1.5.3

Added: vdr/vdr-plugin-timeline/trunk/debian/patches/92_timeline-1.0.141-vdr-1.5.3.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-timeline/trunk/debian/patches/92_timeline-1.0.141-vdr-1.5.3.dpatch?rev=4902&op=file
==============================================================================
--- vdr/vdr-plugin-timeline/trunk/debian/patches/92_timeline-1.0.141-vdr-1.5.3.dpatch (added)
+++ vdr/vdr-plugin-timeline/trunk/debian/patches/92_timeline-1.0.141-vdr-1.5.3.dpatch Wed Jun 27 23:49:53 2007
@@ -1,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 92_timeline-1.0.141-vdr-1.5.3.dpatch by Stone <syphyr at gmail.com>
+##
+## Thomas Günther <tom at toms-cafe.de>
+##   - Added compatibility to VDR < 1.5.3
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.3.
+
+ at DPATCH@
+--- timeline-1.0.141/checkerOsd.c
++++ timeline-1.0.141/checkerOsd.c
+@@ -246,7 +246,11 @@
+ 								localtime_r(&start1t,&day1);
+ 								sprintf(line1,"%s %04d-%02d-%02d (%s):",tr("Conflict on"),day1.tm_year+1900,day1.tm_mon+1,day1.tm_mday,tr("same input device"));
+ 								sprintf(line2,"%02d:%02d-%02d:%02d, (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,ct1->Priority(),ch1->Name(),ct1->File());
++#if APIVERSNUM >= 10503
++								sprintf(line3,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,(const char *)ct2->PrintDay(ct2->Day(),ct2->WeekDays(),false),ct2->Priority(),ch2->Name(),ct2->File());
++#else
+ 								sprintf(line3,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,(const char *)ct2->PrintDay(ct2->Day(),ct2->WeekDays()),ct2->Priority(),ch2->Name(),ct2->File());
++#endif
+ 							}
+ 						}
+ 						else if (!ct1->IsSingleEvent() && ct2->IsSingleEvent())
+@@ -276,7 +280,11 @@
+ 							{
+ 								localtime_r(&start1t,&day1);
+ 								sprintf(line1,"%s %04d-%02d-%02d (%s):",tr("Conflict on"),day1.tm_year+1900,day1.tm_mon+1,day1.tm_mday,tr("same input device"));
++#if APIVERSNUM >= 10503
++								sprintf(line2,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,(const char *)ct1->PrintDay(ct1->Day(),ct1->WeekDays(),false),ct1->Priority(),ch1->Name(),ct1->File());
++#else
+								sprintf(line2,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,(const char *)ct1->PrintDay(ct1->Day(),ct1->WeekDays()),ct1->Priority(),ch1->Name(),ct1->File());
++#endif
+ 								sprintf(line3,"%02d:%02d-%02d:%02d, (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,ct2->Priority(),ch2->Name(),ct2->File());
+ 							}
+ 						}
+@@ -313,9 +321,15 @@
+ 							}
+ 							if (hasmatched)
+ 							{
++#if APIVERSNUM >= 10503
++								sprintf(line1,"%s %s (%s):",tr("Repeating conflict on"),(const char *)ct1->PrintDay(0,mdays,false),tr("same input device"));
++								sprintf(line2,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,(const char *)ct1->PrintDay(ct1->Day(),ct1->WeekDays(),false),ct1->Priority(),ch1->Name(),ct1->File());
++								sprintf(line3,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,(const char *)ct2->PrintDay(ct2->Day(),ct2->WeekDays(),false),ct2->Priority(),ch2->Name(),ct2->File());
++#else
+ 								sprintf(line1,"%s %s (%s):",tr("Repeating conflict on"),(const char *)ct1->PrintDay(0,mdays),tr("same input device"));
+ 								sprintf(line2,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,(const char *)ct1->PrintDay(ct1->Day(),ct1->WeekDays()),ct1->Priority(),ch1->Name(),ct1->File());
+ 								sprintf(line3,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,(const char *)ct2->PrintDay(ct2->Day(),ct2->WeekDays()),ct2->Priority(),ch2->Name(),ct2->File());
++#endif
+ 							}
+ 						}
+ 						else // ct1->IsSingleEvent() && ct2->IsSingleEvent()