Fix removing diverts from renamed packages on Debian and Ubuntu

15 files changed, 108 insertions, 120 deletions

diff --git a/debian/lenny/applications/tdeio-umountwrapper/debian/preinst b/debian/lenny/applications/tdeio-umountwrapper/debian/preinst
index a4d27d2cd..a258f8481 100644
--- a/debian/lenny/applications/tdeio-umountwrapper/debian/preinst
+++ b/debian/lenny/applications/tdeio-umountwrapper/debian/preinst
@@ -30,9 +30,18 @@ mkdir -p /opt/trinity/share/apps/d3lphin/servicemenus/
 case "$1" in
   install)
     # remove old diversions if present
-    dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop || true
-    dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop || true
-    dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop || true
+    divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop"`
+    if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then
+        dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop
+    fi
+    divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop"`
+    if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then
+        dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop
+    fi
+    divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop"`
+    if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then
+        dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop
+    fi
 
     # add new diversions
     dpkg-divert --package $package_name \
diff --git a/debian/lenny/applications/tdesudo/debian/preinst b/debian/lenny/applications/tdesudo/debian/preinst
index 770dfaacb..9633ba544 100644
--- a/debian/lenny/applications/tdesudo/debian/preinst
+++ b/debian/lenny/applications/tdesudo/debian/preinst
@@ -11,15 +11,30 @@ fi
 
 case "$1" in
   install)
+    # remove old diversions if present
+    divert=`dpkg-divert --listpackage "/usr/trinity/bin/kdesu"`
+    if [ -n "$divert" ] && [ "$divert" = "kdesudo-trinity" ]; then
+        dpkg-divert --remove --package kdesudo-trinity --rename /usr/trinity/bin/kdesu
+    fi
+    divert=`dpkg-divert --listpackage "/opt/trinity/bin/kdesu"`
+    if [ -n "$divert" ] && [ "$divert" = "kdesudo-trinity" ]; then
+        dpkg-divert --remove --package kdesudo-trinity --rename /opt/trinity/bin/kdesu
+    fi
+
+    # add new diversion
     dpkg-divert --package $package_name \
     --divert /opt/trinity/bin/tdesu.distrib \
     --rename /opt/trinity/bin/tdesu
     ;;
+
   upgrade)
+    # remove old diversion if present
     divert=`dpkg-divert --listpackage "/usr/trinity/bin/tdesu"`
     if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then
         dpkg-divert --remove --package $package_name --rename "/usr/trinity/bin/tdesu"
     fi
+
+    # add new diversion
     divert=`dpkg-divert --listpackage "/opt/trinity/bin/tdesu"`
     if [ -z "$divert" ]; then
         dpkg-divert --package $package_name \
@@ -27,6 +42,7 @@ case "$1" in
                     --rename /opt/trinity/bin/tdesu
     fi
     ;;
+
   abort-upgrade)
     ;;
   *) echo "$0: didn't understand being called with \`$1'" 1>&2
diff --git a/debian/lenny/metapackages/rename-meta/debian/kdesudo-trinity.preinst b/debian/lenny/metapackages/rename-meta/debian/kdesudo-trinity.preinst
deleted file mode 100644
index 12e16e22d..000000000
--- a/debian/lenny/metapackages/rename-meta/debian/kdesudo-trinity.preinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kdesudo-trinity
-
-divert=`dpkg-divert --listpackage "/opt/trinity/bin/kdesu"`
-if [ -n "$divert" ] && [ "$divert" = $package_name ]; then
-    dpkg-divert --package $package_name --rename --remove \
-                /opt/trinity/bin/kdesu
-fi
-
-exit 0
diff --git a/debian/lenny/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst b/debian/lenny/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst
deleted file mode 100644
index b7af2273b..000000000
--- a/debian/lenny/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kio-umountwrapper-trinity
-
-divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop"`
-if [ -n "$divert" ] && [ "$divert" = $package_name ]; then
-    dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop
-fi
-
-divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop"`
-if [ -n "$divert" ] && [ "$divert" = $package_name ]; then
-    dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop
-fi
-
-divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop"`
-if [ -n "$divert" ] && [ "$divert" = $package_name ]; then
-    dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop
-fi
-
-exit 0
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.preinst b/debian/lenny/tdebase/debian/ksmserver-trinity.preinst
index 4a2ab8a19..503524a11 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.preinst
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.preinst
@@ -6,8 +6,14 @@ case "$1" in
 
     upgrade)
 	# Remove old-style Plasma diversions
-	dpkg-divert --package $package_name --rename --remove /usr/bin/plasma || true
-	dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop || true
+	divert=`dpkg-divert --listpackage "/usr/bin/plasma"`
+	if [ -n "$divert" ]; then
+	    dpkg-divert --package $package_name --rename --remove /usr/bin/plasma
+	fi
+	divert=`dpkg-divert --listpackage "/usr/bin/plasma-desktop"`
+	if [ -n "$divert" ]; then
+	    dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop
+	fi
 	mkdir -p /usr/share/autostart
     ;;
 
diff --git a/debian/squeeze/applications/tdeio-umountwrapper/debian/preinst b/debian/squeeze/applications/tdeio-umountwrapper/debian/preinst
index a4d27d2cd..a258f8481 100644
--- a/debian/squeeze/applications/tdeio-umountwrapper/debian/preinst
+++ b/debian/squeeze/applications/tdeio-umountwrapper/debian/preinst
@@ -30,9 +30,18 @@ mkdir -p /opt/trinity/share/apps/d3lphin/servicemenus/
 case "$1" in
   install)
     # remove old diversions if present
-    dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop || true
-    dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop || true
-    dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop || true
+    divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop"`
+    if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then
+        dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop
+    fi
+    divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop"`
+    if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then
+        dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop
+    fi
+    divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop"`
+    if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then
+        dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop
+    fi
 
     # add new diversions
     dpkg-divert --package $package_name \
diff --git a/debian/squeeze/applications/tdesudo/debian/preinst b/debian/squeeze/applications/tdesudo/debian/preinst
index 770dfaacb..9633ba544 100644
--- a/debian/squeeze/applications/tdesudo/debian/preinst
+++ b/debian/squeeze/applications/tdesudo/debian/preinst
@@ -11,15 +11,30 @@ fi
 
 case "$1" in
   install)
+    # remove old diversions if present
+    divert=`dpkg-divert --listpackage "/usr/trinity/bin/kdesu"`
+    if [ -n "$divert" ] && [ "$divert" = "kdesudo-trinity" ]; then
+        dpkg-divert --remove --package kdesudo-trinity --rename /usr/trinity/bin/kdesu
+    fi
+    divert=`dpkg-divert --listpackage "/opt/trinity/bin/kdesu"`
+    if [ -n "$divert" ] && [ "$divert" = "kdesudo-trinity" ]; then
+        dpkg-divert --remove --package kdesudo-trinity --rename /opt/trinity/bin/kdesu
+    fi
+
+    # add new diversion
     dpkg-divert --package $package_name \
     --divert /opt/trinity/bin/tdesu.distrib \
     --rename /opt/trinity/bin/tdesu
     ;;
+
   upgrade)
+    # remove old diversion if present
     divert=`dpkg-divert --listpackage "/usr/trinity/bin/tdesu"`
     if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then
         dpkg-divert --remove --package $package_name --rename "/usr/trinity/bin/tdesu"
     fi
+
+    # add new diversion
     divert=`dpkg-divert --listpackage "/opt/trinity/bin/tdesu"`
     if [ -z "$divert" ]; then
         dpkg-divert --package $package_name \
@@ -27,6 +42,7 @@ case "$1" in
                     --rename /opt/trinity/bin/tdesu
     fi
     ;;
+
   abort-upgrade)
     ;;
   *) echo "$0: didn't understand being called with \`$1'" 1>&2
diff --git a/debian/squeeze/metapackages/rename-meta/debian/kdesudo-trinity.preinst b/debian/squeeze/metapackages/rename-meta/debian/kdesudo-trinity.preinst
deleted file mode 100644
index 12e16e22d..000000000
--- a/debian/squeeze/metapackages/rename-meta/debian/kdesudo-trinity.preinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kdesudo-trinity
-
-divert=`dpkg-divert --listpackage "/opt/trinity/bin/kdesu"`
-if [ -n "$divert" ] && [ "$divert" = $package_name ]; then
-    dpkg-divert --package $package_name --rename --remove \
-                /opt/trinity/bin/kdesu
-fi
-
-exit 0
diff --git a/debian/squeeze/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst b/debian/squeeze/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst
deleted file mode 100644
index b7af2273b..000000000
--- a/debian/squeeze/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kio-umountwrapper-trinity
-
-divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop"`
-if [ -n "$divert" ] && [ "$divert" = $package_name ]; then
-    dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop
-fi
-
-divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop"`
-if [ -n "$divert" ] && [ "$divert" = $package_name ]; then
-    dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop
-fi
-
-divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop"`
-if [ -n "$divert" ] && [ "$divert" = $package_name ]; then
-    dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop
-fi
-
-exit 0
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst b/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst
index 4a2ab8a19..503524a11 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst
@@ -6,8 +6,14 @@ case "$1" in
 
     upgrade)
 	# Remove old-style Plasma diversions
-	dpkg-divert --package $package_name --rename --remove /usr/bin/plasma || true
-	dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop || true
+	divert=`dpkg-divert --listpackage "/usr/bin/plasma"`
+	if [ -n "$divert" ]; then
+	    dpkg-divert --package $package_name --rename --remove /usr/bin/plasma
+	fi
+	divert=`dpkg-divert --listpackage "/usr/bin/plasma-desktop"`
+	if [ -n "$divert" ]; then
+	    dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop
+	fi
 	mkdir -p /usr/share/autostart
     ;;
 
diff --git a/debian/wheezy/applications/tdeio-umountwrapper/debian/preinst b/debian/wheezy/applications/tdeio-umountwrapper/debian/preinst
index a4d27d2cd..a258f8481 100644
--- a/debian/wheezy/applications/tdeio-umountwrapper/debian/preinst
+++ b/debian/wheezy/applications/tdeio-umountwrapper/debian/preinst
@@ -30,9 +30,18 @@ mkdir -p /opt/trinity/share/apps/d3lphin/servicemenus/
 case "$1" in
   install)
     # remove old diversions if present
-    dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop || true
-    dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop || true
-    dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop || true
+    divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop"`
+    if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then
+        dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop
+    fi
+    divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop"`
+    if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then
+        dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop
+    fi
+    divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop"`
+    if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then
+        dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop
+    fi
 
     # add new diversions
     dpkg-divert --package $package_name \
diff --git a/debian/wheezy/applications/tdesudo/debian/preinst b/debian/wheezy/applications/tdesudo/debian/preinst
index 770dfaacb..9633ba544 100644
--- a/debian/wheezy/applications/tdesudo/debian/preinst
+++ b/debian/wheezy/applications/tdesudo/debian/preinst
@@ -11,15 +11,30 @@ fi
 
 case "$1" in
   install)
+    # remove old diversions if present
+    divert=`dpkg-divert --listpackage "/usr/trinity/bin/kdesu"`
+    if [ -n "$divert" ] && [ "$divert" = "kdesudo-trinity" ]; then
+        dpkg-divert --remove --package kdesudo-trinity --rename /usr/trinity/bin/kdesu
+    fi
+    divert=`dpkg-divert --listpackage "/opt/trinity/bin/kdesu"`
+    if [ -n "$divert" ] && [ "$divert" = "kdesudo-trinity" ]; then
+        dpkg-divert --remove --package kdesudo-trinity --rename /opt/trinity/bin/kdesu
+    fi
+
+    # add new diversion
     dpkg-divert --package $package_name \
     --divert /opt/trinity/bin/tdesu.distrib \
     --rename /opt/trinity/bin/tdesu
     ;;
+
   upgrade)
+    # remove old diversion if present
     divert=`dpkg-divert --listpackage "/usr/trinity/bin/tdesu"`
     if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then
         dpkg-divert --remove --package $package_name --rename "/usr/trinity/bin/tdesu"
     fi
+
+    # add new diversion
     divert=`dpkg-divert --listpackage "/opt/trinity/bin/tdesu"`
     if [ -z "$divert" ]; then
         dpkg-divert --package $package_name \
@@ -27,6 +42,7 @@ case "$1" in
                     --rename /opt/trinity/bin/tdesu
     fi
     ;;
+
   abort-upgrade)
     ;;
   *) echo "$0: didn't understand being called with \`$1'" 1>&2
diff --git a/debian/wheezy/metapackages/rename-meta/debian/kdesudo-trinity.preinst b/debian/wheezy/metapackages/rename-meta/debian/kdesudo-trinity.preinst
deleted file mode 100644
index 12e16e22d..000000000
--- a/debian/wheezy/metapackages/rename-meta/debian/kdesudo-trinity.preinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kdesudo-trinity
-
-divert=`dpkg-divert --listpackage "/opt/trinity/bin/kdesu"`
-if [ -n "$divert" ] && [ "$divert" = $package_name ]; then
-    dpkg-divert --package $package_name --rename --remove \
-                /opt/trinity/bin/kdesu
-fi
-
-exit 0
diff --git a/debian/wheezy/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst b/debian/wheezy/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst
deleted file mode 100644
index b7af2273b..000000000
--- a/debian/wheezy/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kio-umountwrapper-trinity
-
-divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop"`
-if [ -n "$divert" ] && [ "$divert" = $package_name ]; then
-    dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop
-fi
-
-divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop"`
-if [ -n "$divert" ] && [ "$divert" = $package_name ]; then
-    dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop
-fi
-
-divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop"`
-if [ -n "$divert" ] && [ "$divert" = $package_name ]; then
-    dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop
-fi
-
-exit 0
diff --git a/debian/wheezy/tdebase/debian/ksmserver-trinity.preinst b/debian/wheezy/tdebase/debian/ksmserver-trinity.preinst
index 4a2ab8a19..503524a11 100644
--- a/debian/wheezy/tdebase/debian/ksmserver-trinity.preinst
+++ b/debian/wheezy/tdebase/debian/ksmserver-trinity.preinst
@@ -6,8 +6,14 @@ case "$1" in
 
     upgrade)
 	# Remove old-style Plasma diversions
-	dpkg-divert --package $package_name --rename --remove /usr/bin/plasma || true
-	dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop || true
+	divert=`dpkg-divert --listpackage "/usr/bin/plasma"`
+	if [ -n "$divert" ]; then
+	    dpkg-divert --package $package_name --rename --remove /usr/bin/plasma
+	fi
+	divert=`dpkg-divert --listpackage "/usr/bin/plasma-desktop"`
+	if [ -n "$divert" ]; then
+	    dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop
+	fi
 	mkdir -p /usr/share/autostart
     ;;