diff options
Diffstat (limited to 'ubuntu/precise/applications')
3 files changed, 37 insertions, 3 deletions
diff --git a/ubuntu/precise/applications/tdeio-umountwrapper/debian/postrm b/ubuntu/precise/applications/tdeio-umountwrapper/debian/postrm index 18fc57ee1..9a4c04dbd 100644 --- a/ubuntu/precise/applications/tdeio-umountwrapper/debian/postrm +++ b/ubuntu/precise/applications/tdeio-umountwrapper/debian/postrm @@ -1,7 +1,7 @@ #! /bin/sh -# -*- Mode: Sh -*- +# -*- Mode: Sh -*- # Author: Frode M. Døving <frode@lnix.net> (C) 2007 -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -23,6 +23,7 @@ package_name=tdeio-umountwrapper-trinity # make sure than the directories exist before running dpkg-divert mkdir -p /opt/trinity/share/apps/konqueror/servicemenus/ +mkdir -p /opt/trinity/share/apps/dolphin/servicemenus/ mkdir -p /opt/trinity/share/apps/d3lphin/servicemenus/ case "$1" in @@ -38,6 +39,7 @@ case "$1" in # try to remove the dirs we've created for pkg-divert rmdir --ignore-fail-on-non-empty /opt/trinity/share/apps/konqueror/servicemenus/ + rmdir --ignore-fail-on-non-empty /opt/trinity/share/apps/dolphin/servicemenus/ rmdir --ignore-fail-on-non-empty /opt/trinity/share/apps/d3lphin/servicemenus/ ;; diff --git a/ubuntu/precise/applications/tdeio-umountwrapper/debian/preinst b/ubuntu/precise/applications/tdeio-umountwrapper/debian/preinst index 589e2ed5c..a258f8481 100644 --- a/ubuntu/precise/applications/tdeio-umountwrapper/debian/preinst +++ b/ubuntu/precise/applications/tdeio-umountwrapper/debian/preinst @@ -1,5 +1,5 @@ #! /bin/sh -# -*- Mode: Sh -*- +# -*- Mode: Sh -*- # Author: Frode M. Døving <frode@lnix.net> (C) 2007 # # This program is free software; you can redistribute it and/or modify @@ -24,10 +24,26 @@ package_name=tdeio-umountwrapper-trinity # make sure than the directories exist before running dpkg-divert mkdir -p /opt/trinity/share/apps/konqueror/servicemenus/ +mkdir -p /opt/trinity/share/apps/dolphin/servicemenus/ mkdir -p /opt/trinity/share/apps/d3lphin/servicemenus/ case "$1" in install) + # remove old diversions if present + divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop"` + if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then + dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop + fi + divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop"` + if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then + dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop + fi + divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop"` + if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then + dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop + fi + + # add new diversions 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 diff --git a/ubuntu/precise/applications/tdesudo/debian/preinst b/ubuntu/precise/applications/tdesudo/debian/preinst index 770dfaacb..9633ba544 100644 --- a/ubuntu/precise/applications/tdesudo/debian/preinst +++ b/ubuntu/precise/applications/tdesudo/debian/preinst @@ -11,15 +11,30 @@ fi case "$1" in install) + # remove old diversions if present + divert=`dpkg-divert --listpackage "/usr/trinity/bin/kdesu"` + if [ -n "$divert" ] && [ "$divert" = "kdesudo-trinity" ]; then + dpkg-divert --remove --package kdesudo-trinity --rename /usr/trinity/bin/kdesu + fi + divert=`dpkg-divert --listpackage "/opt/trinity/bin/kdesu"` + if [ -n "$divert" ] && [ "$divert" = "kdesudo-trinity" ]; then + dpkg-divert --remove --package kdesudo-trinity --rename /opt/trinity/bin/kdesu + fi + + # add new diversion dpkg-divert --package $package_name \ --divert /opt/trinity/bin/tdesu.distrib \ --rename /opt/trinity/bin/tdesu ;; + upgrade) + # remove old diversion if present 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 + + # add new diversion divert=`dpkg-divert --listpackage "/opt/trinity/bin/tdesu"` if [ -z "$divert" ]; then dpkg-divert --package $package_name \ @@ -27,6 +42,7 @@ case "$1" in --rename /opt/trinity/bin/tdesu fi ;; + abort-upgrade) ;; *) echo "$0: didn't understand being called with \`$1'" 1>&2 |