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

[Thomas Schmidt]

Author: tschmidt
Date: 2005-08-09 20:04:22 +0000 (Tue, 09 Aug 2005)
New Revision: 831

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:
vdr-plugin-femon: Updated for vdr 1.3.28, New Upstream Version 0.9.1

Modified: vdr/vdr-plugin-femon/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/changelog	2005-08-09 19:55:24 UTC (rev 830)
+++ vdr/vdr-plugin-femon/trunk/debian/changelog	2005-08-09 20:04:22 UTC (rev 831)
@@ -1,3 +1,15 @@
+vdr-plugin-femon (0.9.1-1) unstable; urgency=low
+
+  * NOT RELEASED YET
+  
+  * Thomas Schmidt <tschmidt at debian.org>
+    - New upstream release
+      + Updated 10_stuttering.dpatch
+    - Depend/Build-Depend on vdr (>=1.3.28-1)
+    - Conflict with vdr (>=1.3.29)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue,  9 Aug 2005 21:46:48 +0200
+
 vdr-plugin-femon (0.9.0-6) unstable; urgency=low
 
   * Thomas Schmidt <tschmidt at debian.org>

Modified: vdr/vdr-plugin-femon/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/control	2005-08-09 19:55:24 UTC (rev 830)
+++ vdr/vdr-plugin-femon/trunk/debian/control	2005-08-09 20:04:22 UTC (rev 831)
@@ -3,13 +3,13 @@
 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.27-1),  dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.28-1),  dpatch (>= 2.0.9)
 Standards-Version: 3.6.2
 
 Package: vdr-plugin-femon
 Architecture: any
-Depends: ${shlibs:Depends}, vdr (>= 1.3.27-1)
-Conflicts: vdr (>=1.3.28)
+Depends: ${shlibs:Depends}, vdr (>= 1.3.28-1)
+Conflicts: vdr (>=1.3.29)
 Description: DVB frontend status monitor plugin for vdr
  DVB Frontend Status Monitor is a plugin that displays a few signal
  quality parameters of the tuned channel on your screen.

Modified: vdr/vdr-plugin-femon/trunk/debian/patches/10_stuttering.dpatch
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/patches/10_stuttering.dpatch	2005-08-09 19:55:24 UTC (rev 830)
+++ vdr/vdr-plugin-femon/trunk/debian/patches/10_stuttering.dpatch	2005-08-09 20:04:22 UTC (rev 831)
@@ -7,12 +7,13 @@
 ## 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);
+diff -urNad vdr-plugin-femon-0.9.1/femonosd.c /tmp/dpep.AnUWn8/vdr-plugin-femon-0.9.1/femonosd.c
+--- vdr-plugin-femon-0.9.1/femonosd.c	2005-08-09 21:55:51.503534912 +0200
++++ /tmp/dpep.AnUWn8/vdr-plugin-femon-0.9.1/femonosd.c	2005-08-09 21:57:44.894296896 +0200
+@@ -1065,7 +1065,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()));
 +#else