diff -u kadu-0.6.5.2/debian/changelog kadu-0.6.5.2/debian/changelog --- kadu-0.6.5.2/debian/changelog +++ kadu-0.6.5.2/debian/changelog @@ -1,3 +1,11 @@ +kadu (0.6.5.2-4ubuntu1) karmic; urgency=low + + * debian/patches/99-gcc4.4-build-fix2.patch: fix a FTBFS deleting a non used + line in modules/profiles/profiles.cpp (LP: #416733). Patch retrofited from + 0.6.5.3 + + -- Fabrice Coutadeur Mon, 07 Sep 2009 21:23:56 +0000 + kadu (0.6.5.2-4) unstable; urgency=low * Fixed regressive bug: AUTHORS, THANKS, LICENSE, about-changes-tab.txt are diff -u kadu-0.6.5.2/debian/control kadu-0.6.5.2/debian/control --- kadu-0.6.5.2/debian/control +++ kadu-0.6.5.2/debian/control @@ -1,7 +1,8 @@ Source: kadu Section: net Priority: optional -Maintainer: Patryk Cisek +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Patryk Cisek Build-Depends: cmake (>=2.6), debhelper (>= 7), patchutils (>= 0.2.25), sharutils, bzip2, libqt4-dev, libao-dev, libsndfile1-dev (>= 1.0), libcurl3-gnutls-dev, libaudio-dev, libxtst-dev, libgadu-dev, libaspell-dev, libasound-dev, libdbus-1-dev, libqca2-dev, x11proto-scrnsaver-dev, libxss-dev, libphonon-dev Standards-Version: 3.8.2 Homepage: http://kadu.net only in patch2: unchanged: --- kadu-0.6.5.2.orig/debian/patches/99-gcc4.4-build-fix2.patch +++ kadu-0.6.5.2/debian/patches/99-gcc4.4-build-fix2.patch @@ -0,0 +1,16 @@ +# Description: Fix the following compilation error: "profiles.cpp:673: error: +# invalid operands of types '' and 'int' +# to binary 'operator=='" by deleting the wrong line, as done by upstream +# +diff -Nur a/modules/profiles/profiles.cpp b/modules/profiles/profiles.cpp +--- a/modules/profiles/profiles.cpp 2009-09-07 20:56:41.000000000 +0000 ++++ b/modules/profiles/profiles.cpp 2009-09-07 20:56:50.000000000 +0000 +@@ -670,8 +670,6 @@ + + Profile p = profileManager->getProfile(item->text()); + +- if (index == 0) return; +- + profileName->setText(p.name); + profileDir->setText(p.directory); + profileUIN->setText(p.uin);