[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.27-1_etobi1

[etobi]

The following commit has been merged in the e-tobi branch:
commit 6ee9568644420354c72b97e8600d492a692501a3
Author: etobi <git at e-tobi.net>
Date:   Sun Mar 11 20:02:34 2012 +0100

    Updated opt-42-x_MainMenuHooks.patch

diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index d366ba8..acd5e1c 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -10,7 +10,7 @@ debian/patches/99_ncursesw-include.patch:9bafeb768f7921015a5bab5e47786950
 debian/patches/opt-24_jumpplay.patch:4dd24edfe44410440528210202fcc85b
 debian/patches/opt-41-x_timer-info.patch:24767586707d76f36e33021d3e662508
 debian/patches/opt-43-x_recordshowfree.patch:e215d4b880638dd97deb138a36abc9e1
-debian/patches/opt-42-x_MainMenuHooks.patch:e08533a7b9ee8702272477ad3b8002c0
+debian/patches/opt-42-x_MainMenuHooks.patch:5149b740783dbb4e67e4e32161533812
 debian/patches/82_valgrind.patch:60ad50e72eabb0861d096d1002fddca7
 debian/patches/06_default_svdrp_port_0.patch:4835f681f185991262a3160146f43f2f
 debian/patches/opt-50_graphtft.patch:89b222a6d29eede764163c8806a07dd3
diff --git a/debian/changelog b/debian/changelog
index 0e0df3a..5dbd15a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ vdr (1.7.26-1~ctvdr1) unstable; urgency=low
   * Dropped opt-21_internal-cam-devices.patch (doesn't apply anmore)
   * Updated opt-24_jumpplay.patch
   * Dropped opt-38_disableDoubleEpgEntrys.patch (doesn't apply anmore)
+  * Updated opt-42-x_MainMenuHooks.patch
 
  -- Tobias Grimm <etobi at debian.org>  Sun, 19 Feb 2012 17:21:08 +0100
 
diff --git a/debian/patches/opt-42-x_MainMenuHooks.patch b/debian/patches/opt-42-x_MainMenuHooks.patch
index 98ec78c..f4b79a1 100644
--- a/debian/patches/opt-42-x_MainMenuHooks.patch
+++ b/debian/patches/opt-42-x_MainMenuHooks.patch
@@ -4,9 +4,9 @@ Author: Frank Schmirler <vdrdev at schmirler.de>
 
 Index: vdr/menu.c
 ===================================================================
---- vdr.orig/menu.c	2012-01-15 21:21:26.000000000 +0100
-+++ vdr/menu.c	2012-01-15 21:21:27.000000000 +0100
-@@ -3641,15 +3641,30 @@
+--- vdr.orig/menu.c	2012-03-11 20:01:02.000000000 +0100
++++ vdr/menu.c	2012-03-11 20:01:18.000000000 +0100
+@@ -3642,15 +3642,30 @@
  
    // Initial submenus:
  
@@ -43,7 +43,7 @@ Index: vdr/menu.c
  }
  
  cOsdObject *cMenuMain::PluginOsdObject(void)
-@@ -3802,13 +3817,34 @@
+@@ -3803,13 +3818,34 @@
    eOSState state = cOsdMenu::ProcessKey(Key);
    HadSubMenu |= HasSubMenu();
  
@@ -84,7 +84,7 @@ Index: vdr/menu.c
      case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) {
                            cOsdItem *item = Get(Current());
                            if (item) {
-@@ -3901,6 +3937,8 @@
+@@ -3902,6 +3938,8 @@
                 default:      break;
                 }
      }
@@ -95,21 +95,21 @@ Index: vdr/menu.c
    if (Key != kNone) {
 Index: vdr/config.h
 ===================================================================
---- vdr.orig/config.h	2012-01-15 21:21:23.000000000 +0100
-+++ vdr/config.h	2012-01-15 21:21:27.000000000 +0100
+--- vdr.orig/config.h	2012-03-11 20:01:02.000000000 +0100
++++ vdr/config.h	2012-03-11 20:01:45.000000000 +0100
 @@ -40,6 +40,8 @@
- 
+  
  #define JUMPPLAYVERSNUM 100
  
 +#define MAINMENUHOOKSVERSNUM 1.0
 +
- #define MAXPRIORITY 99
- #define MAXLIFETIME 99
- 
+ #define MAXPRIORITY       99
+ #define MINPRIORITY       (-MAXPRIORITY)
+ #define LIVEPRIORITY      0                  // priority used when selecting a device for live viewing
 Index: vdr/README.MainMenuHooks
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ vdr/README.MainMenuHooks	2012-01-15 21:21:27.000000000 +0100
++++ vdr/README.MainMenuHooks	2012-03-11 20:01:18.000000000 +0100
 @@ -0,0 +1,55 @@
 +This is a "patch" for the Video Disk Recorder (VDR).
 +

-- 
vdr packaging repository