summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/lenny/tdebase/debian/ksmserver-trinity.preinst36
-rw-r--r--debian/squeeze/tdebase/debian/ksmserver-trinity.preinst36
2 files changed, 40 insertions, 32 deletions
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.preinst b/debian/lenny/tdebase/debian/ksmserver-trinity.preinst
index 36d174e27..3465cf922 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.preinst
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.preinst
@@ -2,26 +2,30 @@
package_name=ksmserver-trinity
+divert_remove()
+ {
+ divert=`dpkg-divert --listpackage "$1"`
+ if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
+ if [ -e "$1" ]; then
+ rm "$1"
+ fi
+ dpkg-divert --remove --local --rename "$1"
+ fi
+ if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then
+ if [ -e "$1" ]; then
+ rm "$1"
+ fi
+ dpkg-divert --remove --package $package_name --rename "$1"
+ fi
+ }
+
case "$1" in
upgrade)
# Remove old-style Plasma diversions
- divert=`dpkg-divert --listpackage "/usr/bin/plasma"`
- if [ -n "$divert" ]; then
- 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
- 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
+ divert_remove /usr/bin/plasma
+ divert_remove /usr/bin/plasma-desktop
+
mkdir -p /usr/share/autostart
;;
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst b/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst
index 36d174e27..3465cf922 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst
@@ -2,26 +2,30 @@
package_name=ksmserver-trinity
+divert_remove()
+ {
+ divert=`dpkg-divert --listpackage "$1"`
+ if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
+ if [ -e "$1" ]; then
+ rm "$1"
+ fi
+ dpkg-divert --remove --local --rename "$1"
+ fi
+ if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then
+ if [ -e "$1" ]; then
+ rm "$1"
+ fi
+ dpkg-divert --remove --package $package_name --rename "$1"
+ fi
+ }
+
case "$1" in
upgrade)
# Remove old-style Plasma diversions
- divert=`dpkg-divert --listpackage "/usr/bin/plasma"`
- if [ -n "$divert" ]; then
- 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
- 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
+ divert_remove /usr/bin/plasma
+ divert_remove /usr/bin/plasma-desktop
+
mkdir -p /usr/share/autostart
;;