diff -u ktorrent-2.2.1/debian/patches/upstream_01_fix_exit_crash.patch ktorrent-2.2.1/debian/patches/upstream_01_fix_exit_crash.patch --- ktorrent-2.2.1/debian/patches/upstream_01_fix_exit_crash.patch +++ ktorrent-2.2.1/debian/patches/upstream_01_fix_exit_crash.patch @@ -2,49 +2,49 @@ ---- ktorrent-2.2.1/apps/ktorrent/ktorrentcore.cpp 2007-07-23 12:43:11.000000000 -0400 -+++ ktorrent-2.2.1.new/apps/ktorrent/ktorrentcore.cpp 2007-08-10 11:27:09.000000000 -0400 +--- ktorrent-2.2.1/apps/ktorrent/ktorrentcore.cpp 2007-07-23 12:43:11.000000000 -0400 ++++ ktorrent-2.2.1.new/apps/ktorrent/ktorrentcore.cpp 2007-08-10 11:27:09.000000000 -0400 @@ -593,9 +593,7 @@ - qman->onExit(job); - // wait for completion of stopped events - if (job->needToWait()) -- { - WaitJob::execute(job); -- } - else - delete job; - + qman->onExit(job); + // wait for completion of stopped events + if (job->needToWait()) +- { + WaitJob::execute(job); +- } + else + delete job; + diff -Nur ktorrent-2.2.1/libktorrent/pluginmanager.cpp ktorrent-2.2.1.new/libktorrent/pluginmanager.cpp ---- ktorrent-2.2.1/libktorrent/pluginmanager.cpp 2007-07-23 12:43:10.000000000 -0400 -+++ ktorrent-2.2.1.new/libktorrent/pluginmanager.cpp 2007-08-10 11:27:09.000000000 -0400 +--- ktorrent-2.2.1/libktorrent/pluginmanager.cpp 2007-07-23 12:43:10.000000000 -0400 ++++ ktorrent-2.2.1.new/libktorrent/pluginmanager.cpp 2007-08-10 11:27:09.000000000 -0400 @@ -125,12 +125,14 @@ - p->shutdown(wjob); - if (wjob->needToWait()) - bt::WaitJob::execute(wjob); -+ else -+ delete wjob; - } - catch (Error & err) - { - Out(SYS_GEN|LOG_NOTICE) << "Error when unloading plugin: " << err.toString() << endl; - } -- delete wjob; -+ - - gui->removePluginGui(p); - p->unload(); + p->shutdown(wjob); + if (wjob->needToWait()) + bt::WaitJob::execute(wjob); ++ else ++ delete wjob; + } + catch (Error & err) + { + Out(SYS_GEN|LOG_NOTICE) << "Error when unloading plugin: " << err.toString() << endl; + } +- delete wjob; ++ + + gui->removePluginGui(p); + p->unload(); @@ -174,14 +176,16 @@ - p->shutdown(wjob); - i++; - } -+ - if (wjob->needToWait()) - bt::WaitJob::execute(wjob); -+ else -+ delete wjob; - } - catch (Error & err) - { - Out(SYS_GEN|LOG_NOTICE) << "Error when unloading all plugins: " << err.toString() << endl; - } -- delete wjob; - - // then unload them - bt::PtrMap::iterator i = plugins.begin(); + p->shutdown(wjob); + i++; + } ++ + if (wjob->needToWait()) + bt::WaitJob::execute(wjob); ++ else ++ delete wjob; + } + catch (Error & err) + { + Out(SYS_GEN|LOG_NOTICE) << "Error when unloading all plugins: " << err.toString() << endl; + } +- delete wjob; + + // then unload them + bt::PtrMap::iterator i = plugins.begin(); diff -u ktorrent-2.2.1/debian/changelog ktorrent-2.2.1/debian/changelog --- ktorrent-2.2.1/debian/changelog +++ ktorrent-2.2.1/debian/changelog @@ -1,3 +1,10 @@ +ktorrent (2.2.1-0ubuntu3) gutsy; urgency=low + + * Fix debdiff spacing that I screwed up. + - Fixes LP: #130300 + + -- John Dong Sat, 11 Aug 2007 14:59:17 -0400 + ktorrent (2.2.1-0ubuntu2) gutsy; urgency=low * Backport SVN rev 692284