r5392 - in /vdr/vdr-plugin-menuorg/trunk/debian: changelog control patches/ patches/00list patches/90_menuorg-0.3-1.5.9.dpatch rules

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

Author: tom-guest
Date: Tue Aug 28 23:45:17 2007
New Revision: 5392

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5392
Log:
Added 90_menuorg-0.3-1.5.9.dpatch

Added:
    vdr/vdr-plugin-menuorg/trunk/debian/patches/
    vdr/vdr-plugin-menuorg/trunk/debian/patches/00list
    vdr/vdr-plugin-menuorg/trunk/debian/patches/90_menuorg-0.3-1.5.9.dpatch
Modified:
    vdr/vdr-plugin-menuorg/trunk/debian/changelog
    vdr/vdr-plugin-menuorg/trunk/debian/control
    vdr/vdr-plugin-menuorg/trunk/debian/rules

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=5392&op=diff
==============================================================================
--- vdr/vdr-plugin-menuorg/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-menuorg/trunk/debian/changelog Tue Aug 28 23:45:17 2007
@@ -1,3 +1,9 @@
+vdr-plugin-menuorg (0.3-3) unstable; urgency=low
+
+  * Added 90_menuorg-0.3-1.5.9.dpatch
+
+ -- Thomas Günther <tom at toms-cafe.de>  Wed, 29 Aug 2007 01:44:00 +0200
+
 vdr-plugin-menuorg (0.3-2) unstable; urgency=low
 
   * Release for vdrdevel 1.5.9

Modified: vdr/vdr-plugin-menuorg/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-menuorg/trunk/debian/control?rev=5392&op=diff
==============================================================================
--- vdr/vdr-plugin-menuorg/trunk/debian/control (original)
+++ vdr/vdr-plugin-menuorg/trunk/debian/control Tue Aug 28 23:45:17 2007
@@ -2,7 +2,7 @@
 Section: misc
 Priority: extra
 Maintainer: Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>= 5), vdr-dev (>= 1.4.7-2ctvdr1), libxml++2.6-dev, libglibmm-2.4-dev
+Build-Depends: debhelper (>= 5), vdr-dev (>= 1.4.7-2ctvdr1), libxml++2.6-dev, libglibmm-2.4-dev, dpatch
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-menuorg

Added: vdr/vdr-plugin-menuorg/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-menuorg/trunk/debian/patches/00list?rev=5392&op=file
==============================================================================
--- vdr/vdr-plugin-menuorg/trunk/debian/patches/00list (added)
+++ vdr/vdr-plugin-menuorg/trunk/debian/patches/00list Tue Aug 28 23:45:17 2007
@@ -1,0 +1,1 @@
+90_menuorg-0.3-1.5.9

Added: 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=5392&op=file
==============================================================================
--- vdr/vdr-plugin-menuorg/trunk/debian/patches/90_menuorg-0.3-1.5.9.dpatch (added)
+++ vdr/vdr-plugin-menuorg/trunk/debian/patches/90_menuorg-0.3-1.5.9.dpatch Tue Aug 28 23:45:17 2007
@@ -1,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_menuorg-0.3-1.5.9.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.9.
+
+ at DPATCH@
+--- menuorg-0.3/src/i18n.h
++++ menuorg-0.3/src/i18n.h
+@@ -24,7 +24,12 @@
+ #define ___I18N__H
+ 
+ #include <vdr/i18n.h>
++#include <vdr/config.h>
+ 
+ extern const tI18nPhrase Phrases[];
+ 
++#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 @@
+ 
+ IMenuItemDefinition* SystemMenuNode::CreateMenuItemDefinition()
+ {
+-    return new OsdItemDefinition(new cOsdItem(tr(_text.c_str()), _state));
++    return new OsdItemDefinition(new cOsdItem(trVDR(_text.c_str()), _state));
+ }
+ 
+ bool SystemMenuNode::IsHidden()

Modified: vdr/vdr-plugin-menuorg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-menuorg/trunk/debian/rules?rev=5392&op=diff
==============================================================================
--- vdr/vdr-plugin-menuorg/trunk/debian/rules (original)
+++ vdr/vdr-plugin-menuorg/trunk/debian/rules Tue Aug 28 23:45:17 2007
@@ -13,7 +13,7 @@
 endif
 
 # To use dpatch uncomment the following line and set Build-Depends to dpatch
-# DPATCH=yes
+DPATCH=yes
 
 ifdef DPATCH
 include /usr/share/dpatch/dpatch.make