Fix handling of diverts on Debian and Ubuntu

(cherry picked from commit 683152f3b286a04a76f31ee1eed839bbdb2ab307)

2 files changed, 10 insertions, 5 deletions

diff --git a/debian/squeeze/applications/kdesudo/debian/postinst b/debian/squeeze/applications/kdesudo/debian/postinst
index d452abce3..7ec0ace2f 100644
--- a/debian/squeeze/applications/kdesudo/debian/postinst
+++ b/debian/squeeze/applications/kdesudo/debian/postinst
@@ -11,8 +11,6 @@ fi
 
 case "$1" in
   configure)
-	dpkg-divert --package $package_name --rename --remove \
-                /usr/trinity/bin/kdesu || true
     ;;
   abort-upgrade)
     ;;
diff --git a/debian/squeeze/applications/kdesudo/debian/preinst b/debian/squeeze/applications/kdesudo/debian/preinst
index d711fde5b..4ce843004 100644
--- a/debian/squeeze/applications/kdesudo/debian/preinst
+++ b/debian/squeeze/applications/kdesudo/debian/preinst
@@ -16,9 +16,16 @@ case "$1" in
     --rename /opt/trinity/bin/kdesu
     ;;
   upgrade)
-    dpkg-divert --package $package_name \
-    --divert /opt/trinity/bin/kdesu.distrib \
-    --rename /opt/trinity/bin/kdesu
+    divert=`dpkg-divert --listpackage "/usr/trinity/bin/kdesu"`
+    if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then
+        dpkg-divert --remove --package $package_name --rename "/usr/trinity/bin/kdesu"
+    fi
+    divert=`dpkg-divert --listpackage "/opt/trinity/bin/kdesu"`
+    if [ -z "$divert" ]; then
+        dpkg-divert --package $package_name \
+                    --divert /opt/trinity/bin/kdesu.distrib \
+                    --rename /opt/trinity/bin/kdesu
+    fi
     ;;
   abort-upgrade)
     ;;