From eb07de8662dd354dd3d190410e5b7fb124df7541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 18 May 2014 18:25:08 +0200 Subject: Fix removing local diverts in tdebase on Debian and Ubuntu --- debian/squeeze/tdebase/debian/ksmserver-trinity.preinst | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'debian/squeeze/tdebase/debian/ksmserver-trinity.preinst') diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst b/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst index 503524a11..36d174e27 100644 --- a/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst +++ b/debian/squeeze/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 ;; -- cgit v1.2.3