summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-05-19 20:14:52 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-05-19 20:14:52 +0200
commit3a550f1f61d4e99d98ef0d3c878ab5eeadcbd189 (patch)
tree0ddde035dc9c689c9f0cf4ee7ba86ae9977407fa /debian
parent7ebba0ae2f09b70e49cd8fa60cc3106efe1f6123 (diff)
parenteb07de8662dd354dd3d190410e5b7fb124df7541 (diff)
downloadtde-packaging-3a550f1f61d4e99d98ef0d3c878ab5eeadcbd189.tar.gz
tde-packaging-3a550f1f61d4e99d98ef0d3c878ab5eeadcbd189.zip
merge
Diffstat (limited to 'debian')
-rw-r--r--debian/lenny/tdebase/debian/ksmserver-trinity.preinst12
-rw-r--r--debian/squeeze/tdebase/debian/ksmserver-trinity.preinst12
2 files changed, 20 insertions, 4 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
;;
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
;;