r704 - in vdr/vdr-plugin-femon/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2005-06-25 20:31:59 +0000 (Sat, 25 Jun 2005)
New Revision: 704

Added:
   vdr/vdr-plugin-femon/trunk/debian/patches/
   vdr/vdr-plugin-femon/trunk/debian/patches/00list
   vdr/vdr-plugin-femon/trunk/debian/patches/10_stuttering.dpatch
Modified:
   vdr/vdr-plugin-femon/trunk/debian/changelog
   vdr/vdr-plugin-femon/trunk/debian/control
   vdr/vdr-plugin-femon/trunk/debian/rules
Log:
added stuttering patch

Modified: vdr/vdr-plugin-femon/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/changelog	2005-06-25 20:01:53 UTC (rev 703)
+++ vdr/vdr-plugin-femon/trunk/debian/changelog	2005-06-25 20:31:59 UTC (rev 704)
@@ -1,3 +1,9 @@
+vdr-plugin-femon (0.9.0-5) UNRELEASED; urgency=low
+
+  * Added stuttering patch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sat, 25 Jun 2005 22:03:41 +0200
+
 vdr-plugin-femon (0.9.0-4) unstable; urgency=low
  
   * Thomas Schmidt <tschmidt@debian.org>

Modified: vdr/vdr-plugin-femon/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/control	2005-06-25 20:01:53 UTC (rev 703)
+++ vdr/vdr-plugin-femon/trunk/debian/control	2005-06-25 20:31:59 UTC (rev 704)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg@e-tobi.net>, Thomas Schmidt <tschmidt@debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.27-1)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.27-1),  dpatch (>= 2.0.9)
 Standards-Version: 3.6.1
 
 Package: vdr-plugin-femon

Added: vdr/vdr-plugin-femon/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/patches/00list	2005-06-25 20:01:53 UTC (rev 703)
+++ vdr/vdr-plugin-femon/trunk/debian/patches/00list	2005-06-25 20:31:59 UTC (rev 704)
@@ -0,0 +1 @@
+10_stuttering

Added: vdr/vdr-plugin-femon/trunk/debian/patches/10_stuttering.dpatch
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/patches/10_stuttering.dpatch	2005-06-25 20:01:53 UTC (rev 703)
+++ vdr/vdr-plugin-femon/trunk/debian/patches/10_stuttering.dpatch	2005-06-25 20:31:59 UTC (rev 704)
@@ -0,0 +1,23 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## femon-0.9.0-stuttering patch - by Thomas Günther <tom@toms-cafe.de>
+## http://toms-cafe.de/vdr/download/femon-0.9.0-stuttering.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make femon compile if VDR is patched with stuttering patch.
+
+@DPATCH@
+--- femon-0.9.0/femonosd.c
++++ femon-0.9.0/femonosd.c
+@@ -1060,7 +1060,11 @@
+                       cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0);
+                       cControl::Shutdown();
+                       cDevice::GetDevice(device)->SwitchChannel(channel, true);
++#ifdef STUTTERINGVERSION
++                      cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids(), channel->Caids()));
++#else
+                       cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids()));
++#endif
+                       cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number());
+                       break;
+                       }

Modified: vdr/vdr-plugin-femon/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/rules	2005-06-25 20:01:53 UTC (rev 703)
+++ vdr/vdr-plugin-femon/trunk/debian/rules	2005-06-25 20:31:59 UTC (rev 704)
@@ -23,7 +23,7 @@
 DVBDIR=/usr/include
 
 # 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