r1707 - in vdr/vdr-plugin-vcd/trunk/debian: . patches

[Thomas Schmidt]

Author: tschmidt
Date: 2006-01-10 17:51:50 +0000 (Tue, 10 Jan 2006)
New Revision: 1707

Added:
   vdr/vdr-plugin-vcd/trunk/debian/patches/02_vdr-1.3.38-fix.dpatch
Modified:
   vdr/vdr-plugin-vcd/trunk/debian/changelog
   vdr/vdr-plugin-vcd/trunk/debian/control
   vdr/vdr-plugin-vcd/trunk/debian/patches/00list
Log:
vdr-plugin-vcd: Updated for vdr 1.3.38

Modified: vdr/vdr-plugin-vcd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-vcd/trunk/debian/changelog	2006-01-10 17:41:56 UTC (rev 1706)
+++ vdr/vdr-plugin-vcd/trunk/debian/changelog	2006-01-10 17:51:50 UTC (rev 1707)
@@ -1,3 +1,13 @@
+vdr-plugin-vcd (0.7-15) unstable; urgency=low
+
+  * NOT RELEASED YET
+
+  * Thomas Schmidt <tschmidt at debian.org>
+    - Build-Depend on vdr (>=1.3.38-1)
+    - Added 02_vdr-1.3.38-fix.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue, 10 Jan 2006 18:43:43 +0100
+
 vdr-plugin-vcd (0.7-14) unstable; urgency=low
 
   * Thomas Schmidt <tschmidt at debian.org>

Modified: vdr/vdr-plugin-vcd/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-vcd/trunk/debian/control	2006-01-10 17:41:56 UTC (rev 1706)
+++ vdr/vdr-plugin-vcd/trunk/debian/control	2006-01-10 17:51:50 UTC (rev 1707)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.3.37-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.3.38-1), dpatch (>= 2.0.9)
 Standards-Version: 3.6.2
 
 Package: vdr-plugin-vcd

Modified: vdr/vdr-plugin-vcd/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-vcd/trunk/debian/patches/00list	2006-01-10 17:41:56 UTC (rev 1706)
+++ vdr/vdr-plugin-vcd/trunk/debian/patches/00list	2006-01-10 17:51:50 UTC (rev 1707)
@@ -1 +1,2 @@
 01_Makefile-fPIC-fix
+02_vdr-1.3.38-fix

Added: vdr/vdr-plugin-vcd/trunk/debian/patches/02_vdr-1.3.38-fix.dpatch
===================================================================
--- vdr/vdr-plugin-vcd/trunk/debian/patches/02_vdr-1.3.38-fix.dpatch	2006-01-10 17:41:56 UTC (rev 1706)
+++ vdr/vdr-plugin-vcd/trunk/debian/patches/02_vdr-1.3.38-fix.dpatch	2006-01-10 17:51:50 UTC (rev 1707)
@@ -0,0 +1,57 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 02_vdr-1.3.38-fix.dpatch by Habib at vdr-portal.de
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fixes compilation with vdr 1.3.38
+
+ at DPATCH@
+diff -urNad vdr-plugin-vcd-0.7/menucontrol.c /tmp/dpep.RrsomP/vdr-plugin-vcd-0.7/menucontrol.c
+--- vdr-plugin-vcd-0.7/menucontrol.c	2005-01-28 16:06:48.000000000 +0100
++++ /tmp/dpep.RrsomP/vdr-plugin-vcd-0.7/menucontrol.c	2006-01-10 18:48:11.041349250 +0100
+@@ -39,7 +39,7 @@
+ 
+ cMenuSpiControl::~cMenuSpiControl()
+ {
+-  cStatus::MsgReplaying(this, NULL);
++  cStatus::MsgReplaying(this, NULL, NULL, true);
+   Stop();
+ }
+ 
+@@ -118,13 +118,13 @@
+   lastSpeed = -1;
+   timeoutShow = 0;
+   timeSearchActive = false;
+-  cStatus::MsgReplaying(this, "VCD");
++  cStatus::MsgReplaying(this, "VCD", NULL, true);
+ }
+ 
+ cMenuVcdControl::~cMenuVcdControl()
+ {
+   Hide();
+-  cStatus::MsgReplaying(this, NULL);
++  cStatus::MsgReplaying(this, NULL, NULL, false);
+   Stop();
+ }
+ 
+diff -urNad vdr-plugin-vcd-0.7/psdcontrol.c /tmp/dpep.RrsomP/vdr-plugin-vcd-0.7/psdcontrol.c
+--- vdr-plugin-vcd-0.7/psdcontrol.c	2005-01-28 20:15:14.000000000 +0100
++++ /tmp/dpep.RrsomP/vdr-plugin-vcd-0.7/psdcontrol.c	2006-01-10 18:48:38.531067250 +0100
+@@ -84,7 +84,7 @@
+  
+ cPsdSpiControl::~cPsdSpiControl()
+ {
+-  cStatus::MsgReplaying(this, NULL);
++  cStatus::MsgReplaying(this, NULL, NULL, true);
+ }
+ 
+ void cPsdSpiControl::SetItem(int Spi, cVcd *Vcd, union psd_vcd *PsdVcd)
+@@ -252,7 +252,7 @@
+ 
+ cPsdVcdControl::~cPsdVcdControl()
+ {
+-  cStatus::MsgReplaying(this, NULL);
++  cStatus::MsgReplaying(this, NULL, NULL, true);
+ }
+ 
+ void cPsdVcdControl::SetTrack(int Track, cVcd *Vcd, union psd_vcd *PsdVcd)


Property changes on: vdr/vdr-plugin-vcd/trunk/debian/patches/02_vdr-1.3.38-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *