diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-05-18 18:25:08 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-05-18 18:26:01 +0200 |
| commit | eb07de8662dd354dd3d190410e5b7fb124df7541 (patch) | |
| tree | 400be31f0568ffdf6a16bd696d9e3946366b437b | |
| parent | 40bf6cee5c4b10f9918313ba1bf374b837b5d921 (diff) | |
| download | tde-packaging-eb07de8662dd354dd3d190410e5b7fb124df7541.tar.gz tde-packaging-eb07de8662dd354dd3d190410e5b7fb124df7541.zip | |
Fix removing local diverts in tdebase on Debian and Ubuntu
3 files changed, 30 insertions, 6 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 ;; diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst index 503524a11..36d174e27 100644 --- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst +++ b/ubuntu/maverick/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 ;; |