diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-05-27 03:55:42 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-05-27 03:55:42 +0200 |
| commit | 71bb0a3c7a74c05cd8d3747964a54596fe74b72a (patch) | |
| tree | e6ed3dce008cb9f3f43a13e7f7177aa7c35a1eed | |
| parent | c7bb5f0b917b82aed4203df3be0585be82077d9c (diff) | |
| download | tde-packaging-71bb0a3c7a74c05cd8d3747964a54596fe74b72a.tar.gz tde-packaging-71bb0a3c7a74c05cd8d3747964a54596fe74b72a.zip | |
Cleanup diverts for plasma on Debian and Ubuntu
This resolves Bug 2055
3 files changed, 60 insertions, 48 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 ;; diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst index 36d174e27..3465cf922 100644 --- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst +++ b/ubuntu/maverick/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 ;; |