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

[Thomas Günther]

Author: tom-guest
Date: 2005-11-19 21:39:58 +0000 (Sat, 19 Nov 2005)
New Revision: 1489

Modified:
   vdr/vdr-plugin-femon/trunk/debian/changelog
   vdr/vdr-plugin-femon/trunk/debian/control
   vdr/vdr-plugin-femon/trunk/debian/patches/10_stuttering.dpatch
Log:
New upstream release 0.9.5

Modified: vdr/vdr-plugin-femon/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/changelog	2005-11-19 20:37:19 UTC (rev 1488)
+++ vdr/vdr-plugin-femon/trunk/debian/changelog	2005-11-19 21:39:58 UTC (rev 1489)
@@ -1,3 +1,14 @@
+vdr-plugin-femon (0.9.5-1) unstable; urgency=low
+
+  * NOT RELEASED YET
+
+  * Thomas Günther <tom at toms-cafe.de>
+    - New upstream release
+    - Updated 10_stuttering.dpatch
+    - Build-Depend on vdr-dev (>= 1.3.36-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sat, 19 Nov 2005 21:55:56 +0100
+
 vdr-plugin-femon (0.9.4-2) unstable; urgency=low
 
   * NOT RELEASED YET

Modified: vdr/vdr-plugin-femon/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/control	2005-11-19 20:37:19 UTC (rev 1488)
+++ vdr/vdr-plugin-femon/trunk/debian/control	2005-11-19 21:39:58 UTC (rev 1489)
@@ -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.3.35-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.36-1), dpatch (>= 2.0.9)
 Standards-Version: 3.6.2
 
 Package: vdr-plugin-femon

Modified: vdr/vdr-plugin-femon/trunk/debian/patches/10_stuttering.dpatch
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/patches/10_stuttering.dpatch	2005-11-19 20:37:19 UTC (rev 1488)
+++ vdr/vdr-plugin-femon/trunk/debian/patches/10_stuttering.dpatch	2005-11-19 21:39:58 UTC (rev 1489)
@@ -1,23 +1,23 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
 
 ## 10_stuttering.dpatch by Thomas Günther <tom at toms-cafe.de>
-## http://toms-cafe.de/vdr/download/femon-0.9.1-stuttering.diff
+## http://toms-cafe.de/vdr/download/femon-0.9.5-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
-@@ -1065,7 +1065,11 @@
-                       cControl::Shutdown();
-                       cDevice::GetDevice(device)->SwitchChannel(channel, true);
-                       // does this work with primary devices ?
+--- femon-0.9.5/femonosd.c
++++ femon-0.9.5/femonosd.c
+@@ -1013,7 +1013,11 @@
+            cControl::Shutdown();
+            cDevice::GetDevice(device)->SwitchChannel(channel, true);
+            // does this work with primary devices ?
 +#ifdef STUTTERINGVERSION
-+                      cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids(), channel->Caids()));
++           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()));
+            cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids()));
 +#endif
-                       cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number());
-                       break;
-                       }
+            cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number());
+            return (true);
+            }