summaryrefslogtreecommitdiffstats
path: root/debian/lenny/tdebase
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-05-18 18:25:08 +0200
committerSlávek Banko <slavek.banko@axis.cz>2014-05-18 18:26:01 +0200
commiteb07de8662dd354dd3d190410e5b7fb124df7541 (patch)
tree400be31f0568ffdf6a16bd696d9e3946366b437b /debian/lenny/tdebase
parent40bf6cee5c4b10f9918313ba1bf374b837b5d921 (diff)
downloadtde-packaging-eb07de8662dd354dd3d190410e5b7fb124df7541.tar.gz
tde-packaging-eb07de8662dd354dd3d190410e5b7fb124df7541.zip
Fix removing local diverts in tdebase on Debian and Ubuntu
Diffstat (limited to 'debian/lenny/tdebase')
-rw-r--r--debian/lenny/tdebase/debian/ksmserver-trinity.preinst12
1 files changed, 10 insertions, 2 deletions
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.preinst b/debian/lenny/tdebase/debian/ksmserver-trinity.preinst
index 503524a11..36d174e27 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.preinst
+++ b/debian/lenny/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
;;