From 39a63a5c9d139191f97494f30fcff003528cd6de Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 11 Jun 2012 12:46:45 -0500
Subject: Update Ubuntu and Debian packaging to use applications/share/tde

---
 .../adept/debian/adept-installer-trinity.install   |   2 +-
 .../adept/debian/adept-manager-trinity.install     |   2 +-
 .../adept/debian/adept-notifier-trinity.install    |   2 +-
 .../adept/debian/adept-updater-trinity.install     |   2 +-
 .../amarok.cmake/debian/amarok-trinity.install     |   2 +-
 .../amarok/debian/amarok-trinity.install           |   2 +-
 .../basket/debian/basket-trinity.install           |   2 +-
 debian/lenny/applications/basket/debian/rules      |   4 +-
 debian/lenny/applications/digikam/debian/changelog |   2 +-
 .../digikam/debian/digikam-trinity.install         |   2 +-
 .../digikam/debian/showfoto-trinity.install        |   2 +-
 debian/lenny/applications/k3b/debian/changelog     |   2 +-
 debian/lenny/applications/k9copy/debian/rules      |   2 +-
 .../lenny/applications/kaffeine/debian/changelog   |   2 +-
 .../kaffeine/debian/kaffeine-iso.desktop           |   2 +-
 debian/lenny/applications/kaffeine/debian/rules    |   2 +-
 debian/lenny/applications/kdiff3/debian/rules      |   4 +-
 .../applications/kile/debian/kile-trinity.install  |   2 +-
 .../kmplayer/debian/kmplayer-trinity.install       |   2 +-
 .../lenny/applications/kmyfirewall/debian/install  |   2 +-
 .../kmymoney/debian/kmymoney2-trinity.install      |   2 +-
 debian/lenny/applications/knemo/debian/dirs        |   2 +-
 debian/lenny/applications/knowit/debian/rules      |   4 +-
 .../koffice/debian/chalk-data-trinity.install      |   2 +-
 .../koffice/debian/chalk-data-trinity.lintian      |   2 +-
 debian/lenny/applications/koffice/debian/changelog |   2 +-
 .../koffice/debian/karbon-trinity.install          |   2 +-
 .../koffice/debian/kchart-trinity.install          |   2 +-
 .../koffice/debian/kexi-trinity.install            |   2 +-
 .../koffice/debian/kformula-trinity.install        |   2 +-
 .../koffice/debian/kivio-data-trinity.install      |   2 +-
 .../koffice/debian/kivio-data-trinity.lintian      |   2 +-
 .../koffice/debian/koffice-data-trinity.install    |   2 +-
 .../koffice/debian/koshell-trinity.install         |   2 +-
 .../koffice/debian/kplato-trinity.install          |   2 +-
 .../koffice/debian/kpresenter-data-trinity.install |   2 +-
 .../koffice/debian/kpresenter-data-trinity.lintian |   2 +-
 .../koffice/debian/kspread-trinity.install         |   2 +-
 .../koffice/debian/kugar-trinity.install           |   4 +-
 .../koffice/debian/kword-data-trinity.install      |   2 +-
 .../koffice/debian/kword-data-trinity.lintian      |   2 +-
 .../debian/konversation-trinity.install            |   2 +-
 debian/lenny/applications/ksystemlog/debian/rules  |   2 +-
 .../lenny/applications/kvpnc/debian/README.Debian  |   2 +-
 debian/lenny/applications/kvpnc/debian/rules       |   2 +-
 .../debian/soundkonverter-trinity.install          |   2 +-
 .../debian/tde-guidance-trinity.install            |   8 +-
 .../applications/tde-systemsettings/debian/rules   |   4 +-
 .../tdesvn/debian/tdesvn-trinity.install           |   2 +-
 .../tdmtheme/debian/tdmtheme.lintian-overrides     |   6 +-
 .../wlassistant/debian/wlassistant-trinity.dirs    |   2 +-
 .../tdeaccessibility/debian/ksayit-trinity.install |   2 +-
 .../tdeaccessibility/debian/kttsd-trinity.install  |   4 +-
 .../debian/kttsd-trinity.install.kfreebsd-amd64    |   4 +-
 .../debian/kttsd-trinity.install.kfreebsd-i386     |   4 +-
 .../debian/atlantikdesigner-trinity.install        |   2 +-
 debian/lenny/tdeaddons/debian/ksig-trinity.install |   2 +-
 debian/lenny/tdeadmin/debian/kcron-trinity.install |   2 +-
 debian/lenny/tdeadmin/debian/kdat-trinity.install  |   2 +-
 .../tdeadmin/debian/knetworkconf-trinity.install   |   2 +-
 .../lenny/tdeadmin/debian/kpackage-trinity.install |   2 +-
 debian/lenny/tdeadmin/debian/ksysv-trinity.install |   2 +-
 debian/lenny/tdeadmin/debian/kuser-trinity.install |   2 +-
 .../tdeadmin/debian/lilo-config-trinity.install    |   2 +-
 .../tdebase/debian/kappfinder-trinity.install      |   2 +-
 debian/lenny/tdebase/debian/kate-trinity.install   |   4 +-
 .../lenny/tdebase/debian/kcontrol-trinity.install  | 146 ++++++++++-----------
 .../lenny/tdebase/debian/kdepasswd-trinity.install |   4 +-
 debian/lenny/tdebase/debian/kfind-trinity.install  |   2 +-
 .../tdebase/debian/khelpcenter-trinity.install     |   2 +-
 debian/lenny/tdebase/debian/kicker-trinity.install |   2 +-
 .../lenny/tdebase/debian/klipper-trinity.install   |   2 +-
 .../lenny/tdebase/debian/kmenuedit-trinity.install |   2 +-
 .../debian/konqueror-nsplugins-trinity.install     |   2 +-
 .../lenny/tdebase/debian/konqueror-trinity.install |  18 +--
 .../lenny/tdebase/debian/konsole-trinity.install   |   4 +-
 debian/lenny/tdebase/debian/kpager-trinity.install |   2 +-
 .../tdebase/debian/kpersonalizer-trinity.install   |   2 +-
 .../lenny/tdebase/debian/ksplash-trinity.install   |   2 +-
 .../lenny/tdebase/debian/ksysguard-trinity.install |   2 +-
 debian/lenny/tdebase/debian/ktip-trinity.install   |   2 +-
 .../debian/tdebase-kio-plugins-trinity.install     |   2 +-
 .../tdebase/debian/tdebase-trinity-bin.install     |   8 +-
 .../lenny/tdebase/debian/tdeprint-trinity.install  |   6 +-
 debian/lenny/tdebase/debian/twin-trinity.install   |   8 +-
 .../tdebindings/debian/kjscmd-trinity.install      |   2 +-
 debian/lenny/tdeedu/debian/blinken-trinity.install |   2 +-
 debian/lenny/tdeedu/debian/kalzium-trinity.install |   2 +-
 .../lenny/tdeedu/debian/kanagram-trinity.install   |   2 +-
 debian/lenny/tdeedu/debian/kbruch-trinity.install  |   2 +-
 debian/lenny/tdeedu/debian/keduca-trinity.install  |   4 +-
 .../lenny/tdeedu/debian/kgeography-trinity.install |   2 +-
 .../lenny/tdeedu/debian/khangman-trinity.install   |   2 +-
 debian/lenny/tdeedu/debian/kig-trinity.install     |   2 +-
 debian/lenny/tdeedu/debian/kiten-trinity.install   |   2 +-
 debian/lenny/tdeedu/debian/klatin-trinity.install  |   2 +-
 .../lenny/tdeedu/debian/klettres-trinity.install   |   2 +-
 debian/lenny/tdeedu/debian/kmplot-trinity.install  |   2 +-
 .../tdeedu/debian/kpercentage-trinity.install      |   2 +-
 debian/lenny/tdeedu/debian/kstars-trinity.install  |   2 +-
 debian/lenny/tdeedu/debian/ktouch-trinity.install  |   2 +-
 debian/lenny/tdeedu/debian/kturtle-trinity.install |   2 +-
 debian/lenny/tdeedu/debian/kverbos-trinity.install |   2 +-
 .../lenny/tdeedu/debian/kvoctrain-trinity.install  |   2 +-
 .../lenny/tdeedu/debian/kwordquiz-trinity.install  |   2 +-
 .../lenny/tdegames/debian/atlantik-trinity.install |   2 +-
 .../tdegames/debian/kasteroids-trinity.install     |   2 +-
 .../lenny/tdegames/debian/katomic-trinity.install  |   2 +-
 .../tdegames/debian/kbackgammon-trinity.install    |   2 +-
 .../tdegames/debian/kbattleship-trinity.install    |   2 +-
 .../tdegames/debian/kblackbox-trinity.install      |   2 +-
 .../lenny/tdegames/debian/kbounce-trinity.install  |   2 +-
 .../lenny/tdegames/debian/kenolaba-trinity.install |   2 +-
 .../tdegames/debian/kfouleggs-trinity.install      |   2 +-
 .../tdegames/debian/kgoldrunner-trinity.install    |   2 +-
 .../tdegames/debian/kjumpingcube-trinity.install   |   2 +-
 .../lenny/tdegames/debian/klickety-trinity.install |   2 +-
 .../lenny/tdegames/debian/klines-trinity.install   |   2 +-
 .../tdegames/debian/kmahjongg-trinity.install      |   2 +-
 .../lenny/tdegames/debian/kmines-trinity.install   |   2 +-
 .../lenny/tdegames/debian/knetwalk-trinity.install |   2 +-
 debian/lenny/tdegames/debian/kolf-trinity.install  |   2 +-
 .../lenny/tdegames/debian/konquest-trinity.install |   2 +-
 debian/lenny/tdegames/debian/kpat-trinity.install  |   2 +-
 .../lenny/tdegames/debian/kpoker-trinity.install   |   2 +-
 .../lenny/tdegames/debian/kreversi-trinity.install |   2 +-
 debian/lenny/tdegames/debian/ksame-trinity.install |   2 +-
 .../lenny/tdegames/debian/kshisen-trinity.install  |   2 +-
 .../lenny/tdegames/debian/ksirtet-trinity.install  |   2 +-
 .../tdegames/debian/ksmiletris-trinity.install     |   2 +-
 .../lenny/tdegames/debian/ksnake-trinity.install   |   2 +-
 .../lenny/tdegames/debian/ksokoban-trinity.install |   2 +-
 .../tdegames/debian/kspaceduel-trinity.install     |   2 +-
 debian/lenny/tdegames/debian/ktron-trinity.install |   2 +-
 .../tdegames/debian/ktuberling-trinity.install     |   2 +-
 debian/lenny/tdegames/debian/kwin4-trinity.install |   2 +-
 debian/lenny/tdegames/debian/lskat-trinity.install |   2 +-
 .../tdegraphics/debian/kamera-trinity.install      |   2 +-
 .../tdegraphics/debian/kcoloredit-trinity.install  |   4 +-
 .../lenny/tdegraphics/debian/kdvi-trinity.install  |   2 +-
 .../lenny/tdegraphics/debian/kfax-trinity.install  |   2 +-
 .../tdegraphics/debian/kfaxview-trinity.install    |   2 +-
 .../tdegraphics/debian/kgamma-trinity.install      |   2 +-
 .../tdegraphics/debian/kghostview-trinity.install  |   2 +-
 .../tdegraphics/debian/kiconedit-trinity.install   |   2 +-
 .../lenny/tdegraphics/debian/kmrml-trinity.install |   2 +-
 .../tdegraphics/debian/kolourpaint-trinity.install |   2 +-
 .../lenny/tdegraphics/debian/kooka-trinity.install |   2 +-
 .../lenny/tdegraphics/debian/kpdf-trinity.install  |   2 +-
 .../tdegraphics/debian/kpovmodeler-trinity.install |   2 +-
 .../tdegraphics/debian/kruler-trinity.install      |   2 +-
 .../tdegraphics/debian/ksnapshot-trinity.install   |   2 +-
 .../tdegraphics/debian/kuickshow-trinity.install   |   2 +-
 .../lenny/tdegraphics/debian/kview-trinity.install |   2 +-
 .../tdelibs/debian/tdelibs-data-trinity.install    |   2 +-
 .../debian/artsbuilder-trinity.install             |   4 +-
 .../lenny/tdemultimedia/debian/juk-trinity.install |   2 +-
 .../tdemultimedia/debian/kaboodle-trinity.install  |   2 +-
 .../debian/kaudiocreator-trinity.install           |   2 +-
 .../tdemultimedia/debian/kmid-trinity.install      |   2 +-
 .../tdemultimedia/debian/kmix-trinity.install      |   2 +-
 .../tdemultimedia/debian/krec-trinity.install      |   2 +-
 .../tdemultimedia/debian/kscd-trinity.install      |   2 +-
 .../tdemultimedia/debian/libkcddb1-trinity.install |   2 +-
 .../tdemultimedia/debian/noatun-trinity.install    |   2 +-
 .../tdemultimedia-kio-plugins-trinity.install      |   2 +-
 .../lenny/tdenetwork/debian/kdict-trinity.install  |   2 +-
 .../lenny/tdenetwork/debian/kget-trinity.install   |   2 +-
 .../tdenetwork/debian/knewsticker-trinity.install  |   2 +-
 .../lenny/tdenetwork/debian/kopete-trinity.install |   2 +-
 .../lenny/tdenetwork/debian/kppp-trinity.install   |   4 +-
 .../lenny/tdenetwork/debian/krdc-trinity.install   |   2 +-
 .../lenny/tdenetwork/debian/krfb-trinity.install   |   4 +-
 .../lenny/tdenetwork/debian/ksirc-trinity.install  |   2 +-
 .../lenny/tdenetwork/debian/ktalkd-trinity.install |   2 +-
 .../tdenetwork/debian/kwifimanager-trinity.install |   4 +-
 .../debian/tdenetwork-filesharing-trinity.install  |   4 +-
 .../lenny/tdepim/debian/akregator-trinity.install  |   2 +-
 .../tdepim/debian/kaddressbook-trinity.install     |   2 +-
 debian/lenny/tdepim/debian/kalarm-trinity.install  |   2 +-
 debian/lenny/tdepim/debian/kandy-trinity.install   |   2 +-
 debian/lenny/tdepim/debian/karm-trinity.install    |   2 +-
 .../tdepim/debian/kitchensync-trinity.install      |   2 +-
 .../lenny/tdepim/debian/kleopatra-trinity.install  |   2 +-
 debian/lenny/tdepim/debian/kmail-trinity.install   |   4 +-
 debian/lenny/tdepim/debian/knode-trinity.install   |   2 +-
 debian/lenny/tdepim/debian/knotes-trinity.install  |   2 +-
 .../tdepim/debian/konsolekalendar-trinity.install  |   2 +-
 debian/lenny/tdepim/debian/kontact-trinity.install |   4 +-
 .../lenny/tdepim/debian/korganizer-trinity.install |   2 +-
 debian/lenny/tdepim/debian/korn-trinity.install    |   2 +-
 debian/lenny/tdepim/debian/ktnef-trinity.install   |   2 +-
 .../tdepim/debian/tdepim-wizards-trinity.install   |   2 +-
 .../lenny/tdesdk/debian/cervisia-trinity.install   |   2 +-
 debian/lenny/tdesdk/debian/kbabel-trinity.install  |   6 +-
 .../lenny/tdesdk/debian/kbugbuster-trinity.install |   2 +-
 debian/lenny/tdesdk/debian/kompare-trinity.install |   2 +-
 .../lenny/tdesdk/debian/kuiviewer-trinity.install  |   2 +-
 .../tdesdk/debian/tdecachegrind-trinity.install    |   2 +-
 .../lenny/tdesdk/debian/umbrello-trinity.install   |   2 +-
 debian/lenny/tdetoys/debian/amor-trinity.install   |   2 +-
 debian/lenny/tdetoys/debian/kodo-trinity.install   |   2 +-
 .../lenny/tdetoys/debian/kteatime-trinity.install  |   2 +-
 .../tdetoys/debian/kworldclock-trinity.install     |   2 +-
 debian/lenny/tdeutils/debian/ark-trinity.install   |   2 +-
 debian/lenny/tdeutils/debian/kcalc-trinity.install |   2 +-
 .../tdeutils/debian/kcharselect-trinity.install    |   2 +-
 .../lenny/tdeutils/debian/kdelirc-trinity.install  |   4 +-
 debian/lenny/tdeutils/debian/kdf-trinity.install   |   6 +-
 debian/lenny/tdeutils/debian/kedit-trinity.install |   2 +-
 .../lenny/tdeutils/debian/kfloppy-trinity.install  |   2 +-
 debian/lenny/tdeutils/debian/kgpg-trinity.install  |   2 +-
 .../lenny/tdeutils/debian/khexedit-trinity.install |   2 +-
 debian/lenny/tdeutils/debian/kjots-trinity.install |   2 +-
 .../tdeutils/debian/klaptopdaemon-trinity.install  |   4 +-
 .../tdeutils/debian/kmilo-legacy-trinity.install   |   4 +-
 .../tdeutils/debian/kregexpeditor-trinity.install  |   2 +-
 .../lenny/tdeutils/debian/ktimer-trinity.install   |   2 +-
 .../tdeutils/debian/kwalletmanager-trinity.install |   6 +-
 .../tdewebdev/debian/kfilereplace-trinity.install  |   2 +-
 .../debian/kimagemapeditor-trinity.install         |   2 +-
 .../tdewebdev/debian/klinkstatus-trinity.install   |   2 +-
 .../tdewebdev/debian/kommander-trinity.install     |   2 +-
 .../lenny/tdewebdev/debian/kxsldbg-trinity.install |   2 +-
 .../lenny/tdewebdev/debian/quanta-trinity.install  |   2 +-
 225 files changed, 347 insertions(+), 347 deletions(-)

(limited to 'debian/lenny')

diff --git a/debian/lenny/applications/adept/debian/adept-installer-trinity.install b/debian/lenny/applications/adept/debian/adept-installer-trinity.install
index a3de6d18c..b1d5914e1 100644
--- a/debian/lenny/applications/adept/debian/adept-installer-trinity.install
+++ b/debian/lenny/applications/adept/debian/adept-installer-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/bin/adept_installer
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/adept_installer.*
 debian/tmp/opt/trinity/share/apps/adept_installer/adept_installerui.rc
-debian/tmp/opt/trinity/share/applications/kde/adept_installer.desktop
+debian/tmp/opt/trinity/share/applications/tde/adept_installer.desktop
diff --git a/debian/lenny/applications/adept/debian/adept-manager-trinity.install b/debian/lenny/applications/adept/debian/adept-manager-trinity.install
index 35fc0712b..f5f2446e7 100644
--- a/debian/lenny/applications/adept/debian/adept-manager-trinity.install
+++ b/debian/lenny/applications/adept/debian/adept-manager-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/bin/adept_manager
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/adept_manager.*
 debian/tmp/opt/trinity/share/apps/adept_manager/adept_managerui.rc
-debian/tmp/opt/trinity/share/applications/kde/adept_manager.desktop
+debian/tmp/opt/trinity/share/applications/tde/adept_manager.desktop
diff --git a/debian/lenny/applications/adept/debian/adept-notifier-trinity.install b/debian/lenny/applications/adept/debian/adept-notifier-trinity.install
index b1e97afac..e221e4ac3 100644
--- a/debian/lenny/applications/adept/debian/adept-notifier-trinity.install
+++ b/debian/lenny/applications/adept/debian/adept-notifier-trinity.install
@@ -1,3 +1,3 @@
 debian/tmp/opt/trinity/bin/adept_notifier
-debian/tmp/opt/trinity/share/applications/kde/adept_notifier.desktop
+debian/tmp/opt/trinity/share/applications/tde/adept_notifier.desktop
 debian/tmp/etc/xdg/autostart/adept_notifier_auto.desktop
diff --git a/debian/lenny/applications/adept/debian/adept-updater-trinity.install b/debian/lenny/applications/adept/debian/adept-updater-trinity.install
index 0be740892..ba854f2a8 100644
--- a/debian/lenny/applications/adept/debian/adept-updater-trinity.install
+++ b/debian/lenny/applications/adept/debian/adept-updater-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/bin/adept_updater
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/adept_updater.{png,svgz}
 debian/tmp/opt/trinity/share/apps/adept_updater/adept_updaterui.rc
-debian/tmp/opt/trinity/share/applications/kde/adept_updater.desktop
+debian/tmp/opt/trinity/share/applications/tde/adept_updater.desktop
diff --git a/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.install b/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.install
index f5aeb567f..f66beb7cf 100644
--- a/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.install
+++ b/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/share/applications/kde/amarok.desktop
+debian/tmp/opt/trinity/share/applications/tde/amarok.desktop
 debian/tmp/opt/trinity/share/services/amarokitpc.protocol
 debian/tmp/opt/trinity/share/services/amaroklastfm.protocol
 debian/tmp/opt/trinity/share/services/amarokpcast.protocol
diff --git a/debian/lenny/applications/amarok/debian/amarok-trinity.install b/debian/lenny/applications/amarok/debian/amarok-trinity.install
index f5aeb567f..f66beb7cf 100644
--- a/debian/lenny/applications/amarok/debian/amarok-trinity.install
+++ b/debian/lenny/applications/amarok/debian/amarok-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/share/applications/kde/amarok.desktop
+debian/tmp/opt/trinity/share/applications/tde/amarok.desktop
 debian/tmp/opt/trinity/share/services/amarokitpc.protocol
 debian/tmp/opt/trinity/share/services/amaroklastfm.protocol
 debian/tmp/opt/trinity/share/services/amarokpcast.protocol
diff --git a/debian/lenny/applications/basket/debian/basket-trinity.install b/debian/lenny/applications/basket/debian/basket-trinity.install
index a24d7e924..8064234ee 100644
--- a/debian/lenny/applications/basket/debian/basket-trinity.install
+++ b/debian/lenny/applications/basket/debian/basket-trinity.install
@@ -1,4 +1,4 @@
-opt/trinity/share/applications/kde/basket.desktop
+opt/trinity/share/applications/tde/basket.desktop
 opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_excelent.png
 opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_for_later.png
 opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_good.png
diff --git a/debian/lenny/applications/basket/debian/rules b/debian/lenny/applications/basket/debian/rules
index 0527d1198..c0e639fdc 100755
--- a/debian/lenny/applications/basket/debian/rules
+++ b/debian/lenny/applications/basket/debian/rules
@@ -76,8 +76,8 @@ install: build
 	# Install into package-build-dir
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-#	mkdir -p $(CURDIR)/debian/basket-trinity/opt/trinity/share/applications/kde/
-#	mv $(CURDIR)/debian/basket-trinity/opt/trinity/share/applnk/Utilities/basket.desktop $(CURDIR)/debian/basket-trinity/opt/trinity/share/applications/kde/
+#	mkdir -p $(CURDIR)/debian/basket-trinity/opt/trinity/share/applications/tde/
+#	mv $(CURDIR)/debian/basket-trinity/opt/trinity/share/applnk/Utilities/basket.desktop $(CURDIR)/debian/basket-trinity/opt/trinity/share/applications/tde/
 
 binary-indep: build install
 
diff --git a/debian/lenny/applications/digikam/debian/changelog b/debian/lenny/applications/digikam/debian/changelog
index 6a7191d2f..e421b82b9 100644
--- a/debian/lenny/applications/digikam/debian/changelog
+++ b/debian/lenny/applications/digikam/debian/changelog
@@ -846,7 +846,7 @@ digikam (0.7.2-4) unstable; urgency=medium
 
 digikam (0.7.2-3) unstable; urgency=low
 
-  * move digikam.desktop file to /usr/share/applications/kde/
+  * move digikam.desktop file to /usr/share/applications/tde/
     The desktop file is already XDG compliant.  (Closes: #271562)
   * fix grammar in long description.  Thx Justin!  (Closes: #300122)
   * Add 16x16 and 32x32 xpm icons for debian menu file
diff --git a/debian/lenny/applications/digikam/debian/digikam-trinity.install b/debian/lenny/applications/digikam/debian/digikam-trinity.install
index 49fc16b82..26e2288f9 100644
--- a/debian/lenny/applications/digikam/debian/digikam-trinity.install
+++ b/debian/lenny/applications/digikam/debian/digikam-trinity.install
@@ -3,7 +3,7 @@ opt/trinity/bin/digi*
 opt/trinity/lib
 /opt/trinity/share/apps/digikam
 /opt/trinity/share/apps/konqueror/servicemenus/digikam*.desktop
-/opt/trinity/share/applications/kde/digikam.desktop
+/opt/trinity/share/applications/tde/digikam.desktop
 /opt/trinity/share/icons/hicolor/*/apps/digikam.png
 /opt/trinity/share/locale
 /opt/trinity/share/servicetypes/digikamimageplugin.desktop
diff --git a/debian/lenny/applications/digikam/debian/showfoto-trinity.install b/debian/lenny/applications/digikam/debian/showfoto-trinity.install
index d9ff5c47a..73ba9c643 100644
--- a/debian/lenny/applications/digikam/debian/showfoto-trinity.install
+++ b/debian/lenny/applications/digikam/debian/showfoto-trinity.install
@@ -1,6 +1,6 @@
 opt/trinity/bin/showfoto
 /opt/trinity/share/apps/showfoto
-/opt/trinity/share/applications/kde/showfoto.desktop
+/opt/trinity/share/applications/tde/showfoto.desktop
 /opt/trinity/share/icons/hicolor/*/apps/showfoto.png
 debian/xpm.d/showfoto.xpm /opt/trinity/share/pixmaps/
 debian/xpm.d/showfoto-16.xpm /opt/trinity/share/pixmaps/
diff --git a/debian/lenny/applications/k3b/debian/changelog b/debian/lenny/applications/k3b/debian/changelog
index dccced4b4..1b2fa19d5 100644
--- a/debian/lenny/applications/k3b/debian/changelog
+++ b/debian/lenny/applications/k3b/debian/changelog
@@ -713,7 +713,7 @@ k3b (0.12.10-2) unstable; urgency=low
 
   * Rename the menu file so that it shows up in the Debian menu system
     and install the freedesktop menu item into /usr/share/applications
-    directly instead of /usr/share/applications/kde so that it shows up in the
+    directly instead of /usr/share/applications/tde so that it shows up in the
     GNOME menu (closes: #345989)
   * Update the build dependencies for KDE 3.5, dbus 0.6 and the new hal
     (closes: #337882)
diff --git a/debian/lenny/applications/k9copy/debian/rules b/debian/lenny/applications/k9copy/debian/rules
index 7a79ae048..9eb0c27bd 100755
--- a/debian/lenny/applications/k9copy/debian/rules
+++ b/debian/lenny/applications/k9copy/debian/rules
@@ -28,7 +28,7 @@ debian/stamp-bootstrap:
 	touch debian/stamp-bootstrap
 
 install/k9copy::
-	dh_install src/k9copy.desktop opt/trinity/share/applications/kde
+	dh_install src/k9copy.desktop opt/trinity/share/applications/tde
 	dh_link usr/share/doc/tde/HTML/en/k9copy usr/share/doc/k9copy/html
 
 build/k9copy::
diff --git a/debian/lenny/applications/kaffeine/debian/changelog b/debian/lenny/applications/kaffeine/debian/changelog
index 2441c46c2..ae8921760 100644
--- a/debian/lenny/applications/kaffeine/debian/changelog
+++ b/debian/lenny/applications/kaffeine/debian/changelog
@@ -166,7 +166,7 @@ kaffeine (0.8.4-1) unstable; urgency=low
     - fails to properly play files with names containing '#' character
     (Closes: #362807)
   * Build-Depends: libogg-dev
-  * Add /usr/share/applications/kde/kaffeine-iso.desktop
+  * Add /usr/share/applications/tde/kaffeine-iso.desktop
     - play DVD ISO files on filesystem (rather than in DVD drive)
     automatically (Closes: #402382)
 
diff --git a/debian/lenny/applications/kaffeine/debian/kaffeine-iso.desktop b/debian/lenny/applications/kaffeine/debian/kaffeine-iso.desktop
index c1d407f15..63cf8f167 100644
--- a/debian/lenny/applications/kaffeine/debian/kaffeine-iso.desktop
+++ b/debian/lenny/applications/kaffeine/debian/kaffeine-iso.desktop
@@ -1,4 +1,4 @@
-# this file is "/usr/share/applications/kde/kaffeine-iso.desktop"
+# this file is "/usr/share/applications/tde/kaffeine-iso.desktop"
 [Desktop Entry]
 Exec=kaffeine dvd:%f
 Icon=kaffeine
diff --git a/debian/lenny/applications/kaffeine/debian/rules b/debian/lenny/applications/kaffeine/debian/rules
index 9dc73fe0f..8e053f058 100755
--- a/debian/lenny/applications/kaffeine/debian/rules
+++ b/debian/lenny/applications/kaffeine/debian/rules
@@ -33,7 +33,7 @@ install/kaffeine-trinity::
 	install -D -p -m0644 debian/kaffeine.xpm debian/kaffeine/opt/trinity/share/pixmaps/kaffeine.xpm
 	install -D -p -m0644 debian/kaffeine-trinity.lintian-overrides debian/kaffeine/opt/trinity/share/lintian/overrides/kaffeine
 	install -D -p -m0755 debian/install-css.sh debian/kaffeine/opt/trinity/share/doc/kaffeine/install-css.sh
-	install -D -p -m0644 debian/kaffeine-iso.desktop debian/kaffeine/opt/trinity/share/applications/kde/kaffeine-iso.desktop
+	install -D -p -m0644 debian/kaffeine-iso.desktop debian/kaffeine/opt/trinity/share/applications/tde/kaffeine-iso.desktop
 
 	#Debian additions
 	install -D -p -m0755 debian/install-codecs debian/kaffeine/opt/trinity/lib/kaffeine/install-codecs
diff --git a/debian/lenny/applications/kdiff3/debian/rules b/debian/lenny/applications/kdiff3/debian/rules
index ef9215c19..bc64fcc06 100755
--- a/debian/lenny/applications/kdiff3/debian/rules
+++ b/debian/lenny/applications/kdiff3/debian/rules
@@ -80,8 +80,8 @@ install: build
 	mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
 	mv $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
 	# move kdiff3.desktop to freedesktop.org conforming place
-	mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/applications/kde/
-	mv $(CURDIR)/debian/tmp/opt/trinity/share/applnk/Development/kdiff3.desktop $(CURDIR)/debian/tmp/opt/trinity/share/applications/kde/
+	mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/
+	mv $(CURDIR)/debian/tmp/opt/trinity/share/applnk/Development/kdiff3.desktop $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/
 
 
 # Build architecture-independent files here.
diff --git a/debian/lenny/applications/kile/debian/kile-trinity.install b/debian/lenny/applications/kile/debian/kile-trinity.install
index 3d82db5d5..52d706863 100644
--- a/debian/lenny/applications/kile/debian/kile-trinity.install
+++ b/debian/lenny/applications/kile/debian/kile-trinity.install
@@ -1,5 +1,5 @@
 opt/trinity/bin/kile
-/opt/trinity/share/applications/kde/kile.desktop
+/opt/trinity/share/applications/tde/kile.desktop
 /opt/trinity/share/apps/kconf_update
 /opt/trinity/share/apps/kile
 /opt/trinity/share/config.kcfg/kile.kcfg
diff --git a/debian/lenny/applications/kmplayer/debian/kmplayer-trinity.install b/debian/lenny/applications/kmplayer/debian/kmplayer-trinity.install
index f25460f29..f27e64ad7 100644
--- a/debian/lenny/applications/kmplayer/debian/kmplayer-trinity.install
+++ b/debian/lenny/applications/kmplayer/debian/kmplayer-trinity.install
@@ -3,5 +3,5 @@ opt/trinity/lib/trinity/kmplayer.so
 opt/trinity/bin/kmplayer
 opt/trinity/bin/kxvplayer
 /opt/trinity/share/apps/kmplayer/kmplayerui.rc
-/opt/trinity/share/applications/kde/kmplayer.desktop
+/opt/trinity/share/applications/tde/kmplayer.desktop
 /opt/trinity/share/locale
diff --git a/debian/lenny/applications/kmyfirewall/debian/install b/debian/lenny/applications/kmyfirewall/debian/install
index 02500414f..d7b3c5848 100644
--- a/debian/lenny/applications/kmyfirewall/debian/install
+++ b/debian/lenny/applications/kmyfirewall/debian/install
@@ -1,3 +1,3 @@
 debian/kmfinstallerplugin.desktop usr/share/servicetypes
-debian/kmyfirewall.desktop usr/share/applications/kde
+debian/kmyfirewall.desktop usr/share/applications/tde
 debian/kmyfirewall.xpm usr/share/pixmaps
diff --git a/debian/lenny/applications/kmymoney/debian/kmymoney2-trinity.install b/debian/lenny/applications/kmymoney/debian/kmymoney2-trinity.install
index 89ecca2de..8489f7384 100644
--- a/debian/lenny/applications/kmymoney/debian/kmymoney2-trinity.install
+++ b/debian/lenny/applications/kmymoney/debian/kmymoney2-trinity.install
@@ -3,4 +3,4 @@ opt/trinity/bin/kmymoney*
 opt/trinity/lib/trinity/kmm_ofximport.la
 opt/trinity/lib/trinity/kmm_ofximport.so
 opt/trinity/lib/lib*.so.*
-opt/trinity/share/applications/kde/kmymoney2.desktop
+opt/trinity/share/applications/tde/kmymoney2.desktop
diff --git a/debian/lenny/applications/knemo/debian/dirs b/debian/lenny/applications/knemo/debian/dirs
index d6f374669..2025e042b 100644
--- a/debian/lenny/applications/knemo/debian/dirs
+++ b/debian/lenny/applications/knemo/debian/dirs
@@ -1 +1 @@
-usr/share/applications/kde
+usr/share/applications/tde
diff --git a/debian/lenny/applications/knowit/debian/rules b/debian/lenny/applications/knowit/debian/rules
index 5af8a0aa8..06d310592 100755
--- a/debian/lenny/applications/knowit/debian/rules
+++ b/debian/lenny/applications/knowit/debian/rules
@@ -70,8 +70,8 @@ install: build
 	dh_installdirs
 	dh_icons
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/knowit-trinity
-	mkdir -p $(CURDIR)/debian/knowit-trinity/opt/trinity/share/applications/kde
-	mv $(CURDIR)/debian/knowit-trinity/opt/trinity/share/applnk/Applications/knowit.desktop $(CURDIR)/debian/knowit-trinity/opt/trinity/share/applications/kde/knowit.desktop
+	mkdir -p $(CURDIR)/debian/knowit-trinity/opt/trinity/share/applications/tde
+	mv $(CURDIR)/debian/knowit-trinity/opt/trinity/share/applnk/Applications/knowit.desktop $(CURDIR)/debian/knowit-trinity/opt/trinity/share/applications/tde/knowit.desktop
 	rm -r $(CURDIR)/debian/knowit-trinity/opt/trinity/share/applnk
 
 # Build architecture-independent files here.
diff --git a/debian/lenny/applications/koffice/debian/chalk-data-trinity.install b/debian/lenny/applications/koffice/debian/chalk-data-trinity.install
index a37b11ace..7bed60e6c 100644
--- a/debian/lenny/applications/koffice/debian/chalk-data-trinity.install
+++ b/debian/lenny/applications/koffice/debian/chalk-data-trinity.install
@@ -1,5 +1,5 @@
 debian/chalk.xpm opt/trinity/share/pixmaps
-debian/tmp/opt/trinity/share/applications/kde/chalk.desktop
+debian/tmp/opt/trinity/share/applications/tde/chalk.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/chalk_jpeg.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/chalk_openexr.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/chalk_pdf.desktop
diff --git a/debian/lenny/applications/koffice/debian/chalk-data-trinity.lintian b/debian/lenny/applications/koffice/debian/chalk-data-trinity.lintian
index bf1a99e00..820cf112f 100644
--- a/debian/lenny/applications/koffice/debian/chalk-data-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/chalk-data-trinity.lintian
@@ -14,4 +14,4 @@ chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/torturef
 chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/changecs/changecs.rb
 chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/invertruby/invert.rb
 chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/randompaint/randompaint.rc
-chalk-data: desktop-command-not-in-package /usr/share/applications/kde/chalk.desktop chalk
+chalk-data: desktop-command-not-in-package /usr/share/applications/tde/chalk.desktop chalk
diff --git a/debian/lenny/applications/koffice/debian/changelog b/debian/lenny/applications/koffice/debian/changelog
index fa9c8a04f..f68f16811 100644
--- a/debian/lenny/applications/koffice/debian/changelog
+++ b/debian/lenny/applications/koffice/debian/changelog
@@ -312,7 +312,7 @@ koffice (1:1.6.2-1) unstable; urgency=low
   * Upstream branch pull, including fixes to have kexi building against
     the new libpqxx, closes: #420477
   * Updated *.install and *.docs to reflect new Chalk plugins, .desktop files
-    moved to /usr/share/applications/kde/ and other small changes
+    moved to /usr/share/applications/tde/ and other small changes
 
  -- Isaac Clerencia <isaac@debian.org>  Wed, 28 Feb 2007 08:30:28 +0100
 
diff --git a/debian/lenny/applications/koffice/debian/karbon-trinity.install b/debian/lenny/applications/koffice/debian/karbon-trinity.install
index a3649c378..a03e53a02 100644
--- a/debian/lenny/applications/koffice/debian/karbon-trinity.install
+++ b/debian/lenny/applications/koffice/debian/karbon-trinity.install
@@ -46,7 +46,7 @@ debian/tmp/opt/trinity/lib/trinity/libwmfimport.la
 debian/tmp/opt/trinity/lib/trinity/libwmfimport.so
 debian/tmp/opt/trinity/lib/libkarboncommon.so.*
 debian/tmp/opt/trinity/lib/libtdeinit_karbon.so
-debian/tmp/opt/trinity/share/applications/kde/karbon.desktop
+debian/tmp/opt/trinity/share/applications/tde/karbon.desktop
 debian/tmp/opt/trinity/share/apps/karbon
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/karbon_konqi.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/karbon/*.bz2
diff --git a/debian/lenny/applications/koffice/debian/kchart-trinity.install b/debian/lenny/applications/koffice/debian/kchart-trinity.install
index 90c1a6824..c5d3596c2 100644
--- a/debian/lenny/applications/koffice/debian/kchart-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kchart-trinity.install
@@ -22,7 +22,7 @@ debian/tmp/opt/trinity/lib/libkchartcommon.so.*
 debian/tmp/opt/trinity/lib/libkchartimageexport.so.*
 debian/tmp/opt/trinity/lib/libkdchart.*
 debian/tmp/opt/trinity/lib/libtdeinit_kchart.so
-debian/tmp/opt/trinity/share/applications/kde/kchart.desktop
+debian/tmp/opt/trinity/share/applications/tde/kchart.desktop
 debian/tmp/opt/trinity/share/apps/kchart
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kchart_konqi.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kchart/*.bz2
diff --git a/debian/lenny/applications/koffice/debian/kexi-trinity.install b/debian/lenny/applications/koffice/debian/kexi-trinity.install
index 3ff92c525..8cc760616 100644
--- a/debian/lenny/applications/koffice/debian/kexi-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kexi-trinity.install
@@ -61,7 +61,7 @@ debian/tmp/opt/trinity/lib/libkexisql2.so.*
 debian/tmp/opt/trinity/lib/libkexisql3.so.*
 debian/tmp/opt/trinity/lib/libkexiutils.so.*
 debian/tmp/opt/trinity/lib/libkformdesigner.so.*
-debian/tmp/opt/trinity/share/applications/kde/kexi.desktop
+debian/tmp/opt/trinity/share/applications/tde/kexi.desktop
 debian/tmp/opt/trinity/share/apps/kexi/examples/Simple_Database.kexi
 debian/tmp/opt/trinity/share/apps/kexi/icons/crystalsvg/128x128/actions/form_action.png
 debian/tmp/opt/trinity/share/apps/kexi/icons/crystalsvg/16x16/actions/add_field.png
diff --git a/debian/lenny/applications/koffice/debian/kformula-trinity.install b/debian/lenny/applications/koffice/debian/kformula-trinity.install
index 1339cfb67..c97a73fa5 100644
--- a/debian/lenny/applications/koffice/debian/kformula-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kformula-trinity.install
@@ -7,7 +7,7 @@ debian/tmp/opt/trinity/lib/trinity/libkformulapart.so
 debian/tmp/opt/trinity/lib/trinity/libkfosvgexport.la
 debian/tmp/opt/trinity/lib/trinity/libkfosvgexport.so
 debian/tmp/opt/trinity/lib/libtdeinit_kformula.so
-debian/tmp/opt/trinity/share/applications/kde/kformula.desktop
+debian/tmp/opt/trinity/share/applications/tde/kformula.desktop
 debian/tmp/opt/trinity/share/apps/kformula
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kformula_konqi.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kformula/*.bz2
diff --git a/debian/lenny/applications/koffice/debian/kivio-data-trinity.install b/debian/lenny/applications/koffice/debian/kivio-data-trinity.install
index 02f3c0322..def29edd1 100644
--- a/debian/lenny/applications/koffice/debian/kivio-data-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kivio-data-trinity.install
@@ -1,5 +1,5 @@
 debian/kivio.xpm opt/trinity/share/pixmaps
-debian/tmp/opt/trinity/share/applications/kde/kivio.desktop
+debian/tmp/opt/trinity/share/applications/tde/kivio.desktop
 debian/tmp/opt/trinity/share/apps/kivio
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kivio_konqi.desktop
 debian/tmp/opt/trinity/share/config.kcfg/kivio.kcfg
diff --git a/debian/lenny/applications/koffice/debian/kivio-data-trinity.lintian b/debian/lenny/applications/koffice/debian/kivio-data-trinity.lintian
index a5c25f78c..d77987c69 100644
--- a/debian/lenny/applications/koffice/debian/kivio-data-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kivio-data-trinity.lintian
@@ -1,2 +1,2 @@
-kivio-data: desktop-command-not-in-package /usr/share/applications/kde/kivio.desktop kivio
+kivio-data: desktop-command-not-in-package /usr/share/applications/tde/kivio.desktop kivio
 
diff --git a/debian/lenny/applications/koffice/debian/koffice-data-trinity.install b/debian/lenny/applications/koffice/debian/koffice-data-trinity.install
index 2f17354e2..cc7cbb4ac 100644
--- a/debian/lenny/applications/koffice/debian/koffice-data-trinity.install
+++ b/debian/lenny/applications/koffice/debian/koffice-data-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/share/applications/kde/koffice.desktop
+debian/tmp/opt/trinity/share/applications/tde/koffice.desktop
 debian/tmp/opt/trinity/share/apps/koffice
 debian/tmp/opt/trinity/share/apps/kofficewidgets
 debian/tmp/opt/trinity/share/apps/xsltfilter
diff --git a/debian/lenny/applications/koffice/debian/koshell-trinity.install b/debian/lenny/applications/koffice/debian/koshell-trinity.install
index 165f4a36c..4b63bd352 100644
--- a/debian/lenny/applications/koffice/debian/koshell-trinity.install
+++ b/debian/lenny/applications/koffice/debian/koshell-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/bin/koshell
 debian/tmp/opt/trinity/lib/trinity/koshell.la
 debian/tmp/opt/trinity/lib/trinity/koshell.so
 debian/tmp/opt/trinity/lib/libtdeinit_koshell.so
-debian/tmp/opt/trinity/share/applications/kde/koshell.desktop
+debian/tmp/opt/trinity/share/applications/tde/koshell.desktop
 debian/tmp/opt/trinity/share/apps/koshell/koshellui.rc
 debian/tmp/opt/trinity/share/config.kcfg/koshell.kcfg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/koshell/*.bz2
diff --git a/debian/lenny/applications/koffice/debian/kplato-trinity.install b/debian/lenny/applications/koffice/debian/kplato-trinity.install
index ba215cc43..8c3df29c3 100644
--- a/debian/lenny/applications/koffice/debian/kplato-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kplato-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/lib/trinity/kplato.so
 debian/tmp/opt/trinity/lib/trinity/libkplatopart.la
 debian/tmp/opt/trinity/lib/trinity/libkplatopart.so
 debian/tmp/opt/trinity/lib/libtdeinit_kplato.so
-debian/tmp/opt/trinity/share/applications/kde/kplato.desktop
+debian/tmp/opt/trinity/share/applications/tde/kplato.desktop
 debian/tmp/opt/trinity/share/apps/kplato/icons/crystalsvg/22x22/actions/accounts.png
 debian/tmp/opt/trinity/share/apps/kplato/icons/crystalsvg/22x22/actions/add_milestone.png
 debian/tmp/opt/trinity/share/apps/kplato/icons/crystalsvg/22x22/actions/add_sub_task.png
diff --git a/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.install b/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.install
index 3322113fc..78ebe09f2 100644
--- a/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.install
@@ -1,5 +1,5 @@
 debian/kpresenter.xpm opt/trinity/share/pixmaps
-debian/tmp/opt/trinity/share/applications/kde/kpresenter.desktop
+debian/tmp/opt/trinity/share/applications/tde/kpresenter.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kpresenter_konqi.desktop
 debian/tmp/opt/trinity/share/apps/kpresenter
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpresenter/*.bz2
diff --git a/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.lintian b/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.lintian
index af719fd2f..68e69e640 100644
--- a/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.lintian
@@ -1,2 +1,2 @@
-kpresenter-data: desktop-command-not-in-package /usr/share/applications/kde/kpresenter.desktop kpresenter
+kpresenter-data: desktop-command-not-in-package /usr/share/applications/tde/kpresenter.desktop kpresenter
 
diff --git a/debian/lenny/applications/koffice/debian/kspread-trinity.install b/debian/lenny/applications/koffice/debian/kspread-trinity.install
index 5988b97be..ee708351b 100644
--- a/debian/lenny/applications/koffice/debian/kspread-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kspread-trinity.install
@@ -38,7 +38,7 @@ debian/tmp/opt/trinity/lib/trinity/libqproimport.la
 debian/tmp/opt/trinity/lib/trinity/libqproimport.so
 debian/tmp/opt/trinity/lib/libtdeinit_kspread.so
 debian/tmp/opt/trinity/lib/libkspreadcommon.so.*
-debian/tmp/opt/trinity/share/applications/kde/kspread.desktop
+debian/tmp/opt/trinity/share/applications/tde/kspread.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kspread_konqi.desktop
 debian/tmp/opt/trinity/share/apps/kspread
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspread/*.bz2
diff --git a/debian/lenny/applications/koffice/debian/kugar-trinity.install b/debian/lenny/applications/koffice/debian/kugar-trinity.install
index 8dd8860bb..0cda2bece 100644
--- a/debian/lenny/applications/koffice/debian/kugar-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kugar-trinity.install
@@ -16,8 +16,8 @@ debian/tmp/opt/trinity/lib/libtdeinit_kugar.so
 debian/tmp/opt/trinity/lib/libkudesignercore.la
 debian/tmp/opt/trinity/lib/libkudesignercore.so
 debian/tmp/opt/trinity/lib/libkugarlib.so.*
-debian/tmp/opt/trinity/share/applications/kde/kudesigner.desktop
-debian/tmp/opt/trinity/share/applications/kde/kugar.desktop
+debian/tmp/opt/trinity/share/applications/tde/kudesigner.desktop
+debian/tmp/opt/trinity/share/applications/tde/kugar.desktop
 debian/tmp/opt/trinity/share/apps/kudesigner
 debian/tmp/opt/trinity/share/apps/kugar
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kugar/*.bz2
diff --git a/debian/lenny/applications/koffice/debian/kword-data-trinity.install b/debian/lenny/applications/koffice/debian/kword-data-trinity.install
index 32f9e2f9c..7c702418e 100644
--- a/debian/lenny/applications/koffice/debian/kword-data-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kword-data-trinity.install
@@ -1,5 +1,5 @@
 debian/kword.xpm opt/trinity/share/pixmaps
-debian/tmp/opt/trinity/share/applications/kde/kword.desktop
+debian/tmp/opt/trinity/share/applications/tde/kword.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kword_konqi.desktop
 debian/tmp/opt/trinity/share/apps/kword
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kword/*.bz2
diff --git a/debian/lenny/applications/koffice/debian/kword-data-trinity.lintian b/debian/lenny/applications/koffice/debian/kword-data-trinity.lintian
index 2bc903eb9..6fa3d857b 100644
--- a/debian/lenny/applications/koffice/debian/kword-data-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kword-data-trinity.lintian
@@ -1,2 +1,2 @@
-kword-data: desktop-command-not-in-package /usr/share/applications/kde/kword.desktop kword
+kword-data: desktop-command-not-in-package /usr/share/applications/tde/kword.desktop kword
 
diff --git a/debian/lenny/applications/konversation/debian/konversation-trinity.install b/debian/lenny/applications/konversation/debian/konversation-trinity.install
index ca10af6cf..8a6cf218e 100644
--- a/debian/lenny/applications/konversation/debian/konversation-trinity.install
+++ b/debian/lenny/applications/konversation/debian/konversation-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/konversation
-debian/tmp/opt/trinity/share/applications/kde/konversation.desktop
+debian/tmp/opt/trinity/share/applications/tde/konversation.desktop
 debian/tmp/opt/trinity/share/apps/kconf_update/*
 debian/tmp/opt/trinity/share/apps/konversation/eventsrc
 debian/tmp/opt/trinity/share/apps/konversation/konversationui.rc
diff --git a/debian/lenny/applications/ksystemlog/debian/rules b/debian/lenny/applications/ksystemlog/debian/rules
index 6571b56cb..4764fc4b2 100755
--- a/debian/lenny/applications/ksystemlog/debian/rules
+++ b/debian/lenny/applications/ksystemlog/debian/rules
@@ -32,7 +32,7 @@ build/ksystemlog-trinity::
 
 install/ksystemlog-trinity::
 	install -D -p -m0644 ksystemlog/src/ksystemlog.desktop \
-	  debian/ksystemlog-trinity/opt/trinity/share/applications/kde/ksystemlog.desktop
+	  debian/ksystemlog-trinity/opt/trinity/share/applications/tde/ksystemlog.desktop
 
 binary-post-install/ksystemlog-trinity::
 	rm -rf debian/ksystemlog/opt/trinity/share/applnk/
diff --git a/debian/lenny/applications/kvpnc/debian/README.Debian b/debian/lenny/applications/kvpnc/debian/README.Debian
index a65e1a72c..fe3b96cf6 100644
--- a/debian/lenny/applications/kvpnc/debian/README.Debian
+++ b/debian/lenny/applications/kvpnc/debian/README.Debian
@@ -17,7 +17,7 @@ Howto setup kvpnc for use without root password using sudo:
    # User privilege specification
    ALL ALL=NOPASSWD:KVPNC
 
- * Edit desktop link /usr/share/applications/kde/Internet/kvpnc.desktop
+ * Edit desktop link /usr/share/applications/tde/Internet/kvpnc.desktop
 
    * replace the folling lines:
 
diff --git a/debian/lenny/applications/kvpnc/debian/rules b/debian/lenny/applications/kvpnc/debian/rules
index 22a49ef44..354c23311 100755
--- a/debian/lenny/applications/kvpnc/debian/rules
+++ b/debian/lenny/applications/kvpnc/debian/rules
@@ -32,7 +32,7 @@ install/kvpnc-trinity::
 
 	# install desktop file in applications
 	install -D -p -m0644 src/kvpnc.desktop \
-	  debian/kvpnc-trinity/opt/trinity/share/applications/kde/kvpnc.desktop
+	  debian/kvpnc-trinity/opt/trinity/share/applications/tde/kvpnc.desktop
 
 binary-post-install/kvpnc-trinity::
 	rm -rf debian/kvpnc-trinity/opt/trinity/share/applnk/
diff --git a/debian/lenny/applications/soundkonverter/debian/soundkonverter-trinity.install b/debian/lenny/applications/soundkonverter/debian/soundkonverter-trinity.install
index 0f6801b72..fcfaef212 100644
--- a/debian/lenny/applications/soundkonverter/debian/soundkonverter-trinity.install
+++ b/debian/lenny/applications/soundkonverter/debian/soundkonverter-trinity.install
@@ -1,5 +1,5 @@
 opt/trinity/bin/soundkonverter
-opt/trinity/share/applications/kde/soundkonverter.desktop
+opt/trinity/share/applications/tde/soundkonverter.desktop
 opt/trinity/share/apps/soundkonverter/soundkonverterui.rc
 opt/trinity/share/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop
 opt/trinity/share/apps/soundkonverter/format_infos/
diff --git a/debian/lenny/applications/tde-guidance/debian/tde-guidance-trinity.install b/debian/lenny/applications/tde-guidance/debian/tde-guidance-trinity.install
index 7064c79c0..11947924b 100644
--- a/debian/lenny/applications/tde-guidance/debian/tde-guidance-trinity.install
+++ b/debian/lenny/applications/tde-guidance/debian/tde-guidance-trinity.install
@@ -27,10 +27,10 @@ opt/trinity/share/doc/tde/HTML/en/guidance/installation.html
 opt/trinity/share/doc/tde/HTML/en/guidance/requirements.html
 opt/trinity/share/doc/tde/HTML/en/guidance/compilation.html
 opt/trinity/share/doc/tde/HTML/en/guidance/configuration.html
-opt/trinity/share/applications/kde/serviceconfig.desktop
-opt/trinity/share/applications/kde/userconfig.desktop
-opt/trinity/share/applications/kde/mountconfig.desktop
-opt/trinity/share/applications/kde/wineconfig.desktop
+opt/trinity/share/applications/tde/serviceconfig.desktop
+opt/trinity/share/applications/tde/userconfig.desktop
+opt/trinity/share/applications/tde/mountconfig.desktop
+opt/trinity/share/applications/tde/wineconfig.desktop
 opt/trinity/share/apps/guidance/pics/laserwarn.png
 opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png
 opt/trinity/share/apps/guidance/pics/hi16-encrypted.png
diff --git a/debian/lenny/applications/tde-systemsettings/debian/rules b/debian/lenny/applications/tde-systemsettings/debian/rules
index 588264407..f4204f328 100755
--- a/debian/lenny/applications/tde-systemsettings/debian/rules
+++ b/debian/lenny/applications/tde-systemsettings/debian/rules
@@ -37,8 +37,8 @@ install/tde-systemsettings-trinity::
 	# Don't clash files, just Use the ones from kcontrol
 	rm debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/kde-settings-power.directory
 	rm debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/kde-settings-system.directory
-	rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/kde/kcmfontinst.desktop
-	rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/kde/laptoppowermanagement.desktop
+	rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/tde/kcmfontinst.desktop
+	rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/tde/laptoppowermanagement.desktop
 	cp debian/kde-settings-laptops.directory debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/
 
 DEB_INSTALL_MANPAGES_tde-systemsettings-trinity = systemsettings.1
diff --git a/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.install b/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.install
index 4a466ec72..fe0936b26 100644
--- a/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.install
+++ b/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.install
@@ -9,6 +9,6 @@ debian/tmp/opt/trinity/share/apps/kconf_update/
 debian/tmp/opt/trinity/share/icons/
 debian/tmp/opt/trinity/share/locale/*/LC_MESSAGES/*.mo
 debian/tmp/opt/trinity/share/config.kcfg/
-debian/tmp/opt/trinity/share/applications/kde/*.desktop
+debian/tmp/opt/trinity/share/applications/tde/*.desktop
 debian/tmp/opt/trinity/share/doc/tde/
 
diff --git a/debian/lenny/applications/tdmtheme/debian/tdmtheme.lintian-overrides b/debian/lenny/applications/tdmtheme/debian/tdmtheme.lintian-overrides
index 88969d336..be194270f 100644
--- a/debian/lenny/applications/tdmtheme/debian/tdmtheme.lintian-overrides
+++ b/debian/lenny/applications/tdmtheme/debian/tdmtheme.lintian-overrides
@@ -1,6 +1,6 @@
 # provided by tdelibs
-tdmtheme: desktop-command-not-in-package ./usr/share/applications/kde/tdmtheme.desktop kcmshell
+tdmtheme: desktop-command-not-in-package ./usr/share/applications/tde/tdmtheme.desktop kcmshell
 # kcontrol module
-tdmtheme: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/applications/kde/tdmtheme.desktop
-tdmtheme: desktop-entry-lacks-main-category ./usr/share/applications/kde/tdmtheme.desktop
+tdmtheme: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/applications/tde/tdmtheme.desktop
+tdmtheme: desktop-entry-lacks-main-category ./usr/share/applications/tde/tdmtheme.desktop
 
diff --git a/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.dirs b/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.dirs
index 57855aec4..110a71185 100644
--- a/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.dirs
+++ b/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.dirs
@@ -1 +1 @@
-opt/trinity/share/applications/kde
+opt/trinity/share/applications/tde
diff --git a/debian/lenny/tdeaccessibility/debian/ksayit-trinity.install b/debian/lenny/tdeaccessibility/debian/ksayit-trinity.install
index f4a7297c0..010831729 100644
--- a/debian/lenny/tdeaccessibility/debian/ksayit-trinity.install
+++ b/debian/lenny/tdeaccessibility/debian/ksayit-trinity.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/lib/libKTTSD_Lib.la
 debian/tmp/opt/trinity/lib/libKTTSD_Lib.so
 debian/tmp/opt/trinity/lib/libKTTSD_Lib.so.0
 debian/tmp/opt/trinity/lib/libKTTSD_Lib.so.0.0.1
-debian/tmp/opt/trinity/share/applications/kde/ksayit.desktop
+debian/tmp/opt/trinity/share/applications/tde/ksayit.desktop
 debian/tmp/opt/trinity/share/apps/ksayit/ContextMenus.xml
 debian/tmp/opt/trinity/share/apps/ksayit/ksayitui.rc
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/ksayit.png
diff --git a/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install b/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install
index 550a4fa02..cd7b93d85 100644
--- a/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install
+++ b/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install
@@ -32,8 +32,8 @@ debian/tmp/opt/trinity/lib/libkttsd.la
 debian/tmp/opt/trinity/lib/libkttsd.so
 debian/tmp/opt/trinity/lib/libkttsd.so.1
 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0
-debian/tmp/opt/trinity/share/applications/kde/kcmkttsd.desktop
-debian/tmp/opt/trinity/share/applications/kde/kttsmgr.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmkttsd.desktop
+debian/tmp/opt/trinity/share/applications/tde/kttsmgr.desktop
 debian/tmp/opt/trinity/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc
 debian/tmp/opt/trinity/share/apps/kttsd/festivalint/sabletowave.scm
 debian/tmp/opt/trinity/share/apps/kttsd/festivalint/voices
diff --git a/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 b/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
index ad08c3f72..3ebc7a7a8 100644
--- a/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
+++ b/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
@@ -30,8 +30,8 @@ debian/tmp/opt/trinity/lib/libkttsd.la
 debian/tmp/opt/trinity/lib/libkttsd.so
 debian/tmp/opt/trinity/lib/libkttsd.so.1
 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0
-debian/tmp/usr/share/applications/kde/kcmkttsd.desktop
-debian/tmp/usr/share/applications/kde/kttsmgr.desktop
+debian/tmp/usr/share/applications/tde/kcmkttsd.desktop
+debian/tmp/usr/share/applications/tde/kttsmgr.desktop
 debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc
 debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm
 debian/tmp/usr/share/apps/kttsd/festivalint/voices
diff --git a/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 b/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
index ad08c3f72..3ebc7a7a8 100644
--- a/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
+++ b/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
@@ -30,8 +30,8 @@ debian/tmp/opt/trinity/lib/libkttsd.la
 debian/tmp/opt/trinity/lib/libkttsd.so
 debian/tmp/opt/trinity/lib/libkttsd.so.1
 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0
-debian/tmp/usr/share/applications/kde/kcmkttsd.desktop
-debian/tmp/usr/share/applications/kde/kttsmgr.desktop
+debian/tmp/usr/share/applications/tde/kcmkttsd.desktop
+debian/tmp/usr/share/applications/tde/kttsmgr.desktop
 debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc
 debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm
 debian/tmp/usr/share/apps/kttsd/festivalint/voices
diff --git a/debian/lenny/tdeaddons/debian/atlantikdesigner-trinity.install b/debian/lenny/tdeaddons/debian/atlantikdesigner-trinity.install
index 825b20fde..b5b57ed32 100644
--- a/debian/lenny/tdeaddons/debian/atlantikdesigner-trinity.install
+++ b/debian/lenny/tdeaddons/debian/atlantikdesigner-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/bin/atlantikdesigner
 debian/tmp/opt/trinity/share/apps/atlantikdesigner
-debian/tmp/opt/trinity/share/applications/kde/atlantikdesigner.desktop
+debian/tmp/opt/trinity/share/applications/tde/atlantikdesigner.desktop
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/atlantikdesigner.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/atlantikdesigner.png
 debian/icons/atlantikdesigner.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdeaddons/debian/ksig-trinity.install b/debian/lenny/tdeaddons/debian/ksig-trinity.install
index 9f0d70be0..10959a93a 100644
--- a/debian/lenny/tdeaddons/debian/ksig-trinity.install
+++ b/debian/lenny/tdeaddons/debian/ksig-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/ksig
-debian/tmp/opt/trinity/share/applications/kde/ksig.desktop
+debian/tmp/opt/trinity/share/applications/tde/ksig.desktop
 debian/tmp/opt/trinity/share/apps/ksig/ksigui.rc
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/ksig.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ksig.png
diff --git a/debian/lenny/tdeadmin/debian/kcron-trinity.install b/debian/lenny/tdeadmin/debian/kcron-trinity.install
index 45ad26a61..30f478b3a 100644
--- a/debian/lenny/tdeadmin/debian/kcron-trinity.install
+++ b/debian/lenny/tdeadmin/debian/kcron-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/kcron
-debian/tmp/opt/trinity/share/applications/kde/kcron.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcron.desktop
 debian/tmp/opt/trinity/share/apps/kcron/kcronui.rc
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcron/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcron/index.cache.bz2
diff --git a/debian/lenny/tdeadmin/debian/kdat-trinity.install b/debian/lenny/tdeadmin/debian/kdat-trinity.install
index 2f7665f37..fc9d79002 100644
--- a/debian/lenny/tdeadmin/debian/kdat-trinity.install
+++ b/debian/lenny/tdeadmin/debian/kdat-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/kdat
-debian/tmp/opt/trinity/share/applications/kde/kdat.desktop
+debian/tmp/opt/trinity/share/applications/tde/kdat.desktop
 debian/tmp/opt/trinity/share/apps/kdat/icons/hicolor/16x16/apps/kdat.png
 debian/tmp/opt/trinity/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_archive.png
 debian/tmp/opt/trinity/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_backup.png
diff --git a/debian/lenny/tdeadmin/debian/knetworkconf-trinity.install b/debian/lenny/tdeadmin/debian/knetworkconf-trinity.install
index cd5b1d3b4..ec0333100 100644
--- a/debian/lenny/tdeadmin/debian/knetworkconf-trinity.install
+++ b/debian/lenny/tdeadmin/debian/knetworkconf-trinity.install
@@ -51,6 +51,6 @@ debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/vine.png
 debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/rpath.png
 debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/kubuntu.png
 debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/yoper.png
-debian/tmp/opt/trinity/share/applications/kde/kcm_knetworkconfmodule.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcm_knetworkconfmodule.desktop
 debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.so
 debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.la
diff --git a/debian/lenny/tdeadmin/debian/kpackage-trinity.install b/debian/lenny/tdeadmin/debian/kpackage-trinity.install
index 20c26fbe0..0aac54e24 100644
--- a/debian/lenny/tdeadmin/debian/kpackage-trinity.install
+++ b/debian/lenny/tdeadmin/debian/kpackage-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/kpackage
-debian/tmp/opt/trinity/share/applications/kde/kpackage.desktop
+debian/tmp/opt/trinity/share/applications/tde/kpackage.desktop
 debian/tmp/opt/trinity/share/apps/kpackage/kpackageui.rc
 debian/tmp/opt/trinity/share/apps/kpackage/pics/bnew.png
 debian/tmp/opt/trinity/share/apps/kpackage/pics/bsd.png
diff --git a/debian/lenny/tdeadmin/debian/ksysv-trinity.install b/debian/lenny/tdeadmin/debian/ksysv-trinity.install
index 10cd19549..8cfb46dc1 100644
--- a/debian/lenny/tdeadmin/debian/ksysv-trinity.install
+++ b/debian/lenny/tdeadmin/debian/ksysv-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/ksysv
-debian/tmp/opt/trinity/share/applications/kde/ksysv.desktop
+debian/tmp/opt/trinity/share/applications/tde/ksysv.desktop
 debian/tmp/opt/trinity/share/apps/ksysv/ksysvui.rc
 debian/tmp/opt/trinity/share/apps/ksysv/pics/ksysv_locked.png
 debian/tmp/opt/trinity/share/apps/ksysv/pics/ksysv_restart.png
diff --git a/debian/lenny/tdeadmin/debian/kuser-trinity.install b/debian/lenny/tdeadmin/debian/kuser-trinity.install
index a941c76e5..24f6c245d 100644
--- a/debian/lenny/tdeadmin/debian/kuser-trinity.install
+++ b/debian/lenny/tdeadmin/debian/kuser-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/kuser
-debian/tmp/opt/trinity/share/applications/kde/kuser.desktop
+debian/tmp/opt/trinity/share/applications/tde/kuser.desktop
 debian/tmp/opt/trinity/share/apps/kuser/icons/crystalsvg/22x22/actions/add_group.png
 debian/tmp/opt/trinity/share/apps/kuser/icons/crystalsvg/22x22/actions/add_user.png
 debian/tmp/opt/trinity/share/apps/kuser/icons/crystalsvg/22x22/actions/delete_group.png
diff --git a/debian/lenny/tdeadmin/debian/lilo-config-trinity.install b/debian/lenny/tdeadmin/debian/lilo-config-trinity.install
index ca3d4e06e..a30ed1fe7 100644
--- a/debian/lenny/tdeadmin/debian/lilo-config-trinity.install
+++ b/debian/lenny/tdeadmin/debian/lilo-config-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/lib/trinity/kcm_lilo.la
 debian/tmp/opt/trinity/lib/trinity/kcm_lilo.so
-debian/tmp/opt/trinity/share/applications/kde/lilo.desktop
+debian/tmp/opt/trinity/share/applications/tde/lilo.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/lilo-config/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/lilo-config/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/lilo-config/common
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
diff --git a/debian/lenny/tdebindings/debian/kjscmd-trinity.install b/debian/lenny/tdebindings/debian/kjscmd-trinity.install
index e1bbc2e30..a8786e459 100644
--- a/debian/lenny/tdebindings/debian/kjscmd-trinity.install
+++ b/debian/lenny/tdebindings/debian/kjscmd-trinity.install
@@ -1,3 +1,3 @@
 debian/tmp/opt/trinity/bin/kjscmd
-debian/tmp/opt/trinity/share/applications/kde/kjscmd.desktop
+debian/tmp/opt/trinity/share/applications/tde/kjscmd.desktop
 debian/tmp/opt/trinity/share/man/man1/kjscmd.1
diff --git a/debian/lenny/tdeedu/debian/blinken-trinity.install b/debian/lenny/tdeedu/debian/blinken-trinity.install
index b0a94f4f2..033f1086c 100644
--- a/debian/lenny/tdeedu/debian/blinken-trinity.install
+++ b/debian/lenny/tdeedu/debian/blinken-trinity.install
@@ -1,5 +1,5 @@
 opt/trinity/bin/blinken
-/opt/trinity/share/applications/kde/blinken.desktop
+/opt/trinity/share/applications/tde/blinken.desktop
 /opt/trinity/share/apps/blinken/images
 /opt/trinity/share/apps/blinken/sounds
 /opt/trinity/share/config.kcfg/blinken.kcfg
diff --git a/debian/lenny/tdeedu/debian/kalzium-trinity.install b/debian/lenny/tdeedu/debian/kalzium-trinity.install
index 9b9bca470..be9e9bd4d 100644
--- a/debian/lenny/tdeedu/debian/kalzium-trinity.install
+++ b/debian/lenny/tdeedu/debian/kalzium-trinity.install
@@ -1,5 +1,5 @@
 opt/trinity/bin/kalzium
-/opt/trinity/share/applications/kde/kalzium.desktop
+/opt/trinity/share/applications/tde/kalzium.desktop
 /opt/trinity/share/config.kcfg/kalzium.kcfg
 /opt/trinity/share/doc/tde/HTML/en/kalzium/common
 /opt/trinity/share/doc/tde/HTML/en/kalzium/index.cache.bz2
diff --git a/debian/lenny/tdeedu/debian/kanagram-trinity.install b/debian/lenny/tdeedu/debian/kanagram-trinity.install
index 4793db665..747d64a84 100644
--- a/debian/lenny/tdeedu/debian/kanagram-trinity.install
+++ b/debian/lenny/tdeedu/debian/kanagram-trinity.install
@@ -1,5 +1,5 @@
 opt/trinity/bin/kanagram
-/opt/trinity/share/applications/kde/kanagram.desktop
+/opt/trinity/share/applications/tde/kanagram.desktop
 /opt/trinity/share/apps/kanagram
 /opt/trinity/share/config.kcfg/kanagram.kcfg
 /opt/trinity/share/doc/tde/HTML/en/kanagram/common
diff --git a/debian/lenny/tdeedu/debian/kbruch-trinity.install b/debian/lenny/tdeedu/debian/kbruch-trinity.install
index e32bda253..6b4f60d97 100644
--- a/debian/lenny/tdeedu/debian/kbruch-trinity.install
+++ b/debian/lenny/tdeedu/debian/kbruch-trinity.install
@@ -1,6 +1,6 @@
 opt/trinity/bin/kbruch
 /opt/trinity/share/apps/kbruch/kbruchui.rc
-/opt/trinity/share/applications/kde/kbruch.desktop
+/opt/trinity/share/applications/tde/kbruch.desktop
 /opt/trinity/share/config.kcfg/kbruch.kcfg
 /opt/trinity/share/doc/tde/HTML/en/kbruch/*.bz2
 /opt/trinity/share/doc/tde/HTML/en/kbruch/common
diff --git a/debian/lenny/tdeedu/debian/keduca-trinity.install b/debian/lenny/tdeedu/debian/keduca-trinity.install
index 10264f55f..c4ea76970 100644
--- a/debian/lenny/tdeedu/debian/keduca-trinity.install
+++ b/debian/lenny/tdeedu/debian/keduca-trinity.install
@@ -2,8 +2,8 @@ opt/trinity/bin/keduca
 opt/trinity/bin/keducabuilder
 opt/trinity/lib/trinity/libkeducapart.la
 opt/trinity/lib/trinity/libkeducapart.so
-/opt/trinity/share/applications/kde/keduca.desktop
-/opt/trinity/share/applications/kde/keducabuilder.desktop
+/opt/trinity/share/applications/tde/keduca.desktop
+/opt/trinity/share/applications/tde/keducabuilder.desktop
 /opt/trinity/share/apps/keduca
 /opt/trinity/share/config.kcfg/keduca.kcfg
 /opt/trinity/share/doc/tde/HTML/en/keduca/common
diff --git a/debian/lenny/tdeedu/debian/kgeography-trinity.install b/debian/lenny/tdeedu/debian/kgeography-trinity.install
index 01bde9d25..97ceb7fb2 100644
--- a/debian/lenny/tdeedu/debian/kgeography-trinity.install
+++ b/debian/lenny/tdeedu/debian/kgeography-trinity.install
@@ -1,5 +1,5 @@
 opt/trinity/bin/kgeography
-/opt/trinity/share/applications/kde/kgeography.desktop
+/opt/trinity/share/applications/tde/kgeography.desktop
 /opt/trinity/share/config.kcfg/kgeography.kcfg
 /opt/trinity/share/doc/tde/HTML/en/kgeography
 /opt/trinity/share/icons/crystalsvg/128x128/apps/kgeography.png
diff --git a/debian/lenny/tdeedu/debian/khangman-trinity.install b/debian/lenny/tdeedu/debian/khangman-trinity.install
index 2047c5ecb..bd61f0f6d 100644
--- a/debian/lenny/tdeedu/debian/khangman-trinity.install
+++ b/debian/lenny/tdeedu/debian/khangman-trinity.install
@@ -1,6 +1,6 @@
 etc/trinity/khangmanrc
 opt/trinity/bin/khangman
-/opt/trinity/share/applications/kde/khangman.desktop
+/opt/trinity/share/applications/tde/khangman.desktop
 /opt/trinity/share/apps/khangman/data
 /opt/trinity/share/apps/khangman/khangmanui.rc
 /opt/trinity/share/apps/khangman/pics
diff --git a/debian/lenny/tdeedu/debian/kig-trinity.install b/debian/lenny/tdeedu/debian/kig-trinity.install
index 55a817ea8..be8552b20 100644
--- a/debian/lenny/tdeedu/debian/kig-trinity.install
+++ b/debian/lenny/tdeedu/debian/kig-trinity.install
@@ -8,7 +8,7 @@ opt/trinity/lib/trinity/kfile_kig.la
 opt/trinity/lib/trinity/kfile_kig.so
 opt/trinity/lib/trinity/libkigpart.la
 opt/trinity/lib/trinity/libkigpart.so
-/opt/trinity/share/applications/kde/kig.desktop
+/opt/trinity/share/applications/tde/kig.desktop
 /opt/trinity/share/apps/katepart/syntax/python-kig.xml
 /opt/trinity/share/apps/kig
 /opt/trinity/share/doc/tde/HTML/en/kig/*.bz2
diff --git a/debian/lenny/tdeedu/debian/kiten-trinity.install b/debian/lenny/tdeedu/debian/kiten-trinity.install
index 652f08bde..040a3cade 100644
--- a/debian/lenny/tdeedu/debian/kiten-trinity.install
+++ b/debian/lenny/tdeedu/debian/kiten-trinity.install
@@ -1,6 +1,6 @@
 opt/trinity/bin/kiten
 opt/trinity/bin/kitengen
-/opt/trinity/share/applications/kde/kiten.desktop
+/opt/trinity/share/applications/tde/kiten.desktop
 /opt/trinity/share/doc/tde/HTML/en/kiten/common
 /opt/trinity/share/doc/tde/HTML/en/kiten/index.cache.bz2
 /opt/trinity/share/doc/tde/HTML/en/kiten/*.docbook
diff --git a/debian/lenny/tdeedu/debian/klatin-trinity.install b/debian/lenny/tdeedu/debian/klatin-trinity.install
index 239a231f0..1ef736d07 100644
--- a/debian/lenny/tdeedu/debian/klatin-trinity.install
+++ b/debian/lenny/tdeedu/debian/klatin-trinity.install
@@ -1,5 +1,5 @@
 opt/trinity/bin/klatin
-/opt/trinity/share/applications/kde/klatin.desktop
+/opt/trinity/share/applications/tde/klatin.desktop
 /opt/trinity/share/apps/klatin
 /opt/trinity/share/config.kcfg/klatin.kcfg
 /opt/trinity/share/doc/tde/HTML/en/klatin/*.bz2
diff --git a/debian/lenny/tdeedu/debian/klettres-trinity.install b/debian/lenny/tdeedu/debian/klettres-trinity.install
index 793cc5d84..0d55cbb84 100644
--- a/debian/lenny/tdeedu/debian/klettres-trinity.install
+++ b/debian/lenny/tdeedu/debian/klettres-trinity.install
@@ -1,6 +1,6 @@
 etc/trinity/klettresrc
 opt/trinity/bin/klettres
-/opt/trinity/share/applications/kde/klettres.desktop
+/opt/trinity/share/applications/tde/klettres.desktop
 /opt/trinity/share/config.kcfg/klettres.kcfg
 /opt/trinity/share/doc/tde/HTML/en/klettres/common
 /opt/trinity/share/doc/tde/HTML/en/klettres/index.cache.bz2
diff --git a/debian/lenny/tdeedu/debian/kmplot-trinity.install b/debian/lenny/tdeedu/debian/kmplot-trinity.install
index c75adb783..496ba1a4a 100644
--- a/debian/lenny/tdeedu/debian/kmplot-trinity.install
+++ b/debian/lenny/tdeedu/debian/kmplot-trinity.install
@@ -1,7 +1,7 @@
 opt/trinity/bin/kmplot
 opt/trinity/lib/trinity/libkmplotpart.la
 opt/trinity/lib/trinity/libkmplotpart.so
-/opt/trinity/share/applications/kde/kmplot.desktop
+/opt/trinity/share/applications/tde/kmplot.desktop
 /opt/trinity/share/apps/kmplot
 /opt/trinity/share/config.kcfg/kmplot.kcfg
 /opt/trinity/share/doc/tde/HTML/en/kmplot/common
diff --git a/debian/lenny/tdeedu/debian/kpercentage-trinity.install b/debian/lenny/tdeedu/debian/kpercentage-trinity.install
index 592f5475b..b92df18bf 100644
--- a/debian/lenny/tdeedu/debian/kpercentage-trinity.install
+++ b/debian/lenny/tdeedu/debian/kpercentage-trinity.install
@@ -1,5 +1,5 @@
 opt/trinity/bin/kpercentage
-/opt/trinity/share/applications/kde/kpercentage.desktop
+/opt/trinity/share/applications/tde/kpercentage.desktop
 /opt/trinity/share/apps/kpercentage
 /opt/trinity/share/doc/tde/HTML/en/kpercentage/common
 /opt/trinity/share/doc/tde/HTML/en/kpercentage/index.cache.bz2
diff --git a/debian/lenny/tdeedu/debian/kstars-trinity.install b/debian/lenny/tdeedu/debian/kstars-trinity.install
index 78ed81fdf..81b344151 100644
--- a/debian/lenny/tdeedu/debian/kstars-trinity.install
+++ b/debian/lenny/tdeedu/debian/kstars-trinity.install
@@ -2,7 +2,7 @@ etc/trinity/kstarsrc
 opt/trinity/bin/kstars
 /opt/trinity/include/tde/kstarsinterface.h
 /opt/trinity/include/tde/simclockinterface.h
-/opt/trinity/share/applications/kde/kstars.desktop
+/opt/trinity/share/applications/tde/kstars.desktop
 /opt/trinity/share/config.kcfg/kstars.kcfg
 /opt/trinity/share/doc/tde/HTML/en/kstars/common
 /opt/trinity/share/doc/tde/HTML/en/kstars/index.cache.bz2
diff --git a/debian/lenny/tdeedu/debian/ktouch-trinity.install b/debian/lenny/tdeedu/debian/ktouch-trinity.install
index da2308667..38be25793 100644
--- a/debian/lenny/tdeedu/debian/ktouch-trinity.install
+++ b/debian/lenny/tdeedu/debian/ktouch-trinity.install
@@ -1,5 +1,5 @@
 opt/trinity/bin/ktouch
-/opt/trinity/share/applications/kde/ktouch.desktop
+/opt/trinity/share/applications/tde/ktouch.desktop
 /opt/trinity/share/apps/ktouch
 /opt/trinity/share/config.kcfg/ktouch.kcfg
 /opt/trinity/share/doc/tde/HTML/en/ktouch/common
diff --git a/debian/lenny/tdeedu/debian/kturtle-trinity.install b/debian/lenny/tdeedu/debian/kturtle-trinity.install
index f5f42ad75..396fae124 100644
--- a/debian/lenny/tdeedu/debian/kturtle-trinity.install
+++ b/debian/lenny/tdeedu/debian/kturtle-trinity.install
@@ -1,5 +1,5 @@
 opt/trinity/bin/kturtle
-/opt/trinity/share/applications/kde/kturtle.desktop
+/opt/trinity/share/applications/tde/kturtle.desktop
 /opt/trinity/share/apps/katepart/syntax/logohighlightstyle*
 /opt/trinity/share/apps/kturtle
 /opt/trinity/share/config.kcfg/kturtle.kcfg
diff --git a/debian/lenny/tdeedu/debian/kverbos-trinity.install b/debian/lenny/tdeedu/debian/kverbos-trinity.install
index 7ce86854f..553844a03 100644
--- a/debian/lenny/tdeedu/debian/kverbos-trinity.install
+++ b/debian/lenny/tdeedu/debian/kverbos-trinity.install
@@ -1,5 +1,5 @@
 opt/trinity/bin/kverbos
-/opt/trinity/share/applications/kde/kverbos.desktop
+/opt/trinity/share/applications/tde/kverbos.desktop
 /opt/trinity/share/apps/kverbos
 /opt/trinity/share/config.kcfg/kverbos.kcfg
 /opt/trinity/share/doc/tde/HTML/en/kverbos/common
diff --git a/debian/lenny/tdeedu/debian/kvoctrain-trinity.install b/debian/lenny/tdeedu/debian/kvoctrain-trinity.install
index 07d71a27f..9e2031c86 100644
--- a/debian/lenny/tdeedu/debian/kvoctrain-trinity.install
+++ b/debian/lenny/tdeedu/debian/kvoctrain-trinity.install
@@ -5,7 +5,7 @@ opt/trinity/lib/libkvoctraincore.la
 opt/trinity/lib/libkvoctraincore.so
 opt/trinity/lib/libkvoctraincore.so.0
 opt/trinity/lib/libkvoctraincore.so.0.0.0
-/opt/trinity/share/applications/kde/kvoctrain.desktop
+/opt/trinity/share/applications/tde/kvoctrain.desktop
 /opt/trinity/share/apps/kvoctrain
 /opt/trinity/share/mimelnk/text/x-kvtml.desktop
 /opt/trinity/share/config.kcfg/kvoctrain.kcfg
diff --git a/debian/lenny/tdeedu/debian/kwordquiz-trinity.install b/debian/lenny/tdeedu/debian/kwordquiz-trinity.install
index 6490edf60..5db76116f 100644
--- a/debian/lenny/tdeedu/debian/kwordquiz-trinity.install
+++ b/debian/lenny/tdeedu/debian/kwordquiz-trinity.install
@@ -1,6 +1,6 @@
 etc/trinity/kwordquizrc
 opt/trinity/bin/kwordquiz
-/opt/trinity/share/applications/kde/kwordquiz.desktop
+/opt/trinity/share/applications/tde/kwordquiz.desktop
 /opt/trinity/share/apps/kwordquiz
 /opt/trinity/share/config.kcfg/kwordquiz.kcfg
 /opt/trinity/share/doc/tde/HTML/en/kwordquiz/*.bz2
diff --git a/debian/lenny/tdegames/debian/atlantik-trinity.install b/debian/lenny/tdegames/debian/atlantik-trinity.install
index d1c3e9730..fffdeb69c 100644
--- a/debian/lenny/tdegames/debian/atlantik-trinity.install
+++ b/debian/lenny/tdegames/debian/atlantik-trinity.install
@@ -9,7 +9,7 @@
 /opt/trinity/lib/trinity/kio_atlantik.so
 /opt/trinity/share/services/atlantik.protocol
 /opt/trinity/share/doc/tde/HTML/en/atlantik/*
-/opt/trinity/share/applications/kde/atlantik.desktop
+/opt/trinity/share/applications/tde/atlantik.desktop
 /opt/trinity/share/icons/hicolor/48x48/apps/atlantik.png
 /opt/trinity/share/icons/hicolor/32x32/apps/atlantik.png
 /opt/trinity/share/icons/hicolor/16x16/apps/atlantik.png
diff --git a/debian/lenny/tdegames/debian/kasteroids-trinity.install b/debian/lenny/tdegames/debian/kasteroids-trinity.install
index ae24b2a78..2d8ae246a 100644
--- a/debian/lenny/tdegames/debian/kasteroids-trinity.install
+++ b/debian/lenny/tdegames/debian/kasteroids-trinity.install
@@ -5,7 +5,7 @@
 /opt/trinity/share/icons/hicolor/32x32/apps/kasteroids.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kasteroids.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kasteroids.png
-/opt/trinity/share/applications/kde/kasteroids.desktop
+/opt/trinity/share/applications/tde/kasteroids.desktop
 /opt/trinity/share/apps/kasteroids/*
 /opt/trinity/share/config.kcfg/kasteroids.kcfg
 /opt/trinity/share/doc/tde/HTML/en/kasteroids/*
diff --git a/debian/lenny/tdegames/debian/katomic-trinity.install b/debian/lenny/tdegames/debian/katomic-trinity.install
index fca842275..5db0c536c 100644
--- a/debian/lenny/tdegames/debian/katomic-trinity.install
+++ b/debian/lenny/tdegames/debian/katomic-trinity.install
@@ -5,7 +5,7 @@
 /opt/trinity/share/icons/hicolor/48x48/apps/katomic.png
 /opt/trinity/share/icons/hicolor/64x64/apps/katomic.png
 /opt/trinity/share/icons/hicolor/128x128/apps/katomic.png
-/opt/trinity/share/applications/kde/katomic.desktop
+/opt/trinity/share/applications/tde/katomic.desktop
 /opt/trinity/games/katomic
 /opt/trinity/share/doc/tde/HTML/en/katomic/*
 ../icons/katomic.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegames/debian/kbackgammon-trinity.install b/debian/lenny/tdegames/debian/kbackgammon-trinity.install
index 41b81b789..3d84977d1 100644
--- a/debian/lenny/tdegames/debian/kbackgammon-trinity.install
+++ b/debian/lenny/tdegames/debian/kbackgammon-trinity.install
@@ -1,5 +1,5 @@
 /opt/trinity/games/kbackgammon
-/opt/trinity/share/applications/kde/kbackgammon.desktop
+/opt/trinity/share/applications/tde/kbackgammon.desktop
 /opt/trinity/share/apps/kbackgammon/*
 /opt/trinity/share/icons/hicolor/128x128/apps/kbackgammon.png
 /opt/trinity/share/icons/hicolor/64x64/apps/kbackgammon.png
diff --git a/debian/lenny/tdegames/debian/kbattleship-trinity.install b/debian/lenny/tdegames/debian/kbattleship-trinity.install
index 68a6e39ca..94a76d5c9 100644
--- a/debian/lenny/tdegames/debian/kbattleship-trinity.install
+++ b/debian/lenny/tdegames/debian/kbattleship-trinity.install
@@ -6,7 +6,7 @@
 /opt/trinity/share/icons/hicolor/32x32/apps/kbattleship.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kbattleship.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kbattleship.png
-/opt/trinity/share/applications/kde/kbattleship.desktop
+/opt/trinity/share/applications/tde/kbattleship.desktop
 /opt/trinity/games/kbattleship
 /opt/trinity/share/doc/tde/HTML/en/kbattleship/*
 ../icons/kbattleship.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegames/debian/kblackbox-trinity.install b/debian/lenny/tdegames/debian/kblackbox-trinity.install
index d801df8cc..ed4014be9 100644
--- a/debian/lenny/tdegames/debian/kblackbox-trinity.install
+++ b/debian/lenny/tdegames/debian/kblackbox-trinity.install
@@ -5,7 +5,7 @@
 /opt/trinity/share/icons/hicolor/32x32/apps/kblackbox.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kblackbox.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kblackbox.png
-/opt/trinity/share/applications/kde/kblackbox.desktop
+/opt/trinity/share/applications/tde/kblackbox.desktop
 /opt/trinity/games/kblackbox
 /opt/trinity/share/doc/tde/HTML/en/kblackbox/*
 ../icons/kblackbox.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegames/debian/kbounce-trinity.install b/debian/lenny/tdegames/debian/kbounce-trinity.install
index 7c9bac7b3..ee1efab9c 100644
--- a/debian/lenny/tdegames/debian/kbounce-trinity.install
+++ b/debian/lenny/tdegames/debian/kbounce-trinity.install
@@ -1,5 +1,5 @@
 /opt/trinity/share/apps/kbounce/*
-/opt/trinity/share/applications/kde/kbounce.desktop
+/opt/trinity/share/applications/tde/kbounce.desktop
 /opt/trinity/share/icons/hicolor/16x16/apps/kbounce.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kbounce.png
 /opt/trinity/share/icons/hicolor/32x32/apps/kbounce.png
diff --git a/debian/lenny/tdegames/debian/kenolaba-trinity.install b/debian/lenny/tdegames/debian/kenolaba-trinity.install
index 121e8ae52..060b18369 100644
--- a/debian/lenny/tdegames/debian/kenolaba-trinity.install
+++ b/debian/lenny/tdegames/debian/kenolaba-trinity.install
@@ -5,7 +5,7 @@
 /opt/trinity/share/icons/hicolor/48x48/apps/kenolaba.png
 /opt/trinity/share/icons/hicolor/64x64/apps/kenolaba.png
 /opt/trinity/share/icons/hicolor/128x128/apps/kenolaba.png
-/opt/trinity/share/applications/kde/kenolaba.desktop
+/opt/trinity/share/applications/tde/kenolaba.desktop
 /opt/trinity/games/kenolaba
 /opt/trinity/share/doc/tde/HTML/en/kenolaba/*
 ../icons/kenolaba.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegames/debian/kfouleggs-trinity.install b/debian/lenny/tdegames/debian/kfouleggs-trinity.install
index 4ceaf21df..3491175b8 100644
--- a/debian/lenny/tdegames/debian/kfouleggs-trinity.install
+++ b/debian/lenny/tdegames/debian/kfouleggs-trinity.install
@@ -1,4 +1,4 @@
-/opt/trinity/share/applications/kde/kfouleggs.desktop
+/opt/trinity/share/applications/tde/kfouleggs.desktop
 /opt/trinity/share/apps/kfouleggs/*
 /opt/trinity/share/config.kcfg/kfouleggs.kcfg
 /opt/trinity/games/kfouleggs
diff --git a/debian/lenny/tdegames/debian/kgoldrunner-trinity.install b/debian/lenny/tdegames/debian/kgoldrunner-trinity.install
index 5283b997f..871521852 100644
--- a/debian/lenny/tdegames/debian/kgoldrunner-trinity.install
+++ b/debian/lenny/tdegames/debian/kgoldrunner-trinity.install
@@ -5,7 +5,7 @@
 /opt/trinity/share/icons/hicolor/48x48/apps/kgoldrunner.png
 /opt/trinity/share/icons/hicolor/64x64/apps/kgoldrunner.png
 /opt/trinity/share/icons/hicolor/128x128/apps/kgoldrunner.png
-/opt/trinity/share/applications/kde/KGoldrunner.desktop
+/opt/trinity/share/applications/tde/KGoldrunner.desktop
 /opt/trinity/games/kgoldrunner
 /opt/trinity/share/doc/tde/HTML/en/kgoldrunner/*
 ../icons/kgoldrunner.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegames/debian/kjumpingcube-trinity.install b/debian/lenny/tdegames/debian/kjumpingcube-trinity.install
index c5532b2f6..c7395d68f 100644
--- a/debian/lenny/tdegames/debian/kjumpingcube-trinity.install
+++ b/debian/lenny/tdegames/debian/kjumpingcube-trinity.install
@@ -6,7 +6,7 @@
 /opt/trinity/share/icons/hicolor/22x22/apps/kjumpingcube.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kjumpingcube.png
 /opt/trinity/share/apps/kjumpingcube/*
-/opt/trinity/share/applications/kde/kjumpingcube.desktop
+/opt/trinity/share/applications/tde/kjumpingcube.desktop
 /opt/trinity/share/config.kcfg/kjumpingcube.kcfg
 /opt/trinity/share/doc/tde/HTML/en/kjumpingcube/*
 ../icons/kjumpingcube.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegames/debian/klickety-trinity.install b/debian/lenny/tdegames/debian/klickety-trinity.install
index 65e89710d..facefb860 100644
--- a/debian/lenny/tdegames/debian/klickety-trinity.install
+++ b/debian/lenny/tdegames/debian/klickety-trinity.install
@@ -1,6 +1,6 @@
 /opt/trinity/games/klickety
 /opt/trinity/share/doc/tde/HTML/en/klickety/*
-/opt/trinity/share/applications/kde/klickety.desktop
+/opt/trinity/share/applications/tde/klickety.desktop
 /opt/trinity/share/icons/hicolor/16x16/apps/klickety.png
 /opt/trinity/share/icons/hicolor/22x22/apps/klickety.png
 /opt/trinity/share/icons/hicolor/32x32/apps/klickety.png
diff --git a/debian/lenny/tdegames/debian/klines-trinity.install b/debian/lenny/tdegames/debian/klines-trinity.install
index ba07a9752..753271248 100644
--- a/debian/lenny/tdegames/debian/klines-trinity.install
+++ b/debian/lenny/tdegames/debian/klines-trinity.install
@@ -1,5 +1,5 @@
 /opt/trinity/share/apps/klines/*
-/opt/trinity/share/applications/kde/klines.desktop
+/opt/trinity/share/applications/tde/klines.desktop
 /opt/trinity/games/klines
 /opt/trinity/share/config.kcfg/klines.kcfg
 /opt/trinity/share/doc/tde/HTML/en/klines/*
diff --git a/debian/lenny/tdegames/debian/kmahjongg-trinity.install b/debian/lenny/tdegames/debian/kmahjongg-trinity.install
index 19b225795..61a31a9ca 100644
--- a/debian/lenny/tdegames/debian/kmahjongg-trinity.install
+++ b/debian/lenny/tdegames/debian/kmahjongg-trinity.install
@@ -5,7 +5,7 @@
 /opt/trinity/share/icons/hicolor/32x32/apps/kmahjongg.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kmahjongg.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kmahjongg.png
-/opt/trinity/share/applications/kde/kmahjongg.desktop
+/opt/trinity/share/applications/tde/kmahjongg.desktop
 /opt/trinity/games/kmahjongg
 /opt/trinity/share/config.kcfg/kmahjongg.kcfg
 /opt/trinity/share/doc/tde/HTML/en/kmahjongg/*
diff --git a/debian/lenny/tdegames/debian/kmines-trinity.install b/debian/lenny/tdegames/debian/kmines-trinity.install
index bcf5ee654..2490e7a45 100644
--- a/debian/lenny/tdegames/debian/kmines-trinity.install
+++ b/debian/lenny/tdegames/debian/kmines-trinity.install
@@ -4,7 +4,7 @@
 /opt/trinity/share/icons/hicolor/32x32/apps/kmines.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kmines.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kmines.png
-/opt/trinity/share/applications/kde/kmines.desktop
+/opt/trinity/share/applications/tde/kmines.desktop
 /opt/trinity/share/apps/kmines/*
 /opt/trinity/games/kmines
 /opt/trinity/share/doc/tde/HTML/en/kmines/*
diff --git a/debian/lenny/tdegames/debian/knetwalk-trinity.install b/debian/lenny/tdegames/debian/knetwalk-trinity.install
index a3a7adf42..4d1e7cddd 100644
--- a/debian/lenny/tdegames/debian/knetwalk-trinity.install
+++ b/debian/lenny/tdegames/debian/knetwalk-trinity.install
@@ -6,4 +6,4 @@
 /opt/trinity/share/icons/hicolor/128x128/apps/knetwalk.png
 ../icons/knetwalk.xpm /opt/trinity/share/pixmaps
 ../icons/knetwalk-16.xpm /opt/trinity/share/pixmaps
-/opt/trinity/share/applications/kde/knetwalk.desktop
+/opt/trinity/share/applications/tde/knetwalk.desktop
diff --git a/debian/lenny/tdegames/debian/kolf-trinity.install b/debian/lenny/tdegames/debian/kolf-trinity.install
index 28eda8f6a..e66c36b57 100644
--- a/debian/lenny/tdegames/debian/kolf-trinity.install
+++ b/debian/lenny/tdegames/debian/kolf-trinity.install
@@ -1,7 +1,7 @@
 /etc/trinity/magic/kolf.magic
 /opt/trinity/share/apps/kolf/*
 /opt/trinity/games/kolf
-/opt/trinity/share/applications/kde/kolf.desktop
+/opt/trinity/share/applications/tde/kolf.desktop
 /opt/trinity/share/doc/tde/HTML/en/kolf/*
 /opt/trinity/share/icons/hicolor/16x16/apps/kolf.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kolf.png
diff --git a/debian/lenny/tdegames/debian/konquest-trinity.install b/debian/lenny/tdegames/debian/konquest-trinity.install
index d858d2e29..082787157 100644
--- a/debian/lenny/tdegames/debian/konquest-trinity.install
+++ b/debian/lenny/tdegames/debian/konquest-trinity.install
@@ -5,7 +5,7 @@
 /opt/trinity/share/icons/hicolor/32x32/apps/konquest.png
 /opt/trinity/share/icons/hicolor/22x22/apps/konquest.png
 /opt/trinity/share/icons/hicolor/16x16/apps/konquest.png
-/opt/trinity/share/applications/kde/konquest.desktop
+/opt/trinity/share/applications/tde/konquest.desktop
 /opt/trinity/games/konquest
 /opt/trinity/share/doc/tde/HTML/en/konquest/*
 ../icons/konquest.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegames/debian/kpat-trinity.install b/debian/lenny/tdegames/debian/kpat-trinity.install
index 1d7f45758..7fd5ff375 100644
--- a/debian/lenny/tdegames/debian/kpat-trinity.install
+++ b/debian/lenny/tdegames/debian/kpat-trinity.install
@@ -5,7 +5,7 @@
 /opt/trinity/share/icons/hicolor/22x22/apps/kpat.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kpat.png
 /opt/trinity/share/apps/kpat/*
-/opt/trinity/share/applications/kde/kpat.desktop
+/opt/trinity/share/applications/tde/kpat.desktop
 /opt/trinity/games/kpat
 /opt/trinity/share/doc/tde/HTML/en/kpat/*
 ../icons/kpat.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegames/debian/kpoker-trinity.install b/debian/lenny/tdegames/debian/kpoker-trinity.install
index 0f499209c..a7e22f616 100644
--- a/debian/lenny/tdegames/debian/kpoker-trinity.install
+++ b/debian/lenny/tdegames/debian/kpoker-trinity.install
@@ -5,7 +5,7 @@
 /opt/trinity/share/icons/hicolor/32x32/apps/kpoker.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kpoker.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kpoker.png
-/opt/trinity/share/applications/kde/kpoker.desktop
+/opt/trinity/share/applications/tde/kpoker.desktop
 /opt/trinity/games/kpoker
 /opt/trinity/share/doc/tde/HTML/en/kpoker/*
 ../icons/kpoker.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegames/debian/kreversi-trinity.install b/debian/lenny/tdegames/debian/kreversi-trinity.install
index 981e8d7b0..ba2878253 100644
--- a/debian/lenny/tdegames/debian/kreversi-trinity.install
+++ b/debian/lenny/tdegames/debian/kreversi-trinity.install
@@ -1,6 +1,6 @@
 /opt/trinity/games/kreversi
 /opt/trinity/share/doc/tde/HTML/en/kreversi/*
-/opt/trinity/share/applications/kde/kreversi.desktop
+/opt/trinity/share/applications/tde/kreversi.desktop
 /opt/trinity/share/apps/kreversi/*
 /opt/trinity/share/config.kcfg/kreversi.kcfg
 /opt/trinity/share/icons/crystalsvg/48x48/actions/lastmoves.png
diff --git a/debian/lenny/tdegames/debian/ksame-trinity.install b/debian/lenny/tdegames/debian/ksame-trinity.install
index 1451960e7..e00484319 100644
--- a/debian/lenny/tdegames/debian/ksame-trinity.install
+++ b/debian/lenny/tdegames/debian/ksame-trinity.install
@@ -7,6 +7,6 @@
 /opt/trinity/share/icons/hicolor/22x22/apps/ksame.png
 /opt/trinity/share/icons/hicolor/16x16/apps/ksame.png
 /opt/trinity/share/apps/ksame/*
-/opt/trinity/share/applications/kde/ksame.desktop
+/opt/trinity/share/applications/tde/ksame.desktop
 ../icons/ksame.xpm /opt/trinity/share/pixmaps
 ../icons/ksame-16.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegames/debian/kshisen-trinity.install b/debian/lenny/tdegames/debian/kshisen-trinity.install
index b302633c0..11e3696a4 100644
--- a/debian/lenny/tdegames/debian/kshisen-trinity.install
+++ b/debian/lenny/tdegames/debian/kshisen-trinity.install
@@ -6,7 +6,7 @@
 /opt/trinity/share/icons/hicolor/32x32/apps/kshisen.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kshisen.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kshisen.png
-/opt/trinity/share/applications/kde/kshisen.desktop
+/opt/trinity/share/applications/tde/kshisen.desktop
 /opt/trinity/games/kshisen
 /opt/trinity/share/doc/tde/HTML/en/kshisen/*
 ../icons/kshisen.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegames/debian/ksirtet-trinity.install b/debian/lenny/tdegames/debian/ksirtet-trinity.install
index 2de50860e..9d1beca1b 100644
--- a/debian/lenny/tdegames/debian/ksirtet-trinity.install
+++ b/debian/lenny/tdegames/debian/ksirtet-trinity.install
@@ -1,4 +1,4 @@
-/opt/trinity/share/applications/kde/ksirtet.desktop
+/opt/trinity/share/applications/tde/ksirtet.desktop
 /opt/trinity/share/icons/hicolor/128x128/apps/ksirtet.png
 /opt/trinity/share/icons/hicolor/64x64/apps/ksirtet.png
 /opt/trinity/share/icons/hicolor/48x48/apps/ksirtet.png
diff --git a/debian/lenny/tdegames/debian/ksmiletris-trinity.install b/debian/lenny/tdegames/debian/ksmiletris-trinity.install
index 2db54f7ef..5c6f2a3c2 100644
--- a/debian/lenny/tdegames/debian/ksmiletris-trinity.install
+++ b/debian/lenny/tdegames/debian/ksmiletris-trinity.install
@@ -5,7 +5,7 @@
 /opt/trinity/share/icons/hicolor/32x32/apps/ksmiletris.png
 /opt/trinity/share/icons/hicolor/22x22/apps/ksmiletris.png
 /opt/trinity/share/icons/hicolor/16x16/apps/ksmiletris.png
-/opt/trinity/share/applications/kde/ksmiletris.desktop
+/opt/trinity/share/applications/tde/ksmiletris.desktop
 /opt/trinity/games/ksmiletris
 /opt/trinity/share/doc/tde/HTML/en/ksmiletris/*
 ../icons/ksmiletris.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegames/debian/ksnake-trinity.install b/debian/lenny/tdegames/debian/ksnake-trinity.install
index 7f447dedb..8bc7b7949 100644
--- a/debian/lenny/tdegames/debian/ksnake-trinity.install
+++ b/debian/lenny/tdegames/debian/ksnake-trinity.install
@@ -6,7 +6,7 @@
 /opt/trinity/share/icons/hicolor/32x32/apps/ksnake.png
 /opt/trinity/share/icons/hicolor/22x22/apps/ksnake.png
 /opt/trinity/share/icons/hicolor/16x16/apps/ksnake.png
-/opt/trinity/share/applications/kde/ksnake.desktop
+/opt/trinity/share/applications/tde/ksnake.desktop
 /opt/trinity/games/ksnake
 /opt/trinity/share/doc/tde/HTML/en/ksnake/*
 ../icons/ksnake.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegames/debian/ksokoban-trinity.install b/debian/lenny/tdegames/debian/ksokoban-trinity.install
index 00648dd8b..b536d14da 100644
--- a/debian/lenny/tdegames/debian/ksokoban-trinity.install
+++ b/debian/lenny/tdegames/debian/ksokoban-trinity.install
@@ -1,4 +1,4 @@
-/opt/trinity/share/applications/kde/ksokoban.desktop
+/opt/trinity/share/applications/tde/ksokoban.desktop
 /opt/trinity/share/icons/hicolor/128x128/apps/ksokoban.png
 /opt/trinity/share/icons/hicolor/64x64/apps/ksokoban.png
 /opt/trinity/share/icons/hicolor/48x48/apps/ksokoban.png
diff --git a/debian/lenny/tdegames/debian/kspaceduel-trinity.install b/debian/lenny/tdegames/debian/kspaceduel-trinity.install
index 559f89cdc..c5dcbe931 100644
--- a/debian/lenny/tdegames/debian/kspaceduel-trinity.install
+++ b/debian/lenny/tdegames/debian/kspaceduel-trinity.install
@@ -5,7 +5,7 @@
 /opt/trinity/share/icons/hicolor/32x32/apps/kspaceduel.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kspaceduel.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kspaceduel.png
-/opt/trinity/share/applications/kde/kspaceduel.desktop
+/opt/trinity/share/applications/tde/kspaceduel.desktop
 /opt/trinity/games/kspaceduel
 /opt/trinity/share/config.kcfg/kspaceduel.kcfg
 /opt/trinity/share/doc/tde/HTML/en/kspaceduel/*
diff --git a/debian/lenny/tdegames/debian/ktron-trinity.install b/debian/lenny/tdegames/debian/ktron-trinity.install
index 05bf663a5..fa6991c24 100644
--- a/debian/lenny/tdegames/debian/ktron-trinity.install
+++ b/debian/lenny/tdegames/debian/ktron-trinity.install
@@ -6,7 +6,7 @@
 /opt/trinity/share/icons/hicolor/64x64/apps/ktron.png
 /opt/trinity/share/icons/hicolor/128x128/apps/ktron.png
 /opt/trinity/share/doc/tde/HTML/en/ktron/*
-/opt/trinity/share/applications/kde/ktron.desktop
+/opt/trinity/share/applications/tde/ktron.desktop
 /opt/trinity/share/apps/ktron/*
 /opt/trinity/share/config.kcfg/ktron.kcfg
 ../icons/ktron.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegames/debian/ktuberling-trinity.install b/debian/lenny/tdegames/debian/ktuberling-trinity.install
index 098c979c8..e3d4b617b 100644
--- a/debian/lenny/tdegames/debian/ktuberling-trinity.install
+++ b/debian/lenny/tdegames/debian/ktuberling-trinity.install
@@ -6,7 +6,7 @@
 /opt/trinity/share/icons/hicolor/22x22/apps/ktuberling.png
 /opt/trinity/share/icons/hicolor/16x16/apps/ktuberling.png
 /opt/trinity/share/doc/tde/HTML/en/ktuberling/*
-/opt/trinity/share/applications/kde/ktuberling.desktop
+/opt/trinity/share/applications/tde/ktuberling.desktop
 /opt/trinity/share/apps/ktuberling/*
 /opt/trinity/share/mimelnk/application/x-tuberling.desktop
 ../icons/ktuberling.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegames/debian/kwin4-trinity.install b/debian/lenny/tdegames/debian/kwin4-trinity.install
index 265b1da77..d085fb90e 100644
--- a/debian/lenny/tdegames/debian/kwin4-trinity.install
+++ b/debian/lenny/tdegames/debian/kwin4-trinity.install
@@ -8,7 +8,7 @@
 /opt/trinity/share/icons/hicolor/32x32/apps/twin4.png
 /opt/trinity/share/icons/hicolor/22x22/apps/twin4.png
 /opt/trinity/share/icons/hicolor/16x16/apps/twin4.png
-/opt/trinity/share/applications/kde/twin4.desktop
+/opt/trinity/share/applications/tde/twin4.desktop
 /opt/trinity/share/doc/tde/HTML/en/twin4/*
 ../icons/twin4.xpm /opt/trinity/share/pixmaps
 ../icons/twin4-16.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegames/debian/lskat-trinity.install b/debian/lenny/tdegames/debian/lskat-trinity.install
index 7b301e9e0..64552943d 100644
--- a/debian/lenny/tdegames/debian/lskat-trinity.install
+++ b/debian/lenny/tdegames/debian/lskat-trinity.install
@@ -8,6 +8,6 @@
 /opt/trinity/share/icons/hicolor/32x32/apps/lskat.png
 /opt/trinity/share/icons/hicolor/22x22/apps/lskat.png
 /opt/trinity/share/icons/hicolor/16x16/apps/lskat.png
-/opt/trinity/share/applications/kde/lskat.desktop
+/opt/trinity/share/applications/tde/lskat.desktop
 ../icons/lskat.xpm /opt/trinity/share/pixmaps
 ../icons/lskat-16.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdegraphics/debian/kamera-trinity.install b/debian/lenny/tdegraphics/debian/kamera-trinity.install
index d1955c8f0..d9bfc4c27 100644
--- a/debian/lenny/tdegraphics/debian/kamera-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kamera-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/kcm_kamera.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kamera.so
 debian/tmp/opt/trinity/lib/trinity/kio_kamera.la
 debian/tmp/opt/trinity/lib/trinity/kio_kamera.so
-debian/tmp/opt/trinity/share/applications/kde/kamera.desktop
+debian/tmp/opt/trinity/share/applications/tde/kamera.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kamera/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kamera/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kamera/index.docbook
diff --git a/debian/lenny/tdegraphics/debian/kcoloredit-trinity.install b/debian/lenny/tdegraphics/debian/kcoloredit-trinity.install
index d885d8ed8..e872d0f06 100644
--- a/debian/lenny/tdegraphics/debian/kcoloredit-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kcoloredit-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kcolorchooser
 debian/tmp/opt/trinity/bin/kcoloredit
-debian/tmp/opt/trinity/share/applications/kde/kcolorchooser.desktop
-debian/tmp/opt/trinity/share/applications/kde/kcoloredit.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcolorchooser.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcoloredit.desktop
 debian/tmp/opt/trinity/share/apps/kcoloredit/kcoloreditui.rc
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcoloredit/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcoloredit/index.cache.bz2
diff --git a/debian/lenny/tdegraphics/debian/kdvi-trinity.install b/debian/lenny/tdegraphics/debian/kdvi-trinity.install
index b0170ca7c..7e92db06e 100644
--- a/debian/lenny/tdegraphics/debian/kdvi-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kdvi-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kdvi
 debian/tmp/opt/trinity/lib/trinity/kdvipart.la
 debian/tmp/opt/trinity/lib/trinity/kdvipart.so
-debian/tmp/opt/trinity/share/applications/kde/kdvi.desktop
+debian/tmp/opt/trinity/share/applications/tde/kdvi.desktop
 debian/tmp/opt/trinity/share/apps/kdvi/kdvi_part.rc
 debian/tmp/opt/trinity/share/apps/kdvi/kviewshell.rc
 debian/tmp/opt/trinity/share/apps/kdvi/tips
diff --git a/debian/lenny/tdegraphics/debian/kfax-trinity.install b/debian/lenny/tdegraphics/debian/kfax-trinity.install
index 5c08ae3e5..f52d708dc 100644
--- a/debian/lenny/tdegraphics/debian/kfax-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kfax-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/kfax
-debian/tmp/opt/trinity/share/applications/kde/kfax.desktop
+debian/tmp/opt/trinity/share/applications/tde/kfax.desktop
 debian/tmp/opt/trinity/share/apps/kfax/kfaxui.rc
 debian/tmp/opt/trinity/share/apps/kfax/pics/kfax.tif
 debian/tmp/opt/trinity/share/apps/kfax/pics/kfaxlogo.xpm
diff --git a/debian/lenny/tdegraphics/debian/kfaxview-trinity.install b/debian/lenny/tdegraphics/debian/kfaxview-trinity.install
index 92000e53a..3327b7fe0 100644
--- a/debian/lenny/tdegraphics/debian/kfaxview-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kfaxview-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/kfaxviewpart.so
 debian/tmp/opt/trinity/lib/trinity/kfaxviewpart.la
 debian/tmp/opt/trinity/lib/libkfaximage.so
 debian/tmp/opt/trinity/lib/libkfaximage.la
-debian/tmp/opt/trinity/share/applications/kde/kfaxview.desktop
+debian/tmp/opt/trinity/share/applications/tde/kfaxview.desktop
 debian/tmp/opt/trinity/share/apps/kfaxview/kviewshell.rc
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kfaxview.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kfaxview.png
diff --git a/debian/lenny/tdegraphics/debian/kgamma-trinity.install b/debian/lenny/tdegraphics/debian/kgamma-trinity.install
index 4b4875ac9..ff83d71ab 100644
--- a/debian/lenny/tdegraphics/debian/kgamma-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kgamma-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/xf86gammacfg
 debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.so
-debian/tmp/opt/trinity/share/applications/kde/kgamma.desktop
+debian/tmp/opt/trinity/share/applications/tde/kgamma.desktop
 debian/tmp/opt/trinity/share/apps/kgamma/pics/background.png
 debian/tmp/opt/trinity/share/apps/kgamma/pics/cmyscale.png
 debian/tmp/opt/trinity/share/apps/kgamma/pics/darkgrey.png
diff --git a/debian/lenny/tdegraphics/debian/kghostview-trinity.install b/debian/lenny/tdegraphics/debian/kghostview-trinity.install
index b967faccf..59cf101cf 100644
--- a/debian/lenny/tdegraphics/debian/kghostview-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kghostview-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/libkghostviewpart.la
 debian/tmp/opt/trinity/lib/trinity/libkghostviewpart.so
 debian/tmp/opt/trinity/lib/libkghostviewlib.so.0
 debian/tmp/opt/trinity/lib/libkghostviewlib.so.0.0.0
-debian/tmp/opt/trinity/share/applications/kde/kghostview.desktop
+debian/tmp/opt/trinity/share/applications/tde/kghostview.desktop
 debian/tmp/opt/trinity/share/apps/kconf_update/kghostview.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/update-to-xt-names.pl
 debian/tmp/opt/trinity/share/apps/kghostview/kghostviewui.rc
diff --git a/debian/lenny/tdegraphics/debian/kiconedit-trinity.install b/debian/lenny/tdegraphics/debian/kiconedit-trinity.install
index 66bf9a180..aa55810f2 100644
--- a/debian/lenny/tdegraphics/debian/kiconedit-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kiconedit-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/kiconedit
-debian/tmp/opt/trinity/share/applications/kde/kiconedit.desktop
+debian/tmp/opt/trinity/share/applications/tde/kiconedit.desktop
 debian/tmp/opt/trinity/share/apps/kiconedit/kiconeditui.rc
 debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim-cursor.xpm
 debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim.png
diff --git a/debian/lenny/tdegraphics/debian/kmrml-trinity.install b/debian/lenny/tdegraphics/debian/kmrml-trinity.install
index bdbbef7c6..306bec393 100644
--- a/debian/lenny/tdegraphics/debian/kmrml-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kmrml-trinity.install
@@ -10,7 +10,7 @@ debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.so
 debian/tmp/opt/trinity/lib/trinity/mrmlsearch.la
 debian/tmp/opt/trinity/lib/trinity/mrmlsearch.so
 debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.so
-debian/tmp/opt/trinity/share/applications/kde/kcmkmrml.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmkmrml.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/mrml-servicemenu.desktop
 debian/tmp/opt/trinity/share/mimelnk/text/mrml.desktop
 debian/tmp/opt/trinity/share/services/kded/daemonwatcher.desktop
diff --git a/debian/lenny/tdegraphics/debian/kolourpaint-trinity.install b/debian/lenny/tdegraphics/debian/kolourpaint-trinity.install
index 3ee0f1de8..c0570adad 100644
--- a/debian/lenny/tdegraphics/debian/kolourpaint-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kolourpaint-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/kolourpaint
-debian/tmp/opt/trinity/share/applications/kde/kolourpaint.desktop
+debian/tmp/opt/trinity/share/applications/tde/kolourpaint.desktop
 debian/tmp/opt/trinity/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_brush.png
 debian/tmp/opt/trinity/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_color_picker.png
 debian/tmp/opt/trinity/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_color_washer.png
diff --git a/debian/lenny/tdegraphics/debian/kooka-trinity.install b/debian/lenny/tdegraphics/debian/kooka-trinity.install
index 958395531..ad1854179 100644
--- a/debian/lenny/tdegraphics/debian/kooka-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kooka-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/etc/trinity/kookarc
 debian/tmp/opt/trinity/bin/kooka
-debian/tmp/opt/trinity/share/applications/kde/kooka.desktop
+debian/tmp/opt/trinity/share/applications/tde/kooka.desktop
 debian/tmp/opt/trinity/share/apps/kooka/kookaui.rc
 debian/tmp/opt/trinity/share/apps/kooka/pics/gocr.png
 debian/tmp/opt/trinity/share/apps/kooka/pics/lockzoom.png
diff --git a/debian/lenny/tdegraphics/debian/kpdf-trinity.install b/debian/lenny/tdegraphics/debian/kpdf-trinity.install
index 85cde09a4..6b7eaec8c 100644
--- a/debian/lenny/tdegraphics/debian/kpdf-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kpdf-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kpdf
 debian/tmp/opt/trinity/lib/trinity/libkpdfpart.la
 debian/tmp/opt/trinity/lib/trinity/libkpdfpart.so
-debian/tmp/opt/trinity/share/applications/kde/kpdf.desktop
+debian/tmp/opt/trinity/share/applications/tde/kpdf.desktop
 debian/tmp/opt/trinity/share/apps/kpdf/shell.rc
 debian/tmp/opt/trinity/share/apps/kpdfpart/part.rc
 debian/tmp/opt/trinity/share/config.kcfg/kpdf.kcfg
diff --git a/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.install b/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.install
index d0e50b60a..5249f68c1 100644
--- a/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/libkpovmodelerpart.la
 debian/tmp/opt/trinity/lib/trinity/libkpovmodelerpart.so
 debian/tmp/opt/trinity/lib/libkpovmodeler.so.0
 debian/tmp/opt/trinity/lib/libkpovmodeler.so.0.0.0
-debian/tmp/opt/trinity/share/applications/kde/kpovmodeler.desktop
+debian/tmp/opt/trinity/share/applications/tde/kpovmodeler.desktop
 debian/tmp/opt/trinity/share/apps/kpovmodeler/baseinsertrules.xml
 debian/tmp/opt/trinity/share/apps/kpovmodeler/examples/includes/inlined/chars.kpm
 debian/tmp/opt/trinity/share/apps/kpovmodeler/examples/includes/inlined/finish.kpm
diff --git a/debian/lenny/tdegraphics/debian/kruler-trinity.install b/debian/lenny/tdegraphics/debian/kruler-trinity.install
index 9256c231a..b5d49cc81 100644
--- a/debian/lenny/tdegraphics/debian/kruler-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kruler-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/kruler
-debian/tmp/opt/trinity/share/applications/kde/kruler.desktop
+debian/tmp/opt/trinity/share/applications/tde/kruler.desktop
 debian/tmp/opt/trinity/share/applnk/Graphics/kruler.desktop
 debian/tmp/opt/trinity/share/apps/kruler/eventsrc
 debian/tmp/opt/trinity/share/apps/kruler/pics/kruler-east.png
diff --git a/debian/lenny/tdegraphics/debian/ksnapshot-trinity.install b/debian/lenny/tdegraphics/debian/ksnapshot-trinity.install
index 4b83732a3..acdcc61d5 100644
--- a/debian/lenny/tdegraphics/debian/ksnapshot-trinity.install
+++ b/debian/lenny/tdegraphics/debian/ksnapshot-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/ksnapshot
-debian/tmp/opt/trinity/share/applications/kde/ksnapshot.desktop
+debian/tmp/opt/trinity/share/applications/tde/ksnapshot.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksnapshot/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksnapshot/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksnapshot/index.docbook
diff --git a/debian/lenny/tdegraphics/debian/kuickshow-trinity.install b/debian/lenny/tdegraphics/debian/kuickshow-trinity.install
index 24e372536..b1458dc3a 100644
--- a/debian/lenny/tdegraphics/debian/kuickshow-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kuickshow-trinity.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/kuickshow
 debian/tmp/opt/trinity/lib/trinity/kuickshow.la
 debian/tmp/opt/trinity/lib/trinity/kuickshow.so
 debian/tmp/opt/trinity/lib/libtdeinit_kuickshow.so
-debian/tmp/opt/trinity/share/applications/kde/kuickshow.desktop
+debian/tmp/opt/trinity/share/applications/tde/kuickshow.desktop
 debian/tmp/opt/trinity/share/apps/kuickshow/im_palette.pal
 debian/tmp/opt/trinity/share/apps/kuickshow/pics/about.png
 debian/tmp/opt/trinity/share/apps/kuickshow/pics/calibrate.png
diff --git a/debian/lenny/tdegraphics/debian/kview-trinity.install b/debian/lenny/tdegraphics/debian/kview-trinity.install
index 31348d439..dac3ba875 100644
--- a/debian/lenny/tdegraphics/debian/kview-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kview-trinity.install
@@ -26,7 +26,7 @@ debian/tmp/opt/trinity/lib/libkimageviewer.so.0
 debian/tmp/opt/trinity/lib/libkimageviewer.so.0.0.0
 debian/tmp/opt/trinity/lib/trinity/libphotobook.la
 debian/tmp/opt/trinity/lib/trinity/libphotobook.so
-debian/tmp/opt/trinity/share/applications/kde/kview.desktop
+debian/tmp/opt/trinity/share/applications/tde/kview.desktop
 debian/tmp/opt/trinity/share/apps/kview/kpartplugins/kvieweffects.desktop
 debian/tmp/opt/trinity/share/apps/kview/kpartplugins/kvieweffects.rc
 debian/tmp/opt/trinity/share/apps/kview/kpartplugins/kviewpresenter.desktop
diff --git a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
index b13eb6275..83cb5ba94 100644
--- a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
@@ -15,7 +15,7 @@ debian/tmp/etc/trinity/kthemestylerc
 debian/tmp/etc/trinity/language.codes
 debian/tmp/etc/trinity/ui/kprintpreviewui.rc
 debian/tmp/etc/trinity/ui/ui_standards.rc
-debian/tmp/opt/trinity/share/applications/kde/kresources.desktop
+debian/tmp/opt/trinity/share/applications/tde/kresources.desktop
 debian/tmp/opt/trinity/share/apps/dcopidlng/Ast.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/Iter.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kalyptus
diff --git a/debian/lenny/tdemultimedia/debian/artsbuilder-trinity.install b/debian/lenny/tdemultimedia/debian/artsbuilder-trinity.install
index b3f11c769..badda9a18 100644
--- a/debian/lenny/tdemultimedia/debian/artsbuilder-trinity.install
+++ b/debian/lenny/tdemultimedia/debian/artsbuilder-trinity.install
@@ -141,8 +141,8 @@ debian/tmp/opt/trinity/lib/mcop/Arts/Synth_XFADE.mcopclass
 debian/tmp/opt/trinity/lib/mcop/Arts/VBox.mcopclass
 debian/tmp/opt/trinity/lib/mcop/Arts/VoiceRemovalGuiFactory.mcopclass
 debian/tmp/opt/trinity/lib/mcop/Arts/Widget.mcopclass
-debian/tmp/opt/trinity/share/applications/kde/artsbuilder.desktop
-debian/tmp/opt/trinity/share/applications/kde/artscontrol.desktop
+debian/tmp/opt/trinity/share/applications/tde/artsbuilder.desktop
+debian/tmp/opt/trinity/share/applications/tde/artscontrol.desktop
 debian/tmp/opt/trinity/share/apps/artsbuilder/artsbuilderui.rc
 debian/tmp/opt/trinity/share/apps/artsbuilder/examples/example_adsr.arts
 debian/tmp/opt/trinity/share/apps/artsbuilder/examples/example_atan_saturate.arts
diff --git a/debian/lenny/tdemultimedia/debian/juk-trinity.install b/debian/lenny/tdemultimedia/debian/juk-trinity.install
index 39ffc23e4..b3b2e7b91 100644
--- a/debian/lenny/tdemultimedia/debian/juk-trinity.install
+++ b/debian/lenny/tdemultimedia/debian/juk-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/juk
-debian/tmp/opt/trinity/share/applications/kde/juk.desktop
+debian/tmp/opt/trinity/share/applications/tde/juk.desktop
 debian/tmp/opt/trinity/share/apps/juk/jukui-rtl.rc
 debian/tmp/opt/trinity/share/apps/juk/jukui.rc
 debian/tmp/opt/trinity/share/apps/juk/pics/playing.png
diff --git a/debian/lenny/tdemultimedia/debian/kaboodle-trinity.install b/debian/lenny/tdemultimedia/debian/kaboodle-trinity.install
index dbf9019c1..e16be8952 100644
--- a/debian/lenny/tdemultimedia/debian/kaboodle-trinity.install
+++ b/debian/lenny/tdemultimedia/debian/kaboodle-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kaboodle
 debian/tmp/opt/trinity/lib/trinity/libkaboodlepart.la
 debian/tmp/opt/trinity/lib/trinity/libkaboodlepart.so
-debian/tmp/opt/trinity/share/applications/kde/kaboodle.desktop
+debian/tmp/opt/trinity/share/applications/tde/kaboodle.desktop
 debian/tmp/opt/trinity/share/apps/kaboodle/icons/crystalsvg/16x16/actions/kaboodleloop.png
 debian/tmp/opt/trinity/share/apps/kaboodle/icons/crystalsvg/22x22/actions/kaboodleloop.png
 debian/tmp/opt/trinity/share/apps/kaboodle/kaboodlepartui.rc
diff --git a/debian/lenny/tdemultimedia/debian/kaudiocreator-trinity.install b/debian/lenny/tdemultimedia/debian/kaudiocreator-trinity.install
index a21cdff62..136265d9c 100644
--- a/debian/lenny/tdemultimedia/debian/kaudiocreator-trinity.install
+++ b/debian/lenny/tdemultimedia/debian/kaudiocreator-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/kaudiocreator
-debian/tmp/opt/trinity/share/applications/kde/kaudiocreator.desktop
+debian/tmp/opt/trinity/share/applications/tde/kaudiocreator.desktop
 debian/tmp/opt/trinity/share/apps/kaudiocreator/eventsrc
 debian/tmp/opt/trinity/share/apps/kaudiocreator/kaudiocreatorui.rc
 debian/tmp/opt/trinity/share/apps/kaudiocreator/pics/check.png
diff --git a/debian/lenny/tdemultimedia/debian/kmid-trinity.install b/debian/lenny/tdemultimedia/debian/kmid-trinity.install
index 00d66fa05..e77e1784a 100644
--- a/debian/lenny/tdemultimedia/debian/kmid-trinity.install
+++ b/debian/lenny/tdemultimedia/debian/kmid-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/libkmidpart.la
 debian/tmp/opt/trinity/lib/trinity/libkmidpart.so
 debian/tmp/opt/trinity/lib/libkmidlib.so.0
 debian/tmp/opt/trinity/lib/libkmidlib.so.0.0.0
-debian/tmp/opt/trinity/share/applications/kde/kmid.desktop
+debian/tmp/opt/trinity/share/applications/tde/kmid.desktop
 debian/tmp/opt/trinity/share/apps/kmid/DiesIrae.kar
 debian/tmp/opt/trinity/share/apps/kmid/Guantanamera.kar
 debian/tmp/opt/trinity/share/apps/kmid/MariaDeLasMercedes.kar
diff --git a/debian/lenny/tdemultimedia/debian/kmix-trinity.install b/debian/lenny/tdemultimedia/debian/kmix-trinity.install
index 46b045f6f..22044f305 100644
--- a/debian/lenny/tdemultimedia/debian/kmix-trinity.install
+++ b/debian/lenny/tdemultimedia/debian/kmix-trinity.install
@@ -8,7 +8,7 @@ debian/tmp/opt/trinity/lib/trinity/kmixctrl.la
 debian/tmp/opt/trinity/lib/trinity/kmixctrl.so
 debian/tmp/opt/trinity/lib/libtdeinit_kmix.so
 debian/tmp/opt/trinity/lib/libtdeinit_kmixctrl.so
-debian/tmp/opt/trinity/share/applications/kde/kmix.desktop
+debian/tmp/opt/trinity/share/applications/tde/kmix.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/kmixapplet.desktop
 debian/tmp/opt/trinity/share/apps/kmix/kmixui.rc
 debian/tmp/opt/trinity/share/apps/kmix/pics/Listener.png
diff --git a/debian/lenny/tdemultimedia/debian/krec-trinity.install b/debian/lenny/tdemultimedia/debian/krec-trinity.install
index ce6a15bfa..40832458b 100644
--- a/debian/lenny/tdemultimedia/debian/krec-trinity.install
+++ b/debian/lenny/tdemultimedia/debian/krec-trinity.install
@@ -10,7 +10,7 @@ debian/tmp/opt/trinity/lib/trinity/libkrecexport_ogg.so
 debian/tmp/opt/trinity/lib/trinity/libkrecexport_wave.la
 debian/tmp/opt/trinity/lib/trinity/libkrecexport_wave.so
 debian/tmp/opt/trinity/lib/libtdeinit_krec.so
-debian/tmp/opt/trinity/share/applications/kde/krec.desktop
+debian/tmp/opt/trinity/share/applications/tde/krec.desktop
 debian/tmp/opt/trinity/share/apps/krec/icons/crystalsvg/16x16/actions/krec_record.png
 debian/tmp/opt/trinity/share/apps/krec/icons/crystalsvg/22x22/actions/krec_record.png
 debian/tmp/opt/trinity/share/apps/krec/icons/crystalsvg/32x32/actions/krec_record.png
diff --git a/debian/lenny/tdemultimedia/debian/kscd-trinity.install b/debian/lenny/tdemultimedia/debian/kscd-trinity.install
index f1e5b53d8..ee9ba581d 100644
--- a/debian/lenny/tdemultimedia/debian/kscd-trinity.install
+++ b/debian/lenny/tdemultimedia/debian/kscd-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/bin/kscd
 debian/tmp/opt/trinity/bin/workman2cddb.pl
-debian/tmp/opt/trinity/share/applications/kde/kscd.desktop
+debian/tmp/opt/trinity/share/applications/tde/kscd.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/audiocd_play.desktop
 debian/tmp/opt/trinity/share/apps/kscd/icons/crystalsvg/22x22/actions/cdsmall.png
 debian/tmp/opt/trinity/share/apps/profiles/kscd.profile.xml
diff --git a/debian/lenny/tdemultimedia/debian/libkcddb1-trinity.install b/debian/lenny/tdemultimedia/debian/libkcddb1-trinity.install
index cece6d8da..d9858c0dc 100644
--- a/debian/lenny/tdemultimedia/debian/libkcddb1-trinity.install
+++ b/debian/lenny/tdemultimedia/debian/libkcddb1-trinity.install
@@ -2,6 +2,6 @@ debian/tmp/opt/trinity/lib/trinity/kcm_cddb.la
 debian/tmp/opt/trinity/lib/trinity/kcm_cddb.so
 debian/tmp/opt/trinity/lib/libkcddb.so.1
 debian/tmp/opt/trinity/lib/libkcddb.so.1.0.0
-debian/tmp/opt/trinity/share/applications/kde/libkcddb.desktop
+debian/tmp/opt/trinity/share/applications/tde/libkcddb.desktop
 debian/tmp/opt/trinity/share/apps/kconf_update/kcmcddb-emailsettings.upd
 debian/tmp/opt/trinity/share/config.kcfg/libkcddb.kcfg
diff --git a/debian/lenny/tdemultimedia/debian/noatun-trinity.install b/debian/lenny/tdemultimedia/debian/noatun-trinity.install
index 195e387b0..554c5cf07 100644
--- a/debian/lenny/tdemultimedia/debian/noatun-trinity.install
+++ b/debian/lenny/tdemultimedia/debian/noatun-trinity.install
@@ -71,7 +71,7 @@ debian/tmp/opt/trinity/lib/mcop/noatunarts.mcopclass
 debian/tmp/opt/trinity/lib/mcop/noatunarts.mcoptype
 debian/tmp/opt/trinity/lib/mcop/winskinvis.mcopclass
 debian/tmp/opt/trinity/lib/mcop/winskinvis.mcoptype
-debian/tmp/opt/trinity/share/applications/kde/noatun.desktop
+debian/tmp/opt/trinity/share/applications/tde/noatun.desktop
 debian/tmp/opt/trinity/share/apps/kconf_update/noatun.upd
 debian/tmp/opt/trinity/share/apps/noatun/dcopiface.plugin
 debian/tmp/opt/trinity/share/apps/noatun/eq.preset/preset.dance
diff --git a/debian/lenny/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install b/debian/lenny/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
index 9f7c1bd94..82b4ef2b4 100644
--- a/debian/lenny/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
+++ b/debian/lenny/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
@@ -12,7 +12,7 @@ debian/tmp/opt/trinity/lib/trinity/libaudiocd_encoder_wav.la
 debian/tmp/opt/trinity/lib/trinity/libaudiocd_encoder_wav.so
 debian/tmp/opt/trinity/lib/libaudiocdplugins.so.1
 debian/tmp/opt/trinity/lib/libaudiocdplugins.so.1.0.0
-debian/tmp/opt/trinity/share/applications/kde/audiocd.desktop
+debian/tmp/opt/trinity/share/applications/tde/audiocd.desktop
 debian/tmp/opt/trinity/share/apps/kconf_update/audiocd.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/upgrade-metadata.sh
 debian/tmp/opt/trinity/share/config.kcfg/audiocd_lame_encoder.kcfg
diff --git a/debian/lenny/tdenetwork/debian/kdict-trinity.install b/debian/lenny/tdenetwork/debian/kdict-trinity.install
index 5486cfa17..7d57f12cf 100644
--- a/debian/lenny/tdenetwork/debian/kdict-trinity.install
+++ b/debian/lenny/tdenetwork/debian/kdict-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/lib/trinity/kdict.so
 debian/tmp/opt/trinity/lib/trinity/kdict_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/kdict_panelapplet.so
 debian/tmp/opt/trinity/lib/libtdeinit_kdict.so
-debian/tmp/opt/trinity/share/applications/kde/kdict.desktop
+debian/tmp/opt/trinity/share/applications/tde/kdict.desktop
 debian/tmp/opt/trinity/share/apps/kdict/icons/crystalsvg/16x16/actions/define_clip.png
 debian/tmp/opt/trinity/share/apps/kdict/icons/crystalsvg/16x16/actions/query_erase.png
 debian/tmp/opt/trinity/share/apps/kdict/icons/crystalsvg/22x22/actions/define_clip.png
diff --git a/debian/lenny/tdenetwork/debian/kget-trinity.install b/debian/lenny/tdenetwork/debian/kget-trinity.install
index 697f16e2e..9a1ac79f5 100644
--- a/debian/lenny/tdenetwork/debian/kget-trinity.install
+++ b/debian/lenny/tdenetwork/debian/kget-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kget
 debian/tmp/opt/trinity/lib/trinity/khtml_kget.la
 debian/tmp/opt/trinity/lib/trinity/khtml_kget.so
-debian/tmp/opt/trinity/share/applications/kde/kget.desktop
+debian/tmp/opt/trinity/share/applications/tde/kget.desktop
 debian/tmp/opt/trinity/share/apps/kget/eventsrc
 debian/tmp/opt/trinity/share/apps/kget/icons/crystalsvg/22x22/actions/bar0.png
 debian/tmp/opt/trinity/share/apps/kget/icons/crystalsvg/22x22/actions/bar1.png
diff --git a/debian/lenny/tdenetwork/debian/knewsticker-trinity.install b/debian/lenny/tdenetwork/debian/knewsticker-trinity.install
index aa4b90edc..aa7f056d8 100644
--- a/debian/lenny/tdenetwork/debian/knewsticker-trinity.install
+++ b/debian/lenny/tdenetwork/debian/knewsticker-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/knewsticker_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/knewsticker_panelapplet.so
 debian/tmp/opt/trinity/lib/trinity/libkntsrcfilepropsdlg.la
 debian/tmp/opt/trinity/lib/trinity/libkntsrcfilepropsdlg.so
-debian/tmp/opt/trinity/share/applications/kde/knewsticker-standalone.desktop
+debian/tmp/opt/trinity/share/applications/tde/knewsticker-standalone.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/knewstickerstub.desktop
 debian/tmp/opt/trinity/share/apps/kconf_update/knewsticker.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/knt-0.1-0.2.pl
diff --git a/debian/lenny/tdenetwork/debian/kopete-trinity.install b/debian/lenny/tdenetwork/debian/kopete-trinity.install
index b75374a5b..a359ae82f 100644
--- a/debian/lenny/tdenetwork/debian/kopete-trinity.install
+++ b/debian/lenny/tdenetwork/debian/kopete-trinity.install
@@ -111,7 +111,7 @@ debian/tmp/opt/trinity/lib/libkopete.so.1
 debian/tmp/opt/trinity/lib/libkopete.so.1.0.0
 debian/tmp/opt/trinity/lib/libkopete_videodevice.so.0
 debian/tmp/opt/trinity/lib/libkopete_videodevice.so.0.0.0
-debian/tmp/opt/trinity/share/applications/kde/kopete.desktop
+debian/tmp/opt/trinity/share/applications/tde/kopete.desktop
 debian/tmp/opt/trinity/share/apps/kconf_update/kopete-account-0.10.pl
 debian/tmp/opt/trinity/share/apps/kconf_update/kopete-account-kconf_update.sh
 debian/tmp/opt/trinity/share/apps/kconf_update/kopete-account-kconf_update.upd
diff --git a/debian/lenny/tdenetwork/debian/kppp-trinity.install b/debian/lenny/tdenetwork/debian/kppp-trinity.install
index 3e4f063f4..74e95cd57 100644
--- a/debian/lenny/tdenetwork/debian/kppp-trinity.install
+++ b/debian/lenny/tdenetwork/debian/kppp-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kppp
 debian/tmp/opt/trinity/bin/kppplogview
-debian/tmp/opt/trinity/share/applications/kde/Kppp.desktop
-debian/tmp/opt/trinity/share/applications/kde/kppplogview.desktop
+debian/tmp/opt/trinity/share/applications/tde/Kppp.desktop
+debian/tmp/opt/trinity/share/applications/tde/kppplogview.desktop
 debian/tmp/opt/trinity/share/apps/kppp/pics/dock_both.png
 debian/tmp/opt/trinity/share/apps/kppp/pics/dock_left.png
 debian/tmp/opt/trinity/share/apps/kppp/pics/dock_none.png
diff --git a/debian/lenny/tdenetwork/debian/krdc-trinity.install b/debian/lenny/tdenetwork/debian/krdc-trinity.install
index ea0a5284a..af9f4674c 100644
--- a/debian/lenny/tdenetwork/debian/krdc-trinity.install
+++ b/debian/lenny/tdenetwork/debian/krdc-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/krdc
-debian/tmp/opt/trinity/share/applications/kde/krdc.desktop
+debian/tmp/opt/trinity/share/applications/tde/krdc.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/smb2rdc.desktop
 debian/tmp/opt/trinity/share/apps/krdc/pics/close.png
 debian/tmp/opt/trinity/share/apps/krdc/pics/iconify.png
diff --git a/debian/lenny/tdenetwork/debian/krfb-trinity.install b/debian/lenny/tdenetwork/debian/krfb-trinity.install
index f14235846..eb49ef238 100644
--- a/debian/lenny/tdenetwork/debian/krfb-trinity.install
+++ b/debian/lenny/tdenetwork/debian/krfb-trinity.install
@@ -4,8 +4,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_krfb.la
 debian/tmp/opt/trinity/lib/trinity/kcm_krfb.so
 debian/tmp/opt/trinity/lib/trinity/kded_kinetd.la
 debian/tmp/opt/trinity/lib/trinity/kded_kinetd.so
-debian/tmp/opt/trinity/share/applications/kde/kcmkrfb.desktop
-debian/tmp/opt/trinity/share/applications/kde/krfb.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmkrfb.desktop
+debian/tmp/opt/trinity/share/applications/tde/krfb.desktop
 debian/tmp/opt/trinity/share/apps/kinetd/eventsrc
 debian/tmp/opt/trinity/share/apps/krfb/eventsrc
 debian/tmp/opt/trinity/share/apps/krfb/pics/connection-side-image.png
diff --git a/debian/lenny/tdenetwork/debian/ksirc-trinity.install b/debian/lenny/tdenetwork/debian/ksirc-trinity.install
index 0492f8ebf..440ee00e9 100644
--- a/debian/lenny/tdenetwork/debian/ksirc-trinity.install
+++ b/debian/lenny/tdenetwork/debian/ksirc-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/bin/ksirc
 debian/tmp/opt/trinity/lib/trinity/ksirc.la
 debian/tmp/opt/trinity/lib/trinity/ksirc.so
 debian/tmp/opt/trinity/lib/libtdeinit_ksirc.so
-debian/tmp/opt/trinity/share/applications/kde/ksirc.desktop
+debian/tmp/opt/trinity/share/applications/tde/ksirc.desktop
 debian/tmp/opt/trinity/share/apps/ksirc/autodcc.pl
 debian/tmp/opt/trinity/share/apps/ksirc/eventsrc
 debian/tmp/opt/trinity/share/apps/ksirc/filters.pl
diff --git a/debian/lenny/tdenetwork/debian/ktalkd-trinity.install b/debian/lenny/tdenetwork/debian/ktalkd-trinity.install
index 607417afa..91bb7d3c8 100644
--- a/debian/lenny/tdenetwork/debian/ktalkd-trinity.install
+++ b/debian/lenny/tdenetwork/debian/ktalkd-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/bin/ktalkdlg
 debian/tmp/opt/trinity/bin/mail.local
 debian/tmp/opt/trinity/lib/trinity/kcm_ktalkd.la
 debian/tmp/opt/trinity/lib/trinity/kcm_ktalkd.so
-debian/tmp/opt/trinity/share/applications/kde/kcmktalkd.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmktalkd.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtalkd/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtalkd/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtalkd/index.docbook
diff --git a/debian/lenny/tdenetwork/debian/kwifimanager-trinity.install b/debian/lenny/tdenetwork/debian/kwifimanager-trinity.install
index b14b1c99b..328c9ae44 100644
--- a/debian/lenny/tdenetwork/debian/kwifimanager-trinity.install
+++ b/debian/lenny/tdenetwork/debian/kwifimanager-trinity.install
@@ -3,8 +3,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_wifi.la
 debian/tmp/opt/trinity/lib/trinity/kcm_wifi.so
 debian/tmp/opt/trinity/lib/libkwireless.la
 debian/tmp/opt/trinity/lib/libkwireless.so
-debian/tmp/opt/trinity/share/applications/kde/kcmwifi.desktop
-debian/tmp/opt/trinity/share/applications/kde/kwifimanager.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmwifi.desktop
+debian/tmp/opt/trinity/share/applications/tde/kwifimanager.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/kwireless.desktop
 debian/tmp/opt/trinity/share/apps/kwifimanager/kwifimanagerui.rc
 debian/tmp/opt/trinity/share/apps/kwifimanager/locations/DE_BW_Karlsruhe_University.loc
diff --git a/debian/lenny/tdenetwork/debian/tdenetwork-filesharing-trinity.install b/debian/lenny/tdenetwork/debian/tdenetwork-filesharing-trinity.install
index 4b0e9f5b9..4bbdfcb9a 100644
--- a/debian/lenny/tdenetwork/debian/tdenetwork-filesharing-trinity.install
+++ b/debian/lenny/tdenetwork/debian/tdenetwork-filesharing-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/lib/trinity/kcm_fileshare.la
 debian/tmp/opt/trinity/lib/trinity/kcm_fileshare.so
 debian/tmp/opt/trinity/lib/trinity/kcm_kcmsambaconf.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kcmsambaconf.so
-debian/tmp/opt/trinity/share/applications/kde/fileshare.desktop
-debian/tmp/opt/trinity/share/applications/kde/kcmsambaconf.desktop
+debian/tmp/opt/trinity/share/applications/tde/fileshare.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmsambaconf.desktop
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcmsambaconf.png
 debian/tmp/opt/trinity/share/services/fileshare_propsdlgplugin.desktop
diff --git a/debian/lenny/tdepim/debian/akregator-trinity.install b/debian/lenny/tdepim/debian/akregator-trinity.install
index 456a67e27..74762a959 100644
--- a/debian/lenny/tdepim/debian/akregator-trinity.install
+++ b/debian/lenny/tdepim/debian/akregator-trinity.install
@@ -7,7 +7,7 @@
 /opt/trinity/lib/libakregatorprivate.so
 /opt/trinity/lib/libakregatorprivate.so.0
 /opt/trinity/lib/libakregatorprivate.so.0.0.0
-/opt/trinity/share/applications/kde/akregator.desktop
+/opt/trinity/share/applications/tde/akregator.desktop
 /opt/trinity/share/apps/akregator
 /opt/trinity/share/config.kcfg/akregator.kcfg
 /opt/trinity/share/config.kcfg/mk4config.kcfg
diff --git a/debian/lenny/tdepim/debian/kaddressbook-trinity.install b/debian/lenny/tdepim/debian/kaddressbook-trinity.install
index ce026e81a..748b6e9a7 100644
--- a/debian/lenny/tdepim/debian/kaddressbook-trinity.install
+++ b/debian/lenny/tdepim/debian/kaddressbook-trinity.install
@@ -16,7 +16,7 @@
 /opt/trinity/lib/libkabinterfaces.so.1.0.0
 /opt/trinity/lib/libkaddressbook.so.0
 /opt/trinity/lib/libkaddressbook.so.0.0.0
-/opt/trinity/share/applications/kde/kaddressbook.desktop
+/opt/trinity/share/applications/tde/kaddressbook.desktop
 /opt/trinity/share/apps/kaddressbook
 /opt/trinity/share/doc/tde/HTML/en/kaddressbook
 /opt/trinity/share/icons/hicolor/128x128/apps/kaddressbook.png
diff --git a/debian/lenny/tdepim/debian/kalarm-trinity.install b/debian/lenny/tdepim/debian/kalarm-trinity.install
index a191321ec..ab01f0bcd 100644
--- a/debian/lenny/tdepim/debian/kalarm-trinity.install
+++ b/debian/lenny/tdepim/debian/kalarm-trinity.install
@@ -1,6 +1,6 @@
 /opt/trinity/bin/kalarm
 /opt/trinity/bin/kalarmd
-/opt/trinity/share/applications/kde/kalarm.desktop
+/opt/trinity/share/applications/tde/kalarm.desktop
 /opt/trinity/share/applnk/.hidden/kalarmd.desktop
 /opt/trinity/share/applnk/Applications/kalarm.desktop
 /opt/trinity/share/apps/kalarm
diff --git a/debian/lenny/tdepim/debian/kandy-trinity.install b/debian/lenny/tdepim/debian/kandy-trinity.install
index d42acd2ce..bf356be2c 100644
--- a/debian/lenny/tdepim/debian/kandy-trinity.install
+++ b/debian/lenny/tdepim/debian/kandy-trinity.install
@@ -1,6 +1,6 @@
 /opt/trinity/bin/kandy
 /opt/trinity/bin/kandy_client
-/opt/trinity/share/applications/kde/kandy.desktop
+/opt/trinity/share/applications/tde/kandy.desktop
 /opt/trinity/share/applnk/Utilities/kandy.desktop
 /opt/trinity/share/apps/kandy
 /opt/trinity/share/config.kcfg/kandy.kcfg
diff --git a/debian/lenny/tdepim/debian/karm-trinity.install b/debian/lenny/tdepim/debian/karm-trinity.install
index a2a22b674..855a03b27 100644
--- a/debian/lenny/tdepim/debian/karm-trinity.install
+++ b/debian/lenny/tdepim/debian/karm-trinity.install
@@ -4,7 +4,7 @@
 /opt/trinity/lib/libkarm.so.0.0.0
 /opt/trinity/lib/trinity/libkarmpart.la
 /opt/trinity/lib/trinity/libkarmpart.so
-/opt/trinity/share/applications/kde/karm.desktop
+/opt/trinity/share/applications/tde/karm.desktop
 /opt/trinity/share/applnk/Utilities/karm.desktop
 /opt/trinity/share/apps/karm
 /opt/trinity/share/apps/karmpart
diff --git a/debian/lenny/tdepim/debian/kitchensync-trinity.install b/debian/lenny/tdepim/debian/kitchensync-trinity.install
index cdf89734d..f22298aae 100644
--- a/debian/lenny/tdepim/debian/kitchensync-trinity.install
+++ b/debian/lenny/tdepim/debian/kitchensync-trinity.install
@@ -6,7 +6,7 @@
 /opt/trinity/lib/libkitchensync.so.0.0.0
 /opt/trinity/lib/libqopensync.so.0
 /opt/trinity/lib/libqopensync.so.0.0.0
-/opt/trinity/share/applications/kde/kitchensync.desktop
+/opt/trinity/share/applications/tde/kitchensync.desktop
 /opt/trinity/share/icons/hicolor/16x16/apps/kitchensync.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kitchensync.png
 /opt/trinity/share/icons/hicolor/32x32/apps/kitchensync.png
diff --git a/debian/lenny/tdepim/debian/kleopatra-trinity.install b/debian/lenny/tdepim/debian/kleopatra-trinity.install
index 2e5241ad1..b2146723a 100644
--- a/debian/lenny/tdepim/debian/kleopatra-trinity.install
+++ b/debian/lenny/tdepim/debian/kleopatra-trinity.install
@@ -2,7 +2,7 @@
 /opt/trinity/bin/kwatchgnupg
 /opt/trinity/lib/trinity/kcm_kleopatra.la
 /opt/trinity/lib/trinity/kcm_kleopatra.so
-/opt/trinity/share/applications/kde/kleopatra_import.desktop
+/opt/trinity/share/applications/tde/kleopatra_import.desktop
 /opt/trinity/share/apps/kleopatra
 /opt/trinity/share/apps/kwatchgnupg
 /opt/trinity/share/doc/tde/HTML/en/kleopatra
diff --git a/debian/lenny/tdepim/debian/kmail-trinity.install b/debian/lenny/tdepim/debian/kmail-trinity.install
index de2821f79..c9a6e8969 100644
--- a/debian/lenny/tdepim/debian/kmail-trinity.install
+++ b/debian/lenny/tdepim/debian/kmail-trinity.install
@@ -16,8 +16,8 @@
 /opt/trinity/lib/trinity/libkmailpart.so
 /opt/trinity/lib/libkmailprivate.la
 /opt/trinity/lib/libkmailprivate.so
-/opt/trinity/share/applications/kde/KMail.desktop
-/opt/trinity/share/applications/kde/kmail_view.desktop
+/opt/trinity/share/applications/tde/KMail.desktop
+/opt/trinity/share/applications/tde/kmail_view.desktop
 /opt/trinity/share/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
 /opt/trinity/share/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl
 /opt/trinity/share/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
diff --git a/debian/lenny/tdepim/debian/knode-trinity.install b/debian/lenny/tdepim/debian/knode-trinity.install
index 964e43e76..a807a9711 100644
--- a/debian/lenny/tdepim/debian/knode-trinity.install
+++ b/debian/lenny/tdepim/debian/knode-trinity.install
@@ -7,7 +7,7 @@
 /opt/trinity/lib/libknodecommon.so
 /opt/trinity/lib/libknodecommon.so.3
 /opt/trinity/lib/libknodecommon.so.3.0.0
-/opt/trinity/share/applications/kde/KNode.desktop
+/opt/trinity/share/applications/tde/KNode.desktop
 /opt/trinity/share/apps/knode
 /opt/trinity/share/doc/tde/HTML/en/knode
 /opt/trinity/share/icons/hicolor/128x128/apps/knode.png
diff --git a/debian/lenny/tdepim/debian/knotes-trinity.install b/debian/lenny/tdepim/debian/knotes-trinity.install
index 602954d5d..97956b197 100644
--- a/debian/lenny/tdepim/debian/knotes-trinity.install
+++ b/debian/lenny/tdepim/debian/knotes-trinity.install
@@ -4,7 +4,7 @@
 /opt/trinity/lib/libknotes.so
 /opt/trinity/lib/libknotes.so.0
 /opt/trinity/lib/libknotes.so.0.0.0
-/opt/trinity/share/applications/kde/knotes.desktop
+/opt/trinity/share/applications/tde/knotes.desktop
 /opt/trinity/share/apps/knotes
 /opt/trinity/share/config.kcfg/knoteconfig.kcfg
 /opt/trinity/share/config.kcfg/knotesglobalconfig.kcfg
diff --git a/debian/lenny/tdepim/debian/konsolekalendar-trinity.install b/debian/lenny/tdepim/debian/konsolekalendar-trinity.install
index 5f5765429..f46c301bc 100644
--- a/debian/lenny/tdepim/debian/konsolekalendar-trinity.install
+++ b/debian/lenny/tdepim/debian/konsolekalendar-trinity.install
@@ -1,5 +1,5 @@
 /opt/trinity/bin/konsolekalendar
-/opt/trinity/share/applications/kde/konsolekalendar.desktop
+/opt/trinity/share/applications/tde/konsolekalendar.desktop
 /opt/trinity/share/doc/tde/HTML/en/konsolekalendar/common
 /opt/trinity/share/doc/tde/HTML/en/konsolekalendar/index.cache.bz2
 /opt/trinity/share/doc/tde/HTML/en/konsolekalendar/index.docbook
diff --git a/debian/lenny/tdepim/debian/kontact-trinity.install b/debian/lenny/tdepim/debian/kontact-trinity.install
index 4c0bc653b..1adfd780c 100644
--- a/debian/lenny/tdepim/debian/kontact-trinity.install
+++ b/debian/lenny/tdepim/debian/kontact-trinity.install
@@ -17,8 +17,8 @@
 /opt/trinity/lib/libkontact.so.1.0.0
 /opt/trinity/lib/libkpinterfaces.so.1
 /opt/trinity/lib/libkpinterfaces.so.1.0.0
-/opt/trinity/share/applications/kde/Kontact.desktop
-/opt/trinity/share/applications/kde/kontactdcop.desktop
+/opt/trinity/share/applications/tde/Kontact.desktop
+/opt/trinity/share/applications/tde/kontactdcop.desktop
 /opt/trinity/share/apps/kontact
 /opt/trinity/share/apps/kontactsummary/kontactsummary_part.rc
 /opt/trinity/share/config.kcfg/kontact.kcfg
diff --git a/debian/lenny/tdepim/debian/korganizer-trinity.install b/debian/lenny/tdepim/debian/korganizer-trinity.install
index f5b60b56b..72858377b 100644
--- a/debian/lenny/tdepim/debian/korganizer-trinity.install
+++ b/debian/lenny/tdepim/debian/korganizer-trinity.install
@@ -17,7 +17,7 @@
 /opt/trinity/lib/libkorganizer_calendar.so.1.0.0
 /opt/trinity/lib/libkorganizer_eventviewer.so.1
 /opt/trinity/lib/libkorganizer_eventviewer.so.1.0.0
-/opt/trinity/share/applications/kde/korganizer.desktop
+/opt/trinity/share/applications/tde/korganizer.desktop
 /opt/trinity/share/apps/kconf_update/korganizer.upd
 /opt/trinity/share/apps/korgac
 /opt/trinity/share/apps/korganizer
diff --git a/debian/lenny/tdepim/debian/korn-trinity.install b/debian/lenny/tdepim/debian/korn-trinity.install
index 5b1c7fdaf..33c5538d2 100644
--- a/debian/lenny/tdepim/debian/korn-trinity.install
+++ b/debian/lenny/tdepim/debian/korn-trinity.install
@@ -1,6 +1,6 @@
 /opt/trinity/bin/korn
 /opt/trinity/lib/kconf_update_bin/korn-3-4-config_change
-/opt/trinity/share/applications/kde/KOrn.desktop
+/opt/trinity/share/applications/tde/KOrn.desktop
 /opt/trinity/share/apps/kconf_update/korn-3-4-config_change.upd
 /opt/trinity/share/apps/kconf_update/korn-3-5-metadata-update.pl
 /opt/trinity/share/apps/kconf_update/korn-3-5-ssl-update.pl
diff --git a/debian/lenny/tdepim/debian/ktnef-trinity.install b/debian/lenny/tdepim/debian/ktnef-trinity.install
index 1f299a543..5964289ef 100644
--- a/debian/lenny/tdepim/debian/ktnef-trinity.install
+++ b/debian/lenny/tdepim/debian/ktnef-trinity.install
@@ -1,5 +1,5 @@
 /opt/trinity/bin/ktnef
-/opt/trinity/share/applications/kde/ktnef.desktop
+/opt/trinity/share/applications/tde/ktnef.desktop
 /opt/trinity/share/apps/ktnef
 /opt/trinity/share/doc/tde/HTML/en/ktnef
 /opt/trinity/share/icons/hicolor/48x48/apps/ktnef.png
diff --git a/debian/lenny/tdepim/debian/tdepim-wizards-trinity.install b/debian/lenny/tdepim/debian/tdepim-wizards-trinity.install
index 465782c25..ef2fe681a 100644
--- a/debian/lenny/tdepim/debian/tdepim-wizards-trinity.install
+++ b/debian/lenny/tdepim/debian/tdepim-wizards-trinity.install
@@ -18,7 +18,7 @@
 /opt/trinity/lib/trinity/libscalixwizard.so
 /opt/trinity/lib/trinity/libsloxwizard.la
 /opt/trinity/lib/trinity/libsloxwizard.so
-/opt/trinity/share/applications/kde/groupwarewizard.desktop
+/opt/trinity/share/applications/tde/groupwarewizard.desktop
 /opt/trinity/share/config.kcfg/egroupware.kcfg
 /opt/trinity/share/config.kcfg/groupwise.kcfg
 /opt/trinity/share/config.kcfg/kolab.kcfg
diff --git a/debian/lenny/tdesdk/debian/cervisia-trinity.install b/debian/lenny/tdesdk/debian/cervisia-trinity.install
index f696f658f..6cee13ad2 100644
--- a/debian/lenny/tdesdk/debian/cervisia-trinity.install
+++ b/debian/lenny/tdesdk/debian/cervisia-trinity.install
@@ -5,7 +5,7 @@ debian/tmp/opt/trinity/lib/trinity/cervisia.la
 debian/tmp/opt/trinity/lib/trinity/cervisia.so
 debian/tmp/opt/trinity/lib/trinity/libcervisiapart.la
 debian/tmp/opt/trinity/lib/trinity/libcervisiapart.so
-debian/tmp/opt/trinity/share/applications/kde/cervisia.desktop
+debian/tmp/opt/trinity/share/applications/tde/cervisia.desktop
 debian/tmp/opt/trinity/share/apps/cervisia/cervisiashellui.rc
 debian/tmp/opt/trinity/share/apps/cervisia/eventsrc
 debian/tmp/opt/trinity/share/apps/cervisiapart/cervisiaui.rc
diff --git a/debian/lenny/tdesdk/debian/kbabel-trinity.install b/debian/lenny/tdesdk/debian/kbabel-trinity.install
index 89437643b..09e1b6dd7 100644
--- a/debian/lenny/tdesdk/debian/kbabel-trinity.install
+++ b/debian/lenny/tdesdk/debian/kbabel-trinity.install
@@ -53,9 +53,9 @@ debian/tmp/opt/trinity/lib/trinity/kbabeldict_pocompendium.la
 debian/tmp/opt/trinity/lib/trinity/kbabeldict_pocompendium.so
 debian/tmp/opt/trinity/lib/trinity/kbabeldict_tmxcompendium.la
 debian/tmp/opt/trinity/lib/trinity/kbabeldict_tmxcompendium.so
-debian/tmp/opt/trinity/share/applications/kde/catalogmanager.desktop
-debian/tmp/opt/trinity/share/applications/kde/kbabel.desktop
-debian/tmp/opt/trinity/share/applications/kde/kbabeldict.desktop
+debian/tmp/opt/trinity/share/applications/tde/catalogmanager.desktop
+debian/tmp/opt/trinity/share/applications/tde/kbabel.desktop
+debian/tmp/opt/trinity/share/applications/tde/kbabeldict.desktop
 debian/tmp/opt/trinity/share/apps/catalogmanager/catalogmanagerui.rc
 debian/tmp/opt/trinity/share/apps/kbabel/kbabelui.rc
 debian/tmp/opt/trinity/share/apps/kbabel/regexplist.xml
diff --git a/debian/lenny/tdesdk/debian/kbugbuster-trinity.install b/debian/lenny/tdesdk/debian/kbugbuster-trinity.install
index 80072a35e..ca24935e3 100644
--- a/debian/lenny/tdesdk/debian/kbugbuster-trinity.install
+++ b/debian/lenny/tdesdk/debian/kbugbuster-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kbugbuster
 debian/tmp/opt/trinity/lib/trinity/kcal_bugzilla.la
 debian/tmp/opt/trinity/lib/trinity/kcal_bugzilla.so
-debian/tmp/opt/trinity/share/applications/kde/kbugbuster.desktop
+debian/tmp/opt/trinity/share/applications/tde/kbugbuster.desktop
 debian/tmp/opt/trinity/share/apps/kbugbuster/kbugbusterui.rc
 debian/tmp/opt/trinity/share/apps/kbugbuster/pics/bars.png
 debian/tmp/opt/trinity/share/apps/kbugbuster/pics/logo.png
diff --git a/debian/lenny/tdesdk/debian/kompare-trinity.install b/debian/lenny/tdesdk/debian/kompare-trinity.install
index 111ebeea1..aca239beb 100644
--- a/debian/lenny/tdesdk/debian/kompare-trinity.install
+++ b/debian/lenny/tdesdk/debian/kompare-trinity.install
@@ -7,7 +7,7 @@ debian/tmp/opt/trinity/lib/trinity/libkomparenavtreepart.la
 debian/tmp/opt/trinity/lib/trinity/libkomparenavtreepart.so
 debian/tmp/opt/trinity/lib/trinity/libkomparepart.la
 debian/tmp/opt/trinity/lib/trinity/libkomparepart.so
-debian/tmp/opt/trinity/share/applications/kde/kompare.desktop
+debian/tmp/opt/trinity/share/applications/tde/kompare.desktop
 debian/tmp/opt/trinity/share/apps/kompare/komparepartui.rc
 debian/tmp/opt/trinity/share/apps/kompare/kompareui.rc
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kompare/*.bz2
diff --git a/debian/lenny/tdesdk/debian/kuiviewer-trinity.install b/debian/lenny/tdesdk/debian/kuiviewer-trinity.install
index 964614988..0fbde204f 100644
--- a/debian/lenny/tdesdk/debian/kuiviewer-trinity.install
+++ b/debian/lenny/tdesdk/debian/kuiviewer-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/libkuiviewerpart.so
 debian/tmp/opt/trinity/lib/trinity/libkuiviewerpart.la
 debian/tmp/opt/trinity/lib/trinity/quithumbnail.so
 debian/tmp/opt/trinity/lib/trinity/quithumbnail.la
-debian/tmp/opt/trinity/share/applications/kde/kuiviewer.desktop
+debian/tmp/opt/trinity/share/applications/tde/kuiviewer.desktop
 debian/tmp/opt/trinity/share/apps/kuiviewer/kuiviewerui.rc
 debian/tmp/opt/trinity/share/apps/kuiviewerpart/kuiviewer_part.rc
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kuiviewer.png
diff --git a/debian/lenny/tdesdk/debian/tdecachegrind-trinity.install b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.install
index 2d83cc215..b1b9b739e 100644
--- a/debian/lenny/tdesdk/debian/tdecachegrind-trinity.install
+++ b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/tdecachegrind
-debian/tmp/opt/trinity/share/applications/kde/tdecachegrind.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdecachegrind.desktop
 debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/16x16/actions/fromrec.png
 debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/16x16/actions/percent.png
 debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/16x16/actions/recrec.png
diff --git a/debian/lenny/tdesdk/debian/umbrello-trinity.install b/debian/lenny/tdesdk/debian/umbrello-trinity.install
index 2ddf21a77..dbb79a2ad 100644
--- a/debian/lenny/tdesdk/debian/umbrello-trinity.install
+++ b/debian/lenny/tdesdk/debian/umbrello-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/bin/umbodoc
 debian/tmp/opt/trinity/bin/umbrello
-debian/tmp/opt/trinity/share/applications/kde/umbrello.desktop
+debian/tmp/opt/trinity/share/applications/tde/umbrello.desktop
 debian/tmp/opt/trinity/share/apps/umbrello/tips
 debian/tmp/opt/trinity/share/apps/umbrello/umbrelloui.rc
 debian/tmp/opt/trinity/share/apps/umbrello/headings/heading.adb
diff --git a/debian/lenny/tdetoys/debian/amor-trinity.install b/debian/lenny/tdetoys/debian/amor-trinity.install
index 861ad858c..42a96abee 100644
--- a/debian/lenny/tdetoys/debian/amor-trinity.install
+++ b/debian/lenny/tdetoys/debian/amor-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/amor
 debian/tmp/opt/trinity/include/tde/AmorIface.h
 debian/tmp/opt/trinity/share/apps/amor
-debian/tmp/opt/trinity/share/applications/kde/amor.desktop
+debian/tmp/opt/trinity/share/applications/tde/amor.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/amor/*.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/amor/*.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/amor/*.png
diff --git a/debian/lenny/tdetoys/debian/kodo-trinity.install b/debian/lenny/tdetoys/debian/kodo-trinity.install
index e3563ae4c..1b508d11e 100644
--- a/debian/lenny/tdetoys/debian/kodo-trinity.install
+++ b/debian/lenny/tdetoys/debian/kodo-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/kodo
-debian/tmp/opt/trinity/share/applications/kde/kodo.desktop
+debian/tmp/opt/trinity/share/applications/tde/kodo.desktop
 debian/tmp/opt/trinity/share/apps/kodo/numbers.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kodo/*.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kodo/*.docbook
diff --git a/debian/lenny/tdetoys/debian/kteatime-trinity.install b/debian/lenny/tdetoys/debian/kteatime-trinity.install
index dcf1742c4..5e1436d4c 100644
--- a/debian/lenny/tdetoys/debian/kteatime-trinity.install
+++ b/debian/lenny/tdetoys/debian/kteatime-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/kteatime
-debian/tmp/opt/trinity/share/applications/kde/kteatime.desktop
+debian/tmp/opt/trinity/share/applications/tde/kteatime.desktop
 debian/tmp/opt/trinity/share/apps/kteatime
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kteatime/*.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kteatime/*.docbook
diff --git a/debian/lenny/tdetoys/debian/kworldclock-trinity.install b/debian/lenny/tdetoys/debian/kworldclock-trinity.install
index ba9a38321..dd089b668 100644
--- a/debian/lenny/tdetoys/debian/kworldclock-trinity.install
+++ b/debian/lenny/tdetoys/debian/kworldclock-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kworldclock
 debian/tmp/opt/trinity/lib/trinity/ww_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/ww_panelapplet.so
-debian/tmp/opt/trinity/share/applications/kde/kworldclock.desktop
+debian/tmp/opt/trinity/share/applications/tde/kworldclock.desktop
 debian/tmp/opt/trinity/share/apps/kdesktop/programs/kdeworld.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/kwwapplet.desktop
 debian/tmp/opt/trinity/share/apps/kworldclock
diff --git a/debian/lenny/tdeutils/debian/ark-trinity.install b/debian/lenny/tdeutils/debian/ark-trinity.install
index f0fd5ac60..27b3cea81 100644
--- a/debian/lenny/tdeutils/debian/ark-trinity.install
+++ b/debian/lenny/tdeutils/debian/ark-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/lib/trinity/ark.so
 debian/tmp/opt/trinity/lib/trinity/libarkpart.la
 debian/tmp/opt/trinity/lib/trinity/libarkpart.so
 debian/tmp/opt/trinity/lib/libtdeinit_ark.so
-debian/tmp/opt/trinity/share/applications/kde/ark.desktop
+debian/tmp/opt/trinity/share/applications/tde/ark.desktop
 debian/tmp/opt/trinity/share/apps/ark/ark_part.rc
 debian/tmp/opt/trinity/share/apps/ark/ark_part_readonly.rc
 debian/tmp/opt/trinity/share/apps/ark/arkui.rc
diff --git a/debian/lenny/tdeutils/debian/kcalc-trinity.install b/debian/lenny/tdeutils/debian/kcalc-trinity.install
index 0c0e03d96..231afbf24 100644
--- a/debian/lenny/tdeutils/debian/kcalc-trinity.install
+++ b/debian/lenny/tdeutils/debian/kcalc-trinity.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/kcalc
 debian/tmp/opt/trinity/lib/trinity/kcalc.la
 debian/tmp/opt/trinity/lib/trinity/kcalc.so
 debian/tmp/opt/trinity/lib/libtdeinit_kcalc.so
-debian/tmp/opt/trinity/share/applications/kde/kcalc.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcalc.desktop
 debian/tmp/opt/trinity/share/apps/kcalc/kcalcui.rc
 debian/tmp/opt/trinity/share/apps/kconf_update/kcalcrc.upd
 debian/tmp/opt/trinity/share/config.kcfg/kcalc.kcfg
diff --git a/debian/lenny/tdeutils/debian/kcharselect-trinity.install b/debian/lenny/tdeutils/debian/kcharselect-trinity.install
index a18296be0..417f215d6 100644
--- a/debian/lenny/tdeutils/debian/kcharselect-trinity.install
+++ b/debian/lenny/tdeutils/debian/kcharselect-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kcharselect
 debian/tmp/opt/trinity/lib/trinity/kcharselect_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/kcharselect_panelapplet.so
-debian/tmp/opt/trinity/share/applications/kde/KCharSelect.desktop
+debian/tmp/opt/trinity/share/applications/tde/KCharSelect.desktop
 debian/tmp/opt/trinity/share/apps/kcharselect/kcharselectui.rc
 debian/tmp/opt/trinity/share/apps/kconf_update/kcharselect.upd
 debian/tmp/opt/trinity/share/apps/kicker/applets/kcharselectapplet.desktop
diff --git a/debian/lenny/tdeutils/debian/kdelirc-trinity.install b/debian/lenny/tdeutils/debian/kdelirc-trinity.install
index d8b85d6d2..6f5c2b3bb 100644
--- a/debian/lenny/tdeutils/debian/kdelirc-trinity.install
+++ b/debian/lenny/tdeutils/debian/kdelirc-trinity.install
@@ -4,8 +4,8 @@ debian/tmp/opt/trinity/lib/trinity/irkick.so
 debian/tmp/opt/trinity/lib/trinity/kcm_kcmlirc.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kcmlirc.so
 debian/tmp/opt/trinity/lib/libtdeinit_irkick.so
-debian/tmp/opt/trinity/share/applications/kde/irkick.desktop
-debian/tmp/opt/trinity/share/applications/kde/kcmlirc.desktop
+debian/tmp/opt/trinity/share/applications/tde/irkick.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmlirc.desktop
 debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/irkick.png
 debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/irkickflash.png
 debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/irkickoff.png
diff --git a/debian/lenny/tdeutils/debian/kdf-trinity.install b/debian/lenny/tdeutils/debian/kdf-trinity.install
index 074e2f7f8..1c9aa57d4 100644
--- a/debian/lenny/tdeutils/debian/kdf-trinity.install
+++ b/debian/lenny/tdeutils/debian/kdf-trinity.install
@@ -2,9 +2,9 @@ debian/tmp/opt/trinity/bin/kdf
 debian/tmp/opt/trinity/bin/kwikdisk
 debian/tmp/opt/trinity/lib/trinity/kcm_kdf.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kdf.so
-debian/tmp/opt/trinity/share/applications/kde/kcmdf.desktop
-debian/tmp/opt/trinity/share/applications/kde/kdf.desktop
-debian/tmp/opt/trinity/share/applications/kde/kwikdisk.desktop
+debian/tmp/opt/trinity/share/applications/tde/kcmdf.desktop
+debian/tmp/opt/trinity/share/applications/tde/kdf.desktop
+debian/tmp/opt/trinity/share/applications/tde/kwikdisk.desktop
 debian/tmp/opt/trinity/share/apps/kdf/kdfui.rc
 debian/tmp/opt/trinity/share/apps/kdf/pics/delete.png
 debian/tmp/opt/trinity/share/apps/kdf/pics/tick.png
diff --git a/debian/lenny/tdeutils/debian/kedit-trinity.install b/debian/lenny/tdeutils/debian/kedit-trinity.install
index b344d4a03..40d08d1ab 100644
--- a/debian/lenny/tdeutils/debian/kedit-trinity.install
+++ b/debian/lenny/tdeutils/debian/kedit-trinity.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/kedit
 debian/tmp/opt/trinity/lib/trinity/kedit.la
 debian/tmp/opt/trinity/lib/trinity/kedit.so
 debian/tmp/opt/trinity/lib/libtdeinit_kedit.so
-debian/tmp/opt/trinity/share/applications/kde/KEdit.desktop
+debian/tmp/opt/trinity/share/applications/tde/KEdit.desktop
 debian/tmp/opt/trinity/share/apps/kedit/keditui.rc
 debian/tmp/opt/trinity/share/config.kcfg/kedit.kcfg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kedit/common
diff --git a/debian/lenny/tdeutils/debian/kfloppy-trinity.install b/debian/lenny/tdeutils/debian/kfloppy-trinity.install
index 25738bfa0..5c1588041 100644
--- a/debian/lenny/tdeutils/debian/kfloppy-trinity.install
+++ b/debian/lenny/tdeutils/debian/kfloppy-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/kfloppy
-debian/tmp/opt/trinity/share/applications/kde/KFloppy.desktop
+debian/tmp/opt/trinity/share/applications/tde/KFloppy.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/floppy_format.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfloppy/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfloppy/index.cache.bz2
diff --git a/debian/lenny/tdeutils/debian/kgpg-trinity.install b/debian/lenny/tdeutils/debian/kgpg-trinity.install
index 26605d453..2317f8bad 100644
--- a/debian/lenny/tdeutils/debian/kgpg-trinity.install
+++ b/debian/lenny/tdeutils/debian/kgpg-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/kgpg
-debian/tmp/opt/trinity/share/applications/kde/kgpg.desktop
+debian/tmp/opt/trinity/share/applications/tde/kgpg.desktop
 debian/tmp/opt/trinity/share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key1.png
 debian/tmp/opt/trinity/share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key2.png
 debian/tmp/opt/trinity/share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key3.png
diff --git a/debian/lenny/tdeutils/debian/khexedit-trinity.install b/debian/lenny/tdeutils/debian/khexedit-trinity.install
index d48280fed..7ac6b4f2e 100644
--- a/debian/lenny/tdeutils/debian/khexedit-trinity.install
+++ b/debian/lenny/tdeutils/debian/khexedit-trinity.install
@@ -5,7 +5,7 @@ debian/tmp/opt/trinity/lib/trinity/libkhexedit2part.la
 debian/tmp/opt/trinity/lib/trinity/libkhexedit2part.so
 debian/tmp/opt/trinity/lib/libkhexeditcommon.so.0
 debian/tmp/opt/trinity/lib/libkhexeditcommon.so.0.0.0
-debian/tmp/opt/trinity/share/applications/kde/khexedit.desktop
+debian/tmp/opt/trinity/share/applications/tde/khexedit.desktop
 debian/tmp/opt/trinity/share/apps/khexedit/khexeditui.rc
 debian/tmp/opt/trinity/share/apps/khexedit/pics/hexdrag.png
 debian/tmp/opt/trinity/share/apps/khexedit/pics/hexmask.png
diff --git a/debian/lenny/tdeutils/debian/kjots-trinity.install b/debian/lenny/tdeutils/debian/kjots-trinity.install
index 8b117e0b5..2e1546b5c 100644
--- a/debian/lenny/tdeutils/debian/kjots-trinity.install
+++ b/debian/lenny/tdeutils/debian/kjots-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/kjots
-debian/tmp/opt/trinity/share/applications/kde/Kjots.desktop
+debian/tmp/opt/trinity/share/applications/tde/Kjots.desktop
 debian/tmp/opt/trinity/share/apps/kjots/kjotsui.rc
 debian/tmp/opt/trinity/share/apps/kjots/pics/filedel.png
 debian/tmp/opt/trinity/share/config.kcfg/kjots.kcfg
diff --git a/debian/lenny/tdeutils/debian/klaptopdaemon-trinity.install b/debian/lenny/tdeutils/debian/klaptopdaemon-trinity.install
index 3e9d1af18..fe1e6cc76 100644
--- a/debian/lenny/tdeutils/debian/klaptopdaemon-trinity.install
+++ b/debian/lenny/tdeutils/debian/klaptopdaemon-trinity.install
@@ -6,8 +6,8 @@ debian/tmp/opt/trinity/lib/trinity/kded_klaptopdaemon.la
 debian/tmp/opt/trinity/lib/trinity/kded_klaptopdaemon.so
 debian/tmp/opt/trinity/lib/libkcmlaptop.so.0
 debian/tmp/opt/trinity/lib/libkcmlaptop.so.0.0.0
-debian/tmp/opt/trinity/share/applications/kde/laptop.desktop
-debian/tmp/opt/trinity/share/applications/kde/pcmcia.desktop
+debian/tmp/opt/trinity/share/applications/tde/laptop.desktop
+debian/tmp/opt/trinity/share/applications/tde/pcmcia.desktop
 debian/tmp/opt/trinity/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_nobattery.png
 debian/tmp/opt/trinity/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_nocharge.png
 debian/tmp/opt/trinity/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_power.png
diff --git a/debian/lenny/tdeutils/debian/kmilo-legacy-trinity.install b/debian/lenny/tdeutils/debian/kmilo-legacy-trinity.install
index 9cc04b20c..afa9d1fed 100644
--- a/debian/lenny/tdeutils/debian/kmilo-legacy-trinity.install
+++ b/debian/lenny/tdeutils/debian/kmilo-legacy-trinity.install
@@ -10,8 +10,8 @@ debian/tmp/opt/trinity/lib/trinity/kmilo_kvaio.la
 debian/tmp/opt/trinity/lib/trinity/kmilo_kvaio.so
 debian/tmp/opt/trinity/lib/trinity/kmilo_thinkpad.la
 debian/tmp/opt/trinity/lib/trinity/kmilo_thinkpad.so
-debian/tmp/opt/trinity/share/applications/kde/kvaio.desktop
-debian/tmp/opt/trinity/share/applications/kde/thinkpad.desktop
+debian/tmp/opt/trinity/share/applications/tde/kvaio.desktop
+debian/tmp/opt/trinity/share/applications/tde/thinkpad.desktop
 debian/tmp/opt/trinity/share/services/kmilo/kmilo_asus.desktop
 debian/tmp/opt/trinity/share/services/kmilo/kmilo_delli8k.desktop
 debian/tmp/opt/trinity/share/services/kmilo/kmilo_kvaio.desktop
diff --git a/debian/lenny/tdeutils/debian/kregexpeditor-trinity.install b/debian/lenny/tdeutils/debian/kregexpeditor-trinity.install
index ddb0d489f..10946f5fd 100644
--- a/debian/lenny/tdeutils/debian/kregexpeditor-trinity.install
+++ b/debian/lenny/tdeutils/debian/kregexpeditor-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/libkregexpeditorgui.la
 debian/tmp/opt/trinity/lib/trinity/libkregexpeditorgui.so
 debian/tmp/opt/trinity/lib/libkregexpeditorcommon.so.1
 debian/tmp/opt/trinity/lib/libkregexpeditorcommon.so.1.0.0
-debian/tmp/opt/trinity/share/applications/kde/kregexpeditor.desktop
+debian/tmp/opt/trinity/share/applications/tde/kregexpeditor.desktop
 debian/tmp/opt/trinity/share/apps/kregexpeditor/pics/altn.png
 debian/tmp/opt/trinity/share/apps/kregexpeditor/pics/anychar.png
 debian/tmp/opt/trinity/share/apps/kregexpeditor/pics/autoverify.png
diff --git a/debian/lenny/tdeutils/debian/ktimer-trinity.install b/debian/lenny/tdeutils/debian/ktimer-trinity.install
index abebef83d..d2097f244 100644
--- a/debian/lenny/tdeutils/debian/ktimer-trinity.install
+++ b/debian/lenny/tdeutils/debian/ktimer-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/ktimer
-debian/tmp/opt/trinity/share/applications/kde/ktimer.desktop
+debian/tmp/opt/trinity/share/applications/tde/ktimer.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ktimer/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ktimer/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ktimer/index.docbook
diff --git a/debian/lenny/tdeutils/debian/kwalletmanager-trinity.install b/debian/lenny/tdeutils/debian/kwalletmanager-trinity.install
index 250eb2390..1ba37d2e3 100644
--- a/debian/lenny/tdeutils/debian/kwalletmanager-trinity.install
+++ b/debian/lenny/tdeutils/debian/kwalletmanager-trinity.install
@@ -1,9 +1,9 @@
 debian/tmp/opt/trinity/bin/kwalletmanager
 debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.so
-debian/tmp/opt/trinity/share/applications/kde/kwalletconfig.desktop
-debian/tmp/opt/trinity/share/applications/kde/kwalletmanager.desktop
-debian/tmp/opt/trinity/share/applications/kde/kwalletmanager-kwalletd.desktop
+debian/tmp/opt/trinity/share/applications/tde/kwalletconfig.desktop
+debian/tmp/opt/trinity/share/applications/tde/kwalletmanager.desktop
+debian/tmp/opt/trinity/share/applications/tde/kwalletmanager-kwalletd.desktop
 debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png
 debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_open.png
 debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png
diff --git a/debian/lenny/tdewebdev/debian/kfilereplace-trinity.install b/debian/lenny/tdewebdev/debian/kfilereplace-trinity.install
index 368c9640b..ac762a2a5 100644
--- a/debian/lenny/tdewebdev/debian/kfilereplace-trinity.install
+++ b/debian/lenny/tdewebdev/debian/kfilereplace-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kfilereplace
 debian/tmp/opt/trinity/lib/trinity/libkfilereplacepart.la
 debian/tmp/opt/trinity/lib/trinity/libkfilereplacepart.so
-debian/tmp/opt/trinity/share/applications/kde/kfilereplace.desktop
+debian/tmp/opt/trinity/share/applications/tde/kfilereplace.desktop
 debian/tmp/opt/trinity/share/apps/kfilereplace/kfilereplaceui.rc
 debian/tmp/opt/trinity/share/apps/kfilereplacepart
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfilereplace/*.bz2
diff --git a/debian/lenny/tdewebdev/debian/kimagemapeditor-trinity.install b/debian/lenny/tdewebdev/debian/kimagemapeditor-trinity.install
index 62dfdcceb..6ca744b2f 100644
--- a/debian/lenny/tdewebdev/debian/kimagemapeditor-trinity.install
+++ b/debian/lenny/tdewebdev/debian/kimagemapeditor-trinity.install
@@ -3,7 +3,7 @@ debian/icons/kimagemapeditor.xpm	/opt/trinity/share/pixmaps
 debian/tmp/opt/trinity/bin/kimagemapeditor
 debian/tmp/opt/trinity/lib/trinity/libkimagemapeditor.la
 debian/tmp/opt/trinity/lib/trinity/libkimagemapeditor.so
-debian/tmp/opt/trinity/share/applications/kde/kimagemapeditor.desktop
+debian/tmp/opt/trinity/share/applications/tde/kimagemapeditor.desktop
 debian/tmp/opt/trinity/share/apps/kimagemapeditor
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kimagemapeditor.png
 debian/tmp/opt/trinity/share/apps/kimagemapeditor/icons/hicolor/22x22/actions/addpoint.png
diff --git a/debian/lenny/tdewebdev/debian/klinkstatus-trinity.install b/debian/lenny/tdewebdev/debian/klinkstatus-trinity.install
index f65852c45..9c6c7048d 100644
--- a/debian/lenny/tdewebdev/debian/klinkstatus-trinity.install
+++ b/debian/lenny/tdewebdev/debian/klinkstatus-trinity.install
@@ -3,7 +3,7 @@ debian/icons/klinkstatus.xpm	/opt/trinity/share/pixmaps
 debian/tmp/opt/trinity/bin/klinkstatus
 debian/tmp/opt/trinity/lib/trinity/libklinkstatuspart.la
 debian/tmp/opt/trinity/lib/trinity/libklinkstatuspart.so
-debian/tmp/opt/trinity/share/applications/kde/klinkstatus.desktop
+debian/tmp/opt/trinity/share/applications/tde/klinkstatus.desktop
 debian/tmp/opt/trinity/share/apps/klinkstatus
 debian/tmp/opt/trinity/share/apps/klinkstatuspart
 debian/tmp/opt/trinity/share/config.kcfg/klinkstatus.kcfg
diff --git a/debian/lenny/tdewebdev/debian/kommander-trinity.install b/debian/lenny/tdewebdev/debian/kommander-trinity.install
index a95d024c1..4c23ebe43 100644
--- a/debian/lenny/tdewebdev/debian/kommander-trinity.install
+++ b/debian/lenny/tdewebdev/debian/kommander-trinity.install
@@ -8,7 +8,7 @@ debian/tmp/opt/trinity/lib/libkommanderwidget.so.0
 debian/tmp/opt/trinity/lib/libkommanderwidget.so.0.0.0
 debian/tmp/opt/trinity/lib/libkommanderwidgets.so.0
 debian/tmp/opt/trinity/lib/libkommanderwidgets.so.0.0.0
-debian/tmp/opt/trinity/share/applications/kde/kmdr-editor.desktop
+debian/tmp/opt/trinity/share/applications/tde/kmdr-editor.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kmdr-executor.desktop
 debian/tmp/opt/trinity/share/apps/katepart/syntax/kommander.xml
 debian/tmp/opt/trinity/share/apps/kommander/pics/kommandersplash.png
diff --git a/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install b/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install
index 84fec5328..9cbff95cc 100644
--- a/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install
+++ b/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/kxsldbg
 debian/tmp/opt/trinity/bin/xsldbg
 debian/tmp/opt/trinity/lib/trinity/libkxsldbgpart.la
 debian/tmp/opt/trinity/lib/trinity/libkxsldbgpart.so
-debian/tmp/opt/trinity/share/applications/kde/kxsldbg.desktop
+debian/tmp/opt/trinity/share/applications/tde/kxsldbg.desktop
 debian/tmp/opt/trinity/share/apps/kxsldbg
 debian/tmp/opt/trinity/share/apps/kxsldbgpart
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxsldbg/*.bz2
diff --git a/debian/lenny/tdewebdev/debian/quanta-trinity.install b/debian/lenny/tdewebdev/debian/quanta-trinity.install
index 7b3618363..0d06b0bac 100644
--- a/debian/lenny/tdewebdev/debian/quanta-trinity.install
+++ b/debian/lenny/tdewebdev/debian/quanta-trinity.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/lib/trinity/quantadebuggerdbgp.la
 debian/tmp/opt/trinity/lib/trinity/quantadebuggerdbgp.so
 debian/tmp/opt/trinity/lib/trinity/quantadebuggergubed.la
 debian/tmp/opt/trinity/lib/trinity/quantadebuggergubed.so
-debian/tmp/opt/trinity/share/applications/kde/quanta.desktop
+debian/tmp/opt/trinity/share/applications/tde/quanta.desktop
 debian/tmp/opt/trinity/share/apps/kafkapart
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/quanta/*.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/quanta/common
-- 
cgit v1.2.1