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

51 files changed, 61 insertions, 61 deletions

diff --git a/debian/squeeze/applications/adept/debian/adept-installer-trinity.install b/debian/squeeze/applications/adept/debian/adept-installer-trinity.install
index a3de6d18c..b1d5914e1 100644
--- a/debian/squeeze/applications/adept/debian/adept-installer-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/adept/debian/adept-manager-trinity.install b/debian/squeeze/applications/adept/debian/adept-manager-trinity.install
index 35fc0712b..f5f2446e7 100644
--- a/debian/squeeze/applications/adept/debian/adept-manager-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/adept/debian/adept-notifier-trinity.install b/debian/squeeze/applications/adept/debian/adept-notifier-trinity.install
index b1e97afac..e221e4ac3 100644
--- a/debian/squeeze/applications/adept/debian/adept-notifier-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/adept/debian/adept-updater-trinity.install b/debian/squeeze/applications/adept/debian/adept-updater-trinity.install
index 0be740892..ba854f2a8 100644
--- a/debian/squeeze/applications/adept/debian/adept-updater-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/amarok.cmake/debian/amarok-trinity.install b/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.install
index f5aeb567f..f66beb7cf 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/amarok/debian/amarok-trinity.install b/debian/squeeze/applications/amarok/debian/amarok-trinity.install
index f5aeb567f..f66beb7cf 100644
--- a/debian/squeeze/applications/amarok/debian/amarok-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/basket/debian/basket-trinity.install b/debian/squeeze/applications/basket/debian/basket-trinity.install
index a24d7e924..8064234ee 100644
--- a/debian/squeeze/applications/basket/debian/basket-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/basket/debian/rules b/debian/squeeze/applications/basket/debian/rules
index 0527d1198..c0e639fdc 100755
--- a/debian/squeeze/applications/basket/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/digikam/debian/changelog b/debian/squeeze/applications/digikam/debian/changelog
index 6a7191d2f..e421b82b9 100644
--- a/debian/squeeze/applications/digikam/debian/changelog
+++ b/debian/squeeze/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/squeeze/applications/digikam/debian/digikam-trinity.install b/debian/squeeze/applications/digikam/debian/digikam-trinity.install
index 49fc16b82..26e2288f9 100644
--- a/debian/squeeze/applications/digikam/debian/digikam-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/digikam/debian/showfoto-trinity.install b/debian/squeeze/applications/digikam/debian/showfoto-trinity.install
index d9ff5c47a..73ba9c643 100644
--- a/debian/squeeze/applications/digikam/debian/showfoto-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/k3b/debian/changelog b/debian/squeeze/applications/k3b/debian/changelog
index dccced4b4..1b2fa19d5 100644
--- a/debian/squeeze/applications/k3b/debian/changelog
+++ b/debian/squeeze/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/squeeze/applications/k9copy/debian/rules b/debian/squeeze/applications/k9copy/debian/rules
index 7a79ae048..9eb0c27bd 100755
--- a/debian/squeeze/applications/k9copy/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kaffeine/debian/changelog b/debian/squeeze/applications/kaffeine/debian/changelog
index 2441c46c2..ae8921760 100644
--- a/debian/squeeze/applications/kaffeine/debian/changelog
+++ b/debian/squeeze/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/squeeze/applications/kaffeine/debian/kaffeine-iso.desktop b/debian/squeeze/applications/kaffeine/debian/kaffeine-iso.desktop
index c1d407f15..63cf8f167 100644
--- a/debian/squeeze/applications/kaffeine/debian/kaffeine-iso.desktop
+++ b/debian/squeeze/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/squeeze/applications/kaffeine/debian/rules b/debian/squeeze/applications/kaffeine/debian/rules
index 9dc73fe0f..8e053f058 100755
--- a/debian/squeeze/applications/kaffeine/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kdiff3/debian/rules b/debian/squeeze/applications/kdiff3/debian/rules
index ef9215c19..bc64fcc06 100755
--- a/debian/squeeze/applications/kdiff3/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kile/debian/kile-trinity.install b/debian/squeeze/applications/kile/debian/kile-trinity.install
index 3d82db5d5..52d706863 100644
--- a/debian/squeeze/applications/kile/debian/kile-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/kmplayer/debian/kmplayer-trinity.install b/debian/squeeze/applications/kmplayer/debian/kmplayer-trinity.install
index f25460f29..f27e64ad7 100644
--- a/debian/squeeze/applications/kmplayer/debian/kmplayer-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/kmyfirewall/debian/install b/debian/squeeze/applications/kmyfirewall/debian/install
index 02500414f..d7b3c5848 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/install
+++ b/debian/squeeze/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/squeeze/applications/kmymoney/debian/kmymoney2-trinity.install b/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity.install
index 89ecca2de..8489f7384 100644
--- a/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/knemo/debian/dirs b/debian/squeeze/applications/knemo/debian/dirs
index d6f374669..2025e042b 100644
--- a/debian/squeeze/applications/knemo/debian/dirs
+++ b/debian/squeeze/applications/knemo/debian/dirs
@@ -1 +1 @@
-usr/share/applications/kde
+usr/share/applications/tde
diff --git a/debian/squeeze/applications/knowit/debian/rules b/debian/squeeze/applications/knowit/debian/rules
index 5af8a0aa8..06d310592 100755
--- a/debian/squeeze/applications/knowit/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/chalk-data-trinity.install b/debian/squeeze/applications/koffice/debian/chalk-data-trinity.install
index a37b11ace..7bed60e6c 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-data-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/chalk-data-trinity.lintian b/debian/squeeze/applications/koffice/debian/chalk-data-trinity.lintian
index bf1a99e00..820cf112f 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-data-trinity.lintian
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/changelog b/debian/squeeze/applications/koffice/debian/changelog
index fa9c8a04f..f68f16811 100644
--- a/debian/squeeze/applications/koffice/debian/changelog
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/karbon-trinity.install b/debian/squeeze/applications/koffice/debian/karbon-trinity.install
index a3649c378..a03e53a02 100644
--- a/debian/squeeze/applications/koffice/debian/karbon-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kchart-trinity.install b/debian/squeeze/applications/koffice/debian/kchart-trinity.install
index 90c1a6824..c5d3596c2 100644
--- a/debian/squeeze/applications/koffice/debian/kchart-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kexi-trinity.install b/debian/squeeze/applications/koffice/debian/kexi-trinity.install
index 3ff92c525..8cc760616 100644
--- a/debian/squeeze/applications/koffice/debian/kexi-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kformula-trinity.install b/debian/squeeze/applications/koffice/debian/kformula-trinity.install
index 1339cfb67..c97a73fa5 100644
--- a/debian/squeeze/applications/koffice/debian/kformula-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kivio-data-trinity.install b/debian/squeeze/applications/koffice/debian/kivio-data-trinity.install
index 02f3c0322..def29edd1 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-data-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kivio-data-trinity.lintian b/debian/squeeze/applications/koffice/debian/kivio-data-trinity.lintian
index a5c25f78c..d77987c69 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-data-trinity.lintian
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/koffice-data-trinity.install b/debian/squeeze/applications/koffice/debian/koffice-data-trinity.install
index 2f17354e2..cc7cbb4ac 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-data-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/koshell-trinity.install b/debian/squeeze/applications/koffice/debian/koshell-trinity.install
index 165f4a36c..4b63bd352 100644
--- a/debian/squeeze/applications/koffice/debian/koshell-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kplato-trinity.install b/debian/squeeze/applications/koffice/debian/kplato-trinity.install
index ba215cc43..8c3df29c3 100644
--- a/debian/squeeze/applications/koffice/debian/kplato-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kpresenter-data-trinity.install b/debian/squeeze/applications/koffice/debian/kpresenter-data-trinity.install
index 3322113fc..78ebe09f2 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-data-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kpresenter-data-trinity.lintian b/debian/squeeze/applications/koffice/debian/kpresenter-data-trinity.lintian
index af719fd2f..68e69e640 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-data-trinity.lintian
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kspread-trinity.install b/debian/squeeze/applications/koffice/debian/kspread-trinity.install
index 5988b97be..ee708351b 100644
--- a/debian/squeeze/applications/koffice/debian/kspread-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kugar-trinity.install b/debian/squeeze/applications/koffice/debian/kugar-trinity.install
index 8dd8860bb..0cda2bece 100644
--- a/debian/squeeze/applications/koffice/debian/kugar-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kword-data-trinity.install b/debian/squeeze/applications/koffice/debian/kword-data-trinity.install
index 32f9e2f9c..7c702418e 100644
--- a/debian/squeeze/applications/koffice/debian/kword-data-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kword-data-trinity.lintian b/debian/squeeze/applications/koffice/debian/kword-data-trinity.lintian
index 2bc903eb9..6fa3d857b 100644
--- a/debian/squeeze/applications/koffice/debian/kword-data-trinity.lintian
+++ b/debian/squeeze/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/squeeze/applications/konversation/debian/konversation-trinity.install b/debian/squeeze/applications/konversation/debian/konversation-trinity.install
index ca10af6cf..8a6cf218e 100644
--- a/debian/squeeze/applications/konversation/debian/konversation-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/ksystemlog/debian/rules b/debian/squeeze/applications/ksystemlog/debian/rules
index 6571b56cb..4764fc4b2 100755
--- a/debian/squeeze/applications/ksystemlog/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kvpnc/debian/README.Debian b/debian/squeeze/applications/kvpnc/debian/README.Debian
index a65e1a72c..fe3b96cf6 100644
--- a/debian/squeeze/applications/kvpnc/debian/README.Debian
+++ b/debian/squeeze/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/squeeze/applications/kvpnc/debian/rules b/debian/squeeze/applications/kvpnc/debian/rules
index 22a49ef44..354c23311 100755
--- a/debian/squeeze/applications/kvpnc/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/soundkonverter/debian/soundkonverter-trinity.install b/debian/squeeze/applications/soundkonverter/debian/soundkonverter-trinity.install
index 0f6801b72..fcfaef212 100644
--- a/debian/squeeze/applications/soundkonverter/debian/soundkonverter-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/tde-guidance/debian/tde-guidance-trinity.install b/debian/squeeze/applications/tde-guidance/debian/tde-guidance-trinity.install
index 7064c79c0..11947924b 100644
--- a/debian/squeeze/applications/tde-guidance/debian/tde-guidance-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/tde-systemsettings/debian/rules b/debian/squeeze/applications/tde-systemsettings/debian/rules
index 588264407..f4204f328 100755
--- a/debian/squeeze/applications/tde-systemsettings/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/tdesvn/debian/tdesvn-trinity.install b/debian/squeeze/applications/tdesvn/debian/tdesvn-trinity.install
index 4a466ec72..fe0936b26 100644
--- a/debian/squeeze/applications/tdesvn/debian/tdesvn-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/tdmtheme/debian/tdmtheme.lintian-overrides b/debian/squeeze/applications/tdmtheme/debian/tdmtheme.lintian-overrides
index 88969d336..be194270f 100644
--- a/debian/squeeze/applications/tdmtheme/debian/tdmtheme.lintian-overrides
+++ b/debian/squeeze/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/squeeze/applications/wlassistant/debian/wlassistant-trinity.dirs b/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.dirs
index 57855aec4..110a71185 100644
--- a/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.dirs
+++ b/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.dirs
@@ -1 +1 @@
-opt/trinity/share/applications/kde
+opt/trinity/share/applications/tde