DEB tdeio-umountwrapper: removed incorrect dolphin folder.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit cbd8bb0f062b33116b59157d435d03bfcb7982e0)

3 files changed, 0 insertions, 22 deletions

diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/install b/debian/_base/applications/tdeio-umountwrapper/debian/install
index e9c5b29fb..749b1b6cf 100644
--- a/debian/_base/applications/tdeio-umountwrapper/debian/install
+++ b/debian/_base/applications/tdeio-umountwrapper/debian/install
@@ -1,3 +1,2 @@
 debian/media_safelyremove.desktop	/opt/trinity/share/apps/konqueror/servicemenus
-debian/media_safelyremove.desktop	/opt/trinity/share/apps/dolphin/servicemenus
 debian/media_safelyremove.desktop	/opt/trinity/share/apps/d3lphin/servicemenus
diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/postrm b/debian/_base/applications/tdeio-umountwrapper/debian/postrm
index 705c5b806..0768709b6 100644
--- a/debian/_base/applications/tdeio-umountwrapper/debian/postrm
+++ b/debian/_base/applications/tdeio-umountwrapper/debian/postrm
@@ -23,7 +23,6 @@ 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
@@ -32,14 +31,10 @@ case "$1" in
                  /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop
 
     dpkg-divert --package $package_name --rename --remove \
-                /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop
-
-    dpkg-divert --package $package_name --rename --remove \
                 /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop
 
     # 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/debian/_base/applications/tdeio-umountwrapper/debian/preinst b/debian/_base/applications/tdeio-umountwrapper/debian/preinst
index 0b210a270..f16ef3115 100644
--- a/debian/_base/applications/tdeio-umountwrapper/debian/preinst
+++ b/debian/_base/applications/tdeio-umountwrapper/debian/preinst
@@ -24,7 +24,6 @@ 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
@@ -34,10 +33,6 @@ case "$1" in
     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
@@ -49,10 +44,6 @@ 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
 
@@ -65,13 +56,6 @@ case "$1" in
                     --rename /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop
     fi
 
-    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
-
     divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop"`
     if [ -z "$divert" ]; then
         dpkg-divert --package $package_name \