Update Ubuntu and Debian packaging to use applications/share/tde

21 files changed, 112 insertions, 112 deletions

diff --git a/debian/lenny/tdebase/debian/kappfinder-trinity.install b/debian/lenny/tdebase/debian/kappfinder-trinity.install
index 864092754..2ea1e80c7 100644
--- a/debian/lenny/tdebase/debian/kappfinder-trinity.install
+++ b/debian/lenny/tdebase/debian/kappfinder-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/kappfinder
-debian/tmp/opt/trinity/share/applications/kde/kappfinder.desktop
+debian/tmp/opt/trinity/share/applications/tde/kappfinder.desktop
 debian/tmp/opt/trinity/share/applnk/System/kappfinder.desktop
 debian/tmp/opt/trinity/share/apps/kappfinder/apps/Development/assistant.desktop
 debian/tmp/opt/trinity/share/apps/kappfinder/apps/Development/ddd.desktop
diff --git a/debian/lenny/tdebase/debian/kate-trinity.install b/debian/lenny/tdebase/debian/kate-trinity.install
index 275e735e2..74c56bca5 100644
--- a/debian/lenny/tdebase/debian/kate-trinity.install
+++ b/debian/lenny/tdebase/debian/kate-trinity.install
@@ -11,8 +11,8 @@ debian/tmp/opt/trinity/lib/libkateutils.so.0
 debian/tmp/opt/trinity/lib/libkateutils.so.0.0.0
 debian/tmp/opt/trinity/lib/libtdeinit_kate.so
 debian/tmp/opt/trinity/lib/libtdeinit_kwrite.so
-debian/tmp/opt/trinity/share/applications/kde/kate.desktop
-debian/tmp/opt/trinity/share/applications/kde/kwrite.desktop
+debian/tmp/opt/trinity/share/applications/tde/kate.desktop
+debian/tmp/opt/trinity/share/applications/tde/kwrite.desktop
 debian/tmp/opt/trinity/share/apps/kate/externaltools
 debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/16x16/actions/curfiledir.png
 debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/16x16/actions/highlighting.png
diff --git a/debian/lenny/tdebase/debian/kcontrol-trinity.install b/debian/lenny/tdebase/debian/kcontrol-trinity.install
index cdf9e60ac..e8df7c819 100644
--- a/debian/lenny/tdebase/debian/kcontrol-trinity.install
+++ b/debian/lenny/tdebase/debian/kcontrol-trinity.install
@@ -130,80 +130,80 @@ debian/tmp/opt/trinity/lib/libtdeinit_kaccess.so
 debian/tmp/opt/trinity/lib/libtdeinit_kcontrol.so
 debian/tmp/opt/trinity/lib/libkfontinst.so.0
 debian/tmp/opt/trinity/lib/libkfontinst.so.0.0.0
-debian/tmp/opt/trinity/share/applications/kde/arts.desktop
-debian/tmp/opt/trinity/share/applications/kde/background.desktop
-debian/tmp/opt/trinity/share/applications/kde/bell.desktop
-debian/tmp/opt/trinity/share/applications/kde/cache.desktop
-debian/tmp/opt/trinity/share/applications/kde/cdinfo.desktop
-debian/tmp/opt/trinity/share/applications/kde/clock.desktop
-debian/tmp/opt/trinity/share/applications/kde/colors.desktop
-debian/tmp/opt/trinity/share/applications/kde/componentchooser.desktop
-debian/tmp/opt/trinity/share/applications/kde/cookies.desktop
-debian/tmp/opt/trinity/share/applications/kde/crypto.desktop
-debian/tmp/opt/trinity/share/applications/kde/desktopbehavior.desktop
-debian/tmp/opt/trinity/share/applications/kde/desktop.desktop
-debian/tmp/opt/trinity/share/applications/kde/desktoppath.desktop
-debian/tmp/opt/trinity/share/applications/kde/devices.desktop
-debian/tmp/opt/trinity/share/applications/kde/display.desktop
-debian/tmp/opt/trinity/share/applications/kde/displayconfig.desktop
-debian/tmp/opt/trinity/share/applications/kde/dma.desktop
-debian/tmp/opt/trinity/share/applications/kde/ebrowsing.desktop
-debian/tmp/opt/trinity/share/applications/kde/filebrowser.desktop
-debian/tmp/opt/trinity/share/applications/kde/filetypes.desktop
-debian/tmp/opt/trinity/share/applications/kde/fonts.desktop
-debian/tmp/opt/trinity/share/applications/kde/hwmanager.desktop
-debian/tmp/opt/trinity/share/applications/kde/icons.desktop
-debian/tmp/opt/trinity/share/applications/kde/installktheme.desktop
-debian/tmp/opt/trinity/share/applications/kde/interrupts.desktop
-debian/tmp/opt/trinity/share/applications/kde/ioports.desktop
-debian/tmp/opt/trinity/share/applications/kde/ioslaveinfo.desktop
-debian/tmp/opt/trinity/share/applications/kde/joystick.desktop
-debian/tmp/opt/trinity/share/applications/kde/kcm_kdnssd.desktop
-debian/tmp/opt/trinity/share/applications/kde/kcmaccess.desktop
-debian/tmp/opt/trinity/share/applications/kde/kcmcss.desktop
-debian/tmp/opt/trinity/share/applications/kde/kcmfontinst.desktop
-debian/tmp/opt/trinity/share/applications/kde/kcmkded.desktop
-debian/tmp/opt/trinity/share/applications/kde/kcmlaunch.desktop
-debian/tmp/opt/trinity/share/applications/kde/kcmnotify.desktop
-debian/tmp/opt/trinity/share/applications/kde/kcmperformance.desktop
-debian/tmp/opt/trinity/share/applications/kde/kcmsmserver.desktop
-debian/tmp/opt/trinity/share/applications/kde/kcmtaskbar.desktop
-debian/tmp/opt/trinity/share/applications/kde/kcmusb.desktop
-debian/tmp/opt/trinity/share/applications/kde/kcmview1394.desktop
-debian/tmp/opt/trinity/share/applications/kde/KControl.desktop
-debian/tmp/opt/trinity/share/applications/kde/tdm.desktop
-debian/tmp/opt/trinity/share/applications/kde/keys.desktop
-debian/tmp/opt/trinity/share/applications/kde/kfontview.desktop
-debian/tmp/opt/trinity/share/applications/kde/khtml_behavior.desktop
-debian/tmp/opt/trinity/share/applications/kde/khtml_fonts.desktop
-debian/tmp/opt/trinity/share/applications/kde/khtml_java_js.desktop
-debian/tmp/opt/trinity/share/applications/kde/krandrtray.desktop
+debian/tmp/opt/trinity/share/applications/tde/arts.desktop
+debian/tmp/opt/trinity/share/applications/tde/background.desktop
+debian/tmp/opt/trinity/share/applications/tde/bell.desktop
+debian/tmp/opt/trinity/share/applications/tde/cache.desktop
+debian/tmp/opt/trinity/share/applications/tde/cdinfo.desktop
+debian/tmp/opt/trinity/share/applications/tde/clock.desktop
+debian/tmp/opt/trinity/share/applications/tde/colors.desktop
+debian/tmp/opt/trinity/share/applications/tde/componentchooser.desktop
+debian/tmp/opt/trinity/share/applications/tde/cookies.desktop
+debian/tmp/opt/trinity/share/applications/tde/crypto.desktop
+debian/tmp/opt/trinity/share/applications/tde/desktopbehavior.desktop
+debian/tmp/opt/trinity/share/applications/tde/desktop.desktop
+debian/tmp/opt/trinity/share/applications/tde/desktoppath.desktop
+debian/tmp/opt/trinity/share/applications/tde/devices.desktop
+debian/tmp/opt/trinity/share/applications/tde/display.desktop
+debian/tmp/opt/trinity/share/applications/tde/displayconfig.desktop
+debian/tmp/opt/trinity/share/applications/tde/dma.desktop
+debian/tmp/opt/trinity/share/applications/tde/ebrowsing.desktop
+debian/tmp/opt/trinity/share/applications/tde/filebrowser.desktop
+debian/tmp/opt/trinity/share/applications/tde/filetypes.desktop
+debian/tmp/opt/trinity/share/applications/tde/fonts.desktop
+debian/tmp/opt/trinity/share/applications/tde/hwmanager.desktop
+debian/tmp/opt/trinity/share/applications/tde/icons.desktop
+debian/tmp/opt/trinity/share/applications/tde/installktheme.desktop
+debian/tmp/opt/trinity/share/applications/tde/interrupts.desktop
+debian/tmp/opt/trinity/share/applications/tde/ioports.desktop
+debian/tmp/opt/trinity/share/applications/tde/ioslaveinfo.desktop
+debian/tmp/opt/trinity/share/applications/tde/joystick.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcm_kdnssd.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmaccess.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmcss.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmfontinst.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmkded.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmlaunch.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmnotify.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmperformance.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmsmserver.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmtaskbar.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmusb.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmview1394.desktop
+debian/tmp/opt/trinity/share/applications/tde/KControl.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdm.desktop
+debian/tmp/opt/trinity/share/applications/tde/keys.desktop
+debian/tmp/opt/trinity/share/applications/tde/kfontview.desktop
+debian/tmp/opt/trinity/share/applications/tde/khtml_behavior.desktop
+debian/tmp/opt/trinity/share/applications/tde/khtml_fonts.desktop
+debian/tmp/opt/trinity/share/applications/tde/khtml_java_js.desktop
+debian/tmp/opt/trinity/share/applications/tde/krandrtray.desktop
 debian/tmp/opt/trinity/share/autostart/krandrtray-autostart.desktop
-debian/tmp/opt/trinity/share/applications/kde/kthememanager.desktop
-debian/tmp/opt/trinity/share/applications/kde/iccconfig.desktop
-debian/tmp/opt/trinity/share/applications/kde/lanbrowser.desktop
-debian/tmp/opt/trinity/share/applications/kde/language.desktop
-debian/tmp/opt/trinity/share/applications/kde/media.desktop
-debian/tmp/opt/trinity/share/applications/kde/memory.desktop
-debian/tmp/opt/trinity/share/applications/kde/mouse.desktop
-debian/tmp/opt/trinity/share/applications/kde/netpref.desktop
-debian/tmp/opt/trinity/share/applications/kde/nic.desktop
-debian/tmp/opt/trinity/share/applications/kde/opengl.desktop
-debian/tmp/opt/trinity/share/applications/kde/panel_appearance.desktop
-debian/tmp/opt/trinity/share/applications/kde/panel.desktop
-debian/tmp/opt/trinity/share/applications/kde/partitions.desktop
-debian/tmp/opt/trinity/share/applications/kde/pci.desktop
-debian/tmp/opt/trinity/share/applications/kde/privacy.desktop
-debian/tmp/opt/trinity/share/applications/kde/processor.desktop
-debian/tmp/opt/trinity/share/applications/kde/proxy.desktop
-debian/tmp/opt/trinity/share/applications/kde/screensaver.desktop
-debian/tmp/opt/trinity/share/applications/kde/scsi.desktop
-debian/tmp/opt/trinity/share/applications/kde/smbstatus.desktop
-debian/tmp/opt/trinity/share/applications/kde/sound.desktop
-debian/tmp/opt/trinity/share/applications/kde/spellchecking.desktop
-debian/tmp/opt/trinity/share/applications/kde/style.desktop
-debian/tmp/opt/trinity/share/applications/kde/useragent.desktop
-debian/tmp/opt/trinity/share/applications/kde/xserver.desktop
+debian/tmp/opt/trinity/share/applications/tde/kthememanager.desktop
+debian/tmp/opt/trinity/share/applications/tde/iccconfig.desktop
+debian/tmp/opt/trinity/share/applications/tde/lanbrowser.desktop
+debian/tmp/opt/trinity/share/applications/tde/language.desktop
+debian/tmp/opt/trinity/share/applications/tde/media.desktop
+debian/tmp/opt/trinity/share/applications/tde/memory.desktop
+debian/tmp/opt/trinity/share/applications/tde/mouse.desktop
+debian/tmp/opt/trinity/share/applications/tde/netpref.desktop
+debian/tmp/opt/trinity/share/applications/tde/nic.desktop
+debian/tmp/opt/trinity/share/applications/tde/opengl.desktop
+debian/tmp/opt/trinity/share/applications/tde/panel_appearance.desktop
+debian/tmp/opt/trinity/share/applications/tde/panel.desktop
+debian/tmp/opt/trinity/share/applications/tde/partitions.desktop
+debian/tmp/opt/trinity/share/applications/tde/pci.desktop
+debian/tmp/opt/trinity/share/applications/tde/privacy.desktop
+debian/tmp/opt/trinity/share/applications/tde/processor.desktop
+debian/tmp/opt/trinity/share/applications/tde/proxy.desktop
+debian/tmp/opt/trinity/share/applications/tde/screensaver.desktop
+debian/tmp/opt/trinity/share/applications/tde/scsi.desktop
+debian/tmp/opt/trinity/share/applications/tde/smbstatus.desktop
+debian/tmp/opt/trinity/share/applications/tde/sound.desktop
+debian/tmp/opt/trinity/share/applications/tde/spellchecking.desktop
+debian/tmp/opt/trinity/share/applications/tde/style.desktop
+debian/tmp/opt/trinity/share/applications/tde/useragent.desktop
+debian/tmp/opt/trinity/share/applications/tde/xserver.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/energy.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/fileappearance.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/filebehavior.desktop
diff --git a/debian/lenny/tdebase/debian/kdepasswd-trinity.install b/debian/lenny/tdebase/debian/kdepasswd-trinity.install
index 1850960ec..06a22062c 100644
--- a/debian/lenny/tdebase/debian/kdepasswd-trinity.install
+++ b/debian/lenny/tdebase/debian/kdepasswd-trinity.install
@@ -1,8 +1,8 @@
 debian/tmp/opt/trinity/bin/kdepasswd
 debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.la
 debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.so
-debian/tmp/opt/trinity/share/applications/kde/kcm_useraccount.desktop
-debian/tmp/opt/trinity/share/applications/kde/kdepasswd.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcm_useraccount.desktop
+debian/tmp/opt/trinity/share/applications/tde/kdepasswd.desktop
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/Apple.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/BeachBall.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/Blowfish.png
diff --git a/debian/lenny/tdebase/debian/kfind-trinity.install b/debian/lenny/tdebase/debian/kfind-trinity.install
index 88df3e87f..8422b0717 100644
--- a/debian/lenny/tdebase/debian/kfind-trinity.install
+++ b/debian/lenny/tdebase/debian/kfind-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kfind
 debian/tmp/opt/trinity/lib/trinity/libkfindpart.la
 debian/tmp/opt/trinity/lib/trinity/libkfindpart.so
-debian/tmp/opt/trinity/share/applications/kde/Kfind.desktop
+debian/tmp/opt/trinity/share/applications/tde/Kfind.desktop
 debian/tmp/opt/trinity/share/apps/kfindpart/icons/locolor/22x22/actions/archive.png
 debian/tmp/opt/trinity/share/apps/kfindpart/icons/locolor/22x22/actions/delete.png
 debian/tmp/opt/trinity/share/apps/kfindpart/icons/locolor/22x22/actions/idea.png
diff --git a/debian/lenny/tdebase/debian/khelpcenter-trinity.install b/debian/lenny/tdebase/debian/khelpcenter-trinity.install
index ff66000f7..4874633a4 100644
--- a/debian/lenny/tdebase/debian/khelpcenter-trinity.install
+++ b/debian/lenny/tdebase/debian/khelpcenter-trinity.install
@@ -7,7 +7,7 @@ debian/tmp/opt/trinity/bin/khelpcenter
 debian/tmp/opt/trinity/lib/trinity/khelpcenter.la
 debian/tmp/opt/trinity/lib/trinity/khelpcenter.so
 debian/tmp/opt/trinity/lib/libtdeinit_khelpcenter.so
-debian/tmp/opt/trinity/share/applications/kde/Help.desktop
+debian/tmp/opt/trinity/share/applications/tde/Help.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/glossary.html.in
 debian/tmp/opt/trinity/share/apps/khelpcenter/glossary.xslt
 debian/tmp/opt/trinity/share/apps/khelpcenter/index.html.in
diff --git a/debian/lenny/tdebase/debian/kicker-trinity.install b/debian/lenny/tdebase/debian/kicker-trinity.install
index ee5993977..65f0e8861 100644
--- a/debian/lenny/tdebase/debian/kicker-trinity.install
+++ b/debian/lenny/tdebase/debian/kicker-trinity.install
@@ -70,7 +70,7 @@ debian/tmp/opt/trinity/lib/libtaskmanager.so.1
 debian/tmp/opt/trinity/lib/libtaskmanager.so.1.0.0
 debian/tmp/opt/trinity/lib/libkickoffsearch_interfaces.so.0
 debian/tmp/opt/trinity/lib/libkickoffsearch_interfaces.so.0.0.0
-debian/tmp/opt/trinity/share/applications/kde/kcmkicker.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmkicker.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kicker_config_arrangement.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kicker_config_hiding.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kicker_config_menus.desktop
diff --git a/debian/lenny/tdebase/debian/klipper-trinity.install b/debian/lenny/tdebase/debian/klipper-trinity.install
index 2e3c456a2..67026d9b2 100644
--- a/debian/lenny/tdebase/debian/klipper-trinity.install
+++ b/debian/lenny/tdebase/debian/klipper-trinity.install
@@ -5,7 +5,7 @@ debian/tmp/opt/trinity/lib/trinity/klipper_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/klipper_panelapplet.so
 debian/tmp/opt/trinity/lib/trinity/klipper.so
 debian/tmp/opt/trinity/lib/libtdeinit_klipper.so
-debian/tmp/opt/trinity/share/applications/kde/klipper.desktop
+debian/tmp/opt/trinity/share/applications/tde/klipper.desktop
 debian/tmp/opt/trinity/share/apps/kconf_update/klipper-1-2.pl
 debian/tmp/opt/trinity/share/apps/kconf_update/klipper-trinity1.sh
 debian/tmp/opt/trinity/share/apps/kconf_update/klipperrc.upd
diff --git a/debian/lenny/tdebase/debian/kmenuedit-trinity.install b/debian/lenny/tdebase/debian/kmenuedit-trinity.install
index 05c05cd11..ec5672f01 100644
--- a/debian/lenny/tdebase/debian/kmenuedit-trinity.install
+++ b/debian/lenny/tdebase/debian/kmenuedit-trinity.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/lib/trinity/kmenuedit.la
 debian/tmp/opt/trinity/lib/trinity/kmenuedit.so
 debian/tmp/opt/trinity/lib/libtdeinit_kcontroledit.so
 debian/tmp/opt/trinity/lib/libtdeinit_kmenuedit.so
-debian/tmp/opt/trinity/share/applications/kde/kmenuedit.desktop
+debian/tmp/opt/trinity/share/applications/tde/kmenuedit.desktop
 debian/tmp/opt/trinity/share/applnk/System/kmenuedit.desktop
 debian/tmp/opt/trinity/share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png
 debian/tmp/opt/trinity/share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new_sep.png
diff --git a/debian/lenny/tdebase/debian/konqueror-nsplugins-trinity.install b/debian/lenny/tdebase/debian/konqueror-nsplugins-trinity.install
index 9064613b0..923c93227 100644
--- a/debian/lenny/tdebase/debian/konqueror-nsplugins-trinity.install
+++ b/debian/lenny/tdebase/debian/konqueror-nsplugins-trinity.install
@@ -4,5 +4,5 @@ debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.la
 debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.so
 debian/tmp/opt/trinity/lib/trinity/libnsplugin.la
 debian/tmp/opt/trinity/lib/trinity/libnsplugin.so
-debian/tmp/opt/trinity/share/applications/kde/khtml_plugins.desktop
+debian/tmp/opt/trinity/share/applications/tde/khtml_plugins.desktop
 debian/tmp/opt/trinity/share/apps/plugin/nspluginpart.rc
diff --git a/debian/lenny/tdebase/debian/konqueror-trinity.install b/debian/lenny/tdebase/debian/konqueror-trinity.install
index 3fbf16acf..71c1d7215 100644
--- a/debian/lenny/tdebase/debian/konqueror-trinity.install
+++ b/debian/lenny/tdebase/debian/konqueror-trinity.install
@@ -42,15 +42,15 @@ debian/tmp/opt/trinity/lib/libtdeinit_kfmclient.so
 debian/tmp/opt/trinity/lib/libtdeinit_konqueror.so
 debian/tmp/opt/trinity/lib/libkonqsidebarplugin.so.1
 debian/tmp/opt/trinity/lib/libkonqsidebarplugin.so.1.2.0
-debian/tmp/opt/trinity/share/applications/kde/Home.desktop
-debian/tmp/opt/trinity/share/applications/kde/kcmhistory.desktop
-debian/tmp/opt/trinity/share/applications/kde/kfmclient.desktop
-debian/tmp/opt/trinity/share/applications/kde/kfmclient_dir.desktop
-debian/tmp/opt/trinity/share/applications/kde/kfmclient_html.desktop
-debian/tmp/opt/trinity/share/applications/kde/kfmclient_war.desktop
-debian/tmp/opt/trinity/share/applications/kde/khtml_filter.desktop
-debian/tmp/opt/trinity/share/applications/kde/konqbrowser.desktop
-debian/tmp/opt/trinity/share/applications/kde/konquerorsu.desktop
+debian/tmp/opt/trinity/share/applications/tde/Home.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmhistory.desktop
+debian/tmp/opt/trinity/share/applications/tde/kfmclient.desktop
+debian/tmp/opt/trinity/share/applications/tde/kfmclient_dir.desktop
+debian/tmp/opt/trinity/share/applications/tde/kfmclient_html.desktop
+debian/tmp/opt/trinity/share/applications/tde/kfmclient_war.desktop
+debian/tmp/opt/trinity/share/applications/tde/khtml_filter.desktop
+debian/tmp/opt/trinity/share/applications/tde/konqbrowser.desktop
+debian/tmp/opt/trinity/share/applications/tde/konquerorsu.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/konqfilemgr.desktop
 debian/tmp/opt/trinity/share/applnk/Internet/keditbookmarks.desktop
 debian/tmp/opt/trinity/share/applnk/konqueror.desktop
diff --git a/debian/lenny/tdebase/debian/konsole-trinity.install b/debian/lenny/tdebase/debian/konsole-trinity.install
index e5e2fdf6d..410f512c3 100644
--- a/debian/lenny/tdebase/debian/konsole-trinity.install
+++ b/debian/lenny/tdebase/debian/konsole-trinity.install
@@ -8,8 +8,8 @@ debian/tmp/opt/trinity/lib/trinity/konsole.so
 debian/tmp/opt/trinity/lib/trinity/libkonsolepart.la
 debian/tmp/opt/trinity/lib/trinity/libkonsolepart.so
 debian/tmp/opt/trinity/lib/libtdeinit_konsole.so
-debian/tmp/opt/trinity/share/applications/kde/konsole.desktop
-debian/tmp/opt/trinity/share/applications/kde/konsolesu.desktop
+debian/tmp/opt/trinity/share/applications/tde/konsole.desktop
+debian/tmp/opt/trinity/share/applications/tde/konsolesu.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kcmkonsole.desktop
 debian/tmp/opt/trinity/share/apps/kconf_update/konsole.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/schemaStrip.pl
diff --git a/debian/lenny/tdebase/debian/kpager-trinity.install b/debian/lenny/tdebase/debian/kpager-trinity.install
index d9a0bb1ce..1e7f8cd51 100644
--- a/debian/lenny/tdebase/debian/kpager-trinity.install
+++ b/debian/lenny/tdebase/debian/kpager-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/kpager
-debian/tmp/opt/trinity/share/applications/kde/kpager.desktop
+debian/tmp/opt/trinity/share/applications/tde/kpager.desktop
 debian/tmp/opt/trinity/share/applnk/Utilities/kpager.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/index.cache.bz2
diff --git a/debian/lenny/tdebase/debian/kpersonalizer-trinity.install b/debian/lenny/tdebase/debian/kpersonalizer-trinity.install
index 2a710a674..900d73907 100644
--- a/debian/lenny/tdebase/debian/kpersonalizer-trinity.install
+++ b/debian/lenny/tdebase/debian/kpersonalizer-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/kpersonalizer
-debian/tmp/opt/trinity/share/applications/kde/kpersonalizer.desktop
+debian/tmp/opt/trinity/share/applications/tde/kpersonalizer.desktop
 debian/tmp/opt/trinity/share/applnk/System/kpersonalizer.desktop
 debian/tmp/opt/trinity/share/apps/kpersonalizer/pics/step1.png
 debian/tmp/opt/trinity/share/apps/kpersonalizer/pics/step2.png
diff --git a/debian/lenny/tdebase/debian/ksplash-trinity.install b/debian/lenny/tdebase/debian/ksplash-trinity.install
index 847b02505..f00d50a90 100644
--- a/debian/lenny/tdebase/debian/ksplash-trinity.install
+++ b/debian/lenny/tdebase/debian/ksplash-trinity.install
@@ -12,7 +12,7 @@ debian/tmp/opt/trinity/lib/trinity/ksplashstandard.la
 debian/tmp/opt/trinity/lib/trinity/ksplashstandard.so
 debian/tmp/opt/trinity/lib/libksplashthemes.so.0
 debian/tmp/opt/trinity/lib/libksplashthemes.so.0.0.0
-debian/tmp/opt/trinity/share/applications/kde/ksplashthememgr.desktop
+debian/tmp/opt/trinity/share/applications/tde/ksplashthememgr.desktop
 debian/tmp/opt/trinity/share/apps/ksplash/pics/splash.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/blue-bend/Preview.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/blue-bend/splash_active_bar.png
diff --git a/debian/lenny/tdebase/debian/ksysguard-trinity.install b/debian/lenny/tdebase/debian/ksysguard-trinity.install
index 54649197d..eebc853f7 100644
--- a/debian/lenny/tdebase/debian/ksysguard-trinity.install
+++ b/debian/lenny/tdebase/debian/ksysguard-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/lib/trinity/sysguard_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/sysguard_panelapplet.so
 debian/tmp/opt/trinity/lib/libksgrd.so.1
 debian/tmp/opt/trinity/lib/libksgrd.so.1.2.0
-debian/tmp/opt/trinity/share/applications/kde/ksysguard.desktop
+debian/tmp/opt/trinity/share/applications/tde/ksysguard.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/ksysguardapplet.desktop
 debian/tmp/opt/trinity/share/apps/ksysguard/eventsrc
 debian/tmp/opt/trinity/share/apps/ksysguard/KSysGuardApplet.xml
diff --git a/debian/lenny/tdebase/debian/ktip-trinity.install b/debian/lenny/tdebase/debian/ktip-trinity.install
index c1aa2e4b8..8cb2171de 100644
--- a/debian/lenny/tdebase/debian/ktip-trinity.install
+++ b/debian/lenny/tdebase/debian/ktip-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/ktip
-debian/tmp/opt/trinity/share/applications/kde/ktip.desktop
+debian/tmp/opt/trinity/share/applications/tde/ktip.desktop
 debian/tmp/opt/trinity/share/applnk/Toys/ktip.desktop
 debian/tmp/opt/trinity/share/apps/kdewizard/pics/wizard_small.png
 debian/tmp/opt/trinity/share/apps/kdewizard/tips
diff --git a/debian/lenny/tdebase/debian/tdebase-kio-plugins-trinity.install b/debian/lenny/tdebase/debian/tdebase-kio-plugins-trinity.install
index b148601c3..f2b452126 100644
--- a/debian/lenny/tdebase/debian/tdebase-kio-plugins-trinity.install
+++ b/debian/lenny/tdebase/debian/tdebase-kio-plugins-trinity.install
@@ -82,7 +82,7 @@ debian/tmp/opt/trinity/lib/trinity/media_propsdlgplugin.la
 debian/tmp/opt/trinity/lib/trinity/media_propsdlgplugin.so
 debian/tmp/opt/trinity/lib/trinity/textthumbnail.la
 debian/tmp/opt/trinity/lib/trinity/textthumbnail.so
-debian/tmp/opt/trinity/share/applications/kde/kcmcgi.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmcgi.desktop
 debian/tmp/opt/trinity/share/apps/kio_finger/kio_finger.css
 debian/tmp/opt/trinity/share/apps/kio_finger/kio_finger.pl
 debian/tmp/opt/trinity/share/apps/kio_info/kde-info2html
diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-bin.install b/debian/lenny/tdebase/debian/tdebase-trinity-bin.install
index 40deb0f83..bc3a2f1c6 100644
--- a/debian/lenny/tdebase/debian/tdebase-trinity-bin.install
+++ b/debian/lenny/tdebase/debian/tdebase-trinity-bin.install
@@ -52,10 +52,10 @@ debian/tmp/opt/trinity/lib/libtdeinit_khotkeys.so
 debian/tmp/opt/trinity/lib/libtdeinit_kxkb.so
 debian/tmp/opt/trinity/lib/libkhotkeys_shared.so.1
 debian/tmp/opt/trinity/lib/libkhotkeys_shared.so.1.0.0
-debian/tmp/opt/trinity/share/applications/kde/keyboard.desktop
-debian/tmp/opt/trinity/share/applications/kde/keyboard_layout.desktop
-debian/tmp/opt/trinity/share/applications/kde/khotkeys.desktop
-debian/tmp/opt/trinity/share/applications/kde/knetattach.desktop
+debian/tmp/opt/trinity/share/applications/tde/keyboard.desktop
+debian/tmp/opt/trinity/share/applications/tde/keyboard_layout.desktop
+debian/tmp/opt/trinity/share/applications/tde/khotkeys.desktop
+debian/tmp/opt/trinity/share/applications/tde/knetattach.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KBlankscreen.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KRandom.desktop
 debian/tmp/opt/trinity/share/apps/drkonqi/debuggers/gdbrc
diff --git a/debian/lenny/tdebase/debian/tdeprint-trinity.install b/debian/lenny/tdebase/debian/tdeprint-trinity.install
index 5539be8f2..64628abc9 100644
--- a/debian/lenny/tdebase/debian/tdeprint-trinity.install
+++ b/debian/lenny/tdebase/debian/tdeprint-trinity.install
@@ -13,9 +13,9 @@ debian/tmp/opt/trinity/lib/trinity/libtdeprint_part.la
 debian/tmp/opt/trinity/lib/trinity/libtdeprint_part.so
 debian/tmp/opt/trinity/lib/libtdeinit_kjobviewer.so
 debian/tmp/opt/trinity/lib/libtdeinit_kprinter.so
-debian/tmp/opt/trinity/share/applications/kde/tdeprintfax.desktop
-debian/tmp/opt/trinity/share/applications/kde/kjobviewer.desktop
-debian/tmp/opt/trinity/share/applications/kde/printers.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdeprintfax.desktop
+debian/tmp/opt/trinity/share/applications/tde/kjobviewer.desktop
+debian/tmp/opt/trinity/share/applications/tde/printers.desktop
 debian/tmp/opt/trinity/share/apps/tdeprintfax/anytops
 debian/tmp/opt/trinity/share/apps/tdeprintfax/faxfilters
 debian/tmp/opt/trinity/share/apps/tdeprintfax/icons/crystalsvg/16x16/actions/abentry.png
diff --git a/debian/lenny/tdebase/debian/twin-trinity.install b/debian/lenny/tdebase/debian/twin-trinity.install
index 452b1e542..2bf0dec5a 100644
--- a/debian/lenny/tdebase/debian/twin-trinity.install
+++ b/debian/lenny/tdebase/debian/twin-trinity.install
@@ -49,10 +49,10 @@ debian/tmp/opt/trinity/lib/libtdecorations.so.1
 debian/tmp/opt/trinity/lib/libtdecorations.so.1.0.0
 debian/tmp/opt/trinity/lib/libtdeinit_twin_rules_dialog.so
 debian/tmp/opt/trinity/lib/libtdeinit_twin.so
-debian/tmp/opt/trinity/share/applications/kde/showdesktop.desktop
-debian/tmp/opt/trinity/share/applications/kde/twindecoration.desktop
-debian/tmp/opt/trinity/share/applications/kde/twinoptions.desktop
-debian/tmp/opt/trinity/share/applications/kde/twinrules.desktop
+debian/tmp/opt/trinity/share/applications/tde/showdesktop.desktop
+debian/tmp/opt/trinity/share/applications/tde/twindecoration.desktop
+debian/tmp/opt/trinity/share/applications/tde/twinoptions.desktop
+debian/tmp/opt/trinity/share/applications/tde/twinrules.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/twinactions.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/twinadvanced.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/twinfocus.desktop