diff -u kpackagekit-0.5.4/debian/changelog kpackagekit-0.5.4/debian/changelog --- kpackagekit-0.5.4/debian/changelog +++ kpackagekit-0.5.4/debian/changelog @@ -1,3 +1,11 @@ +kpackagekit (0.5.4-0ubuntu4.2) lucid-proposed; urgency=low + + * Add kubuntu_06_no_automatic_updates.diff, don't run automatic + install updates from KPackageKit settings. Apt already has its + own settings and ability to do this. Closes LP: #586497 + + -- Jonathan Riddell Fri, 18 Jun 2010 12:11:45 +0100 + kpackagekit (0.5.4-0ubuntu4.1) lucid-proposed; urgency=low * Replace dependency on kdebase-workspace-bin with a dependency on diff -u kpackagekit-0.5.4/debian/patches/series kpackagekit-0.5.4/debian/patches/series --- kpackagekit-0.5.4/debian/patches/series +++ kpackagekit-0.5.4/debian/patches/series @@ -3,0 +4 @@ +kubuntu_06_no_automatic_updates.diff only in patch2: unchanged: --- kpackagekit-0.5.4.orig/debian/patches/kubuntu_06_no_automatic_updates.diff +++ kpackagekit-0.5.4/debian/patches/kubuntu_06_no_automatic_updates.diff @@ -0,0 +1,21 @@ +Index: KPackageKit-0.6.0/SmartIcon/KpkUpdateIcon.cpp +=================================================================== +--- KPackageKit-0.6.0.orig/SmartIcon/KpkUpdateIcon.cpp 2010-06-18 11:59:18.751703100 +0100 ++++ KPackageKit-0.6.0/SmartIcon/KpkUpdateIcon.cpp 2010-06-18 12:01:11.475695138 +0100 +@@ -243,6 +243,7 @@ + KConfig config("KPackageKit"); + KConfigGroup checkUpdateGroup(&config, "CheckUpdate"); + uint updateType = static_cast(checkUpdateGroup.readEntry("autoUpdate", KpkEnum::AutoUpdateDefault)); ++ /* + if (updateType == KpkEnum::None) { + // update none + notifyUpdates(); +@@ -302,6 +303,8 @@ + } + } + } ++ */ ++ notifyUpdates(); + } + decreaseRunning(); + }