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

6 files changed, 2 insertions, 48 deletions

diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/konqueror-profile/email.desktop b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/konqueror-profile/email.desktop
deleted file mode 100644
index 4cb6de28a..000000000
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/konqueror-profile/email.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Actions=Email
-Encoding=UTF-8
-ServiceTypes=allfiles
-
-[Desktop Action Email]
-Name=Email File
-Name[de]=Versenden als E-Mail
-Name[fr]=Envoyer par courriel
-Name[pl]=Wyślij plik w załączniku
-Exec=kmail --attach %F
-Icon=kmail
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/konqueror-profile/email.desktop b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/konqueror-profile/email.desktop
deleted file mode 100644
index 4cb6de28a..000000000
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/konqueror-profile/email.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Actions=Email
-Encoding=UTF-8
-ServiceTypes=allfiles
-
-[Desktop Action Email]
-Name=Email File
-Name[de]=Versenden als E-Mail
-Name[fr]=Envoyer par courriel
-Name[pl]=Wyślij plik w załączniku
-Exec=kmail --attach %F
-Icon=kmail
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/konqueror-profile/email.desktop b/ubuntu/maverick/defaultsettings/redmond-default-settings/konqueror-profile/email.desktop
deleted file mode 100644
index 4cb6de28a..000000000
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/konqueror-profile/email.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Actions=Email
-Encoding=UTF-8
-ServiceTypes=allfiles
-
-[Desktop Action Email]
-Name=Email File
-Name[de]=Versenden als E-Mail
-Name[fr]=Envoyer par courriel
-Name[pl]=Wyślij plik w załączniku
-Exec=kmail --attach %F
-Icon=kmail
diff --git a/ubuntu/maverick/tdebase/debian/edit-as-root.desktop b/ubuntu/maverick/tdebase/debian/edit-as-root.desktop
deleted file mode 100644
index e3df17006..000000000
--- a/ubuntu/maverick/tdebase/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=tdesu "kwrite" "%U"
diff --git a/ubuntu/maverick/tdebase/debian/libkonq4-trinity.install b/ubuntu/maverick/tdebase/debian/libkonq4-trinity.install
index 15ee2a8d3..a76a548dc 100644
--- a/ubuntu/maverick/tdebase/debian/libkonq4-trinity.install
+++ b/ubuntu/maverick/tdebase/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/ubuntu/maverick/tdepim/debian/kmail-trinity.install b/ubuntu/maverick/tdepim/debian/kmail-trinity.install
index 811623fe8..a26f45d79 100644
--- a/ubuntu/maverick/tdepim/debian/kmail-trinity.install
+++ b/ubuntu/maverick/tdepim/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