r2691 - in vdr/vdr-plugin-extrecmenu/trunk/debian: . patches

[Thomas Günther]

Author: tom-guest
Date: 2006-05-02 22:19:51 +0000 (Tue, 02 May 2006)
New Revision: 2691

Removed:
   vdr/vdr-plugin-extrecmenu/trunk/debian/patches/02_fix-jumpplay.dpatch
Modified:
   vdr/vdr-plugin-extrecmenu/trunk/debian/changelog
   vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list
   vdr/vdr-plugin-extrecmenu/trunk/debian/patches/03_fix-cmdsubmenu.dpatch
Log:
Removed 02_fix-jumpplay.dpatch, Updated 03_fix-cmdsubmenu.dpatch

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/changelog	2006-05-02 21:18:23 UTC (rev 2690)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/changelog	2006-05-02 22:19:51 UTC (rev 2691)
@@ -7,6 +7,9 @@
   * Tobias Grimm <tg at e-tobi.net>
     - Removed 90_APIVERSION.dpatch
     - Updated 01_dvdarchive-path.dpatch
+  * Thomas Günther <tom at toms-cafe.de>
+    - Removed 02_fix-jumpplay.dpatch (fixed upstream)
+    - Updated 03_fix-cmdsubmenu.dpatch
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun, 30 Apr 2006 22:31:43 +0200
 

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list	2006-05-02 21:18:23 UTC (rev 2690)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list	2006-05-02 22:19:51 UTC (rev 2691)
@@ -1,3 +1,2 @@
 01_dvdarchive-path
-02_fix-jumpplay
 03_fix-cmdsubmenu

Deleted: vdr/vdr-plugin-extrecmenu/trunk/debian/patches/02_fix-jumpplay.dpatch
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/patches/02_fix-jumpplay.dpatch	2006-05-02 21:18:23 UTC (rev 2690)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/patches/02_fix-jumpplay.dpatch	2006-05-02 22:19:51 UTC (rev 2691)
@@ -1,15 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix-jumpplay.dpatch by Thomas Günther <tom at toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Using JUMPPLAYVERSNUM to activate the jumpplay features (version >= 0.7
-## DP: of jumpplay is needed).
-
- at DPATCH@
---- extrecmenu-0.9a/myreplaycontrol.h
-+++ extrecmenu-0.9a/myreplaycontrol.h
-@@ -1,1 +1,4 @@
- #include <vdr/dvbplayer.h>
-+#ifdef JUMPPLAYVERSNUM
-+#define BIGPATCHVERSION JUMPPLAYVERSNUM
-+#endif

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/patches/03_fix-cmdsubmenu.dpatch
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/patches/03_fix-cmdsubmenu.dpatch	2006-05-02 21:18:23 UTC (rev 2690)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/patches/03_fix-cmdsubmenu.dpatch	2006-05-02 22:19:51 UTC (rev 2691)
@@ -6,11 +6,8 @@
 ## DP: of cmdsubmenu is needed).
 
 @DPATCH@
---- extrecmenu-0.9a/mymenucommands.c
-+++ extrecmenu-0.9a/mymenucommands.c
-@@ -33,3 +33,3 @@
--#ifdef CMD_SUBMENUS
+--- extrecmenu-0.10/mymenucommands.c
++++ extrecmenu-0.10/mymenucommands.c
+@@ -33,1 +33,1 @@
+-#ifdef BIGPATCHVERSION
 +#ifdef CMDSUBMENUVERSNUM
-      if (command->hasChilds()) {
--        AddSubMenu(new cMenuCommands(command->Title(), command->getChilds(), parameters));
-+        AddSubMenu(new myMenuCommands(command->Title(), command->getChilds(), parameters));