r3155 - in vdr/vdr-plugin-xineliboutput/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2006-08-21 20:40:26 +0000 (Mon, 21 Aug 2006)
New Revision: 3155

Added:
   vdr/vdr-plugin-xineliboutput/trunk/debian/patches/
   vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
   vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_restore-channel-on-primary-device.dpatch
Modified:
   vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
   vdr/vdr-plugin-xineliboutput/trunk/debian/control
   vdr/vdr-plugin-xineliboutput/trunk/debian/rules
Log:
Added 01_restore-channel-on-primary-device.dpatch


Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/changelog	2006-08-21 19:21:45 UTC (rev 3154)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/changelog	2006-08-21 20:40:26 UTC (rev 3155)
@@ -1,3 +1,9 @@
+vdr-plugin-xineliboutput (0.99rc4+cvs20060821-2) unstable; urgency=low
+
+  * Added 01_restore-channel-on-primary-device.dpatch
+
+ -- Tobias Grimm <tg at e-tobi.net>  Mon, 21 Aug 2006 22:40:04 +0200
+
 vdr-plugin-xineliboutput (0.99rc4+cvs20060821-1) unstable; urgency=low
 
   * New CVS snaphsot

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/control	2006-08-21 19:21:45 UTC (rev 3154)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/control	2006-08-21 20:40:26 UTC (rev 3155)
@@ -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>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.1-1), libxine-dev (>= 1.1.1), libjpeg62-dev, libxv-dev, libx11-dev, libxext-dev
+Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.1-1), libxine-dev (>= 1.1.1), libjpeg62-dev, libxv-dev, libx11-dev, libxext-dev
 Standards-Version: 3.6.2
 
 Package: vdr-plugin-xineliboutput

Added: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list	2006-08-21 19:21:45 UTC (rev 3154)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list	2006-08-21 20:40:26 UTC (rev 3155)
@@ -0,0 +1,2 @@
+01_restore-channel-on-primary-device
+

Added: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_restore-channel-on-primary-device.dpatch
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_restore-channel-on-primary-device.dpatch	2006-08-21 19:21:45 UTC (rev 3154)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_restore-channel-on-primary-device.dpatch	2006-08-21 20:40:26 UTC (rev 3155)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_restore-channel-on-primary-device by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Force to switch to current channel, when restoring old primary device.
+
+ at DPATCH@
+--- vdr-plugin-xineliboutput-0.99rc4+cvs20060821.orig/device.c
++++ vdr-plugin-xineliboutput-0.99rc4+cvs20060821/device.c
+@@ -294,7 +294,9 @@
+ 	  cRemote::CallPlugin("xineliboutput");
+ #endif
+ 	}
++        cChannel *channel = Channels.GetByNumber(CurrentChannel());
+ 	cDevice::SetPrimaryDevice(Original);
++	PrimaryDevice()->SwitchChannel(channel, true);
+ 	Original = 0;
+       }
+     }

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/rules	2006-08-21 19:21:45 UTC (rev 3154)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/rules	2006-08-21 20:40:26 UTC (rev 3155)
@@ -19,7 +19,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