r4341 - in vdr/vdr/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2007-03-11 10:55:15 +0000 (Sun, 11 Mar 2007)
New Revision: 4341

Removed:
   vdr/vdr/trunk/debian/patches/opt-42-x_extrecmenu.dpatch
Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/patches/00list
   vdr/vdr/trunk/debian/patches/patchtest
Log:
* Removed  opt-42-x_extrecmenu.dpatch

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2007-03-11 10:53:53 UTC (rev 4340)
+++ vdr/vdr/trunk/debian/changelog	2007-03-11 10:55:15 UTC (rev 4341)
@@ -5,6 +5,7 @@
   * Upgraded opt-48_pin.dpatch
   * Updated opt-50_graphtft.dpatch
   * Removed 92_MainMenuHooks.dpatch
+  * Removed  opt-42-x_extrecmenu.dpatch
 
  -- Tobias Grimm <tg at e-tobi.net>  Sat, 10 Mar 2007 20:59:30 +0100
 

Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list	2007-03-11 10:53:53 UTC (rev 4340)
+++ vdr/vdr/trunk/debian/patches/00list	2007-03-11 10:55:15 UTC (rev 4341)
@@ -49,9 +49,6 @@
 # Patch to allow plugins to replace the VDR mainmenus
 # opt-42-x_MainMenuHooks
 
-# Patch to allow extrecmenu to replace the recordings menu with it's own version.
-# opt-42-x_extrecmenu
-
 # Patch needed for the rotor plugin.
 # opt-44_rotor
 

Deleted: vdr/vdr/trunk/debian/patches/opt-42-x_extrecmenu.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/opt-42-x_extrecmenu.dpatch	2007-03-11 10:53:53 UTC (rev 4340)
+++ vdr/vdr/trunk/debian/patches/opt-42-x_extrecmenu.dpatch	2007-03-11 10:55:15 UTC (rev 4341)
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## opt-xx_extrecmenu.dpatch by Martin Prochnow <nordlicht at martins-kabuff.de>
-## From the vdr-extrecmenu plugin: http://martins-kabuff.de/extrecmenu.html
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This patch allows the extrecmenu plugin to replace the recordings
-## DP: menu with it's own version.
-
- at DPATCH@
-diff -urNad vdr-1.4.2~/menu.c vdr-1.4.2/menu.c
---- vdr-1.4.2~/menu.c	2006-08-27 22:49:17.000000000 +0200
-+++ vdr-1.4.2/menu.c	2006-08-27 22:49:17.000000000 +0200
-@@ -3133,7 +3133,11 @@
-     case osSchedule:   AddSubMenu(new cMenuSchedule); break;
-     case osChannels:   AddSubMenu(new cMenuChannels); break;
-     case osTimers:     AddSubMenu(new cMenuTimers); break;
--    case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, true)); break;
-+    case osRecordings: {
-+		        cPlugin *p = cPluginManager::GetPlugin("extrecmenu");
-+    		        (p && !p->SetupParse("IsOrgRecMenu", "0")) ? AddSubMenu((cOsdMenu *)p->MainMenuAction()) : AddSubMenu(new cMenuRecordings(NULL, 0, true));
-+		       }
-+		       break;
-     case osSetup:      AddSubMenu(new cMenuSetup); break;
-     case osCommands:   AddSubMenu(new cMenuCommands(tr("Commands"), &Commands)); break;
-     default: break;
-@@ -3376,7 +3380,14 @@
-     case osSchedule:   return AddSubMenu(new cMenuSchedule);
-     case osChannels:   return AddSubMenu(new cMenuChannels);
-     case osTimers:     return AddSubMenu(new cMenuTimers);
--    case osRecordings: return AddSubMenu(new cMenuRecordings);
-+    case osRecordings: {
-+			cPlugin *p = cPluginManager::GetPlugin("extrecmenu");
-+            	        if (p && !p->SetupParse("IsOrgRecMenu", "0"))
-+			    return AddSubMenu((cOsdMenu *)p->MainMenuAction());
-+			else
-+			    return AddSubMenu(new cMenuRecordings);
-+		       }
-+		       break;
-     case osSetup:      return AddSubMenu(new cMenuSetup);
-     case osCommands:   return AddSubMenu(new cMenuCommands(tr("Commands"), &Commands));
-     case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) {

Modified: vdr/vdr/trunk/debian/patches/patchtest
===================================================================
--- vdr/vdr/trunk/debian/patches/patchtest	2007-03-11 10:53:53 UTC (rev 4340)
+++ vdr/vdr/trunk/debian/patches/patchtest	2007-03-11 10:55:15 UTC (rev 4341)
@@ -27,7 +27,6 @@
     opt-40_wareagle-icons \
     opt-41-x_timer-info \
     opt-42-x_MainMenuHooks \
-    opt-42-x_extrecmenu \
     opt-44_rotor \
     opt-45_yaepg \
     opt-46_dvdarchive \