diff -u vdr-plugin-epgsearch-0.9.24/debian/control vdr-plugin-epgsearch-0.9.24/debian/control
--- vdr-plugin-epgsearch-0.9.24/debian/control
+++ vdr-plugin-epgsearch-0.9.24/debian/control
@@ -1,7 +1,8 @@
 Source: vdr-plugin-epgsearch
 Section: misc
 Priority: extra
-Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt@debian.org>, Tobias Grimm <tg@e-tobi.net>, Thomas Günther <tom@toms-cafe.de>
 Build-Depends: debhelper (>> 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), gettext
 Standards-Version: 3.8.0
diff -u vdr-plugin-epgsearch-0.9.24/debian/changelog vdr-plugin-epgsearch-0.9.24/debian/changelog
--- vdr-plugin-epgsearch-0.9.24/debian/changelog
+++ vdr-plugin-epgsearch-0.9.24/debian/changelog
@@ -1,3 +1,10 @@
+vdr-plugin-epgsearch (0.9.24-3ubuntu1) lucid; urgency=low
+
+  * Fix FTBFS with gcc 4.4 (LP: #569928)
+    - Add debian/patches/03_gcc-4.4.dpatch, cherry-pick from 0.9.24-6
+
+ -- Felix Geyer <debfx-pkg@fobos.de>  Sun, 25 Apr 2010 23:20:45 +0200
+
 vdr-plugin-epgsearch (0.9.24-3) unstable; urgency=low
 
   [ Tobias Grimm ]
diff -u vdr-plugin-epgsearch-0.9.24/debian/patches/00list vdr-plugin-epgsearch-0.9.24/debian/patches/00list
--- vdr-plugin-epgsearch-0.9.24/debian/patches/00list
+++ vdr-plugin-epgsearch-0.9.24/debian/patches/00list
@@ -2,0 +3 @@
+03_gcc-4.4
only in patch2:
unchanged:
--- vdr-plugin-epgsearch-0.9.24.orig/debian/patches/03_gcc-4.4.dpatch
+++ vdr-plugin-epgsearch-0.9.24/debian/patches/03_gcc-4.4.dpatch
@@ -0,0 +1,85 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_gcc-4.4.dpatch by Tobias Grimm <etobi@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad vdr-plugin-epgsearch-0.9.24~/epgsearchsvdrp.c vdr-plugin-epgsearch-0.9.24/epgsearchsvdrp.c
+--- vdr-plugin-epgsearch-0.9.24~/epgsearchsvdrp.c	2008-04-13 20:53:44.000000000 +0200
++++ vdr-plugin-epgsearch-0.9.24/epgsearchsvdrp.c	2009-10-26 20:27:07.000000000 +0100
+@@ -742,12 +742,13 @@
+    {
+       if (*Option) 
+       {
+-         char* pipePos = strchr(Option, '|');
++         const char* pipePos = strchr(Option, '|');
+          if (pipePos)
+          {
+-            *pipePos = 0;
+-            const char* oldName = Option;
+-            const char* newName = pipePos+1;
++            int index = pipePos - Option;
++            char* oldName = strdup(Option);
++            *(oldName + index) = 0;
++            const char* newName = oldName + index + 1;
+             if (strlen(oldName) > 0 && strlen(newName) > 0)
+             {
+                cChannelGroup *changrp = ChannelGroups.GetGroupByName(Option);
+@@ -769,15 +770,18 @@
+                   }
+                   ChannelGroups.Save();
+                   SearchExts.Save();
++                  free(oldName);
+                   return cString::sprintf("renamed channel group '%s' to '%s'", oldName, newName);
+ 
+                }		    
+                else
+                {
++                  free(oldName);
+                   ReplyCode = 901;
+                   return cString::sprintf("channel group '%s' not defined", Option);
+                }
+             }
++            free(oldName);
+          }
+          ReplyCode = 901;
+          return cString("Error in channel group parameters");	
+diff -urNad vdr-plugin-epgsearch-0.9.24~/epgsearchtools.c vdr-plugin-epgsearch-0.9.24/epgsearchtools.c
+--- vdr-plugin-epgsearch-0.9.24~/epgsearchtools.c	2008-04-13 20:53:42.000000000 +0200
++++ vdr-plugin-epgsearch-0.9.24/epgsearchtools.c	2009-10-26 20:27:07.000000000 +0100
+@@ -743,7 +743,7 @@
+    while(tmp)
+    {
+       // extract a single line
+-      char* lf = strchr(tmp, '\n');
++      const char* lf = strchr(tmp, '\n');
+       char* line = NULL;
+       if (lf)
+ 	line = strndup(tmp, lf-tmp);
+diff -urNad vdr-plugin-epgsearch-0.9.24~/menu_dirselect.c vdr-plugin-epgsearch-0.9.24/menu_dirselect.c
+--- vdr-plugin-epgsearch-0.9.24~/menu_dirselect.c	2008-04-13 20:53:44.000000000 +0200
++++ vdr-plugin-epgsearch-0.9.24/menu_dirselect.c	2009-10-26 20:27:07.000000000 +0100
+@@ -83,7 +83,7 @@
+ 	return 1;
+     do
+     {
+-	char* pos = strchr(szDir, '~');
++	const char* pos = strchr(szDir, '~');
+ 	if (pos)
+ 	{
+ 	    iLevel++;
+diff -urNad vdr-plugin-epgsearch-0.9.24~/searchtimer_thread.c vdr-plugin-epgsearch-0.9.24/searchtimer_thread.c
+--- vdr-plugin-epgsearch-0.9.24~/searchtimer_thread.c	2008-04-28 18:22:31.000000000 +0200
++++ vdr-plugin-epgsearch-0.9.24/searchtimer_thread.c	2009-10-26 20:27:28.000000000 +0100
+@@ -565,8 +565,8 @@
+    if (!isempty(aux))
+    {
+       tmpaux = strdup(aux);
+-      char* begin = strstr(aux, "<epgsearch>");
+-      char* end = strstr(aux, "</epgsearch>");
++      const char* begin = strstr(aux, "<epgsearch>");
++      const char* end = strstr(aux, "</epgsearch>");
+       if (begin && end)
+       {
+          if (begin == aux) strcpy(tmpaux, ""); else strn0cpy(tmpaux, aux, begin-aux+1);