Cleanup diverts for plasma on Debian and Ubuntu

This resolves Bug 2055

debian/lenny/tdebase/debian/ksmserver-trinity.preinst

@@ -2,26 +2,30 @@
 
 package_name=ksmserver-trinity
 
-case "$1" in
+divert_remove()
-
+ {
-    upgrade)
+    divert=`dpkg-divert --listpackage "$1"`
-	# Remove old-style Plasma diversions
+    if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
-	divert=`dpkg-divert --listpackage "/usr/bin/plasma"`
+        if [ -e "$1" ]; then
-	if [ -n "$divert" ]; then
+            rm "$1"
-	    if [ "$divert" = "LOCAL" ]; then
-	        dpkg-divert --local --rename --remove /usr/bin/plasma
-	    else
-	        dpkg-divert --package $package_name --rename --remove /usr/bin/plasma
         fi
+        dpkg-divert --remove --local --rename "$1"
     fi
-	divert=`dpkg-divert --listpackage "/usr/bin/plasma-desktop"`
+    if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then
-	if [ -n "$divert" ]; then
+        if [ -e "$1" ]; then
-	    if [ "$divert" = "LOCAL" ]; then
+            rm "$1"
-	        dpkg-divert --local --rename --remove /usr/bin/plasma-desktop
-	    else
-	        dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop
         fi
+        dpkg-divert --remove --package $package_name --rename "$1"
     fi
+ }
+
+case "$1" in
+
+    upgrade)
+	# Remove old-style Plasma diversions
+	divert_remove /usr/bin/plasma
+	divert_remove /usr/bin/plasma-desktop
+
 	mkdir -p /usr/share/autostart
     ;;
 

debian/squeeze/tdebase/debian/ksmserver-trinity.preinst

@@ -2,26 +2,30 @@
 
 package_name=ksmserver-trinity
 
-case "$1" in
+divert_remove()
-
+ {
-    upgrade)
+    divert=`dpkg-divert --listpackage "$1"`
-	# Remove old-style Plasma diversions
+    if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
-	divert=`dpkg-divert --listpackage "/usr/bin/plasma"`
+        if [ -e "$1" ]; then
-	if [ -n "$divert" ]; then
+            rm "$1"
-	    if [ "$divert" = "LOCAL" ]; then
-	        dpkg-divert --local --rename --remove /usr/bin/plasma
-	    else
-	        dpkg-divert --package $package_name --rename --remove /usr/bin/plasma
         fi
+        dpkg-divert --remove --local --rename "$1"
     fi
-	divert=`dpkg-divert --listpackage "/usr/bin/plasma-desktop"`
+    if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then
-	if [ -n "$divert" ]; then
+        if [ -e "$1" ]; then
-	    if [ "$divert" = "LOCAL" ]; then
+            rm "$1"
-	        dpkg-divert --local --rename --remove /usr/bin/plasma-desktop
-	    else
-	        dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop
         fi
+        dpkg-divert --remove --package $package_name --rename "$1"
     fi
+ }
+
+case "$1" in
+
+    upgrade)
+	# Remove old-style Plasma diversions
+	divert_remove /usr/bin/plasma
+	divert_remove /usr/bin/plasma-desktop
+
 	mkdir -p /usr/share/autostart
     ;;
 

ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst

@@ -2,26 +2,30 @@
 
 package_name=ksmserver-trinity
 
-case "$1" in
+divert_remove()
-
+ {
-    upgrade)
+    divert=`dpkg-divert --listpackage "$1"`
-	# Remove old-style Plasma diversions
+    if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
-	divert=`dpkg-divert --listpackage "/usr/bin/plasma"`
+        if [ -e "$1" ]; then
-	if [ -n "$divert" ]; then
+            rm "$1"
-	    if [ "$divert" = "LOCAL" ]; then
-	        dpkg-divert --local --rename --remove /usr/bin/plasma
-	    else
-	        dpkg-divert --package $package_name --rename --remove /usr/bin/plasma
         fi
+        dpkg-divert --remove --local --rename "$1"
     fi
-	divert=`dpkg-divert --listpackage "/usr/bin/plasma-desktop"`
+    if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then
-	if [ -n "$divert" ]; then
+        if [ -e "$1" ]; then
-	    if [ "$divert" = "LOCAL" ]; then
+            rm "$1"
-	        dpkg-divert --local --rename --remove /usr/bin/plasma-desktop
-	    else
-	        dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop
         fi
+        dpkg-divert --remove --package $package_name --rename "$1"
     fi
+ }
+
+case "$1" in
+
+    upgrade)
+	# Remove old-style Plasma diversions
+	divert_remove /usr/bin/plasma
+	divert_remove /usr/bin/plasma-desktop
+
 	mkdir -p /usr/share/autostart
     ;;