Merging casper 1.167.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 9056345..6f1b59b 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,9 @@
+casper (1.167) jaunty; urgency=low
+
+  * Disable kwallet from KDE 4 in 34disable_kde_services
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 27 Mar 2009 18:40:35 +0000
+
 casper (1.166) jaunty; urgency=low
 
   [ Emmet Hikory ]

diff --git a/scripts/live-bottom/34disable_kde_services b/scripts/live-bottom/34disable_kde_services
index ae13794..3350d61 100755 (executable)
--- a/scripts/live-bottom/34disable_kde_services
+++ b/scripts/live-bottom/34disable_kde_services
@@ -27,6 +27,7 @@ log_begin_msg "Disabling unnecessary KDE services..."
 # live-initramfs script
 
 rm -f /root/usr/share/services/kded/kwalletd.desktop
+rm -f /root/usr/share/kde4/services/kwalletd.desktop
 rm -f /root/usr/share/autostart/kab2kabc.desktop
 rm -f /root/usr/share/autostart/kabcdistlistupdater.desktop
 rm -f /root/usr/share/autostart/korgac.desktop