Move edit-as-root and email service menus to the main TDE GIT tree

(cherry picked from commit dac1d74d6a65b286d01ed89496b0d7303add3718)

4 files changed, 3 insertions, 13 deletions

diff --git a/debian/squeeze/kdebase/debian/edit-as-root.desktop b/debian/squeeze/kdebase/debian/edit-as-root.desktop
deleted file mode 100644
index 049454ea0..000000000
--- a/debian/squeeze/kdebase/debian/edit-as-root.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-ServiceTypes=text/*,application/x-desktop
-Actions=Editassu
-
-[Desktop Action Editassu]
-Name=Edit as Root
-Name[it]=Edita come Root
-Name[fr]=Editer en tant que Root
-Name[es]=Editar como Root
-Name[de]=Als root bearbeiten
-Icon=kfm
-Exec=kdesu "kwrite" "%U"
diff --git a/debian/squeeze/kdebase/debian/libkonq4-trinity.install b/debian/squeeze/kdebase/debian/libkonq4-trinity.install
index 77ea07f1a..6cad9785f 100644
--- a/debian/squeeze/kdebase/debian/libkonq4-trinity.install
+++ b/debian/squeeze/kdebase/debian/libkonq4-trinity.install
@@ -12,5 +12,6 @@ debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_bottomright.png
 debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_topleft.png
 debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_topright.png
 debian/tmp/opt/trinity/share/apps/konqueror/pics/thumbnailfont_7x4.png
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/edit-as-root.desktop
 debian/tmp/opt/trinity/share/services/kded/favicons.desktop
 debian/tmp/opt/trinity/share/servicetypes/konqpopupmenuplugin.desktop
diff --git a/debian/squeeze/kdebase/debian/rules b/debian/squeeze/kdebase/debian/rules
index e9da37ef3..f19b000c6 100755
--- a/debian/squeeze/kdebase/debian/rules
+++ b/debian/squeeze/kdebase/debian/rules
@@ -251,7 +251,7 @@ binary-install/kcontrol-trinity::
 	debian/usermap.pl kcontrol/input/logitechmouse.usermap > debian/kcontrol/etc/udev/logitechmouse.rules
 
 binary-install/konqueror-trinity::
-	install -p -D -m644 debian/edit-as-root.desktop debian/konqueror-trinity/opt/trinity/share/apps/konqueror/servicemenus/edit-as-root.desktop
+	#install -p -D -m644 debian/edit-as-root.desktop debian/konqueror-trinity/opt/trinity/share/apps/konqueror/servicemenus/edit-as-root.desktop
 	#cp -Rp debian/konqueror-trinity/usr/* debian/konqueror-trinity/opt/trinity/
 	#rm -rf debian/konqueror-trinity/usr
 
diff --git a/debian/squeeze/kdepim/debian/kmail-trinity.install b/debian/squeeze/kdepim/debian/kmail-trinity.install
index de2821f79..54df014f9 100644
--- a/debian/squeeze/kdepim/debian/kmail-trinity.install
+++ b/debian/squeeze/kdepim/debian/kmail-trinity.install
@@ -58,6 +58,7 @@
 /opt/trinity/share/services/kontact/kmailplugin.desktop
 /opt/trinity/share/servicetypes/dcopimap.desktop
 /opt/trinity/share/servicetypes/dcopmail.desktop
+/opt/trinity/share/apps/konqueror/servicemenus/email.desktop
 ../icons/kmail.xpm /opt/trinity/share/pixmaps
 ../icons/kmail-16.xpm /opt/trinity/share/pixmaps
 ../man/out/kmail_antivir.sh-trinity.1 /opt/trinity/share/man/man1