summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/maverick')
-rw-r--r--ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst12
1 files changed, 10 insertions, 2 deletions
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst
index 503524a11..36d174e27 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst
@@ -8,11 +8,19 @@ case "$1" in
# Remove old-style Plasma diversions
divert=`dpkg-divert --listpackage "/usr/bin/plasma"`
if [ -n "$divert" ]; then
- dpkg-divert --package $package_name --rename --remove /usr/bin/plasma
+ if [ "$divert" = "LOCAL" ]; then
+ dpkg-divert --local --rename --remove /usr/bin/plasma
+ else
+ dpkg-divert --package $package_name --rename --remove /usr/bin/plasma
+ fi
fi
divert=`dpkg-divert --listpackage "/usr/bin/plasma-desktop"`
if [ -n "$divert" ]; then
- dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop
+ if [ "$divert" = "LOCAL" ]; then
+ dpkg-divert --local --rename --remove /usr/bin/plasma-desktop
+ else
+ dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop
+ fi
fi
mkdir -p /usr/share/autostart
;;