rev 4874 - trunk/packages/kdebase/debian

[Josh Metzler]

Author: jdmetz-guest
Date: 2006-11-10 14:46:37 +0100 (Fri, 10 Nov 2006)
New Revision: 4874

Modified:
   trunk/packages/kdebase/debian/kdebase-data.preinst
Log:
Stop removing applications-merged dir, since we now use it again.  Do safer removal of kde-applications-merged.

Modified: trunk/packages/kdebase/debian/kdebase-data.preinst
===================================================================
--- trunk/packages/kdebase/debian/kdebase-data.preinst	2006-11-10 03:27:13 UTC (rev 4873)
+++ trunk/packages/kdebase/debian/kdebase-data.preinst	2006-11-10 13:46:37 UTC (rev 4874)
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
-FILE="/etc/xdg/menus/applications-merged/kde-essential.menu"
-SUBDIR="/etc/xdg/menus/applications-merged"
+FILE="/etc/xdg/menus/kde-applications-merged/kde-essential.menu"
+SUBDIR="/etc/xdg/menus/kde-applications-merged"
 
 case "$1" in
 
@@ -33,13 +33,9 @@
 	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"
-		rmdir --ignore-fail-on-non-empty "$SUBDIR"
-	fi
+	[ -d "$SUBDIR" ]  || exit 0
+	if [ -f "$FILE" ]; then rm -f "$FILE"; fi
+	rmdir --ignore-fail-on-non-empty "$SUBDIR"
     ;;
 
     install|abort-upgrade)