[SCM] live-config branch, debian-next, updated. debian/3.0_a6-1-1-g2993088

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 2993088e03e2ce5ce01c7371795be6ab0b64858d
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Sep 13 22:16:22 2010 +0200

    Applying patch from Jonathan Riddell <jriddell at ubuntu.com> to disable some new akonadi services in kde-services script.

diff --git a/scripts/config/107-kde-services b/scripts/config/107-kde-services
index 987f9e8..f387de4 100755
--- a/scripts/config/107-kde-services
+++ b/scripts/config/107-kde-services
@@ -48,7 +48,7 @@ EOF
 
 	# Disabling unnecessary KDE services
 	rm -f /usr/share/autostart/kab2kabc.desktop
-	rm -f /usr/share/autostart/kabcdistlistupdater.desktop
+	rm -f /usr/share/autostart/kaddressbookmigrator.desktop
 	rm -f /usr/share/autostart/korgac.desktop
 	rm -f /usr/share/autostart/printer-applet.desktop
 	rm -f /usr/share/autostart/nepomukserver.desktop
@@ -57,6 +57,7 @@ EOF
 	rm -f /usr/share/kde4/services/kded/freespacenotifier.desktop
 	rm -f /usr/share/kde4/services/plasma-runner-contacts.desktop  # starts akonadi
 	rm -f /usr/share/kde4/services/kded/notificationhelper.desktop
+	rm -f /usr/share/kde4/services/plasma-dataengine-calendar.desktop # starts akonadi
 
 	# should enable kxkb in ~/.kde/share/config/kxkbrc
 	# if multiple layouts are specified. gnome does it per default.

-- 
live-config