Merging casper 1.164.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 7f2f987..ab7d2d5 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,10 @@
+casper (1.164) jaunty; urgency=low
+
+  * Update 34disable_kde_services to not start
+    update-notifier-kde or plasma's contact plugin which uses akonadi
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 18 Mar 2009 18:07:52 +0000
+
 casper (1.163) jaunty; urgency=low
 
   * 34disable_kwallet moved to 34disable_kde_services and disables

diff --git a/scripts/live-bottom/34disable_kde_services b/scripts/live-bottom/34disable_kde_services
index 37da8ea..ae13794 100755 (executable)
--- a/scripts/live-bottom/34disable_kde_services
+++ b/scripts/live-bottom/34disable_kde_services
@@ -34,5 +34,7 @@ rm -f /root/usr/share/autostart/printer-applet.desktop
 rm -f /root/usr/share/autostart/nepomukserver.desktop
 rm -f /root/usr/share/kde4/services/kded/kpackagekitd.desktop
 rm -f /root/usr/share/kde4/services/kded/susefreespacenotifier.desktop
+rm -f /root/usr/share/kde4/services/plasma-runner-contacts.desktop  # starts akonadi
+rm -f /root/etc/xdg/autostart/update-notifier-kde.desktop
 
 log_end_msg