r4073 - in vdr/vdr-plugin-timeline/trunk/debian: . patches

[Thomas Günther]

Author: tom-guest
Date: 2007-01-17 01:45:31 +0100 (Wed, 17 Jan 2007)
New Revision: 4073

Added:
   vdr/vdr-plugin-timeline/trunk/debian/patches/
   vdr/vdr-plugin-timeline/trunk/debian/patches/00list
   vdr/vdr-plugin-timeline/trunk/debian/patches/91_timeline-1.0.141-1.5.0.dpatch
Modified:
   vdr/vdr-plugin-timeline/trunk/debian/changelog
   vdr/vdr-plugin-timeline/trunk/debian/control
   vdr/vdr-plugin-timeline/trunk/debian/rules
Log:
Added 91_timeline-1.0.141-1.5.0.dpatch

Modified: vdr/vdr-plugin-timeline/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-timeline/trunk/debian/changelog	2007-01-17 00:42:37 UTC (rev 4072)
+++ vdr/vdr-plugin-timeline/trunk/debian/changelog	2007-01-17 00:45:31 UTC (rev 4073)
@@ -1,3 +1,10 @@
+vdr-plugin-timeline (1.0.141-6) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Added 91_timeline-1.0.141-1.5.0.dpatch
+
+ -- Thomas Günther <tom at toms-cafe.de>  Wed, 17 Jan 2007 01:44:31 +0100
+
 vdr-plugin-timeline (1.0.141-5) experimental; urgency=low
 
   [ Thomas Günther ]

Modified: vdr/vdr-plugin-timeline/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-timeline/trunk/debian/control	2007-01-17 00:42:37 UTC (rev 4072)
+++ vdr/vdr-plugin-timeline/trunk/debian/control	2007-01-17 00:45:31 UTC (rev 4073)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>= 4.1.16), vdr-dev (>= 1.4.5-1)
+Build-Depends: debhelper (>= 4.1.16), vdr-dev (>= 1.4.5-1), dpatch
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-timeline

Added: vdr/vdr-plugin-timeline/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-timeline/trunk/debian/patches/00list	2007-01-17 00:42:37 UTC (rev 4072)
+++ vdr/vdr-plugin-timeline/trunk/debian/patches/00list	2007-01-17 00:45:31 UTC (rev 4073)
@@ -0,0 +1 @@
+91_timeline-1.0.141-1.5.0

Added: vdr/vdr-plugin-timeline/trunk/debian/patches/91_timeline-1.0.141-1.5.0.dpatch
===================================================================
--- vdr/vdr-plugin-timeline/trunk/debian/patches/91_timeline-1.0.141-1.5.0.dpatch	2007-01-17 00:42:37 UTC (rev 4072)
+++ vdr/vdr-plugin-timeline/trunk/debian/patches/91_timeline-1.0.141-1.5.0.dpatch	2007-01-17 00:45:31 UTC (rev 4073)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 91_timeline-1.0.141-1.5.0.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.0.
+
+ at DPATCH@
+--- timeline-1.0.141/checkerOsd.c
++++ timeline-1.0.141/checkerOsd.c
+@@ -339,8 +339,14 @@
+ 							{ // verschiedene Kanäle, genug Devices?
+ 								bool nofree=true;
+ 								
++#if APIVERSNUM >= 10500
++								cDevice *cd1=cDevice::GetDevice(ch1,-1,false);
++								cDevice *cd2=cDevice::GetDevice(ch2,-1,false);
++#else
+ 								cDevice *cd1=cDevice::GetDevice(ch1);
+-								cDevice *cd2=cDevice::GetDevice(ch2),*cdt;
++								cDevice *cd2=cDevice::GetDevice(ch2);
++#endif
++								cDevice *cdt;
+ 								if (cd1->DeviceNumber()!=cd2->DeviceNumber())
+ 								{ // Sonderfall: ch2 kann gar nicht auf Device von ch1 empfangen werden
+ 									nofree=false;

Modified: vdr/vdr-plugin-timeline/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-timeline/trunk/debian/rules	2007-01-17 00:42:37 UTC (rev 4072)
+++ vdr/vdr-plugin-timeline/trunk/debian/rules	2007-01-17 00:45:31 UTC (rev 4073)
@@ -13,7 +13,7 @@
 endif
 
 # To use dpatch uncomment the following line and set Build-Depends to dpatch
-# DPATCH=yes
+DPATCH=yes
 
 ifdef DPATCH
 include /usr/share/dpatch/dpatch.make