r5958 - in /vdr/vdr-plugin-menuorg/trunk/debian: changelog patches/90_menuorg-0.3-1.5.9.dpatch

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Mon Nov 26 20:26:04 2007
New Revision: 5958

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5958
Log:
* Fixed 90_menuorg-0.3-1.5.9.dpatch to build with VDR 1.4 as well

Modified:
    vdr/vdr-plugin-menuorg/trunk/debian/changelog
    vdr/vdr-plugin-menuorg/trunk/debian/patches/90_menuorg-0.3-1.5.9.dpatch

Modified: vdr/vdr-plugin-menuorg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-menuorg/trunk/debian/changelog?rev=5958&op=diff
==============================================================================
--- vdr/vdr-plugin-menuorg/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-menuorg/trunk/debian/changelog Mon Nov 26 20:26:04 2007
@@ -1,3 +1,9 @@
+vdr-plugin-menuorg (0.3-7) unstable; urgency=low
+
+  * Fixed 90_menuorg-0.3-1.5.9.dpatch to build with VDR 1.4 as well
+
+ -- Tobias Grimm <tg at e-tobi.net>  Mon, 26 Nov 2007 21:17:41 +0100
+
 vdr-plugin-menuorg (0.3-6) unstable; urgency=low
 
   * Release for vdrdevel 1.5.12

Modified: vdr/vdr-plugin-menuorg/trunk/debian/patches/90_menuorg-0.3-1.5.9.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-menuorg/trunk/debian/patches/90_menuorg-0.3-1.5.9.dpatch?rev=5958&op=diff
==============================================================================
--- vdr/vdr-plugin-menuorg/trunk/debian/patches/90_menuorg-0.3-1.5.9.dpatch (original)
+++ vdr/vdr-plugin-menuorg/trunk/debian/patches/90_menuorg-0.3-1.5.9.dpatch Mon Nov 26 20:26:04 2007
@@ -5,9 +5,10 @@
 ## DP: Changes for VDR >= 1.5.9.
 
 @DPATCH@
---- menuorg-0.3/src/i18n.h
-+++ menuorg-0.3/src/i18n.h
-@@ -24,7 +24,12 @@
+diff -urNad vdr-plugin-menuorg-0.3~/src/i18n.h vdr-plugin-menuorg-0.3/src/i18n.h
+--- vdr-plugin-menuorg-0.3~/src/i18n.h	2007-11-26 20:59:14.000000000 +0100
++++ vdr-plugin-menuorg-0.3/src/i18n.h	2007-11-26 21:03:16.000000000 +0100
+@@ -24,6 +24,7 @@
  #define ___I18N__H
  
  #include <vdr/i18n.h>
@@ -15,14 +16,21 @@
  
  extern const tI18nPhrase Phrases[];
  
+diff -urNad vdr-plugin-menuorg-0.3~/src/systemmenunode.cpp vdr-plugin-menuorg-0.3/src/systemmenunode.cpp
+--- vdr-plugin-menuorg-0.3~/src/systemmenunode.cpp	2007-11-26 20:59:14.000000000 +0100
++++ vdr-plugin-menuorg-0.3/src/systemmenunode.cpp	2007-11-26 21:02:18.000000000 +0100
+@@ -25,6 +25,10 @@
+ #include "osditemdefinition.h"
+ #include "childlock.h"
+ 
 +#if VDRVERSNUM < 10509
 +#define trVDR(s) tr(s)
 +#endif
 +
- #endif
---- menuorg-0.3/src/systemmenunode.cpp
-+++ menuorg-0.3/src/systemmenunode.cpp
-@@ -33,7 +33,7 @@
+ SystemMenuNode::SystemMenuNode(std::string text, eOSState state)
+ {
+     _text = text;
+@@ -33,7 +37,7 @@
  
  IMenuItemDefinition* SystemMenuNode::CreateMenuItemDefinition()
  {