summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-05-09 11:38:38 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-05-09 11:38:38 -0500
commitc1049b58d84c6e78ef6647a5b30780d3f5469a8e (patch)
tree9534468e024c40e28de704574603c9b09d420c03
parent363baf857d4be40f76d42bf2c831e8defc792798 (diff)
downloadtde-packaging-c1049b58d84c6e78ef6647a5b30780d3f5469a8e.tar.gz
tde-packaging-c1049b58d84c6e78ef6647a5b30780d3f5469a8e.zip
Remove dpkg-diverts for plasma on Debian and Ubuntu
This resolves Bug 113
-rw-r--r--debian/lenny/tdebase/debian/ksmserver-trinity.postrm7
-rw-r--r--debian/lenny/tdebase/debian/ksmserver-trinity.preinst78
-rw-r--r--debian/squeeze/tdebase/debian/ksmserver-trinity.postrm7
-rw-r--r--debian/squeeze/tdebase/debian/ksmserver-trinity.preinst78
-rw-r--r--debian/wheezy/tdebase/debian/ksmserver-trinity.postrm7
-rw-r--r--debian/wheezy/tdebase/debian/ksmserver-trinity.preinst78
-rw-r--r--ubuntu/maverick/tdebase/debian/ksmserver-trinity.postrm7
-rw-r--r--ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst78
-rw-r--r--ubuntu/precise/tdebase/debian/ksmserver-trinity.postrm7
-rw-r--r--ubuntu/precise/tdebase/debian/ksmserver-trinity.preinst78
-rw-r--r--ubuntu/raring/tdebase/debian/ksmserver-trinity.postrm7
-rw-r--r--ubuntu/raring/tdebase/debian/ksmserver-trinity.preinst78
12 files changed, 18 insertions, 492 deletions
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.postrm b/debian/lenny/tdebase/debian/ksmserver-trinity.postrm
index 424143ebe..b4c661eaa 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.postrm
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.postrm
@@ -4,13 +4,6 @@ package_name=ksmserver-trinity
case "$1" in
remove)
- # Intrepid plasma
- dpkg-divert --package $package_name \
- --rename --remove /usr/bin/plasma
-
- # Jaunty plasma-desktop
- dpkg-divert --package $package_name \
- --rename --remove /usr/bin/plasma-desktop
;;
purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.preinst b/debian/lenny/tdebase/debian/ksmserver-trinity.preinst
index f4443b487..4a2ab8a19 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.preinst
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.preinst
@@ -5,85 +5,13 @@ package_name=ksmserver-trinity
case "$1" in
upgrade)
- rm -f /etc/gdm/Sessions/KDE
- rm -f /etc/trinity/debian/starttde
- /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde2
- /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/trinity
+ # Remove old-style Plasma diversions
+ dpkg-divert --package $package_name --rename --remove /usr/bin/plasma || true
+ dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop || true
mkdir -p /usr/share/autostart
-
- # Intrepid plasma
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma ]; then
- rm -f /usr/bin/plasma
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma
- divert=""
- fi
- if [ -z "$divert" ]; then
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma.kde4 \
- --add /usr/bin/plasma
- fi
-
- # Jaunty plasma-desktop
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma-desktop.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma-desktop.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma-desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma-desktop ]; then
- rm -f /usr/bin/plasma-desktop
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma-desktop
- divert=""
- fi
- if [ -z "$divert" ]; then
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma-desktop.kde4 \
- --add /usr/bin/plasma-desktop
- fi
;;
install)
- # Intrepid plasma
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma ]; then
- rm -f /usr/bin/plasma
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma
- divert=""
- fi
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma.kde4 \
- --add /usr/bin/plasma
-
- # Jaunty plasma-desktop
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma-desktop.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma-desktop.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma-desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma-desktop ]; then
- rm -f /usr/bin/plasma-desktop
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma-desktop
- divert=""
- fi
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma-desktop.kde4 \
- --add /usr/bin/plasma-desktop
;;
abort-upgrade)
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.postrm b/debian/squeeze/tdebase/debian/ksmserver-trinity.postrm
index 424143ebe..b4c661eaa 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.postrm
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.postrm
@@ -4,13 +4,6 @@ package_name=ksmserver-trinity
case "$1" in
remove)
- # Intrepid plasma
- dpkg-divert --package $package_name \
- --rename --remove /usr/bin/plasma
-
- # Jaunty plasma-desktop
- dpkg-divert --package $package_name \
- --rename --remove /usr/bin/plasma-desktop
;;
purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst b/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst
index f4443b487..4a2ab8a19 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst
@@ -5,85 +5,13 @@ package_name=ksmserver-trinity
case "$1" in
upgrade)
- rm -f /etc/gdm/Sessions/KDE
- rm -f /etc/trinity/debian/starttde
- /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde2
- /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/trinity
+ # Remove old-style Plasma diversions
+ dpkg-divert --package $package_name --rename --remove /usr/bin/plasma || true
+ dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop || true
mkdir -p /usr/share/autostart
-
- # Intrepid plasma
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma ]; then
- rm -f /usr/bin/plasma
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma
- divert=""
- fi
- if [ -z "$divert" ]; then
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma.kde4 \
- --add /usr/bin/plasma
- fi
-
- # Jaunty plasma-desktop
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma-desktop.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma-desktop.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma-desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma-desktop ]; then
- rm -f /usr/bin/plasma-desktop
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma-desktop
- divert=""
- fi
- if [ -z "$divert" ]; then
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma-desktop.kde4 \
- --add /usr/bin/plasma-desktop
- fi
;;
install)
- # Intrepid plasma
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma ]; then
- rm -f /usr/bin/plasma
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma
- divert=""
- fi
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma.kde4 \
- --add /usr/bin/plasma
-
- # Jaunty plasma-desktop
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma-desktop.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma-desktop.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma-desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma-desktop ]; then
- rm -f /usr/bin/plasma-desktop
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma-desktop
- divert=""
- fi
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma-desktop.kde4 \
- --add /usr/bin/plasma-desktop
;;
abort-upgrade)
diff --git a/debian/wheezy/tdebase/debian/ksmserver-trinity.postrm b/debian/wheezy/tdebase/debian/ksmserver-trinity.postrm
index 424143ebe..b4c661eaa 100644
--- a/debian/wheezy/tdebase/debian/ksmserver-trinity.postrm
+++ b/debian/wheezy/tdebase/debian/ksmserver-trinity.postrm
@@ -4,13 +4,6 @@ package_name=ksmserver-trinity
case "$1" in
remove)
- # Intrepid plasma
- dpkg-divert --package $package_name \
- --rename --remove /usr/bin/plasma
-
- # Jaunty plasma-desktop
- dpkg-divert --package $package_name \
- --rename --remove /usr/bin/plasma-desktop
;;
purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/wheezy/tdebase/debian/ksmserver-trinity.preinst b/debian/wheezy/tdebase/debian/ksmserver-trinity.preinst
index f4443b487..4a2ab8a19 100644
--- a/debian/wheezy/tdebase/debian/ksmserver-trinity.preinst
+++ b/debian/wheezy/tdebase/debian/ksmserver-trinity.preinst
@@ -5,85 +5,13 @@ package_name=ksmserver-trinity
case "$1" in
upgrade)
- rm -f /etc/gdm/Sessions/KDE
- rm -f /etc/trinity/debian/starttde
- /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde2
- /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/trinity
+ # Remove old-style Plasma diversions
+ dpkg-divert --package $package_name --rename --remove /usr/bin/plasma || true
+ dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop || true
mkdir -p /usr/share/autostart
-
- # Intrepid plasma
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma ]; then
- rm -f /usr/bin/plasma
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma
- divert=""
- fi
- if [ -z "$divert" ]; then
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma.kde4 \
- --add /usr/bin/plasma
- fi
-
- # Jaunty plasma-desktop
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma-desktop.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma-desktop.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma-desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma-desktop ]; then
- rm -f /usr/bin/plasma-desktop
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma-desktop
- divert=""
- fi
- if [ -z "$divert" ]; then
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma-desktop.kde4 \
- --add /usr/bin/plasma-desktop
- fi
;;
install)
- # Intrepid plasma
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma ]; then
- rm -f /usr/bin/plasma
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma
- divert=""
- fi
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma.kde4 \
- --add /usr/bin/plasma
-
- # Jaunty plasma-desktop
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma-desktop.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma-desktop.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma-desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma-desktop ]; then
- rm -f /usr/bin/plasma-desktop
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma-desktop
- divert=""
- fi
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma-desktop.kde4 \
- --add /usr/bin/plasma-desktop
;;
abort-upgrade)
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postrm b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postrm
index 424143ebe..b4c661eaa 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postrm
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postrm
@@ -4,13 +4,6 @@ package_name=ksmserver-trinity
case "$1" in
remove)
- # Intrepid plasma
- dpkg-divert --package $package_name \
- --rename --remove /usr/bin/plasma
-
- # Jaunty plasma-desktop
- dpkg-divert --package $package_name \
- --rename --remove /usr/bin/plasma-desktop
;;
purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst
index f4443b487..4a2ab8a19 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst
@@ -5,85 +5,13 @@ package_name=ksmserver-trinity
case "$1" in
upgrade)
- rm -f /etc/gdm/Sessions/KDE
- rm -f /etc/trinity/debian/starttde
- /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde2
- /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/trinity
+ # Remove old-style Plasma diversions
+ dpkg-divert --package $package_name --rename --remove /usr/bin/plasma || true
+ dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop || true
mkdir -p /usr/share/autostart
-
- # Intrepid plasma
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma ]; then
- rm -f /usr/bin/plasma
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma
- divert=""
- fi
- if [ -z "$divert" ]; then
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma.kde4 \
- --add /usr/bin/plasma
- fi
-
- # Jaunty plasma-desktop
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma-desktop.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma-desktop.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma-desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma-desktop ]; then
- rm -f /usr/bin/plasma-desktop
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma-desktop
- divert=""
- fi
- if [ -z "$divert" ]; then
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma-desktop.kde4 \
- --add /usr/bin/plasma-desktop
- fi
;;
install)
- # Intrepid plasma
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma ]; then
- rm -f /usr/bin/plasma
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma
- divert=""
- fi
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma.kde4 \
- --add /usr/bin/plasma
-
- # Jaunty plasma-desktop
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma-desktop.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma-desktop.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma-desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma-desktop ]; then
- rm -f /usr/bin/plasma-desktop
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma-desktop
- divert=""
- fi
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma-desktop.kde4 \
- --add /usr/bin/plasma-desktop
;;
abort-upgrade)
diff --git a/ubuntu/precise/tdebase/debian/ksmserver-trinity.postrm b/ubuntu/precise/tdebase/debian/ksmserver-trinity.postrm
index 424143ebe..b4c661eaa 100644
--- a/ubuntu/precise/tdebase/debian/ksmserver-trinity.postrm
+++ b/ubuntu/precise/tdebase/debian/ksmserver-trinity.postrm
@@ -4,13 +4,6 @@ package_name=ksmserver-trinity
case "$1" in
remove)
- # Intrepid plasma
- dpkg-divert --package $package_name \
- --rename --remove /usr/bin/plasma
-
- # Jaunty plasma-desktop
- dpkg-divert --package $package_name \
- --rename --remove /usr/bin/plasma-desktop
;;
purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/ubuntu/precise/tdebase/debian/ksmserver-trinity.preinst b/ubuntu/precise/tdebase/debian/ksmserver-trinity.preinst
index f4443b487..4a2ab8a19 100644
--- a/ubuntu/precise/tdebase/debian/ksmserver-trinity.preinst
+++ b/ubuntu/precise/tdebase/debian/ksmserver-trinity.preinst
@@ -5,85 +5,13 @@ package_name=ksmserver-trinity
case "$1" in
upgrade)
- rm -f /etc/gdm/Sessions/KDE
- rm -f /etc/trinity/debian/starttde
- /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde2
- /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/trinity
+ # Remove old-style Plasma diversions
+ dpkg-divert --package $package_name --rename --remove /usr/bin/plasma || true
+ dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop || true
mkdir -p /usr/share/autostart
-
- # Intrepid plasma
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma ]; then
- rm -f /usr/bin/plasma
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma
- divert=""
- fi
- if [ -z "$divert" ]; then
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma.kde4 \
- --add /usr/bin/plasma
- fi
-
- # Jaunty plasma-desktop
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma-desktop.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma-desktop.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma-desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma-desktop ]; then
- rm -f /usr/bin/plasma-desktop
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma-desktop
- divert=""
- fi
- if [ -z "$divert" ]; then
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma-desktop.kde4 \
- --add /usr/bin/plasma-desktop
- fi
;;
install)
- # Intrepid plasma
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma ]; then
- rm -f /usr/bin/plasma
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma
- divert=""
- fi
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma.kde4 \
- --add /usr/bin/plasma
-
- # Jaunty plasma-desktop
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma-desktop.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma-desktop.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma-desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma-desktop ]; then
- rm -f /usr/bin/plasma-desktop
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma-desktop
- divert=""
- fi
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma-desktop.kde4 \
- --add /usr/bin/plasma-desktop
;;
abort-upgrade)
diff --git a/ubuntu/raring/tdebase/debian/ksmserver-trinity.postrm b/ubuntu/raring/tdebase/debian/ksmserver-trinity.postrm
index 424143ebe..b4c661eaa 100644
--- a/ubuntu/raring/tdebase/debian/ksmserver-trinity.postrm
+++ b/ubuntu/raring/tdebase/debian/ksmserver-trinity.postrm
@@ -4,13 +4,6 @@ package_name=ksmserver-trinity
case "$1" in
remove)
- # Intrepid plasma
- dpkg-divert --package $package_name \
- --rename --remove /usr/bin/plasma
-
- # Jaunty plasma-desktop
- dpkg-divert --package $package_name \
- --rename --remove /usr/bin/plasma-desktop
;;
purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/ubuntu/raring/tdebase/debian/ksmserver-trinity.preinst b/ubuntu/raring/tdebase/debian/ksmserver-trinity.preinst
index f4443b487..4a2ab8a19 100644
--- a/ubuntu/raring/tdebase/debian/ksmserver-trinity.preinst
+++ b/ubuntu/raring/tdebase/debian/ksmserver-trinity.preinst
@@ -5,85 +5,13 @@ package_name=ksmserver-trinity
case "$1" in
upgrade)
- rm -f /etc/gdm/Sessions/KDE
- rm -f /etc/trinity/debian/starttde
- /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde2
- /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/trinity
+ # Remove old-style Plasma diversions
+ dpkg-divert --package $package_name --rename --remove /usr/bin/plasma || true
+ dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop || true
mkdir -p /usr/share/autostart
-
- # Intrepid plasma
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma ]; then
- rm -f /usr/bin/plasma
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma
- divert=""
- fi
- if [ -z "$divert" ]; then
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma.kde4 \
- --add /usr/bin/plasma
- fi
-
- # Jaunty plasma-desktop
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma-desktop.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma-desktop.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma-desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma-desktop ]; then
- rm -f /usr/bin/plasma-desktop
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma-desktop
- divert=""
- fi
- if [ -z "$divert" ]; then
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma-desktop.kde4 \
- --add /usr/bin/plasma-desktop
- fi
;;
install)
- # Intrepid plasma
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma ]; then
- rm -f /usr/bin/plasma
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma
- divert=""
- fi
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma.kde4 \
- --add /usr/bin/plasma
-
- # Jaunty plasma-desktop
- divert=`dpkg-divert --listpackage /usr/share/autostart/plasma-desktop.desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- dpkg-divert --remove --local --rename /usr/share/autostart/plasma-desktop.desktop
- fi
- divert=`dpkg-divert --listpackage /usr/bin/plasma-desktop`
- if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
- if [ -L /usr/bin/plasma-desktop ]; then
- rm -f /usr/bin/plasma-desktop
- fi
- dpkg-divert --remove --local --rename /usr/bin/plasma-desktop
- divert=""
- fi
- dpkg-divert --package $package_name --rename \
- --divert /usr/bin/plasma-desktop.kde4 \
- --add /usr/bin/plasma-desktop
;;
abort-upgrade)