diff -u amule-2.2.6+debian0/debian/control amule-2.2.6+debian0/debian/control --- amule-2.2.6+debian0/debian/control +++ amule-2.2.6+debian0/debian/control @@ -1,7 +1,8 @@ Source: amule Section: net Priority: optional -Maintainer: Debian aMule Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian aMule Team Uploaders: Adrian Yanes , Cristian Greco , Sandro Tosi , Giuseppe Iuculano Build-Depends: autotools-dev, diff -u amule-2.2.6+debian0/debian/changelog amule-2.2.6+debian0/debian/changelog --- amule-2.2.6+debian0/debian/changelog +++ amule-2.2.6+debian0/debian/changelog @@ -1,3 +1,9 @@ +amule (2.2.6+debian0-8ubuntu2) natty; urgency=low + + * Fix FTBFS on gcc 4.5 + + -- shankao Wed, 15 Dec 2010 16:50:15 +0000 + amule (2.2.6+debian0-8ubuntu1) maverick; urgency=low * debian/control: Remove unnecessary info from main amule description diff -u amule-2.2.6+debian0/debian/patches/series amule-2.2.6+debian0/debian/patches/series --- amule-2.2.6+debian0/debian/patches/series +++ amule-2.2.6+debian0/debian/patches/series @@ -6,0 +7 @@ +fix_ftbfs_on_gcc45.diff only in patch2: unchanged: --- amule-2.2.6+debian0.orig/debian/patches/fix_ftbfs_on_gcc45.diff +++ amule-2.2.6+debian0/debian/patches/fix_ftbfs_on_gcc45.diff @@ -0,0 +1,18 @@ +Index: amule-2.2.6+debian0/src/utils/wxCas/src/wxcasframe.cpp +=================================================================== +--- amule-2.2.6+debian0.orig/src/utils/wxCas/src/wxcasframe.cpp 2010-12-15 16:46:18.435693002 +0000 ++++ amule-2.2.6+debian0/src/utils/wxCas/src/wxcasframe.cpp 2010-12-15 16:47:07.151693001 +0000 +@@ -285,11 +285,11 @@ + #ifdef __WXMSW__ + + memdc. +- SetFont ( wxFont::wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) ); ++ SetFont ( wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) ); + #else + + memdc. +- SetFont ( wxFont::wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) ); ++ SetFont ( wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) ); + #endif + + memdc.