rev 4870 - trunk/packages/kdebase/debian

[Fathi Boudra]

Author: fboudra-guest
Date: 2006-11-09 16:59:33 +0100 (Thu, 09 Nov 2006)
New Revision: 4870

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/kdebase-data.preinst
Log:
remove kde-applications-merged dir in kdebase-data.preinst

Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2006-11-09 15:46:06 UTC (rev 4869)
+++ trunk/packages/kdebase/debian/changelog	2006-11-09 15:59:33 UTC (rev 4870)
@@ -1,3 +1,10 @@
+kdebase (4:3.5.5a.dfsg.1-2) unstable; urgency=low
+
+  * Remove kde-applications-merged directory in kdebase-data.preinst as we must
+    use applications-merged as the default merge directory.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu,  9 Nov 2006 16:54:04 +0100
+
 kdebase (4:3.5.5a.dfsg.1-1) unstable; urgency=medium
 
   * Add 4 new patches. Thanks to Sune Vuorela for investigating and

Modified: trunk/packages/kdebase/debian/kdebase-data.preinst
===================================================================
--- trunk/packages/kdebase/debian/kdebase-data.preinst	2006-11-09 15:46:06 UTC (rev 4869)
+++ trunk/packages/kdebase/debian/kdebase-data.preinst	2006-11-09 15:59:33 UTC (rev 4870)
@@ -33,6 +33,8 @@
 	rm -f /etc/kde3/debian/d-window-managers.desktop
 	rm -f /etc/kde3/debian/d-xshells.desktop
 
+	rm -rf /etc/xdg/menus/kde-applications-merged
+
 	[ -f "$FILE" ] || exit 0
 	if dpkg --compare-versions "$2" lt "4:3.4.0-0pre4"; then
 		rm -f "$FILE"