r467 - in vdr/vdr-plugin-timeline/trunk/debian: . patches
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Sun, 17 Apr 2005 09:35:28 +0000
Author: tschmidt
Date: 2005-04-17 09:35:28 +0000 (Sun, 17 Apr 2005)
New Revision: 467
Added:
vdr/vdr-plugin-timeline/trunk/debian/patches/92_timeline-1.3.23.dpatch
Modified:
vdr/vdr-plugin-timeline/trunk/debian/changelog
vdr/vdr-plugin-timeline/trunk/debian/control
vdr/vdr-plugin-timeline/trunk/debian/patches/00list
Log:
vdr-plugin-timeline:
- Depend/Build-Depend on vdr (>=1.3.23-1)
- Conflict with vdr (>=1.3.24)
- Added 92_timeline-1.3.23.dpatch to be able to compile the
plugin for vdr (>=1.3.23)
Modified: vdr/vdr-plugin-timeline/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-timeline/trunk/debian/changelog 2005-04-16 21:29:13 UTC (rev 466)
+++ vdr/vdr-plugin-timeline/trunk/debian/changelog 2005-04-17 09:35:28 UTC (rev 467)
@@ -1,15 +1,17 @@
-vdr-plugin-timeline (0.9.0-2) unstable; urgency=low
+vdr-plugin-timeline (0.9.0-2) experimental; urgency=low
- !!!
- This Plugin needs the ElchiAIO-Patch or a newer vdr. As the elchi patch is
- not part of the binary packages in Debian, this plugin should not be released,
- before vdr 1.4 is available.
- !!!
+ * NOT RELEASED YET
* First upload to official Debian-archive (closes: Bug#288435)
- -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Thu, 06 Jan 2005 23:36:00 +0100
+ * Thomas Schmidt <tschmidt@debian.org>
+ - Depend/Build-Depend on vdr (>=1.3.23-1)
+ - Conflict with vdr (>=1.3.24)
+ - Added 92_timeline-1.3.23.dpatch to be able to compile the
+ plugin for vdr (>=1.3.23)
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sat, 16 Apr 2005 23:18:00 +0200
+
vdr-plugin-timeline (0.9.0-1) unstable; urgency=low
* Tobias Grimm <tg@e-tobi.net>
Modified: vdr/vdr-plugin-timeline/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-timeline/trunk/debian/control 2005-04-16 21:29:13 UTC (rev 466)
+++ vdr/vdr-plugin-timeline/trunk/debian/control 2005-04-17 09:35:28 UTC (rev 467)
@@ -2,14 +2,14 @@
Section: misc
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
-Uploaders: Tobias Grimm <tg@e-tobi.net>, Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
-Build-Depends: debhelper (>= 4.1.16), vdr-dev (>=1.2.6-6), dpatch (>=2.0.9)
+Uploaders: Tobias Grimm <tg@e-tobi.net>, Thomas Schmidt <tschmidt@debian.org>
+Build-Depends: debhelper (>= 4.1.16), vdr-dev (>=1.3.23-1), dpatch (>=2.0.9)
Standards-Version: 3.6.1
Package: vdr-plugin-timeline
Architecture: any
-Depends: ${shlibs:Depends}, vdr (>= 1.2.6-6)
-Conflicts: vdr (>=1.2.7)
+Depends: ${shlibs:Depends}, vdr (>= 1.3.23-1)
+Conflicts: vdr (>=1.3.24)
Description: Timeline plugin for vdr
Shows a timeline of all programmed timers per day and informs
you of timer conflicts.
Modified: vdr/vdr-plugin-timeline/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-timeline/trunk/debian/patches/00list 2005-04-16 21:29:13 UTC (rev 466)
+++ vdr/vdr-plugin-timeline/trunk/debian/patches/00list 2005-04-17 09:35:28 UTC (rev 467)
@@ -1 +1,2 @@
01_Makefile-fPIC-fix
+92_timeline-1.3.23
Added: vdr/vdr-plugin-timeline/trunk/debian/patches/92_timeline-1.3.23.dpatch
===================================================================
--- vdr/vdr-plugin-timeline/trunk/debian/patches/92_timeline-1.3.23.dpatch 2005-04-16 21:29:13 UTC (rev 466)
+++ vdr/vdr-plugin-timeline/trunk/debian/patches/92_timeline-1.3.23.dpatch 2005-04-17 09:35:28 UTC (rev 467)
@@ -0,0 +1,105 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## timeline-1.3.23 patch - by Thomas Günther <tom@toms-cafe.de>
+## http://toms-cafe.de/vdr/download/timeline-0.9.0-1.3.23.diff
+##
+## integrated vdr-1.3.18-timeline-0.9.0.diff by C.Y.M <syphir@syphir.sytes.net>
+## (http://www.vdr-portal.de/board/thread.php?postid=246589#post246589)
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.3.18 and VDR >= 1.3.23.
+
+@DPATCH@
+--- timeline-0.9.0/checkerOsd.c
++++ timeline-0.9.0/checkerOsd.c
+@@ -228,7 +228,11 @@
+ {
+ if (showDay<0 && ct1->IsSingleEvent())
+ {
++#if VDRVERSNUM < 10323
+ showDay=ct1->Day();
++#else
++ showDay=cTimer::GetMDay(ct1->Day());
++#endif
+ }
+
+ for(int i=0;i<MAXDEVICES;i++)
+@@ -271,7 +275,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());
+- sprintf(line3,"%02d:%02d-%02d:%02d (%s), (P%d) %s: %s",ct2->Start()/100,ct2->Start()%100,ct2->Stop()/100,ct2->Stop()%100,ct2->PrintDay(ct2->Day()),ct2->Priority(),ch2->Name(),ct2->File());
++#if VDRVERSNUM < 10323
++ 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->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())
+@@ -301,7 +309,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 (%s), (P%d) %s: %s",ct1->Start()/100,ct1->Start()%100,ct1->Stop()/100,ct1->Stop()%100,ct1->PrintDay(ct1->Day()),ct1->Priority(),ch1->Name(),ct1->File());
++#if VDRVERSNUM < 10323
++ 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->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());
+ }
+ }
+@@ -312,7 +324,11 @@
+ for(int i=0;i<6;i++)
+ {
+ hassubmatch=false;
++#if VDRVERSNUM < 10323
+ if (ct1->Day() & (1<<i))
++#else
++ if (ct1->WeekDays() & (1<<i))
++#endif
+ {
+ int nn=(4+i)*SECSINDAY; // 4: first Sunday after Unix time 0
+ start1t=ct1->SetTime(nn,ct1->TimeToInt(ct1->Start()));
+@@ -338,9 +354,15 @@
+ }
+ if (hasmatched)
+ {
+- sprintf(line1,"%s %s (%s):",tr("Repeating conflict on"),ct1->PrintDay(mdays|0x80000000),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,ct1->PrintDay(ct1->Day()),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,ct2->PrintDay(ct2->Day()),ct2->Priority(),ch2->Name(),ct2->File());
++#if VDRVERSNUM < 10323
++ sprintf(line1,"%s %s (%s):",tr("Repeating conflict on"),(const char *)ct1->PrintDay(mdays|0x80000000),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->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->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()
+@@ -574,13 +596,21 @@
+ ct1=Timers.First();
+ while (ct1)
+ {
++#if VDRVERSNUM < 10323
+ int day1=ct1->Day();
++#else
++ int day1=cTimer::GetMDay(ct1->Day());
++#endif
+ if (!ct1->IsSingleEvent())
+ {
+ if (ct1->DayMatches(dayt))
+ {
+ day1=day;
+ }
++ else
++ {
++ day1=0;
++ }
+ }
+ int start1=ct1->Start();
+ int stop1=ct1->Stop();