diff -u vdr-plugin-extrecmenu-1.1/debian/control vdr-plugin-extrecmenu-1.1/debian/control --- vdr-plugin-extrecmenu-1.1/debian/control +++ vdr-plugin-extrecmenu-1.1/debian/control @@ -1,7 +1,8 @@ Source: vdr-plugin-extrecmenu Section: misc Priority: extra -Maintainer: Debian VDR Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian VDR Team Uploaders: Thomas Günther , Tobias Grimm , Thomas Schmidt Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5) Standards-Version: 3.8.0 diff -u vdr-plugin-extrecmenu-1.1/debian/changelog vdr-plugin-extrecmenu-1.1/debian/changelog --- vdr-plugin-extrecmenu-1.1/debian/changelog +++ vdr-plugin-extrecmenu-1.1/debian/changelog @@ -1,3 +1,10 @@ +vdr-plugin-extrecmenu (1.1-8ubuntu1) lucid; urgency=low + + * Fix FTBFS with gcc 4.4 (LP: #569917) + - Add debian/patches/02_fix_ftbfs_gcc_4.4.dpatch + + -- Felix Geyer Sun, 25 Apr 2010 23:10:04 +0200 + vdr-plugin-extrecmenu (1.1-8build1) intrepid; urgency=low * Sync from e-tobi.net, no Ubuntu changes. diff -u vdr-plugin-extrecmenu-1.1/debian/patches/00list vdr-plugin-extrecmenu-1.1/debian/patches/00list --- vdr-plugin-extrecmenu-1.1/debian/patches/00list +++ vdr-plugin-extrecmenu-1.1/debian/patches/00list @@ -1,0 +2 @@ +02_fix_ftbfs_gcc_4.4.dpatch only in patch2: unchanged: --- vdr-plugin-extrecmenu-1.1.orig/debian/patches/02_fix_ftbfs_gcc_4.4.dpatch +++ vdr-plugin-extrecmenu-1.1/debian/patches/02_fix_ftbfs_gcc_4.4.dpatch @@ -0,0 +1,54 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +# Fix FTBFS with gcc 4.4 + +@DPATCH@ +diff -Nur vdr-plugin-extrecmenu-1.1.orig/mymenueditrecording.c vdr-plugin-extrecmenu-1.1/mymenueditrecording.c +--- vdr-plugin-extrecmenu-1.1.orig/mymenueditrecording.c 2007-08-19 14:12:34.000000000 +0200 ++++ vdr-plugin-extrecmenu-1.1/mymenueditrecording.c 2010-04-25 22:06:16.000000000 +0200 +@@ -25,15 +25,15 @@ + + if(recording) + { +- char *p=strrchr(recording->Name(),'~'); ++ const char *p=strrchr(recording->Name(),'~'); + if(p) + { + strn0cpy(name,++p,sizeof(name)); + strn0cpy(path,recording->Name(),sizeof(path)); + +- p=strrchr(path,'~'); +- if(p) +- *p=0; ++ char* p2=strrchr(path,'~'); ++ if(p2) ++ *p2=0; + } + else + strn0cpy(name,recording->Name(),sizeof(name)); +@@ -307,7 +307,7 @@ + asprintf(&dir,"%s%s%s",base?base:"",base?"~":"",item->Text()); + else // needed for move recording menu + { +- char *p=strrchr(recording->Name(),'~'); ++ const char *p=strrchr(recording->Name(),'~'); + asprintf(&dir,"%s%s%s~%s",base?base:"",base?"~":"",item->Text(),p?p+1:recording->Name()); + } + } +@@ -315,7 +315,7 @@ + { + if(!dirname) + { +- char *p=strrchr(recording->Name(),'~'); ++ const char *p=strrchr(recording->Name(),'~'); + asprintf(&dir,"%s",p?++p:recording->Name()); + } + } +@@ -326,7 +326,7 @@ + asprintf(&dir,"%s",base); + else + { +- char *p=strrchr(recording->Name(),'~'); ++ const char *p=strrchr(recording->Name(),'~'); + asprintf(&dir,"%s~%s",base,p?p:recording->Name()); + } + }