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

[Thomas Günther]

Author: tom-guest
Date: 2006-05-15 12:52:38 +0000 (Mon, 15 May 2006)
New Revision: 2782

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/patches/03_cmdsubmenu.dpatch
Log:
Upgraded 03_cmdsubmenu.dpatch (closes: #367360)

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2006-05-14 20:46:11 UTC (rev 2781)
+++ vdr/vdr/trunk/debian/changelog	2006-05-15 12:52:38 UTC (rev 2782)
@@ -4,6 +4,8 @@
 
   * Thomas Günther <tom at toms-cafe.de>
     - Fixed i18n texts for replay in 10_dd-record-option.dpatch
+    - Upgraded 03_cmdsubmenu.dpatch to version 0.7 - fixes FTBFS with G++ 4.1:
+      extra qualification (closes: #367360)
   * Thomas Schmidt <tschmidt at debian.org>
     - Fixed debian/watch
   

Modified: vdr/vdr/trunk/debian/patches/03_cmdsubmenu.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/03_cmdsubmenu.dpatch	2006-05-14 20:46:11 UTC (rev 2781)
+++ vdr/vdr/trunk/debian/patches/03_cmdsubmenu.dpatch	2006-05-15 12:52:38 UTC (rev 2782)
@@ -1,16 +1,16 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 03_cmdsubmenu.dpatch by Albu at vdrportal.de
-## http://toms-cafe.de/vdr/download/vdr-cmdsubmenu-0.6-1.3.47.diff (applicable to VDR >= 1.3.36)
+## http://toms-cafe.de/vdr/download/vdr-cmdsubmenu-0.7-1.4.0.diff (applicable to VDR >= 1.3.36)
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Adds submenus within the commands and recording commands menu.
 ## DP: To create a submenu entry, prefix the name by one ore more "-".
 
 @DPATCH@
-diff -Naur vdr-1.3.47/README.cmdsubmenu vdr-1.3.47-cmdsubmenu-0.6/README.cmdsubmenu
---- vdr-1.3.47/README.cmdsubmenu	1970-01-01 01:00:00.000000000 +0100
-+++ vdr-1.3.47-cmdsubmenu-0.6/README.cmdsubmenu	2006-04-23 18:15:36.000000000 +0200
-@@ -0,0 +1,50 @@
+diff -Naur vdr-1.4.0/README.cmdsubmenu vdr-1.4.0-cmdsubmenu-0.7/README.cmdsubmenu
+--- vdr-1.4.0/README.cmdsubmenu	1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.4.0-cmdsubmenu-0.7/README.cmdsubmenu	2006-05-15 13:49:50.000000000 +0200
+@@ -0,0 +1,54 @@
 +CmdSubmenu patch for VDR
 +------------------------
 +
@@ -61,9 +61,13 @@
 +  2006-04-23: Version 0.6 - Thomas Günther <tom at toms-cafe.de>
 +    - Fixed menus with more than one level
 +    http://toms-cafe.de/vdr/download/vdr-cmdsubmenu-0.6-1.3.47.diff
-diff -Naur vdr-1.3.47/config.c vdr-1.3.47-cmdsubmenu-0.6/config.c
---- vdr-1.3.47/config.c	2006-04-17 14:43:57.000000000 +0200
-+++ vdr-1.3.47-cmdsubmenu-0.6/config.c	2006-04-23 01:06:54.000000000 +0200
++
++  2006-05-15: Version 0.7 - Thomas Günther <tom at toms-cafe.de>
++    - Fixed build with G++ 4.1 (extra qualification)
++    http://toms-cafe.de/vdr/download/vdr-cmdsubmenu-0.7-1.4.0.diff
+diff -Naur vdr-1.4.0/config.c vdr-1.4.0-cmdsubmenu-0.7/config.c
+--- vdr-1.4.0/config.c	2006-04-17 14:43:57.000000000 +0200
++++ vdr-1.4.0-cmdsubmenu-0.7/config.c	2006-05-15 13:45:23.000000000 +0200
 @@ -28,18 +28,26 @@
  {
    title = command = NULL;
@@ -132,9 +136,9 @@
  // -- cSVDRPhosts ------------------------------------------------------------
  
  cSVDRPhosts SVDRPhosts;
-diff -Naur vdr-1.3.47/config.h vdr-1.3.47-cmdsubmenu-0.6/config.h
---- vdr-1.3.47/config.h	2006-04-16 11:36:10.000000000 +0200
-+++ vdr-1.3.47-cmdsubmenu-0.6/config.h	2006-04-23 18:15:54.000000000 +0200
+diff -Naur vdr-1.4.0/config.h vdr-1.4.0-cmdsubmenu-0.7/config.h
+--- vdr-1.4.0/config.h	2006-04-29 11:24:07.000000000 +0200
++++ vdr-1.4.0-cmdsubmenu-0.7/config.h	2006-05-15 13:45:45.000000000 +0200
 @@ -35,6 +35,8 @@
  // plugins to work with newer versions of the core VDR as long as no
  // VDR header files have changed.
@@ -166,7 +170,7 @@
    const char *Execute(const char *Parameters = NULL);
 +  int getIndent(void) { return nIndent; }
 +  void setIndent(int nNewIndent) { nIndent = nNewIndent; }
-+  cCommands *cCommand::getChilds(void) { return childs; }
++  cCommands *getChilds(void) { return childs; }
 +  int getChildCount(void);
 +  bool hasChilds(void) { return getChildCount() > 0; }
 +  void addChild(cCommand *newChild);
@@ -202,9 +206,9 @@
  
  class cSVDRPhosts : public cConfig<cSVDRPhost> {
  public:
-diff -Naur vdr-1.3.47/menu.c vdr-1.3.47-cmdsubmenu-0.6/menu.c
---- vdr-1.3.47/menu.c	2006-04-16 14:20:46.000000000 +0200
-+++ vdr-1.3.47-cmdsubmenu-0.6/menu.c	2006-04-22 14:13:04.000000000 +0200
+diff -Naur vdr-1.4.0/menu.c vdr-1.4.0-cmdsubmenu-0.7/menu.c
+--- vdr-1.4.0/menu.c	2006-04-28 14:48:01.000000000 +0200
++++ vdr-1.4.0-cmdsubmenu-0.7/menu.c	2006-05-15 13:45:23.000000000 +0200
 @@ -1522,6 +1522,10 @@
    if (command) {
       char *buffer = NULL;