summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/applications
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-02-15 16:59:06 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-02-15 16:59:06 +0100
commit683152f3b286a04a76f31ee1eed839bbdb2ab307 (patch)
treefc382ee1f535909a1892d0e07ebeb957fa68c49f /ubuntu/maverick/applications
parentcbfc487458706037e61278c9b5263685619d47f0 (diff)
downloadtde-packaging-683152f3b286a04a76f31ee1eed839bbdb2ab307.tar.gz
tde-packaging-683152f3b286a04a76f31ee1eed839bbdb2ab307.zip
Fix handling of diverts on Debian and Ubuntu
Diffstat (limited to 'ubuntu/maverick/applications')
-rw-r--r--ubuntu/maverick/applications/kio-umountwrapper/debian/preinst33
-rw-r--r--ubuntu/maverick/applications/kpowersave-nohal/debian/preinst14
-rw-r--r--ubuntu/maverick/applications/kpowersave/debian/preinst14
-rw-r--r--ubuntu/maverick/applications/tdesudo/debian/postinst2
-rw-r--r--ubuntu/maverick/applications/tdesudo/debian/preinst13
5 files changed, 58 insertions, 18 deletions
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/preinst b/ubuntu/maverick/applications/kio-umountwrapper/debian/preinst
index f1e4f5d24..78e02c765 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/preinst
+++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/preinst
@@ -33,24 +33,35 @@ case "$1" in
--rename /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop
dpkg-divert --package $package_name \
+ --divert /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop.distrib \
+ --rename /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop
+
+ dpkg-divert --package $package_name \
--divert /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop.distrib \
--rename /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop
- rm -f /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop
- rm -f /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop
-
;;
upgrade)
- dpkg-divert --package $package_name \
- --divert /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop.distrib \
- --rename /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop
+ divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop"`
+ if [ -z "$divert" ]; then
+ dpkg-divert --package $package_name \
+ --divert /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop.distrib \
+ --rename /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop
+ fi
- dpkg-divert --package $package_name \
- --divert /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop.distrib \
- --rename /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop
+ divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop"`
+ if [ -z "$divert" ]; then
+ dpkg-divert --package $package_name \
+ --divert /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop.distrib \
+ --rename /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop
+ fi
- rm -f /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop
- rm -f /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop
+ divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop"`
+ if [ -z "$divert" ]; then
+ dpkg-divert --package $package_name \
+ --divert /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop.distrib \
+ --rename /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop
+ fi
exit 0
;;
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/preinst b/ubuntu/maverick/applications/kpowersave-nohal/debian/preinst
index a66bf589f..5b0e73f61 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/preinst
+++ b/ubuntu/maverick/applications/kpowersave-nohal/debian/preinst
@@ -11,10 +11,22 @@ fi
case "$1" in
install)
+ divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"`
+ if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
+ dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh"
+ divert=""
+ fi
dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
;;
upgrade)
- dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
+ divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"`
+ if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
+ dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh"
+ divert=""
+ fi
+ if [ -z "$divert" ]; then
+ dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
+ fi
;;
abort-upgrade)
;;
diff --git a/ubuntu/maverick/applications/kpowersave/debian/preinst b/ubuntu/maverick/applications/kpowersave/debian/preinst
index b007ccf90..d0eb1227c 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/preinst
+++ b/ubuntu/maverick/applications/kpowersave/debian/preinst
@@ -11,10 +11,22 @@ fi
case "$1" in
install)
+ divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"`
+ if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
+ dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh"
+ divert=""
+ fi
dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
;;
upgrade)
- dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
+ divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"`
+ if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
+ dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh"
+ divert=""
+ fi
+ if [ -z "$divert" ]; then
+ dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
+ fi
;;
abort-upgrade)
;;
diff --git a/ubuntu/maverick/applications/tdesudo/debian/postinst b/ubuntu/maverick/applications/tdesudo/debian/postinst
index 9164f9d4a..5269ffae5 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/postinst
+++ b/ubuntu/maverick/applications/tdesudo/debian/postinst
@@ -11,8 +11,6 @@ fi
case "$1" in
configure)
- dpkg-divert --package $package_name --rename --remove \
- /usr/trinity/bin/tdesu || true
;;
abort-upgrade)
;;
diff --git a/ubuntu/maverick/applications/tdesudo/debian/preinst b/ubuntu/maverick/applications/tdesudo/debian/preinst
index a13492559..770dfaacb 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/preinst
+++ b/ubuntu/maverick/applications/tdesudo/debian/preinst
@@ -16,9 +16,16 @@ case "$1" in
--rename /opt/trinity/bin/tdesu
;;
upgrade)
- dpkg-divert --package $package_name \
- --divert /opt/trinity/bin/tdesu.distrib \
- --rename /opt/trinity/bin/tdesu
+ divert=`dpkg-divert --listpackage "/usr/trinity/bin/tdesu"`
+ if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then
+ dpkg-divert --remove --package $package_name --rename "/usr/trinity/bin/tdesu"
+ fi
+ divert=`dpkg-divert --listpackage "/opt/trinity/bin/tdesu"`
+ if [ -z "$divert" ]; then
+ dpkg-divert --package $package_name \
+ --divert /opt/trinity/bin/tdesu.distrib \
+ --rename /opt/trinity/bin/tdesu
+ fi
;;
abort-upgrade)
;;