summaryrefslogtreecommitdiffstats
path: root/debian/lenny
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-06-11 20:06:54 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-06-11 20:06:54 -0500
commit71ae4d910268cfb4ef4eae10df6f81094b8e43d0 (patch)
tree9c8cbefa15e02eecf613823d5ef45aa77439060a /debian/lenny
parented29c4c89dbc11778e9c49f2644f13a97969c3b4 (diff)
downloadtde-packaging-71ae4d910268cfb4ef4eae10df6f81094b8e43d0.tar.gz
tde-packaging-71ae4d910268cfb4ef4eae10df6f81094b8e43d0.zip
Update Debian and Ubuntu build scripts to reflect X-TDE category
Diffstat (limited to 'debian/lenny')
-rw-r--r--debian/lenny/applications/abakus/debian/abakus-trinity.menu2
-rw-r--r--debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu2
-rw-r--r--debian/lenny/applications/amarok.cmake/debian/amarok_play_audiocd.desktop2
-rw-r--r--debian/lenny/applications/amarok/debian/amarok-trinity.menu2
-rw-r--r--debian/lenny/applications/amarok/debian/amarok_play_audiocd.desktop2
-rw-r--r--debian/lenny/applications/k3b/debian/changelog4
-rw-r--r--debian/lenny/applications/k3b/debian/k3b-rip-audiocd.desktop2
-rw-r--r--debian/lenny/applications/k3b/debian/k3b-rip-videodvd.desktop2
-rw-r--r--debian/lenny/applications/kaffeine/debian/kaffeine_codecinstall.desktop6
-rw-r--r--debian/lenny/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop4
-rw-r--r--debian/lenny/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop4
-rw-r--r--debian/lenny/applications/kaffeine/debian/menu2
-rwxr-xr-xdebian/lenny/applications/katapult/debian/rules2
-rw-r--r--debian/lenny/applications/kcpuload/debian/menu2
-rw-r--r--debian/lenny/applications/kile/debian/menu2
-rw-r--r--debian/lenny/applications/kio-umountwrapper/debian/media_safelyremove.desktop4
-rw-r--r--debian/lenny/applications/kiosktool/debian/changelog2
-rw-r--r--debian/lenny/applications/kmplayer/debian/menu2
-rw-r--r--debian/lenny/applications/kmyfirewall/debian/kmfinstallerplugin.desktop4
-rw-r--r--debian/lenny/applications/kmyfirewall/debian/kmyfirewall.desktop2
-rw-r--r--debian/lenny/applications/kmyfirewall/debian/menu2
-rw-r--r--debian/lenny/applications/kmymoney/debian/changelog2
-rw-r--r--debian/lenny/applications/kmymoney/debian/menu2
-rw-r--r--debian/lenny/applications/knetload/debian/menu2
-rw-r--r--debian/lenny/applications/knutclient/debian/knutclient.menu2
-rw-r--r--debian/lenny/applications/koffice/debian/kformula-trinity.menu2
-rw-r--r--debian/lenny/applications/koffice/debian/koshell-trinity.menu2
-rw-r--r--debian/lenny/applications/koffice/debian/kthesaurus-trinity.menu2
-rw-r--r--debian/lenny/applications/koffice/debian/kugar-trinity.menu4
-rw-r--r--debian/lenny/applications/kradio/debian/menu2
-rw-r--r--debian/lenny/applications/krusader/debian/menu4
-rw-r--r--debian/lenny/applications/ktechlab/debian/menu2
-rw-r--r--debian/lenny/applications/kuickshow/debian/kuickshow-trinity.menu2
-rw-r--r--debian/lenny/applications/kvpnc/debian/README.Debian4
-rw-r--r--debian/lenny/applications/kvpnc/debian/menu2
-rw-r--r--debian/lenny/applications/kvpnc/debian/patches/10_su-to-root_usage.diff4
-rw-r--r--debian/lenny/applications/rosegarden/debian/x-rosegarden.desktop2
-rw-r--r--debian/lenny/applications/smb4k/debian/menu2
-rw-r--r--debian/lenny/applications/tdmtheme/debian/tdmtheme.lintian-overrides2
-rw-r--r--debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu2
-rw-r--r--debian/lenny/dependencies/qt3/debian/qt3-assistant.menu2
-rw-r--r--debian/lenny/dependencies/qt3/debian/qt3-designer.menu2
-rw-r--r--debian/lenny/dependencies/qt3/debian/qt3-linguist.menu2
-rw-r--r--debian/lenny/dependencies/tqt3/debian/tqt3-assistant.menu2
-rw-r--r--debian/lenny/dependencies/tqt3/debian/tqt3-designer.menu2
-rw-r--r--debian/lenny/dependencies/tqt3/debian/tqt3-linguist.menu2
-rw-r--r--debian/lenny/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides2
-rw-r--r--debian/lenny/tdeaccessibility/debian/kmag-trinity.menu2
-rw-r--r--debian/lenny/tdeaccessibility/debian/kmousetool-trinity.menu2
-rw-r--r--debian/lenny/tdeaccessibility/debian/kmouth-trinity.menu2
-rw-r--r--debian/lenny/tdeaccessibility/debian/ksayit-trinity.menu2
-rw-r--r--debian/lenny/tdeaddons/debian/konq-plugins-trinity.menu2
-rw-r--r--debian/lenny/tdeaddons/debian/ksig-trinity.menu2
-rw-r--r--debian/lenny/tdeadmin/debian/kcron-trinity.menu2
-rw-r--r--debian/lenny/tdeadmin/debian/kdat-trinity.menu2
-rw-r--r--debian/lenny/tdeadmin/debian/kpackage-trinity.menu2
-rw-r--r--debian/lenny/tdeadmin/debian/ksysv-trinity.menu2
-rw-r--r--debian/lenny/tdeadmin/debian/kuser-trinity.menu2
-rw-r--r--debian/lenny/tdeadmin/debian/lilo-config-trinity.menu2
-rw-r--r--debian/lenny/tdebase/debian/kappfinder-trinity.menu2
-rw-r--r--debian/lenny/tdebase/debian/kcontrol-trinity.menu4
-rw-r--r--debian/lenny/tdebase/debian/kdepasswd-trinity.menu2
-rw-r--r--debian/lenny/tdebase/debian/kfind-trinity.menu2
-rw-r--r--debian/lenny/tdebase/debian/khelpcenter-trinity.menu2
-rw-r--r--debian/lenny/tdebase/debian/kicker-trinity.menu2
-rw-r--r--debian/lenny/tdebase/debian/klipper-trinity.menu2
-rw-r--r--debian/lenny/tdebase/debian/kmenuedit-trinity.menu2
-rw-r--r--debian/lenny/tdebase/debian/konqueror-trinity.menu2
-rw-r--r--debian/lenny/tdebase/debian/konsole-trinity.menu2
-rw-r--r--debian/lenny/tdebase/debian/kpager-trinity.menu2
-rw-r--r--debian/lenny/tdebase/debian/kpersonalizer-trinity.menu2
-rw-r--r--debian/lenny/tdebase/debian/ksysguard-trinity.menu4
-rw-r--r--debian/lenny/tdebase/debian/ktip-trinity.menu2
-rw-r--r--debian/lenny/tdebase/debian/man/kdialog-trinity.12
-rw-r--r--debian/lenny/tdebase/debian/tdebase-trinity-bin.menu4
-rw-r--r--debian/lenny/tdebase/debian/tdeprint-trinity.menu6
-rw-r--r--debian/lenny/tdebindings/debian/kjscmd-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/blinken-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/kalzium-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/kanagram-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/kbruch-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/keduca-trinity.menu4
-rw-r--r--debian/lenny/tdeedu/debian/kgeography-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/khangman-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/kig-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/kiten-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/klatin-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/klettres-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/kmplot-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/kpercentage-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/kstars-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/ktouch-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/kturtle-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/kverbos-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/kvoctrain-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/kwordquiz-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/kasteroids-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/katomic-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/kbackgammon-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/kbattleship-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/kbounce-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/kenolaba-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/kfouleggs-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/kgoldrunner-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/kjumpingcube-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/klickety-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/klines-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/kolf-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/konquest-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/kpat-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/kpoker-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/kreversi-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/kshisen-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/ksirtet-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/ksmiletris-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/ksnake-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/kspaceduel-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/ktron-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/ktuberling-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/kwin4-trinity.menu2
-rw-r--r--debian/lenny/tdegames/debian/lskat-trinity.menu2
-rw-r--r--debian/lenny/tdegraphics/debian/kcoloredit-trinity.menu4
-rw-r--r--debian/lenny/tdegraphics/debian/kfax-trinity.menu2
-rw-r--r--debian/lenny/tdegraphics/debian/kfaxview-trinity.menu2
-rw-r--r--debian/lenny/tdegraphics/debian/kiconedit-trinity.menu2
-rw-r--r--debian/lenny/tdegraphics/debian/kolourpaint-trinity.menu2
-rw-r--r--debian/lenny/tdegraphics/debian/kooka-trinity.menu2
-rw-r--r--debian/lenny/tdegraphics/debian/kpdf-trinity.menu2
-rw-r--r--debian/lenny/tdegraphics/debian/kruler-trinity.menu2
-rw-r--r--debian/lenny/tdegraphics/debian/ksnapshot-trinity.menu2
-rw-r--r--debian/lenny/tdegraphics/debian/kuickshow-trinity.menu2
-rw-r--r--debian/lenny/tdelibs/debian/changelog4
-rw-r--r--debian/lenny/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl2
-rw-r--r--debian/lenny/tdemultimedia/debian/artsbuilder-trinity.menu4
-rw-r--r--debian/lenny/tdemultimedia/debian/juk-trinity.menu2
-rw-r--r--debian/lenny/tdemultimedia/debian/kaboodle-trinity.menu2
-rw-r--r--debian/lenny/tdemultimedia/debian/kaudiocreator-trinity.menu2
-rw-r--r--debian/lenny/tdemultimedia/debian/kmid-trinity.menu2
-rw-r--r--debian/lenny/tdemultimedia/debian/kmix-trinity.menu2
-rw-r--r--debian/lenny/tdemultimedia/debian/krec-trinity.menu2
-rw-r--r--debian/lenny/tdemultimedia/debian/kscd-trinity.menu2
-rw-r--r--debian/lenny/tdemultimedia/debian/noatun-trinity.menu2
-rw-r--r--debian/lenny/tdenetwork/debian/kdict-trinity.menu2
-rw-r--r--debian/lenny/tdenetwork/debian/kget-trinity.menu2
-rw-r--r--debian/lenny/tdenetwork/debian/knewsticker-trinity.menu2
-rw-r--r--debian/lenny/tdenetwork/debian/kppp-trinity.menu4
-rw-r--r--debian/lenny/tdenetwork/debian/krdc-trinity.menu2
-rw-r--r--debian/lenny/tdenetwork/debian/krfb-trinity.menu2
-rw-r--r--debian/lenny/tdenetwork/debian/kwifimanager-trinity.menu2
-rw-r--r--debian/lenny/tdepim/debian/akregator-trinity.menu2
-rw-r--r--debian/lenny/tdepim/debian/changelog2
-rw-r--r--debian/lenny/tdepim/debian/kaddressbook-trinity.menu2
-rw-r--r--debian/lenny/tdepim/debian/kalarm-trinity.menu2
-rw-r--r--debian/lenny/tdepim/debian/kandy-trinity.menu2
-rw-r--r--debian/lenny/tdepim/debian/karm-trinity.menu2
-rw-r--r--debian/lenny/tdepim/debian/kitchensync-trinity.menu4
-rw-r--r--debian/lenny/tdepim/debian/kleopatra-trinity.menu4
-rw-r--r--debian/lenny/tdepim/debian/knotes-trinity.menu2
-rw-r--r--debian/lenny/tdepim/debian/kontact-trinity.menu2
-rw-r--r--debian/lenny/tdepim/debian/korganizer-trinity.menu2
-rw-r--r--debian/lenny/tdepim/debian/korn-trinity.menu2
-rw-r--r--debian/lenny/tdepim/debian/ktnef-trinity.menu2
-rw-r--r--debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu12
-rw-r--r--debian/lenny/tdesdk/debian/desktop-i18n/createdesktop.pl2
-rw-r--r--debian/lenny/tdesdk/debian/kbugbuster-trinity.menu2
-rw-r--r--debian/lenny/tdesdk/debian/kompare-trinity.menu2
-rw-r--r--debian/lenny/tdesdk/debian/kuiviewer-trinity.menu2
-rw-r--r--debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu2
-rw-r--r--debian/lenny/tdesdk/debian/umbrello-trinity.menu2
-rw-r--r--debian/lenny/tdetoys/debian/amor-trinity.menu2
-rw-r--r--debian/lenny/tdetoys/debian/kodo-trinity.menu2
-rw-r--r--debian/lenny/tdetoys/debian/kteatime-trinity.menu2
-rw-r--r--debian/lenny/tdetoys/debian/ktux-trinity.menu2
-rw-r--r--debian/lenny/tdetoys/debian/kworldclock-trinity.menu2
-rw-r--r--debian/lenny/tdeutils/debian/ark-trinity.menu2
-rw-r--r--debian/lenny/tdeutils/debian/kdf-trinity.menu4
-rw-r--r--debian/lenny/tdeutils/debian/kfloppy-trinity.menu2
-rw-r--r--debian/lenny/tdeutils/debian/kgpg-trinity.menu2
-rw-r--r--debian/lenny/tdeutils/debian/khexedit-trinity.menu2
-rw-r--r--debian/lenny/tdeutils/debian/kjots-trinity.menu2
-rw-r--r--debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu2
-rw-r--r--debian/lenny/tdeutils/debian/ktimer-trinity.menu2
-rw-r--r--debian/lenny/tdeutils/debian/man/kgpg-trinity.12
-rw-r--r--debian/lenny/tdeutils/debian/superkaramba-trinity.menu2
-rw-r--r--debian/lenny/tdevelop/debian/changelog4
-rw-r--r--debian/lenny/tdewebdev/debian/kimagemapeditor-trinity.menu2
-rw-r--r--debian/lenny/tdewebdev/debian/klinkstatus-trinity.menu2
-rw-r--r--debian/lenny/tdewebdev/debian/kommander-trinity.menu2
-rw-r--r--debian/lenny/tdewebdev/debian/kxsldbg-trinity.menu2
-rw-r--r--debian/lenny/tdewebdev/debian/quanta-trinity.menu2
190 files changed, 220 insertions, 220 deletions
diff --git a/debian/lenny/applications/abakus/debian/abakus-trinity.menu b/debian/lenny/applications/abakus/debian/abakus-trinity.menu
index fb1dcd130..7692affbf 100644
--- a/debian/lenny/applications/abakus/debian/abakus-trinity.menu
+++ b/debian/lenny/applications/abakus/debian/abakus-trinity.menu
@@ -2,5 +2,5 @@
section="Apps/Math"\
title="AbaKus"\
command="/opt/trinity/bin/abakus"\
- hints="KDE"\
+ hints="TDE"\
icon="/usr/share/pixmaps/abakus.xpm"
diff --git a/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu b/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu
index f78ef6060..7bd18dffa 100644
--- a/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu
+++ b/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu
@@ -1,7 +1,7 @@
?package(amarok):\
needs="X11"\
section="Applications/Sound"\
- hints="KDE"\
+ hints="TDE"\
title="Amarok"\
icon32x32="/usr/share/pixmaps/amarok.xpm"\
icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
diff --git a/debian/lenny/applications/amarok.cmake/debian/amarok_play_audiocd.desktop b/debian/lenny/applications/amarok.cmake/debian/amarok_play_audiocd.desktop
index 434630b60..6126d7b4b 100644
--- a/debian/lenny/applications/amarok.cmake/debian/amarok_play_audiocd.desktop
+++ b/debian/lenny/applications/amarok.cmake/debian/amarok_play_audiocd.desktop
@@ -2,7 +2,7 @@
ServiceTypes=media/audiocd
Actions=Play;
Encoding=UTF-8
-X-KDE-Priority=TopLevel
+X-TDE-Priority=TopLevel
[Desktop Action Play]
Name=Play Audio CD with amaroK
diff --git a/debian/lenny/applications/amarok/debian/amarok-trinity.menu b/debian/lenny/applications/amarok/debian/amarok-trinity.menu
index f78ef6060..7bd18dffa 100644
--- a/debian/lenny/applications/amarok/debian/amarok-trinity.menu
+++ b/debian/lenny/applications/amarok/debian/amarok-trinity.menu
@@ -1,7 +1,7 @@
?package(amarok):\
needs="X11"\
section="Applications/Sound"\
- hints="KDE"\
+ hints="TDE"\
title="Amarok"\
icon32x32="/usr/share/pixmaps/amarok.xpm"\
icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
diff --git a/debian/lenny/applications/amarok/debian/amarok_play_audiocd.desktop b/debian/lenny/applications/amarok/debian/amarok_play_audiocd.desktop
index 434630b60..6126d7b4b 100644
--- a/debian/lenny/applications/amarok/debian/amarok_play_audiocd.desktop
+++ b/debian/lenny/applications/amarok/debian/amarok_play_audiocd.desktop
@@ -2,7 +2,7 @@
ServiceTypes=media/audiocd
Actions=Play;
Encoding=UTF-8
-X-KDE-Priority=TopLevel
+X-TDE-Priority=TopLevel
[Desktop Action Play]
Name=Play Audio CD with amaroK
diff --git a/debian/lenny/applications/k3b/debian/changelog b/debian/lenny/applications/k3b/debian/changelog
index 1b2fa19d5..77f899f3c 100644
--- a/debian/lenny/applications/k3b/debian/changelog
+++ b/debian/lenny/applications/k3b/debian/changelog
@@ -495,7 +495,7 @@ k3b (1.0~rc5-0ubuntu1) feisty; urgency=low
- disable splash screen on startup
kubuntu_107_iso_cue_mimetypes.diff
- add application/x-iso and application/x-cue to MimeType and
- X-KDE-NativeMimeType
+ X-TDE-NativeMimeType
kubuntu_108_add_specify_device_arg_on_cmd_line.diff
- add an optional command line argument to specify the writer device
kubuntu_109_disable_firstrun.diff
@@ -767,7 +767,7 @@ k3b (0.12.14-0ubuntu4) dapper; urgency=low
k3b (0.12.14-0ubuntu3) dapper; urgency=low
- * Remove X-KDE-settings-system; from Categories in
+ * Remove X-TDE-settings-system; from Categories in
kubuntu_06_hide_k3bsetup.diff so the module doesn't show in SystemSettings.
-- Raphaël Pinson <raphink@ubuntu.com> Thu, 16 Mar 2006 22:57:23 +0100
diff --git a/debian/lenny/applications/k3b/debian/k3b-rip-audiocd.desktop b/debian/lenny/applications/k3b/debian/k3b-rip-audiocd.desktop
index 2d7d24def..811d936a8 100644
--- a/debian/lenny/applications/k3b/debian/k3b-rip-audiocd.desktop
+++ b/debian/lenny/applications/k3b/debian/k3b-rip-audiocd.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Audio' ]
+X-TDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Audio' ]
Type=Service
Actions=ripaudiocd;
diff --git a/debian/lenny/applications/k3b/debian/k3b-rip-videodvd.desktop b/debian/lenny/applications/k3b/debian/k3b-rip-videodvd.desktop
index 627ed3a24..2f20cf920 100644
--- a/debian/lenny/applications/k3b/debian/k3b-rip-videodvd.desktop
+++ b/debian/lenny/applications/k3b/debian/k3b-rip-videodvd.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ]
+X-TDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ]
Type=Service
Actions=ripvideodvd;
diff --git a/debian/lenny/applications/kaffeine/debian/kaffeine_codecinstall.desktop b/debian/lenny/applications/kaffeine/debian/kaffeine_codecinstall.desktop
index 25ec5689c..7fc146c18 100644
--- a/debian/lenny/applications/kaffeine/debian/kaffeine_codecinstall.desktop
+++ b/debian/lenny/applications/kaffeine/debian/kaffeine_codecinstall.desktop
@@ -1,13 +1,13 @@
[Desktop Entry]
Encoding=UTF-8
Type=ServiceType
-X-KDE-ServiceType=Kaffeine/CodecInstall
+X-TDE-ServiceType=Kaffeine/CodecInstall
# The unplayable codec
-[PropertyDef::X-KDE-Kaffeine-codec]
+[PropertyDef::X-TDE-Kaffeine-codec]
Type=QString
-[PropertyDef::X-KDE-Kaffeine-engine]
+[PropertyDef::X-TDE-Kaffeine-engine]
Type=QString
[PropertyDef::Exec]
diff --git a/debian/lenny/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop b/debian/lenny/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop
index 7b4adb8d9..7192a4f53 100644
--- a/debian/lenny/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop
+++ b/debian/lenny/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop
@@ -2,7 +2,7 @@
Encoding=UTF-8
Type=Service
ServiceTypes=Kaffeine/CodecInstall
-X-KDE-Kaffeine-codec=dvdcss
-X-KDE-Kaffeine-engine=xine-engine
+X-TDE-Kaffeine-codec=dvdcss
+X-TDE-Kaffeine-engine=xine-engine
Exec=kdialog --sorry "This DVD Video is encrypted. To be able to watch it you will need to install libdvdcss by running from a console: sudo /usr/share/doc/kaffeine/install-css.sh. In some countries it is illegal to install the decryption software without permission from the video copyright holder."
diff --git a/debian/lenny/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop b/debian/lenny/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop
index a022ecda3..b32fcac45 100644
--- a/debian/lenny/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop
+++ b/debian/lenny/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop
@@ -2,7 +2,7 @@
Encoding=UTF-8
Type=Service
ServiceTypes=Kaffeine/CodecInstall
-X-KDE-Kaffeine-codec=ffmpeg
-X-KDE-Kaffeine-engine=xine-engine
+X-TDE-Kaffeine-codec=ffmpeg
+X-TDE-Kaffeine-engine=xine-engine
Exec=/opt/trinity/lib/kaffeine/install-codecs ffmpeg
diff --git a/debian/lenny/applications/kaffeine/debian/menu b/debian/lenny/applications/kaffeine/debian/menu
index 4314c464a..c9f3a50ac 100644
--- a/debian/lenny/applications/kaffeine/debian/menu
+++ b/debian/lenny/applications/kaffeine/debian/menu
@@ -1,7 +1,7 @@
?package(kaffeine):\
needs="X11"\
section="Apps/Sound"\
- hints="KDE"\
+ hints="TDE"\
title="Kaffeine"\
command="/opt/trinity/bin/kaffeine"\
icon="/usr/share/pixmaps/kaffeine.xpm"
diff --git a/debian/lenny/applications/katapult/debian/rules b/debian/lenny/applications/katapult/debian/rules
index e48ac244a..52f84b778 100755
--- a/debian/lenny/applications/katapult/debian/rules
+++ b/debian/lenny/applications/katapult/debian/rules
@@ -39,4 +39,4 @@ install/katapult-trinity::
rm -f $(CURDIR)/debian/katapult-trinity/opt/trinity/lib/libkatapult*.la
dh_install $(DEB_SRCDIR)/debian/lintian opt/trinity/share/lintian/overrides/katapult
# dh_install $(DEB_SRCDIR)/katapult/katapult/katapult.desktop opt/trinity/share/autostart
-# echo 'X-KDE-autostart-condition=katapultrc:General:Autostart:true' >> $(DEB_DESTDIR)/opt/trinity/share/autostart/katapult.desktop
+# echo 'X-TDE-autostart-condition=katapultrc:General:Autostart:true' >> $(DEB_DESTDIR)/opt/trinity/share/autostart/katapult.desktop
diff --git a/debian/lenny/applications/kcpuload/debian/menu b/debian/lenny/applications/kcpuload/debian/menu
index 684348e2f..181ec82e6 100644
--- a/debian/lenny/applications/kcpuload/debian/menu
+++ b/debian/lenny/applications/kcpuload/debian/menu
@@ -1,6 +1,6 @@
?package(kcpuload):needs="X11"\
section="Applications/System/Monitoring"\
- hints="KDE"\
+ hints="TDE"\
kderemove="1"\
title="KCPULoad"\
command="/opt/trinity/bin/kcpuload"\
diff --git a/debian/lenny/applications/kile/debian/menu b/debian/lenny/applications/kile/debian/menu
index 8ddf08ad7..2d5ca41b0 100644
--- a/debian/lenny/applications/kile/debian/menu
+++ b/debian/lenny/applications/kile/debian/menu
@@ -1,6 +1,6 @@
?package(kile):needs="X11" \
section="Applications/Editors" \
- hints="KDE" \
+ hints="TDE" \
title="Kile" \
longtitle="Kile (LaTeX development environment)" \
command="/opt/trinity/bin/kile" \
diff --git a/debian/lenny/applications/kio-umountwrapper/debian/media_safelyremove.desktop b/debian/lenny/applications/kio-umountwrapper/debian/media_safelyremove.desktop
index 7f73117a9..22b716ad5 100644
--- a/debian/lenny/applications/kio-umountwrapper/debian/media_safelyremove.desktop
+++ b/debian/lenny/applications/kio-umountwrapper/debian/media_safelyremove.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
ServiceTypes=media/removable_mounted,media/removable_mounted_decrypted,media/removable_unmounted,media/removable_unmounted_decrypted,media/camera_mounted,media/camera_unmounted
Actions=MediaSafelyRemove;
-X-KDE-Priority=TopLevel
-X-KDE-MediaNotifierHide=true
+X-TDE-Priority=TopLevel
+X-TDE-MediaNotifierHide=true
[Desktop Action MediaSafelyRemove]
Name=Safely Remove
diff --git a/debian/lenny/applications/kiosktool/debian/changelog b/debian/lenny/applications/kiosktool/debian/changelog
index 05237119a..550c04bb0 100644
--- a/debian/lenny/applications/kiosktool/debian/changelog
+++ b/debian/lenny/applications/kiosktool/debian/changelog
@@ -62,7 +62,7 @@ kiosktool (0.9-2) unstable; urgency=low
* Solved a problem with upstream sources due to some messages translated to Spanish
* Changed description
* First Debian upload, closes: #267595
- * Erased line Categories=Qt;KDE;System in kiosktool.desktop because this file is installed in Utilities category
+ * Erased line Categories=Qt;TDE;System in kiosktool.desktop because this file is installed in Utilities category
-- Pedro Jurado Maqueda <melenas@kdehispano.org> Wed, 5 Jan 2005 15:18:17 +0100
diff --git a/debian/lenny/applications/kmplayer/debian/menu b/debian/lenny/applications/kmplayer/debian/menu
index 444b60fb5..879939d6e 100644
--- a/debian/lenny/applications/kmplayer/debian/menu
+++ b/debian/lenny/applications/kmplayer/debian/menu
@@ -1,6 +1,6 @@
?package(kmplayer):\
needs="X11"\
section="Applications/Video"\
- hints="KDE"\
+ hints="TDE"\
title="Kmplayer"\
command="/opt/trinity/bin/kmplayer"
diff --git a/debian/lenny/applications/kmyfirewall/debian/kmfinstallerplugin.desktop b/debian/lenny/applications/kmyfirewall/debian/kmfinstallerplugin.desktop
index 77922f4b4..d2f3ae9ed 100644
--- a/debian/lenny/applications/kmyfirewall/debian/kmfinstallerplugin.desktop
+++ b/debian/lenny/applications/kmyfirewall/debian/kmfinstallerplugin.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Encoding=UTF-8
Type=ServiceType
-X-KDE-ServiceType=KMyFirewall/Installer
-X-KDE-Library=libkmfinstallerplugin
+X-TDE-ServiceType=KMyFirewall/Installer
+X-TDE-Library=libkmfinstallerplugin
Name=KMyFirewall Installer Plugin
Name[bg]=Приставка-инсталатор на KMyFirewall
diff --git a/debian/lenny/applications/kmyfirewall/debian/kmyfirewall.desktop b/debian/lenny/applications/kmyfirewall/debian/kmyfirewall.desktop
index a0a63ecf9..cedd87cc0 100644
--- a/debian/lenny/applications/kmyfirewall/debian/kmyfirewall.desktop
+++ b/debian/lenny/applications/kmyfirewall/debian/kmyfirewall.desktop
@@ -4,7 +4,7 @@ MimeType=application/x-kmyfirewall;application/x-kmyfirewall-kmfrs;application/x
Icon=kmyfirewall
Exec=/usr/trinity/bin/kmyfirewall %u
Terminal=false
-Categories=Qt;KDE;System;
+Categories=Qt;TDE;System;
Name=KMyFirewall
Name[sv]=Min brandvägg
Name[xx]=xxKMyFirewallxx
diff --git a/debian/lenny/applications/kmyfirewall/debian/menu b/debian/lenny/applications/kmyfirewall/debian/menu
index 3d1feab6e..7a3cd8337 100644
--- a/debian/lenny/applications/kmyfirewall/debian/menu
+++ b/debian/lenny/applications/kmyfirewall/debian/menu
@@ -1,6 +1,6 @@
?package(kmyfirewall):needs="X11" \
section="Applications/System/Security" \
title="KMyFirewall" \
- hints="KDE" \
+ hints="TDE" \
icon="kmyfirewall.xpm" \
command="/opt/trinity/bin/kmyfirewall"
diff --git a/debian/lenny/applications/kmymoney/debian/changelog b/debian/lenny/applications/kmymoney/debian/changelog
index a7240314d..43b7f26fa 100644
--- a/debian/lenny/applications/kmymoney/debian/changelog
+++ b/debian/lenny/applications/kmymoney/debian/changelog
@@ -443,7 +443,7 @@ kmymoney2 (0.7.0-1) unstable; urgency=low
- File a wishlist bug report at http://bugs.debian.org/kmymoney2
* Add Build-Depends: libofx-dev
* Closes: #270028: it does not appear in the proper KDE menu section.
- - Add Categories=Qt;KDE;Office to kmymoney2.destop
+ - Add Categories=Qt;TDE;Office to kmymoney2.destop
-- Mark Purcell <msp@debian.org> Sun, 15 May 2005 12:45:18 +0100
diff --git a/debian/lenny/applications/kmymoney/debian/menu b/debian/lenny/applications/kmymoney/debian/menu
index 3a6b25af8..e30e26de9 100644
--- a/debian/lenny/applications/kmymoney/debian/menu
+++ b/debian/lenny/applications/kmymoney/debian/menu
@@ -1,7 +1,7 @@
?package(kmymoney2):\
needs="x11"\
section="Applications/Office"\
- hints="KDE"\
+ hints="TDE"\
title="KMyMoney"\
icon="/opt/trinity/share/pixmaps/kmymoney2.xpm"\
command="/opt/trinity/bin/kmymoney2"
diff --git a/debian/lenny/applications/knetload/debian/menu b/debian/lenny/applications/knetload/debian/menu
index a39b37e3c..d6e27b1a4 100644
--- a/debian/lenny/applications/knetload/debian/menu
+++ b/debian/lenny/applications/knetload/debian/menu
@@ -1,6 +1,6 @@
?package(knetload):needs="X11"\
section="Apps/System"\
- hints="KDE"\
+ hints="TDE"\
title="KNetLoad"\
command="/opt/trinity/bin/knetload"\
icon="/usr/share/pixmaps/knetload.xpm"
diff --git a/debian/lenny/applications/knutclient/debian/knutclient.menu b/debian/lenny/applications/knutclient/debian/knutclient.menu
index a520f80ba..411dd4bf1 100644
--- a/debian/lenny/applications/knutclient/debian/knutclient.menu
+++ b/debian/lenny/applications/knutclient/debian/knutclient.menu
@@ -1,7 +1,7 @@
?package(knutclient):\
needs="X11"\
section="Applications/System/Monitoring"\
- hints="KDE"\
+ hints="TDE"\
title="KNutClient"\
command="/opt/trinity/bin/knutclient"
diff --git a/debian/lenny/applications/koffice/debian/kformula-trinity.menu b/debian/lenny/applications/koffice/debian/kformula-trinity.menu
index 37f699400..64a4489bb 100644
--- a/debian/lenny/applications/koffice/debian/kformula-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/kformula-trinity.menu
@@ -1,7 +1,7 @@
?package(kformula):\
needs="x11"\
section="Applications/Science/Mathematics"\
- hints="KDE"\
+ hints="TDE"\
title="KFormula"\
longtitle="KFormula (Formula Editor)"\
icon="/opt/trinity/share/pixmaps/kformula.xpm"\
diff --git a/debian/lenny/applications/koffice/debian/koshell-trinity.menu b/debian/lenny/applications/koffice/debian/koshell-trinity.menu
index ec838c038..dec271e06 100644
--- a/debian/lenny/applications/koffice/debian/koshell-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/koshell-trinity.menu
@@ -1,7 +1,7 @@
?package(koshell):\
needs="x11"\
section="Applications/Office"\
- hints="KDE"\
+ hints="TDE"\
title="KOffice Workspace"\
longtitle="KOffice Workspace (Office Suite)"\
icon="/opt/trinity/share/pixmaps/koshell.xpm"\
diff --git a/debian/lenny/applications/koffice/debian/kthesaurus-trinity.menu b/debian/lenny/applications/koffice/debian/kthesaurus-trinity.menu
index e2e0f4256..a11667fe3 100644
--- a/debian/lenny/applications/koffice/debian/kthesaurus-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/kthesaurus-trinity.menu
@@ -1,7 +1,7 @@
?package(kthesaurus):\
needs="x11"\
section="Applications/Office"\
- hints="KDE"\
+ hints="TDE"\
title="KThesaurus"\
longtitle="KThesaurus (Related Words)"\
icon="/opt/trinity/share/pixmaps/kthesaurus.xpm"\
diff --git a/debian/lenny/applications/koffice/debian/kugar-trinity.menu b/debian/lenny/applications/koffice/debian/kugar-trinity.menu
index c378a94a1..68027f023 100644
--- a/debian/lenny/applications/koffice/debian/kugar-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/kugar-trinity.menu
@@ -1,7 +1,7 @@
?package(kugar):\
needs="x11"\
section="Applications/Office"\
- hints="KDE"\
+ hints="TDE"\
title="Kugar"\
longtitle="Kugar (Report Generator)"\
icon="/opt/trinity/share/pixmaps/kugar.xpm"\
@@ -10,7 +10,7 @@
?package(kugar):\
needs="x11"\
section="Applications/Office"\
- hints="KDE"\
+ hints="TDE"\
title="Kugar Designer"\
longtitle="Kugar Designer (Report Template Designer)"\
command="/opt/trinity/bin/kudesigner"
diff --git a/debian/lenny/applications/kradio/debian/menu b/debian/lenny/applications/kradio/debian/menu
index 9c29dc73c..773521bdb 100644
--- a/debian/lenny/applications/kradio/debian/menu
+++ b/debian/lenny/applications/kradio/debian/menu
@@ -1,6 +1,6 @@
?package(kradio):needs="X11" \
section="Applications/TV and Radio" \
- hints="KDE" \
+ hints="TDE" \
title="KRadio" \
longtitle="K-Radio Application" \
command="/opt/trinity/bin/kradio" \
diff --git a/debian/lenny/applications/krusader/debian/menu b/debian/lenny/applications/krusader/debian/menu
index 759ac536f..8999b22e7 100644
--- a/debian/lenny/applications/krusader/debian/menu
+++ b/debian/lenny/applications/krusader/debian/menu
@@ -1,7 +1,7 @@
?package(krusader):\
needs="X11"\
section="Applications/Network/File Transfer"\
- hints="KDE"\
+ hints="TDE"\
title="krusader (File Manager)"\
icon32x32="/usr/share/pixmaps/krusader_user.xpm"\
icon16x16="/usr/share/pixmaps/krusader_user-16.xpm"\
@@ -10,7 +10,7 @@
?package(krusader):\
needs="X11"\
section="Applications/Network/File Transfer"\
- hints="KDE"\
+ hints="TDE"\
title="krusader - root-mode (File Manager)"\
icon32x32="/usr/share/pixmaps/krusader_root.xpm"\
icon16x16="/usr/share/pixmaps/krusader_root-16.xpm"\
diff --git a/debian/lenny/applications/ktechlab/debian/menu b/debian/lenny/applications/ktechlab/debian/menu
index 8d468de83..bb72dd11c 100644
--- a/debian/lenny/applications/ktechlab/debian/menu
+++ b/debian/lenny/applications/ktechlab/debian/menu
@@ -1,6 +1,6 @@
?package(ktechlab):needs="X11" \
section="Applications/Programming" \
- hints="KDE" \
+ hints="TDE" \
title="KTechLab" \
command="/opt/trinity/bin/ktechlab" \
icon="/usr/share/pixmaps/ktechlab.xpm"
diff --git a/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.menu b/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.menu
index 4d17d621c..eee2e1417 100644
--- a/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.menu
+++ b/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.menu
@@ -1,7 +1,7 @@
?package(kuickshow):\
needs="X11"\
section="Apps/Graphics"\
- hints="KDE"\
+ hints="TDE"\
title="Kuickshow"\
icon32x32="/usr/share/pixmaps/kuickshow.xpm"\
icon16x16="/usr/share/pixmaps/kuickshow-16.xpm"\
diff --git a/debian/lenny/applications/kvpnc/debian/README.Debian b/debian/lenny/applications/kvpnc/debian/README.Debian
index fe3b96cf6..b6bc07ea6 100644
--- a/debian/lenny/applications/kvpnc/debian/README.Debian
+++ b/debian/lenny/applications/kvpnc/debian/README.Debian
@@ -22,11 +22,11 @@ Howto setup kvpnc for use without root password using sudo:
* replace the folling lines:
Exec=su-to-root -X -c /usr/bin/kvpnc
- X-KDE-SubstituteUID=true
+ X-TDE-SubstituteUID=true
with:
Exec=sudo kvpnc
- X-KDE-SubstituteUID=false
+ X-TDE-SubstituteUID=false
-- Fathi Boudra <fboudra@free.fr>, Thu, 18 May 2006 15:17:52 +0100
diff --git a/debian/lenny/applications/kvpnc/debian/menu b/debian/lenny/applications/kvpnc/debian/menu
index 1f3e59d31..909adb58a 100644
--- a/debian/lenny/applications/kvpnc/debian/menu
+++ b/debian/lenny/applications/kvpnc/debian/menu
@@ -2,5 +2,5 @@
needs="X11"\
section="Applications/Network/Communication"\
title="kvpnc"\
- hints="KDE"\
+ hints="TDE"\
command="su-to-root -X -c kvpnc"
diff --git a/debian/lenny/applications/kvpnc/debian/patches/10_su-to-root_usage.diff b/debian/lenny/applications/kvpnc/debian/patches/10_su-to-root_usage.diff
index 9630fd3f8..711bbff74 100644
--- a/debian/lenny/applications/kvpnc/debian/patches/10_su-to-root_usage.diff
+++ b/debian/lenny/applications/kvpnc/debian/patches/10_su-to-root_usage.diff
@@ -3,9 +3,9 @@
@@ -18,7 +18,7 @@
GenericName[xx]=xxVPN Client GUIxx
- Categories=Network;RemoteAccess;KDE;Qt
+ Categories=Network;RemoteAccess;TDE;Qt
-Exec=kvpnc
+Exec=su-to-root -X -c /opt/trinity/bin/kvpnc
- X-KDE-SubstituteUID=true
+ X-TDE-SubstituteUID=true
Icon=kvpnc
Type=Application
diff --git a/debian/lenny/applications/rosegarden/debian/x-rosegarden.desktop b/debian/lenny/applications/rosegarden/debian/x-rosegarden.desktop
index b6b766909..69018aa05 100644
--- a/debian/lenny/applications/rosegarden/debian/x-rosegarden.desktop
+++ b/debian/lenny/applications/rosegarden/debian/x-rosegarden.desktop
@@ -6,4 +6,4 @@ Icon=x-rosegarden.png
MimeType=audio/x-rosegarden
Patterns=*.rg;*.RG
Type=MimeType
-X-KDE-AutoEmbed=false
+X-TDE-AutoEmbed=false
diff --git a/debian/lenny/applications/smb4k/debian/menu b/debian/lenny/applications/smb4k/debian/menu
index 7f7c9cb2a..c56defa90 100644
--- a/debian/lenny/applications/smb4k/debian/menu
+++ b/debian/lenny/applications/smb4k/debian/menu
@@ -1,7 +1,7 @@
?package(smb4k):\
needs="X11"\
section="Applications/Network"\
- hints="KDE"\
+ hints="TDE"\
kderemove="1"\
title="SAMBA for KDE"\
longtitle="SAMBA Advanced Browser"\
diff --git a/debian/lenny/applications/tdmtheme/debian/tdmtheme.lintian-overrides b/debian/lenny/applications/tdmtheme/debian/tdmtheme.lintian-overrides
index be194270f..5ad21ad51 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/tde/tdmtheme.desktop kcmshell
# kcontrol module
-tdmtheme: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/applications/tde/tdmtheme.desktop
+tdmtheme: desktop-entry-invalid-category X-TDE-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.menu b/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu
index e30b43ad8..4004b5a65 100644
--- a/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu
@@ -1,7 +1,7 @@
?package(wlassistant):\
needs="X11"\
section="Applications/Network/Monitoring"\
- hints="KDE"\
+ hints="TDE"\
icon32x32="/usr/share/pixmaps/wlassistant.xpm"\
icon16x16="/usr/share/pixmaps/wlassistant-16.xpm"\
title="wlassistant"\
diff --git a/debian/lenny/dependencies/qt3/debian/qt3-assistant.menu b/debian/lenny/dependencies/qt3/debian/qt3-assistant.menu
index 997a47b23..1b4c81243 100644
--- a/debian/lenny/dependencies/qt3/debian/qt3-assistant.menu
+++ b/debian/lenny/dependencies/qt3/debian/qt3-assistant.menu
@@ -1,6 +1,6 @@
?package(qt3-assistant):\
needs="x11"\
section="Applications/Programming"\
- hints="KDE"\
+ hints="TDE"\
title="Qt3 Assistant"\
command="/usr/bin/assistant-qt3"
diff --git a/debian/lenny/dependencies/qt3/debian/qt3-designer.menu b/debian/lenny/dependencies/qt3/debian/qt3-designer.menu
index 065115120..9b15d7bb5 100644
--- a/debian/lenny/dependencies/qt3/debian/qt3-designer.menu
+++ b/debian/lenny/dependencies/qt3/debian/qt3-designer.menu
@@ -1,7 +1,7 @@
?package(qt3-designer):\
needs="x11"\
section="Applications/Programming"\
- hints="KDE"\
+ hints="TDE"\
title="Qt3 Designer"\
command="/usr/bin/designer-qt3"
diff --git a/debian/lenny/dependencies/qt3/debian/qt3-linguist.menu b/debian/lenny/dependencies/qt3/debian/qt3-linguist.menu
index d0b39269e..ebd7e43b7 100644
--- a/debian/lenny/dependencies/qt3/debian/qt3-linguist.menu
+++ b/debian/lenny/dependencies/qt3/debian/qt3-linguist.menu
@@ -1,6 +1,6 @@
?package(qt3-linguist):\
needs="x11"\
section="Applications/Programming"\
- hints="KDE"\
+ hints="TDE"\
title="Qt3 Linguist"\
command="/usr/bin/linguist-qt3"
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.menu b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.menu
index b47a494ac..0706262b5 100644
--- a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.menu
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.menu
@@ -1,6 +1,6 @@
?package(tqt3-assistant):\
needs="x11"\
section="Applications/Programming"\
- hints="KDE"\
+ hints="TDE"\
title="Qt3 Assistant"\
command="/usr/bin/assistant-tqt3"
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.menu b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.menu
index cc01205eb..d3c55b41a 100644
--- a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.menu
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.menu
@@ -1,7 +1,7 @@
?package(tqt3-designer):\
needs="x11"\
section="Applications/Programming"\
- hints="KDE"\
+ hints="TDE"\
title="Qt3 Designer"\
command="/usr/bin/designer-tqt3"
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.menu b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.menu
index 6da50281a..faf1b8eae 100644
--- a/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.menu
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.menu
@@ -1,6 +1,6 @@
?package(tqt3-linguist):\
needs="x11"\
section="Applications/Programming"\
- hints="KDE"\
+ hints="TDE"\
title="Qt3 Linguist"\
command="/usr/bin/linguist-tqt3"
diff --git a/debian/lenny/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides b/debian/lenny/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
index 3b34d51a5..bf93b96ee 100644
--- a/debian/lenny/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
+++ b/debian/lenny/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
@@ -1,7 +1,7 @@
pytdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB]
pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell
pytdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
-pytdeextensions: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions: desktop-entry-invalid-category X-TDE-settings-system ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
pytdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$
pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$
diff --git a/debian/lenny/tdeaccessibility/debian/kmag-trinity.menu b/debian/lenny/tdeaccessibility/debian/kmag-trinity.menu
index e65ffb1d6..7dff915b1 100644
--- a/debian/lenny/tdeaccessibility/debian/kmag-trinity.menu
+++ b/debian/lenny/tdeaccessibility/debian/kmag-trinity.menu
@@ -1,7 +1,7 @@
?package(kmag):\
needs="x11"\
section="Applications/Accessibility"\
- hints="KDE"\
+ hints="TDE"\
title="KMag"\
icon32x32="/opt/trinity/share/pixmaps/kmag.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kmag-16.xpm"\
diff --git a/debian/lenny/tdeaccessibility/debian/kmousetool-trinity.menu b/debian/lenny/tdeaccessibility/debian/kmousetool-trinity.menu
index 1925a2979..a5faa6475 100644
--- a/debian/lenny/tdeaccessibility/debian/kmousetool-trinity.menu
+++ b/debian/lenny/tdeaccessibility/debian/kmousetool-trinity.menu
@@ -1,7 +1,7 @@
?package(kmousetool):\
needs="x11"\
section="Applications/Accessibility"\
- hints="KDE"\
+ hints="TDE"\
title="KMousetool"\
icon32x32="/opt/trinity/share/pixmaps/kmousetool.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kmousetool-16.xpm"\
diff --git a/debian/lenny/tdeaccessibility/debian/kmouth-trinity.menu b/debian/lenny/tdeaccessibility/debian/kmouth-trinity.menu
index 249e7792e..f4164062a 100644
--- a/debian/lenny/tdeaccessibility/debian/kmouth-trinity.menu
+++ b/debian/lenny/tdeaccessibility/debian/kmouth-trinity.menu
@@ -1,7 +1,7 @@
?package(kmouth):\
needs="x11"\
section="Applications/Accessibility"\
- hints="KDE"\
+ hints="TDE"\
title="KMouth"\
icon32x32="/opt/trinity/share/pixmaps/kmouth.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kmouth-16.xpm"\
diff --git a/debian/lenny/tdeaccessibility/debian/ksayit-trinity.menu b/debian/lenny/tdeaccessibility/debian/ksayit-trinity.menu
index a88a21ebc..0acb02c9e 100644
--- a/debian/lenny/tdeaccessibility/debian/ksayit-trinity.menu
+++ b/debian/lenny/tdeaccessibility/debian/ksayit-trinity.menu
@@ -1,7 +1,7 @@
?package(ksayit):\
needs="x11"\
section="Applications/Accessibility"\
- hints="KDE"\
+ hints="TDE"\
title="KSayIt"\
icon32x32="/opt/trinity/share/pixmaps/ksayit.xpm"\
icon16x16="/opt/trinity/share/pixmaps/ksayit-16.xpm"\
diff --git a/debian/lenny/tdeaddons/debian/konq-plugins-trinity.menu b/debian/lenny/tdeaddons/debian/konq-plugins-trinity.menu
index 0a87e945c..835631c96 100644
--- a/debian/lenny/tdeaddons/debian/konq-plugins-trinity.menu
+++ b/debian/lenny/tdeaddons/debian/konq-plugins-trinity.menu
@@ -1,6 +1,6 @@
?package(konq-plugins):needs="X11"\
section="Applications/System/Monitoring"\
- hints="KDE"\
+ hints="TDE"\
title="FSView"\
longtitle="FSView (Graphical Disk Usage / Filesystem Viewer)"\
command="/opt/trinity/bin/fsview"\
diff --git a/debian/lenny/tdeaddons/debian/ksig-trinity.menu b/debian/lenny/tdeaddons/debian/ksig-trinity.menu
index 1b9cf2f16..3ff5213f4 100644
--- a/debian/lenny/tdeaddons/debian/ksig-trinity.menu
+++ b/debian/lenny/tdeaddons/debian/ksig-trinity.menu
@@ -1,6 +1,6 @@
?package(ksig):needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE"\
+ hints="TDE"\
title="KSig"\
longtitle="KSig (Signature Editor)"\
command="/opt/trinity/bin/ksig"\
diff --git a/debian/lenny/tdeadmin/debian/kcron-trinity.menu b/debian/lenny/tdeadmin/debian/kcron-trinity.menu
index 13b9c1279..40ce7f089 100644
--- a/debian/lenny/tdeadmin/debian/kcron-trinity.menu
+++ b/debian/lenny/tdeadmin/debian/kcron-trinity.menu
@@ -1,7 +1,7 @@
?package(kcron):\
needs="X11"\
section="Applications/Editors"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Task Scheduler"\
icon32x32="/usr/share/pixmaps/kcron.xpm"\
icon16x16="/usr/share/pixmaps/kcron-16.xpm"\
diff --git a/debian/lenny/tdeadmin/debian/kdat-trinity.menu b/debian/lenny/tdeadmin/debian/kdat-trinity.menu
index 549b237ad..398c54bd6 100644
--- a/debian/lenny/tdeadmin/debian/kdat-trinity.menu
+++ b/debian/lenny/tdeadmin/debian/kdat-trinity.menu
@@ -1,7 +1,7 @@
?package(kdat):\
needs="X11"\
section="Applications/System/Hardware"\
- hints="KDE"\
+ hints="TDE"\
title="KDat"\
icon32x32="/usr/share/pixmaps/kdat.xpm"\
icon16x16="/usr/share/pixmaps/kdat-16.xpm"\
diff --git a/debian/lenny/tdeadmin/debian/kpackage-trinity.menu b/debian/lenny/tdeadmin/debian/kpackage-trinity.menu
index a22bc37d3..0274b1556 100644
--- a/debian/lenny/tdeadmin/debian/kpackage-trinity.menu
+++ b/debian/lenny/tdeadmin/debian/kpackage-trinity.menu
@@ -1,7 +1,7 @@
?package(kpackage):\
needs="X11"\
section="Applications/System/Package Management"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Package Manager"\
icon32x32="/usr/share/pixmaps/kpackage.xpm"\
icon16x16="/usr/share/pixmaps/kpackage-16.xpm"\
diff --git a/debian/lenny/tdeadmin/debian/ksysv-trinity.menu b/debian/lenny/tdeadmin/debian/ksysv-trinity.menu
index 74953dc41..1da3e1e60 100644
--- a/debian/lenny/tdeadmin/debian/ksysv-trinity.menu
+++ b/debian/lenny/tdeadmin/debian/ksysv-trinity.menu
@@ -1,7 +1,7 @@
?package(ksysv):\
needs="X11"\
section="Applications/Editors"\
- hints="KDE"\
+ hints="TDE"\
title="KDE SysV-Init Editor"\
icon32x32="/usr/share/pixmaps/ksysv.xpm"\
icon16x16="/usr/share/pixmaps/ksysv-16.xpm"\
diff --git a/debian/lenny/tdeadmin/debian/kuser-trinity.menu b/debian/lenny/tdeadmin/debian/kuser-trinity.menu
index d610c6835..b66726e62 100644
--- a/debian/lenny/tdeadmin/debian/kuser-trinity.menu
+++ b/debian/lenny/tdeadmin/debian/kuser-trinity.menu
@@ -1,7 +1,7 @@
?package(kuser):\
needs="X11"\
section="Applications/System/Administration"\
- hints="KDE"\
+ hints="TDE"\
title="KDE User Manager"\
icon32x32="/usr/share/pixmaps/kuser.xpm"\
icon16x16="/usr/share/pixmaps/kuser-16.xpm"\
diff --git a/debian/lenny/tdeadmin/debian/lilo-config-trinity.menu b/debian/lenny/tdeadmin/debian/lilo-config-trinity.menu
index 6efa201f0..c7234f5b2 100644
--- a/debian/lenny/tdeadmin/debian/lilo-config-trinity.menu
+++ b/debian/lenny/tdeadmin/debian/lilo-config-trinity.menu
@@ -1,6 +1,6 @@
?package(lilo-config):\
needs="X11"\
section="Applications/System/Administration"\
- hints="KDE"\
+ hints="TDE"\
title="lilo-config"\
command="/opt/trinity/bin/tdesu kcmshell lilo"
diff --git a/debian/lenny/tdebase/debian/kappfinder-trinity.menu b/debian/lenny/tdebase/debian/kappfinder-trinity.menu
index 597600f9e..d3109e3c6 100644
--- a/debian/lenny/tdebase/debian/kappfinder-trinity.menu
+++ b/debian/lenny/tdebase/debian/kappfinder-trinity.menu
@@ -1,7 +1,7 @@
?package(kappfinder):\
needs="X11"\
section="Applications/System/Administration"\
- hints="KDE"\
+ hints="TDE"\
title="kAppfinder"\
icon32x32="/opt/trinity/share/pixmaps/kappfinder.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kappfinder-16.xpm"\
diff --git a/debian/lenny/tdebase/debian/kcontrol-trinity.menu b/debian/lenny/tdebase/debian/kcontrol-trinity.menu
index 7035a694c..f2bedef2b 100644
--- a/debian/lenny/tdebase/debian/kcontrol-trinity.menu
+++ b/debian/lenny/tdebase/debian/kcontrol-trinity.menu
@@ -1,7 +1,7 @@
?package(kcontrol):\
needs="X11"\
section="Applications/System/Administration"\
- hints="KDE"\
+ hints="TDE"\
title="KControl"\
icon32x32="/opt/trinity/share/pixmaps/kcontrol.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kcontrol-16.xpm"\
@@ -10,7 +10,7 @@
?package(kcontrol):\
needs="X11"\
section="Applications/System/Administration"\
- hints="KDE"\
+ hints="TDE"\
title="KInfoCenter"\
icon32x32="/opt/trinity/share/pixmaps/kinfocenter.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kinfocenter-16.xpm"\
diff --git a/debian/lenny/tdebase/debian/kdepasswd-trinity.menu b/debian/lenny/tdebase/debian/kdepasswd-trinity.menu
index 3610102c0..7273c2657 100644
--- a/debian/lenny/tdebase/debian/kdepasswd-trinity.menu
+++ b/debian/lenny/tdebase/debian/kdepasswd-trinity.menu
@@ -1,6 +1,6 @@
?package(kdepasswd):\
needs="X11"\
section="Applications/System/Administration"\
- hints="KDE"\
+ hints="TDE"\
title="kdepasswd"\
command="/opt/trinity/bin/kdepasswd"
diff --git a/debian/lenny/tdebase/debian/kfind-trinity.menu b/debian/lenny/tdebase/debian/kfind-trinity.menu
index 8763f0a87..457df9255 100644
--- a/debian/lenny/tdebase/debian/kfind-trinity.menu
+++ b/debian/lenny/tdebase/debian/kfind-trinity.menu
@@ -1,7 +1,7 @@
?package(kfind):\
needs="X11"\
section="Applications/System/Administration"\
- hints="KDE"\
+ hints="TDE"\
title="KFind"\
icon32x32="/opt/trinity/share/pixmaps/kfind.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kfind-16.xpm"\
diff --git a/debian/lenny/tdebase/debian/khelpcenter-trinity.menu b/debian/lenny/tdebase/debian/khelpcenter-trinity.menu
index 5b1822b93..e353cea94 100644
--- a/debian/lenny/tdebase/debian/khelpcenter-trinity.menu
+++ b/debian/lenny/tdebase/debian/khelpcenter-trinity.menu
@@ -1,7 +1,7 @@
?package(khelpcenter):\
needs="X11"\
section="Help"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Help Center"\
icon32x32="/opt/trinity/share/pixmaps/khelpcenter.xpm"\
icon16x16="/opt/trinity/share/pixmaps/khelpcenter-16.xpm"\
diff --git a/debian/lenny/tdebase/debian/kicker-trinity.menu b/debian/lenny/tdebase/debian/kicker-trinity.menu
index d945d3a4d..f18046d6d 100644
--- a/debian/lenny/tdebase/debian/kicker-trinity.menu
+++ b/debian/lenny/tdebase/debian/kicker-trinity.menu
@@ -1,7 +1,7 @@
?package(kicker):\
needs="X11"\
section="Applications/System/Administration"\
- hints="KDE"\
+ hints="TDE"\
title="Kicker"\
icon="/opt/trinity/share/pixmaps/kicker.xpm"\
command="/opt/trinity/bin/kicker"
diff --git a/debian/lenny/tdebase/debian/klipper-trinity.menu b/debian/lenny/tdebase/debian/klipper-trinity.menu
index c7992a9b4..d295ac398 100644
--- a/debian/lenny/tdebase/debian/klipper-trinity.menu
+++ b/debian/lenny/tdebase/debian/klipper-trinity.menu
@@ -1,7 +1,7 @@
?package(klipper):\
needs="X11"\
section="Applications/Editors"\
- hints="KDE"\
+ hints="TDE"\
title="Klipper"\
icon32x32="/opt/trinity/share/pixmaps/klipper.xpm"\
icon16x16="/opt/trinity/share/pixmaps/klipper-16.xpm"\
diff --git a/debian/lenny/tdebase/debian/kmenuedit-trinity.menu b/debian/lenny/tdebase/debian/kmenuedit-trinity.menu
index 370349760..6901559ac 100644
--- a/debian/lenny/tdebase/debian/kmenuedit-trinity.menu
+++ b/debian/lenny/tdebase/debian/kmenuedit-trinity.menu
@@ -1,7 +1,7 @@
?package(kmenuedit):\
needs="X11"\
section="Applications/System/Administration"\
- hints="KDE"\
+ hints="TDE"\
title="KMenuEdit"\
icon32x32="/opt/trinity/share/pixmaps/kmenuedit.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kmenuedit-16.xpm"\
diff --git a/debian/lenny/tdebase/debian/konqueror-trinity.menu b/debian/lenny/tdebase/debian/konqueror-trinity.menu
index 6c829efaf..7f2ffa797 100644
--- a/debian/lenny/tdebase/debian/konqueror-trinity.menu
+++ b/debian/lenny/tdebase/debian/konqueror-trinity.menu
@@ -1,7 +1,7 @@
?package(konqueror):\
needs="X11"\
section="Applications/System/Administration"\
- hints="KDE"\
+ hints="TDE"\
title="KEditBookmarks"\
icon32x32="/opt/trinity/share/pixmaps/keditbookmarks.xpm"\
icon16x16="/opt/trinity/share/pixmaps/keditbookmarks-16.xpm"\
diff --git a/debian/lenny/tdebase/debian/konsole-trinity.menu b/debian/lenny/tdebase/debian/konsole-trinity.menu
index 2439a78a2..4b13da3ec 100644
--- a/debian/lenny/tdebase/debian/konsole-trinity.menu
+++ b/debian/lenny/tdebase/debian/konsole-trinity.menu
@@ -1,7 +1,7 @@
?package(konsole):\
needs="X11"\
section="Applications/Terminal Emulators"\
- hints="KDE"\
+ hints="TDE"\
title="Konsole"\
icon32x32="/opt/trinity/share/pixmaps/konsole.xpm"\
icon16x16="/opt/trinity/share/pixmaps/konsole-16.xpm"\
diff --git a/debian/lenny/tdebase/debian/kpager-trinity.menu b/debian/lenny/tdebase/debian/kpager-trinity.menu
index 15e3c298e..0e12f9646 100644
--- a/debian/lenny/tdebase/debian/kpager-trinity.menu
+++ b/debian/lenny/tdebase/debian/kpager-trinity.menu
@@ -1,7 +1,7 @@
?package(kpager):\
needs="X11"\
section="Applications/System/Administration"\
- hints="KDE"\
+ hints="TDE"\
title="KPager"\
icon32x32="/opt/trinity/share/pixmaps/kpager.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kpager-16.xpm"\
diff --git a/debian/lenny/tdebase/debian/kpersonalizer-trinity.menu b/debian/lenny/tdebase/debian/kpersonalizer-trinity.menu
index fe93901c6..ede0b9036 100644
--- a/debian/lenny/tdebase/debian/kpersonalizer-trinity.menu
+++ b/debian/lenny/tdebase/debian/kpersonalizer-trinity.menu
@@ -1,7 +1,7 @@
?package(kpersonalizer):\
needs="X11"\
section="Applications/System/Administration"\
- hints="KDE"\
+ hints="TDE"\
title="KPersonalizer"\
icon32x32="/opt/trinity/share/pixmaps/kpersonalizer.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kpersonalizer-16.xpm"\
diff --git a/debian/lenny/tdebase/debian/ksysguard-trinity.menu b/debian/lenny/tdebase/debian/ksysguard-trinity.menu
index 811fdfbeb..5b66c9a43 100644
--- a/debian/lenny/tdebase/debian/ksysguard-trinity.menu
+++ b/debian/lenny/tdebase/debian/ksysguard-trinity.menu
@@ -1,7 +1,7 @@
?package(ksysguard):\
needs="X11"\
section="Applications/System/Monitoring"\
- hints="KDE"\
+ hints="TDE"\
title="KDE System Guard"\
icon32x32="/opt/trinity/share/pixmaps/ksysguard.xpm"\
icon16x16="/opt/trinity/share/pixmaps/ksysguard-16.xpm"\
@@ -10,7 +10,7 @@
?package(ksysguard):\
needs="X11"\
section="Applications/System/Monitoring"\
- hints="KDE"\
+ hints="TDE"\
title="KDE System Guard - Process Table"\
command="/opt/trinity/bin/kpm"
diff --git a/debian/lenny/tdebase/debian/ktip-trinity.menu b/debian/lenny/tdebase/debian/ktip-trinity.menu
index 0e2f320c5..0f252cd2a 100644
--- a/debian/lenny/tdebase/debian/ktip-trinity.menu
+++ b/debian/lenny/tdebase/debian/ktip-trinity.menu
@@ -1,7 +1,7 @@
?package(ktip):\
needs="X11"\
section="Help"\
- hints="KDE"\
+ hints="TDE"\
title="KTip"\
icon32x32="/opt/trinity/share/pixmaps/ktip.xpm"\
icon16x16="/opt/trinity/share/pixmaps/ktip-16.xpm"\
diff --git a/debian/lenny/tdebase/debian/man/kdialog-trinity.1 b/debian/lenny/tdebase/debian/man/kdialog-trinity.1
index fc4ccccb1..3df82c3e2 100644
--- a/debian/lenny/tdebase/debian/man/kdialog-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kdialog-trinity.1
@@ -1,4 +1,4 @@
-.TH KDIALOG "1" "December 2002" "KDE" "KDE Application"
+.TH KDIALOG "1" "December 2002" "TDE" "KDE Application"
.SH NAME
kdialog \- Show KDE dialog boxes from shell scripts
.SH SYNOPSIS
diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-bin.menu b/debian/lenny/tdebase/debian/tdebase-trinity-bin.menu
index 1f1176e14..4011466f4 100644
--- a/debian/lenny/tdebase/debian/tdebase-trinity-bin.menu
+++ b/debian/lenny/tdebase/debian/tdebase-trinity-bin.menu
@@ -1,13 +1,13 @@
?package(tdebase-bin):\
needs="X11"\
section="Applications/System/Administration"\
- hints="KDE"\
+ hints="TDE"\
title="KDebugDialog"\
command="/opt/trinity/bin/kdebugdialog"
?package(tdebase-bin):\
needs="X11"\
section="Applications/System/Monitoring"\
- hints="KDE"\
+ hints="TDE"\
title="KDCOP"\
command="/opt/trinity/bin/kdcop"
diff --git a/debian/lenny/tdebase/debian/tdeprint-trinity.menu b/debian/lenny/tdebase/debian/tdeprint-trinity.menu
index 1268aa55c..1e840a172 100644
--- a/debian/lenny/tdebase/debian/tdeprint-trinity.menu
+++ b/debian/lenny/tdebase/debian/tdeprint-trinity.menu
@@ -1,7 +1,7 @@
?package(tdeprint):\
needs="X11"\
section="Applications/System/Monitoring"\
- hints="KDE"\
+ hints="TDE"\
title="KJobViewer"\
icon32x32="/opt/trinity/share/pixmaps/kjobviewer.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kjobviewer-16.xpm"\
@@ -10,7 +10,7 @@
?package(tdeprint):\
needs="X11"\
section="Applications/System/Administration"\
- hints="KDE"\
+ hints="TDE"\
title="KPrinter"\
icon32x32="/opt/trinity/share/pixmaps/tdeprint.xpm"\
icon16x16="/opt/trinity/share/pixmaps/tdeprint-16.xpm"\
@@ -19,7 +19,7 @@
?package(tdeprint):\
needs="X11"\
section="Applications/System/Administration"\
- hints="KDE"\
+ hints="TDE"\
title="KDEPrintFax"\
icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\
icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\
diff --git a/debian/lenny/tdebindings/debian/kjscmd-trinity.menu b/debian/lenny/tdebindings/debian/kjscmd-trinity.menu
index 6997d23cb..dce8b0826 100644
--- a/debian/lenny/tdebindings/debian/kjscmd-trinity.menu
+++ b/debian/lenny/tdebindings/debian/kjscmd-trinity.menu
@@ -1,6 +1,6 @@
?package(kjscmd):\
needs="X11"\
section="Applications/Programming"\
- hints="KDE"\
+ hints="TDE"\
title="KDE JavaScript Console"\
command="/opt/trinity/bin/kjscmd --console --exec"
diff --git a/debian/lenny/tdeedu/debian/blinken-trinity.menu b/debian/lenny/tdeedu/debian/blinken-trinity.menu
index 27d188afa..6b851f95c 100644
--- a/debian/lenny/tdeedu/debian/blinken-trinity.menu
+++ b/debian/lenny/tdeedu/debian/blinken-trinity.menu
@@ -1,6 +1,6 @@
?package(blinken):needs="X11"\
section="Games/Puzzles"\
- hints="KDE"\
+ hints="TDE"\
title="Blinken"\
longtitle="Blinken (Memory Game)"\
command="/opt/trinity/bin/blinken"\
diff --git a/debian/lenny/tdeedu/debian/kalzium-trinity.menu b/debian/lenny/tdeedu/debian/kalzium-trinity.menu
index 8150473ae..5c727993c 100644
--- a/debian/lenny/tdeedu/debian/kalzium-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kalzium-trinity.menu
@@ -1,6 +1,6 @@
?package(kalzium):needs="X11"\
section="Apps/Science/Chemistry"\
- hints="KDE"\
+ hints="TDE"\
title="Kalzium"\
longtitle="Kalzium (Periodic Table of Elements)"\
command="/opt/trinity/bin/kalzium"\
diff --git a/debian/lenny/tdeedu/debian/kanagram-trinity.menu b/debian/lenny/tdeedu/debian/kanagram-trinity.menu
index 2ae493c03..c0cfb57b4 100644
--- a/debian/lenny/tdeedu/debian/kanagram-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kanagram-trinity.menu
@@ -1,6 +1,6 @@
?package(kanagram):needs="X11"\
section="Games/Puzzles"\
- hints="KDE"\
+ hints="TDE"\
title="KAnagram"\
longtitle="KAnagram (Letter Order Game)"\
command="/opt/trinity/bin/kanagram"\
diff --git a/debian/lenny/tdeedu/debian/kbruch-trinity.menu b/debian/lenny/tdeedu/debian/kbruch-trinity.menu
index 895407a25..684d52e2f 100644
--- a/debian/lenny/tdeedu/debian/kbruch-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kbruch-trinity.menu
@@ -1,6 +1,6 @@
?package(kbruch):needs="X11"\
section="Applications/Education"\
- hints="KDE"\
+ hints="TDE"\
title="KBruch"\
longtitle="KBruch (Exercise Fractions)"\
command="/opt/trinity/bin/kbruch"\
diff --git a/debian/lenny/tdeedu/debian/keduca-trinity.menu b/debian/lenny/tdeedu/debian/keduca-trinity.menu
index 58650bb79..3eb2c2819 100644
--- a/debian/lenny/tdeedu/debian/keduca-trinity.menu
+++ b/debian/lenny/tdeedu/debian/keduca-trinity.menu
@@ -1,6 +1,6 @@
?package(keduca):needs="X11"\
section="Applications/Education"\
- hints="KDE"\
+ hints="TDE"\
title="KEduca"\
longtitle="KEduca (Tests and Exams)"\
command="/opt/trinity/bin/keduca"\
@@ -8,7 +8,7 @@
?package(keduca):needs="X11"\
section="Applications/Education"\
- hints="KDE"\
+ hints="TDE"\
title="KEduca-Editor"\
longtitle="KEduca-Editor (Tests and Exams Editor)"\
command="/opt/trinity/bin/keducabuilder"\
diff --git a/debian/lenny/tdeedu/debian/kgeography-trinity.menu b/debian/lenny/tdeedu/debian/kgeography-trinity.menu
index 0bf2a46b0..54458aab8 100644
--- a/debian/lenny/tdeedu/debian/kgeography-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kgeography-trinity.menu
@@ -1,6 +1,6 @@
?package(kgeography):needs="X11"\
section="Applications/Education"\
- hints="KDE"\
+ hints="TDE"\
title="KGeography"\
longtitle="KGeography (Geography Learning Tool)"\
command="/opt/trinity/bin/kgeography"\
diff --git a/debian/lenny/tdeedu/debian/khangman-trinity.menu b/debian/lenny/tdeedu/debian/khangman-trinity.menu
index 14019cf51..4130e814a 100644
--- a/debian/lenny/tdeedu/debian/khangman-trinity.menu
+++ b/debian/lenny/tdeedu/debian/khangman-trinity.menu
@@ -1,6 +1,6 @@
?package(khangman):needs="X11"\
section="Games/Puzzles"\
- hints="KDE"\
+ hints="TDE"\
title="KHangMan"\
longtitle="KHangMan (Hangman Game)"\
command="/opt/trinity/bin/khangman"\
diff --git a/debian/lenny/tdeedu/debian/kig-trinity.menu b/debian/lenny/tdeedu/debian/kig-trinity.menu
index ae6ef3bb7..74b7208ed 100644
--- a/debian/lenny/tdeedu/debian/kig-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kig-trinity.menu
@@ -1,6 +1,6 @@
?package(kig):needs="X11"\
section="Applications/Science/Mathematics"\
- hints="KDE"\
+ hints="TDE"\
title="Kig"\
longtitle="Kig (Interactive Geometry)"\
command="/opt/trinity/bin/kig"\
diff --git a/debian/lenny/tdeedu/debian/kiten-trinity.menu b/debian/lenny/tdeedu/debian/kiten-trinity.menu
index 6acb9a175..674cfc40e 100644
--- a/debian/lenny/tdeedu/debian/kiten-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kiten-trinity.menu
@@ -1,6 +1,6 @@
?package(kiten):needs="X11"\
section="Applications/Education"\
- hints="KDE"\
+ hints="TDE"\
title="Kiten"\
longtitle="Kiten (Japanese Reference/Study Tool)"\
command="/opt/trinity/bin/kiten"\
diff --git a/debian/lenny/tdeedu/debian/klatin-trinity.menu b/debian/lenny/tdeedu/debian/klatin-trinity.menu
index d25c39903..eba23f711 100644
--- a/debian/lenny/tdeedu/debian/klatin-trinity.menu
+++ b/debian/lenny/tdeedu/debian/klatin-trinity.menu
@@ -1,6 +1,6 @@
?package(klatin):needs="X11"\
section="Applications/Education"\
- hints="KDE"\
+ hints="TDE"\
title="KLatin"\
longtitle="KLatin (Latin Reviser)"\
command="/opt/trinity/bin/klatin"\
diff --git a/debian/lenny/tdeedu/debian/klettres-trinity.menu b/debian/lenny/tdeedu/debian/klettres-trinity.menu
index 7fc2ff5d1..d95337ae4 100644
--- a/debian/lenny/tdeedu/debian/klettres-trinity.menu
+++ b/debian/lenny/tdeedu/debian/klettres-trinity.menu
@@ -1,6 +1,6 @@
?package(klettres):needs="X11"\
section="Applications/Education"\
- hints="KDE"\
+ hints="TDE"\
title="KLettres"\
longtitle="KLettres (Learn Alphabet)"\
command="/opt/trinity/bin/klettres"\
diff --git a/debian/lenny/tdeedu/debian/kmplot-trinity.menu b/debian/lenny/tdeedu/debian/kmplot-trinity.menu
index 6315ba999..cce8113dc 100644
--- a/debian/lenny/tdeedu/debian/kmplot-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kmplot-trinity.menu
@@ -1,6 +1,6 @@
?package(kmplot):needs="X11"\
section="Applications/Science/Mathematics"\
- hints="KDE"\
+ hints="TDE"\
title="KmPlot"\
longtitle="KmPlot (Mathematical Function Plotter)"\
command="/opt/trinity/bin/kmplot"\
diff --git a/debian/lenny/tdeedu/debian/kpercentage-trinity.menu b/debian/lenny/tdeedu/debian/kpercentage-trinity.menu
index 8196c2b98..5efdba16a 100644
--- a/debian/lenny/tdeedu/debian/kpercentage-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kpercentage-trinity.menu
@@ -1,6 +1,6 @@
?package(kpercentage):needs="X11"\
section="Applications/Education"\
- hints="KDE"\
+ hints="TDE"\
title="KPercentage"\
longtitle="KPercentage (Exercise Percentages)"\
command="/opt/trinity/bin/kpercentage"\
diff --git a/debian/lenny/tdeedu/debian/kstars-trinity.menu b/debian/lenny/tdeedu/debian/kstars-trinity.menu
index 6afa4e411..9bae2a16c 100644
--- a/debian/lenny/tdeedu/debian/kstars-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kstars-trinity.menu
@@ -1,6 +1,6 @@
?package(kstars):needs="X11"\
section="Applications/Science/Astronomy"\
- hints="KDE"\
+ hints="TDE"\
title="KStars"\
longtitle="KStars (Desktop Planetarium)"\
command="/opt/trinity/bin/kstars"\
diff --git a/debian/lenny/tdeedu/debian/ktouch-trinity.menu b/debian/lenny/tdeedu/debian/ktouch-trinity.menu
index dc1037238..52b5d3347 100644
--- a/debian/lenny/tdeedu/debian/ktouch-trinity.menu
+++ b/debian/lenny/tdeedu/debian/ktouch-trinity.menu
@@ -1,6 +1,6 @@
?package(ktouch):needs="X11"\
section="Applications/Education"\
- hints="KDE"\
+ hints="TDE"\
title="KTouch"\
longtitle="KTouch (Touch Typing Tutor)"\
command="/opt/trinity/bin/ktouch"\
diff --git a/debian/lenny/tdeedu/debian/kturtle-trinity.menu b/debian/lenny/tdeedu/debian/kturtle-trinity.menu
index b1de72c0e..eabb3cbb3 100644
--- a/debian/lenny/tdeedu/debian/kturtle-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kturtle-trinity.menu
@@ -1,6 +1,6 @@
?package(kturtle):needs="X11"\
section="Applications/Education"\
- hints="KDE"\
+ hints="TDE"\
title="KTurtle"\
longtitle="KTurtle (Logo Programming Environment)"\
command="/opt/trinity/bin/kturtle"\
diff --git a/debian/lenny/tdeedu/debian/kverbos-trinity.menu b/debian/lenny/tdeedu/debian/kverbos-trinity.menu
index f6aece42e..a6111be0e 100644
--- a/debian/lenny/tdeedu/debian/kverbos-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kverbos-trinity.menu
@@ -1,6 +1,6 @@
?package(kverbos):needs="X11"\
section="Applications/Education"\
- hints="KDE"\
+ hints="TDE"\
title="Kverbos"\
longtitle="Kverbos (Study Spanish Verbforms)"\
command="/opt/trinity/bin/kverbos"\
diff --git a/debian/lenny/tdeedu/debian/kvoctrain-trinity.menu b/debian/lenny/tdeedu/debian/kvoctrain-trinity.menu
index 65716e3c1..e4043bee4 100644
--- a/debian/lenny/tdeedu/debian/kvoctrain-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kvoctrain-trinity.menu
@@ -1,6 +1,6 @@
?package(kvoctrain):needs="X11"\
section="Applications/Education"\
- hints="KDE"\
+ hints="TDE"\
title="KVocTrain"\
longtitle="KVocTrain (Vocabulary Trainer)"\
command="/opt/trinity/bin/kvoctrain"\
diff --git a/debian/lenny/tdeedu/debian/kwordquiz-trinity.menu b/debian/lenny/tdeedu/debian/kwordquiz-trinity.menu
index bb408e28c..5abc01a39 100644
--- a/debian/lenny/tdeedu/debian/kwordquiz-trinity.menu
+++ b/debian/lenny/tdeedu/debian/kwordquiz-trinity.menu
@@ -1,6 +1,6 @@
?package(kwordquiz):needs="X11"\
section="Applications/Education"\
- hints="KDE"\
+ hints="TDE"\
title="KWordQuiz"\
longtitle="KWordQuiz (Vocabulary Trainer)"\
command="/opt/trinity/bin/kwordquiz"\
diff --git a/debian/lenny/tdegames/debian/kasteroids-trinity.menu b/debian/lenny/tdegames/debian/kasteroids-trinity.menu
index e8eb57662..e7a7dc8af 100644
--- a/debian/lenny/tdegames/debian/kasteroids-trinity.menu
+++ b/debian/lenny/tdegames/debian/kasteroids-trinity.menu
@@ -1,7 +1,7 @@
?package(kasteroids):\
needs="x11"\
section="Games/Arcade"\
- hints="KDE"\
+ hints="TDE"\
title="KAsteroids"\
icon32x32="/usr/share/pixmaps/kasteroids.xpm"\
icon16x16="/usr/share/pixmaps/kasteroids-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/katomic-trinity.menu b/debian/lenny/tdegames/debian/katomic-trinity.menu
index cf426c63e..3026b7fb1 100644
--- a/debian/lenny/tdegames/debian/katomic-trinity.menu
+++ b/debian/lenny/tdegames/debian/katomic-trinity.menu
@@ -1,7 +1,7 @@
?package(katomic):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Atomic Entertainment"\
icon32x32="/usr/share/pixmaps/katomic.xpm"\
icon16x16="/usr/share/pixmaps/katomic-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/kbackgammon-trinity.menu b/debian/lenny/tdegames/debian/kbackgammon-trinity.menu
index bb187d03a..5a4f30f0e 100644
--- a/debian/lenny/tdegames/debian/kbackgammon-trinity.menu
+++ b/debian/lenny/tdegames/debian/kbackgammon-trinity.menu
@@ -1,7 +1,7 @@
?package(kbackgammon):\
needs="x11"\
section="Games/Board"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Backgammon"\
icon32x32="/usr/share/pixmaps/kbackgammon.xpm"\
icon16x16="/usr/share/pixmaps/kbackgammon-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/kbattleship-trinity.menu b/debian/lenny/tdegames/debian/kbattleship-trinity.menu
index f22f356a0..f402671bb 100644
--- a/debian/lenny/tdegames/debian/kbattleship-trinity.menu
+++ b/debian/lenny/tdegames/debian/kbattleship-trinity.menu
@@ -1,7 +1,7 @@
?package(kbattleship):\
needs="x11"\
section="Games/Board"\
- hints="KDE"\
+ hints="TDE"\
title="KBattleship"\
icon32x32="/usr/share/pixmaps/kbattleship.xpm"\
icon16x16="/usr/share/pixmaps/kbattleship-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/kbounce-trinity.menu b/debian/lenny/tdegames/debian/kbounce-trinity.menu
index c4763e539..aa0d01b1e 100644
--- a/debian/lenny/tdegames/debian/kbounce-trinity.menu
+++ b/debian/lenny/tdegames/debian/kbounce-trinity.menu
@@ -1,7 +1,7 @@
?package(kbounce):\
needs="x11"\
section="Games/Arcade"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Bounce Ball Game"\
icon32x32="/usr/share/pixmaps/kbounce.xpm"\
icon16x16="/usr/share/pixmaps/kbounce-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/kenolaba-trinity.menu b/debian/lenny/tdegames/debian/kenolaba-trinity.menu
index 92c2eafb4..5786cf47b 100644
--- a/debian/lenny/tdegames/debian/kenolaba-trinity.menu
+++ b/debian/lenny/tdegames/debian/kenolaba-trinity.menu
@@ -1,7 +1,7 @@
?package(kenolaba):\
needs="x11"\
section="Games/Board"\
- hints="KDE"\
+ hints="TDE"\
title="KEnolaba"\
icon32x32="/usr/share/pixmaps/kenolaba.xpm"\
icon16x16="/usr/share/pixmaps/kenolaba-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/kfouleggs-trinity.menu b/debian/lenny/tdegames/debian/kfouleggs-trinity.menu
index 0b5146d3d..49b76d6ee 100644
--- a/debian/lenny/tdegames/debian/kfouleggs-trinity.menu
+++ b/debian/lenny/tdegames/debian/kfouleggs-trinity.menu
@@ -1,7 +1,7 @@
?package(kfouleggs):\
needs="x11"\
section="Games/Tetris-like"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Foul Eggs"\
icon32x32="/usr/share/pixmaps/kfouleggs.xpm"\
icon16x16="/usr/share/pixmaps/kfouleggs-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/kgoldrunner-trinity.menu b/debian/lenny/tdegames/debian/kgoldrunner-trinity.menu
index 879d0fa0d..e240fcebe 100644
--- a/debian/lenny/tdegames/debian/kgoldrunner-trinity.menu
+++ b/debian/lenny/tdegames/debian/kgoldrunner-trinity.menu
@@ -1,7 +1,7 @@
?package(kgoldrunner):\
needs="x11"\
section="Games/Arcade"\
- hints="KDE"\
+ hints="TDE"\
title="KGoldrunner"\
icon32x32="/usr/share/pixmaps/kgoldrunner.xpm"\
icon16x16="/usr/share/pixmaps/kgoldrunner-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/kjumpingcube-trinity.menu b/debian/lenny/tdegames/debian/kjumpingcube-trinity.menu
index 8c3d8376b..5c8c3481e 100644
--- a/debian/lenny/tdegames/debian/kjumpingcube-trinity.menu
+++ b/debian/lenny/tdegames/debian/kjumpingcube-trinity.menu
@@ -1,7 +1,7 @@
?package(kjumpingcube):\
needs="x11"\
section="Games/Strategy"\
- hints="KDE"\
+ hints="TDE"\
title="KJumpingCube"\
icon32x32="/usr/share/pixmaps/kjumpingcube.xpm"\
icon16x16="/usr/share/pixmaps/kjumpingcube-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/klickety-trinity.menu b/debian/lenny/tdegames/debian/klickety-trinity.menu
index e18881c82..111245dbb 100644
--- a/debian/lenny/tdegames/debian/klickety-trinity.menu
+++ b/debian/lenny/tdegames/debian/klickety-trinity.menu
@@ -1,7 +1,7 @@
?package(klickety):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE"\
+ hints="TDE"\
title="Klickety"\
icon32x32="/usr/share/pixmaps/klickety.xpm"\
icon16x16="/usr/share/pixmaps/klickety-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/klines-trinity.menu b/debian/lenny/tdegames/debian/klines-trinity.menu
index 36fa06ff7..d4ec4624a 100644
--- a/debian/lenny/tdegames/debian/klines-trinity.menu
+++ b/debian/lenny/tdegames/debian/klines-trinity.menu
@@ -1,7 +1,7 @@
?package(klines):\
needs="x11"\
section="Games/Board"\
- hints="KDE"\
+ hints="TDE"\
title="KLines"\
icon32x32="/usr/share/pixmaps/klines.xpm"\
icon16x16="/usr/share/pixmaps/klines-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/kolf-trinity.menu b/debian/lenny/tdegames/debian/kolf-trinity.menu
index c77a47477..082abe64f 100644
--- a/debian/lenny/tdegames/debian/kolf-trinity.menu
+++ b/debian/lenny/tdegames/debian/kolf-trinity.menu
@@ -1,7 +1,7 @@
?package(kolf):\
needs="x11"\
section="Games/Arcade"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Miniature Golf"\
icon32x32="/usr/share/pixmaps/kolf.xpm"\
icon16x16="/usr/share/pixmaps/kolf-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/konquest-trinity.menu b/debian/lenny/tdegames/debian/konquest-trinity.menu
index 9f2056609..6f1ba3d5b 100644
--- a/debian/lenny/tdegames/debian/konquest-trinity.menu
+++ b/debian/lenny/tdegames/debian/konquest-trinity.menu
@@ -1,7 +1,7 @@
?package(konquest):\
needs="x11"\
section="Games/Strategy"\
- hints="KDE"\
+ hints="TDE"\
title="Konquest"\
icon32x32="/usr/share/pixmaps/konquest.xpm"\
icon16x16="/usr/share/pixmaps/konquest-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/kpat-trinity.menu b/debian/lenny/tdegames/debian/kpat-trinity.menu
index 84fc42bef..e5a38e07a 100644
--- a/debian/lenny/tdegames/debian/kpat-trinity.menu
+++ b/debian/lenny/tdegames/debian/kpat-trinity.menu
@@ -1,7 +1,7 @@
?package(kpat):\
needs="x11"\
section="Games/Card"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Patience"\
icon32x32="/usr/share/pixmaps/kpat.xpm"\
icon16x16="/usr/share/pixmaps/kpat-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/kpoker-trinity.menu b/debian/lenny/tdegames/debian/kpoker-trinity.menu
index 56ef86035..c2d4159ae 100644
--- a/debian/lenny/tdegames/debian/kpoker-trinity.menu
+++ b/debian/lenny/tdegames/debian/kpoker-trinity.menu
@@ -1,7 +1,7 @@
?package(kpoker):\
needs="x11"\
section="Games/Card"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Poker"\
icon32x32="/usr/share/pixmaps/kpoker.xpm"\
icon16x16="/usr/share/pixmaps/kpoker-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/kreversi-trinity.menu b/debian/lenny/tdegames/debian/kreversi-trinity.menu
index aa29af9c4..b70e74f45 100644
--- a/debian/lenny/tdegames/debian/kreversi-trinity.menu
+++ b/debian/lenny/tdegames/debian/kreversi-trinity.menu
@@ -1,7 +1,7 @@
?package(kreversi):\
needs="x11"\
section="Games/Board"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Reversi"\
icon32x32="/usr/share/pixmaps/kreversi.xpm"\
icon16x16="/usr/share/pixmaps/kreversi-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/kshisen-trinity.menu b/debian/lenny/tdegames/debian/kshisen-trinity.menu
index cc49eb3f2..a39078df3 100644
--- a/debian/lenny/tdegames/debian/kshisen-trinity.menu
+++ b/debian/lenny/tdegames/debian/kshisen-trinity.menu
@@ -1,7 +1,7 @@
?package(kshisen):\
needs="x11"\
section="Games/Board"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Shisen-Sho"\
icon32x32="/usr/share/pixmaps/kshisen.xpm"\
icon16x16="/usr/share/pixmaps/kshisen-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/ksirtet-trinity.menu b/debian/lenny/tdegames/debian/ksirtet-trinity.menu
index bdd1f23d1..24fd18497 100644
--- a/debian/lenny/tdegames/debian/ksirtet-trinity.menu
+++ b/debian/lenny/tdegames/debian/ksirtet-trinity.menu
@@ -1,7 +1,7 @@
?package(ksirtet):\
needs="x11"\
section="Games/Tetris-like"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Sirtet"\
icon32x32="/usr/share/pixmaps/ksirtet.xpm"\
icon16x16="/usr/share/pixmaps/ksirtet-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/ksmiletris-trinity.menu b/debian/lenny/tdegames/debian/ksmiletris-trinity.menu
index 7df7ce4be..bd7016ec5 100644
--- a/debian/lenny/tdegames/debian/ksmiletris-trinity.menu
+++ b/debian/lenny/tdegames/debian/ksmiletris-trinity.menu
@@ -1,7 +1,7 @@
?package(ksmiletris):\
needs="x11"\
section="Games/Tetris-like"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Smiletris"\
icon32x32="/usr/share/pixmaps/ksmiletris.xpm"\
icon16x16="/usr/share/pixmaps/ksmiletris-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/ksnake-trinity.menu b/debian/lenny/tdegames/debian/ksnake-trinity.menu
index 621bb2c45..aff1ff762 100644
--- a/debian/lenny/tdegames/debian/ksnake-trinity.menu
+++ b/debian/lenny/tdegames/debian/ksnake-trinity.menu
@@ -1,7 +1,7 @@
?package(ksnake):\
needs="x11"\
section="Games/Arcade"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Snake Race"\
icon32x32="/usr/share/pixmaps/ksnake.xpm"\
icon16x16="/usr/share/pixmaps/ksnake-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/kspaceduel-trinity.menu b/debian/lenny/tdegames/debian/kspaceduel-trinity.menu
index d42077726..fc371d376 100644
--- a/debian/lenny/tdegames/debian/kspaceduel-trinity.menu
+++ b/debian/lenny/tdegames/debian/kspaceduel-trinity.menu
@@ -1,7 +1,7 @@
?package(kspaceduel):\
needs="x11"\
section="Games/Arcade"\
- hints="KDE"\
+ hints="TDE"\
title="KDE SpaceDuel"\
icon32x32="/usr/share/pixmaps/kspaceduel.xpm"\
icon16x16="/usr/share/pixmaps/kspaceduel-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/ktron-trinity.menu b/debian/lenny/tdegames/debian/ktron-trinity.menu
index a2c4c5466..5815cd46e 100644
--- a/debian/lenny/tdegames/debian/ktron-trinity.menu
+++ b/debian/lenny/tdegames/debian/ktron-trinity.menu
@@ -1,7 +1,7 @@
?package(ktron):\
needs="x11"\
section="Games/Arcade"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Tron"\
icon32x32="/usr/share/pixmaps/ktron.xpm"\
icon16x16="/usr/share/pixmaps/ktron-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/ktuberling-trinity.menu b/debian/lenny/tdegames/debian/ktuberling-trinity.menu
index 5514bcfbc..dd349623a 100644
--- a/debian/lenny/tdegames/debian/ktuberling-trinity.menu
+++ b/debian/lenny/tdegames/debian/ktuberling-trinity.menu
@@ -1,7 +1,7 @@
?package(ktuberling):\
needs="x11"\
section="Games/Toys"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Potato Guy"\
icon32x32="/usr/share/pixmaps/ktuberling.xpm"\
icon16x16="/usr/share/pixmaps/ktuberling-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/kwin4-trinity.menu b/debian/lenny/tdegames/debian/kwin4-trinity.menu
index cce23cd01..4b754c211 100644
--- a/debian/lenny/tdegames/debian/kwin4-trinity.menu
+++ b/debian/lenny/tdegames/debian/kwin4-trinity.menu
@@ -1,7 +1,7 @@
?package(twin4):\
needs="x11"\
section="Games/Board"\
- hints="KDE"\
+ hints="TDE"\
title="KWin4"\
icon32x32="/usr/share/pixmaps/twin4.xpm"\
icon16x16="/usr/share/pixmaps/twin4-16.xpm"\
diff --git a/debian/lenny/tdegames/debian/lskat-trinity.menu b/debian/lenny/tdegames/debian/lskat-trinity.menu
index d81800fa2..a4d714d7e 100644
--- a/debian/lenny/tdegames/debian/lskat-trinity.menu
+++ b/debian/lenny/tdegames/debian/lskat-trinity.menu
@@ -1,7 +1,7 @@
?package(lskat):\
needs="x11"\
section="Games/Card"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Lieutnant Skat"\
icon32x32="/usr/share/pixmaps/lskat.xpm"\
icon16x16="/usr/share/pixmaps/lskat-16.xpm"\
diff --git a/debian/lenny/tdegraphics/debian/kcoloredit-trinity.menu b/debian/lenny/tdegraphics/debian/kcoloredit-trinity.menu
index a864f4fcb..73907fedd 100644
--- a/debian/lenny/tdegraphics/debian/kcoloredit-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kcoloredit-trinity.menu
@@ -1,7 +1,7 @@
?package(kcoloredit):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE"\
+ hints="TDE"\
title="KColorChooser"\
icon32x32="/usr/share/pixmaps/kcolorchooser.xpm"\
icon16x16="/usr/share/pixmaps/kcolorchooser-16.xpm"\
@@ -10,7 +10,7 @@
?package(kcoloredit):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE"\
+ hints="TDE"\
title="KColorEdit"\
icon32x32="/usr/share/pixmaps/kcoloredit.xpm"\
icon16x16="/usr/share/pixmaps/kcoloredit-16.xpm"\
diff --git a/debian/lenny/tdegraphics/debian/kfax-trinity.menu b/debian/lenny/tdegraphics/debian/kfax-trinity.menu
index 3498fed01..344e227f7 100644
--- a/debian/lenny/tdegraphics/debian/kfax-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kfax-trinity.menu
@@ -1,7 +1,7 @@
?package(kfax):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE"\
+ hints="TDE"\
title="KFax"\
icon32x32="/usr/share/pixmaps/kfax.xpm"\
icon16x16="/usr/share/pixmaps/kfax-16.xpm"\
diff --git a/debian/lenny/tdegraphics/debian/kfaxview-trinity.menu b/debian/lenny/tdegraphics/debian/kfaxview-trinity.menu
index 64550dfb4..edc02c8d2 100644
--- a/debian/lenny/tdegraphics/debian/kfaxview-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kfaxview-trinity.menu
@@ -1,7 +1,7 @@
?package(kfaxview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE"\
+ hints="TDE"\
title="KFaxView"\
icon32x32="/usr/share/pixmaps/kfaxview.xpm"\
icon16x16="/usr/share/pixmaps/kfaxview-16.xpm"\
diff --git a/debian/lenny/tdegraphics/debian/kiconedit-trinity.menu b/debian/lenny/tdegraphics/debian/kiconedit-trinity.menu
index 7add5c4f6..34118bfb2 100644
--- a/debian/lenny/tdegraphics/debian/kiconedit-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kiconedit-trinity.menu
@@ -1,7 +1,7 @@
?package(kiconedit):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE"\
+ hints="TDE"\
title="KIconEdit"\
icon32x32="/usr/share/pixmaps/kiconedit.xpm"\
icon16x16="/usr/share/pixmaps/kiconedit-16.xpm"\
diff --git a/debian/lenny/tdegraphics/debian/kolourpaint-trinity.menu b/debian/lenny/tdegraphics/debian/kolourpaint-trinity.menu
index 4ae819ad3..53e88edba 100644
--- a/debian/lenny/tdegraphics/debian/kolourpaint-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kolourpaint-trinity.menu
@@ -1,7 +1,7 @@
?package(kolourpaint):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE"\
+ hints="TDE"\
title="KolourPaint"\
icon32x32="/usr/share/pixmaps/kolourpaint.xpm"\
icon16x16="/usr/share/pixmaps/kolourpaint-16.xpm"\
diff --git a/debian/lenny/tdegraphics/debian/kooka-trinity.menu b/debian/lenny/tdegraphics/debian/kooka-trinity.menu
index a1c221081..63fcecea8 100644
--- a/debian/lenny/tdegraphics/debian/kooka-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kooka-trinity.menu
@@ -1,7 +1,7 @@
?package(kooka):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE"\
+ hints="TDE"\
title="Kooka"\
icon32x32="/usr/share/pixmaps/kooka.xpm"\
icon16x16="/usr/share/pixmaps/kooka-16.xpm"\
diff --git a/debian/lenny/tdegraphics/debian/kpdf-trinity.menu b/debian/lenny/tdegraphics/debian/kpdf-trinity.menu
index a9bf7aa0a..971b89101 100644
--- a/debian/lenny/tdegraphics/debian/kpdf-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kpdf-trinity.menu
@@ -1,7 +1,7 @@
?package(kpdf):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE"\
+ hints="TDE"\
title="KPDF"\
icon32x32="/usr/share/pixmaps/kpdf.xpm"\
icon16x16="/usr/share/pixmaps/kpdf-16.xpm"\
diff --git a/debian/lenny/tdegraphics/debian/kruler-trinity.menu b/debian/lenny/tdegraphics/debian/kruler-trinity.menu
index b84cda933..0f1e9c2c1 100644
--- a/debian/lenny/tdegraphics/debian/kruler-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kruler-trinity.menu
@@ -1,7 +1,7 @@
?package(kruler):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE"\
+ hints="TDE"\
title="KRuler"\
icon32x32="/usr/share/pixmaps/kruler.xpm"\
icon16x16="/usr/share/pixmaps/kruler-16.xpm"\
diff --git a/debian/lenny/tdegraphics/debian/ksnapshot-trinity.menu b/debian/lenny/tdegraphics/debian/ksnapshot-trinity.menu
index 5939d5d61..c490d6cf4 100644
--- a/debian/lenny/tdegraphics/debian/ksnapshot-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/ksnapshot-trinity.menu
@@ -1,7 +1,7 @@
?package(ksnapshot):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE"\
+ hints="TDE"\
title="KSnapshot"\
icon32x32="/usr/share/pixmaps/ksnapshot.xpm"\
icon16x16="/usr/share/pixmaps/ksnapshot-16.xpm"\
diff --git a/debian/lenny/tdegraphics/debian/kuickshow-trinity.menu b/debian/lenny/tdegraphics/debian/kuickshow-trinity.menu
index 4075305dc..3e92e9147 100644
--- a/debian/lenny/tdegraphics/debian/kuickshow-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kuickshow-trinity.menu
@@ -1,7 +1,7 @@
?package(kuickshow):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE"\
+ hints="TDE"\
title="Kuickshow"\
icon32x32="/usr/share/pixmaps/kuickshow.xpm"\
icon16x16="/usr/share/pixmaps/kuickshow-16.xpm"\
diff --git a/debian/lenny/tdelibs/debian/changelog b/debian/lenny/tdelibs/debian/changelog
index 2969809e6..18c366029 100644
--- a/debian/lenny/tdelibs/debian/changelog
+++ b/debian/lenny/tdelibs/debian/changelog
@@ -908,12 +908,12 @@ tdelibs (4:3.5.5a.dfsg.1-4) unstable; urgency=medium
tdelibs (4:3.5.5a.dfsg.1-3) unstable; urgency=medium
* Patch: 41_x_kde_getactionmenu_no_timeout.diff
- Do not time out when waiting for the reply for the X-KDE-GetActionMenu
+ Do not time out when waiting for the reply for the X-TDE-GetActionMenu
DCOP call. DCOP protocol is synchronouos by design and a reply for the
timed out call (i.e. garbage) still arrives and might be falsely returned
as a valid reply for the subsequent DCOP call on the same connection. The
application currently known to be badly hurt by this is tdesvn and its
- konqueror service menu integration. Its X-KDE-GetActionMenu might take
+ konqueror service menu integration. Its X-TDE-GetActionMenu might take
longer than current 100 milisecond timeout to complete. As a result
then, a late reply will "pollute" a main DCOP connection of the client
application (e.g. konqueror) causing further DCOP failures.
diff --git a/debian/lenny/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl b/debian/lenny/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
index 0d6c5cc92..1e2ff4bdb 100644
--- a/debian/lenny/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
+++ b/debian/lenny/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
@@ -53,7 +53,7 @@ sub processfiles
#warn("Using $filename");
#my $regexp = qr{^(Name|Comment|Language|Keywords|About|Description|GenericName)=};
- my $regexp = qr{^(Name|Comment|Language|Keywords|About|Description|GenericName|Query|ExtraNames|X-KDE-Submenu)=};
+ my $regexp = qr{^(Name|Comment|Language|Keywords|About|Description|GenericName|Query|ExtraNames|X-TDE-Submenu)=};
while( <FH> )
{
diff --git a/debian/lenny/tdemultimedia/debian/artsbuilder-trinity.menu b/debian/lenny/tdemultimedia/debian/artsbuilder-trinity.menu
index 8f8a1c989..93ba5a776 100644
--- a/debian/lenny/tdemultimedia/debian/artsbuilder-trinity.menu
+++ b/debian/lenny/tdemultimedia/debian/artsbuilder-trinity.menu
@@ -1,7 +1,7 @@
?package(artsbuilder):\
needs="X11"\
section="Apps/Sound"\
- hints="KDE"\
+ hints="TDE"\
title="aRts Builder"\
icon="/opt/trinity/share/pixmaps/artsbuilder.xpm"\
command="/opt/trinity/bin/artsbuilder"
@@ -9,7 +9,7 @@
?package(artsbuilder):\
needs="X11"\
section="Apps/Sound"\
- hints="KDE"\
+ hints="TDE"\
title="aRts Control"\
icon="/opt/trinity/share/pixmaps/artscontrol.xpm"\
command="/opt/trinity/bin/artscontrol"
diff --git a/debian/lenny/tdemultimedia/debian/juk-trinity.menu b/debian/lenny/tdemultimedia/debian/juk-trinity.menu
index b8af14259..29dec4a1f 100644
--- a/debian/lenny/tdemultimedia/debian/juk-trinity.menu
+++ b/debian/lenny/tdemultimedia/debian/juk-trinity.menu
@@ -1,7 +1,7 @@
?package(juk):\
needs="X11"\
section="Apps/Sound"\
- hints="KDE"\
+ hints="TDE"\
title="JuK"\
icon32x32="/opt/trinity/share/pixmaps/juk.xpm"\
icon16x16="/opt/trinity/share/pixmaps/juk-16.xpm"\
diff --git a/debian/lenny/tdemultimedia/debian/kaboodle-trinity.menu b/debian/lenny/tdemultimedia/debian/kaboodle-trinity.menu
index 23e507270..ddbeac283 100644
--- a/debian/lenny/tdemultimedia/debian/kaboodle-trinity.menu
+++ b/debian/lenny/tdemultimedia/debian/kaboodle-trinity.menu
@@ -1,7 +1,7 @@
?package(kaboodle):\
needs="X11"\
section="Apps/Sound"\
- hints="KDE"\
+ hints="TDE"\
title="Kaboodle"\
icon32x32="/opt/trinity/share/pixmaps/kaboodle.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kaboodle-16.xpm"\
diff --git a/debian/lenny/tdemultimedia/debian/kaudiocreator-trinity.menu b/debian/lenny/tdemultimedia/debian/kaudiocreator-trinity.menu
index 3dea45352..d3b75bcbe 100644
--- a/debian/lenny/tdemultimedia/debian/kaudiocreator-trinity.menu
+++ b/debian/lenny/tdemultimedia/debian/kaudiocreator-trinity.menu
@@ -1,7 +1,7 @@
?package(kaudiocreator):\
needs="X11"\
section="Apps/Sound"\
- hints="KDE"\
+ hints="TDE"\
title="KAudioCreator"\
icon32x32="/opt/trinity/share/pixmaps/kaudiocreator.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kaudiocreator-16.xpm"\
diff --git a/debian/lenny/tdemultimedia/debian/kmid-trinity.menu b/debian/lenny/tdemultimedia/debian/kmid-trinity.menu
index 03e2ae87f..ca828ea94 100644
--- a/debian/lenny/tdemultimedia/debian/kmid-trinity.menu
+++ b/debian/lenny/tdemultimedia/debian/kmid-trinity.menu
@@ -1,7 +1,7 @@
?package(kmid):\
needs="X11"\
section="Apps/Sound"\
- hints="KDE"\
+ hints="TDE"\
title="KMid"\
icon32x32="/opt/trinity/share/pixmaps/kmid.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kmid-16.xpm"\
diff --git a/debian/lenny/tdemultimedia/debian/kmix-trinity.menu b/debian/lenny/tdemultimedia/debian/kmix-trinity.menu
index 4f49f0f34..6c7f65fbf 100644
--- a/debian/lenny/tdemultimedia/debian/kmix-trinity.menu
+++ b/debian/lenny/tdemultimedia/debian/kmix-trinity.menu
@@ -1,7 +1,7 @@
?package(kmix):\
needs="X11"\
section="Apps/Sound"\
- hints="KDE"\
+ hints="TDE"\
title="KMix"\
icon32x32="/opt/trinity/share/pixmaps/kmix.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kmix-16.xpm"\
diff --git a/debian/lenny/tdemultimedia/debian/krec-trinity.menu b/debian/lenny/tdemultimedia/debian/krec-trinity.menu
index 4458fbd9b..8601b3562 100644
--- a/debian/lenny/tdemultimedia/debian/krec-trinity.menu
+++ b/debian/lenny/tdemultimedia/debian/krec-trinity.menu
@@ -1,7 +1,7 @@
?package(krec):\
needs="X11"\
section="Apps/Sound"\
- hints="KDE"\
+ hints="TDE"\
title="KRec"\
icon32x32="/opt/trinity/share/pixmaps/krec.xpm"\
icon16x16="/opt/trinity/share/pixmaps/krec-16.xpm"\
diff --git a/debian/lenny/tdemultimedia/debian/kscd-trinity.menu b/debian/lenny/tdemultimedia/debian/kscd-trinity.menu
index 20acd8291..8252bea38 100644
--- a/debian/lenny/tdemultimedia/debian/kscd-trinity.menu
+++ b/debian/lenny/tdemultimedia/debian/kscd-trinity.menu
@@ -1,7 +1,7 @@
?package(kscd):\
needs="X11"\
section="Apps/Sound"\
- hints="KDE"\
+ hints="TDE"\
title="KsCD"\
icon32x32="/opt/trinity/share/pixmaps/kscd.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kscd-16.xpm"\
diff --git a/debian/lenny/tdemultimedia/debian/noatun-trinity.menu b/debian/lenny/tdemultimedia/debian/noatun-trinity.menu
index a79589ace..e7e7e697c 100644
--- a/debian/lenny/tdemultimedia/debian/noatun-trinity.menu
+++ b/debian/lenny/tdemultimedia/debian/noatun-trinity.menu
@@ -1,7 +1,7 @@
?package(noatun):\
needs="X11"\
section="Apps/Sound"\
- hints="KDE"\
+ hints="TDE"\
title="Noatun"\
icon32x32="/opt/trinity/share/pixmaps/noatun.xpm"\
icon16x16="/opt/trinity/share/pixmaps/noatun-16.xpm"\
diff --git a/debian/lenny/tdenetwork/debian/kdict-trinity.menu b/debian/lenny/tdenetwork/debian/kdict-trinity.menu
index 3bdad62c0..29497a656 100644
--- a/debian/lenny/tdenetwork/debian/kdict-trinity.menu
+++ b/debian/lenny/tdenetwork/debian/kdict-trinity.menu
@@ -1,7 +1,7 @@
?package(kdict):\
needs="X11"\
section="Apps/Net"\
- hints="KDE"\
+ hints="TDE"\
title="KDict"\
icon32x32="/opt/trinity/share/pixmaps/kdict.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kdict-16.xpm"\
diff --git a/debian/lenny/tdenetwork/debian/kget-trinity.menu b/debian/lenny/tdenetwork/debian/kget-trinity.menu
index 9f46d2ca2..a80d49f68 100644
--- a/debian/lenny/tdenetwork/debian/kget-trinity.menu
+++ b/debian/lenny/tdenetwork/debian/kget-trinity.menu
@@ -1,7 +1,7 @@
?package(kget):\
needs="X11"\
section="Apps/Net"\
- hints="KDE"\
+ hints="TDE"\
title="KGet"\
icon32x32="/opt/trinity/share/pixmaps/kget.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kget-16.xpm"\
diff --git a/debian/lenny/tdenetwork/debian/knewsticker-trinity.menu b/debian/lenny/tdenetwork/debian/knewsticker-trinity.menu
index c8eb2dd48..ba79aace8 100644
--- a/debian/lenny/tdenetwork/debian/knewsticker-trinity.menu
+++ b/debian/lenny/tdenetwork/debian/knewsticker-trinity.menu
@@ -1,7 +1,7 @@
?package(knewsticker):\
needs="X11"\
section="Apps/Net"\
- hints="KDE"\
+ hints="TDE"\
title="KNewsTicker"\
icon32x32="/opt/trinity/share/pixmaps/knewsticker.xpm"\
icon16x16="/opt/trinity/share/pixmaps/knewsticker-16.xpm"\
diff --git a/debian/lenny/tdenetwork/debian/kppp-trinity.menu b/debian/lenny/tdenetwork/debian/kppp-trinity.menu
index 28837883b..e7847b2e7 100644
--- a/debian/lenny/tdenetwork/debian/kppp-trinity.menu
+++ b/debian/lenny/tdenetwork/debian/kppp-trinity.menu
@@ -1,7 +1,7 @@
?package(kppp):\
needs="X11"\
section="Apps/Net"\
- hints="KDE"\
+ hints="TDE"\
title="KPPP"\
icon32x32="/opt/trinity/share/pixmaps/kppp.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kppp-16.xpm"\
@@ -10,6 +10,6 @@
?package(kppp):\
needs="X11"\
section="Apps/Net"\
- hints="KDE"\
+ hints="TDE"\
title="KPPP - Logview"\
command="/opt/trinity/bin/kppplogview"
diff --git a/debian/lenny/tdenetwork/debian/krdc-trinity.menu b/debian/lenny/tdenetwork/debian/krdc-trinity.menu
index 3f81d8ace..01e746c56 100644
--- a/debian/lenny/tdenetwork/debian/krdc-trinity.menu
+++ b/debian/lenny/tdenetwork/debian/krdc-trinity.menu
@@ -1,7 +1,7 @@
?package(krdc):\
needs="X11"\
section="Apps/Net"\
- hints="KDE"\
+ hints="TDE"\
title="Krdc"\
icon32x32="/opt/trinity/share/pixmaps/krdc.xpm"\
icon16x16="/opt/trinity/share/pixmaps/krdc-16.xpm"\
diff --git a/debian/lenny/tdenetwork/debian/krfb-trinity.menu b/debian/lenny/tdenetwork/debian/krfb-trinity.menu
index 17114ebb0..488fdb2dd 100644
--- a/debian/lenny/tdenetwork/debian/krfb-trinity.menu
+++ b/debian/lenny/tdenetwork/debian/krfb-trinity.menu
@@ -1,7 +1,7 @@
?package(krfb):\
needs="X11"\
section="Apps/Net"\
- hints="KDE"\
+ hints="TDE"\
title="Krfb"\
icon32x32="/opt/trinity/share/pixmaps/krfb.xpm"\
icon16x16="/opt/trinity/share/pixmaps/krfb-16.xpm"\
diff --git a/debian/lenny/tdenetwork/debian/kwifimanager-trinity.menu b/debian/lenny/tdenetwork/debian/kwifimanager-trinity.menu
index 8be926f6a..1b20da92e 100644
--- a/debian/lenny/tdenetwork/debian/kwifimanager-trinity.menu
+++ b/debian/lenny/tdenetwork/debian/kwifimanager-trinity.menu
@@ -1,7 +1,7 @@
?package(kwifimanager):\
needs="X11"\
section="Apps/Net"\
- hints="KDE"\
+ hints="TDE"\
title="KWifiManager"\
icon32x32="/opt/trinity/share/pixmaps/kwifimanager.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kwifimanager-16.xpm"\
diff --git a/debian/lenny/tdepim/debian/akregator-trinity.menu b/debian/lenny/tdepim/debian/akregator-trinity.menu
index 5007b658f..21d583f1e 100644
--- a/debian/lenny/tdepim/debian/akregator-trinity.menu
+++ b/debian/lenny/tdepim/debian/akregator-trinity.menu
@@ -1,7 +1,7 @@
?package(akregator):\
needs="X11"\
section="Applications/Network/Web News"\
- hints="KDE"\
+ hints="TDE"\
title="aKregator"\
icon32x32="/usr/share/pixmaps/akregator.xpm"\
icon16x16="/usr/share/pixmaps/akregator-16.xpm"\
diff --git a/debian/lenny/tdepim/debian/changelog b/debian/lenny/tdepim/debian/changelog
index 1bcdda185..09dc0dfc3 100644
--- a/debian/lenny/tdepim/debian/changelog
+++ b/debian/lenny/tdepim/debian/changelog
@@ -1071,7 +1071,7 @@ tdepim (4:3.5-rc1-0ubuntu1) dapper; urgency=low
* New upstream pre-release
* Sync with Debian
- * Remove kubuntu_02_kalarm_kmenu_tidy.diff (now X-KDE-PIM, not X-KDE-More)
+ * Remove kubuntu_02_kalarm_kmenu_tidy.diff (now X-TDE-PIM, not X-TDE-More)
* Remove kubuntu_03_karm_kmenu_tidy.diff
* libkleopatra0a now libkleopatra1
* libkleopatra0-dev now libkleopatra1-dev
diff --git a/debian/lenny/tdepim/debian/kaddressbook-trinity.menu b/debian/lenny/tdepim/debian/kaddressbook-trinity.menu
index e8ffd03da..61b962fe4 100644
--- a/debian/lenny/tdepim/debian/kaddressbook-trinity.menu
+++ b/debian/lenny/tdepim/debian/kaddressbook-trinity.menu
@@ -1,7 +1,7 @@
?package(kaddressbook):\
needs="X11"\
section="Applications/Data Management"\
- hints="KDE"\
+ hints="TDE"\
title="KAddressbook"\
icon32x32="/usr/share/pixmaps/kaddressbook.xpm"\
icon16x16="/usr/share/pixmaps/kaddressbook-16.xpm"\
diff --git a/debian/lenny/tdepim/debian/kalarm-trinity.menu b/debian/lenny/tdepim/debian/kalarm-trinity.menu
index 9042b1f8f..237e68f5a 100644
--- a/debian/lenny/tdepim/debian/kalarm-trinity.menu
+++ b/debian/lenny/tdepim/debian/kalarm-trinity.menu
@@ -1,7 +1,7 @@
?package(kalarm):\
needs="X11"\
section="Applications/Data Management"\
- hints="KDE"\
+ hints="TDE"\
title="KAlarm"\
icon32x32="/usr/share/pixmaps/kalarm.xpm"\
icon16x16="/usr/share/pixmaps/kalarm-16.xpm"\
diff --git a/debian/lenny/tdepim/debian/kandy-trinity.menu b/debian/lenny/tdepim/debian/kandy-trinity.menu
index 6166a1cb3..f79c6188d 100644
--- a/debian/lenny/tdepim/debian/kandy-trinity.menu
+++ b/debian/lenny/tdepim/debian/kandy-trinity.menu
@@ -1,6 +1,6 @@
?package(kandy):\
needs="X11"\
section="Applications/Mobile Devices"\
- hints="KDE"\
+ hints="TDE"\
title="Kandy"\
command="/opt/trinity/bin/kandy"
diff --git a/debian/lenny/tdepim/debian/karm-trinity.menu b/debian/lenny/tdepim/debian/karm-trinity.menu
index 1d268ea7d..3dd2ce7a1 100644
--- a/debian/lenny/tdepim/debian/karm-trinity.menu
+++ b/debian/lenny/tdepim/debian/karm-trinity.menu
@@ -1,7 +1,7 @@
?package(karm):\
needs="X11"\
section="Applications/Project Management"\
- hints="KDE"\
+ hints="TDE"\
title="KArm"\
icon32x32="/usr/share/pixmaps/karm.xpm"\
icon16x16="/usr/share/pixmaps/karm-16.xpm"\
diff --git a/debian/lenny/tdepim/debian/kitchensync-trinity.menu b/debian/lenny/tdepim/debian/kitchensync-trinity.menu
index 3e47d5786..e98f349a9 100644
--- a/debian/lenny/tdepim/debian/kitchensync-trinity.menu
+++ b/debian/lenny/tdepim/debian/kitchensync-trinity.menu
@@ -1,13 +1,13 @@
?package(kitchensync):\
needs="X11"\
section="Applications/Data Management"\
- hints="KDE"\
+ hints="TDE"\
title="KitchenSync"\
command="/opt/trinity/bin/kitchensync"
?package(kitchensync):\
needs="X11"\
section="Applications/Data Management"\
- hints="KDE"\
+ hints="TDE"\
title="MultiSynk"\
command="/opt/trinity/bin/multisynk"
diff --git a/debian/lenny/tdepim/debian/kleopatra-trinity.menu b/debian/lenny/tdepim/debian/kleopatra-trinity.menu
index c243663c9..f57f829b0 100644
--- a/debian/lenny/tdepim/debian/kleopatra-trinity.menu
+++ b/debian/lenny/tdepim/debian/kleopatra-trinity.menu
@@ -1,13 +1,13 @@
?package(kleopatra):\
needs="X11"\
section="Applications/Data Management"\
- hints="KDE"\
+ hints="TDE"\
title="Kleopatra"\
command="/opt/trinity/bin/kleopatra"
?package(kleopatra):\
needs="X11"\
section="Applications/Data Management"\
- hints="KDE"\
+ hints="TDE"\
title="KWatchGnuPG"\
command="/opt/trinity/bin/kwatchgnupg"
diff --git a/debian/lenny/tdepim/debian/knotes-trinity.menu b/debian/lenny/tdepim/debian/knotes-trinity.menu
index ed71f1012..5f7950cec 100644
--- a/debian/lenny/tdepim/debian/knotes-trinity.menu
+++ b/debian/lenny/tdepim/debian/knotes-trinity.menu
@@ -1,7 +1,7 @@
?package(knotes):\
needs="X11"\
section="Applications/Data Management"\
- hints="KDE"\
+ hints="TDE"\
title="KNotes"\
icon32x32="/usr/share/pixmaps/knotes.xpm"\
icon16x16="/usr/share/pixmaps/knotes-16.xpm"\
diff --git a/debian/lenny/tdepim/debian/kontact-trinity.menu b/debian/lenny/tdepim/debian/kontact-trinity.menu
index 04ef20207..82f335a93 100644
--- a/debian/lenny/tdepim/debian/kontact-trinity.menu
+++ b/debian/lenny/tdepim/debian/kontact-trinity.menu
@@ -1,7 +1,7 @@
?package(kontact):\
needs="X11"\
section="Applications/Data Management"\
- hints="KDE"\
+ hints="TDE"\
title="Kontact"\
icon32x32="/usr/share/pixmaps/kontact.xpm"\
icon16x16="/usr/share/pixmaps/kontact-16.xpm"\
diff --git a/debian/lenny/tdepim/debian/korganizer-trinity.menu b/debian/lenny/tdepim/debian/korganizer-trinity.menu
index d5d1f0aaf..949d187c4 100644
--- a/debian/lenny/tdepim/debian/korganizer-trinity.menu
+++ b/debian/lenny/tdepim/debian/korganizer-trinity.menu
@@ -1,7 +1,7 @@
?package(korganizer):\
needs="X11"\
section="Applications/Data Management"\
- hints="KDE"\
+ hints="TDE"\
title="KOrganizer"\
icon32x32="/usr/share/pixmaps/korganizer.xpm"\
icon16x16="/usr/share/pixmaps/korganizer-16.xpm"\
diff --git a/debian/lenny/tdepim/debian/korn-trinity.menu b/debian/lenny/tdepim/debian/korn-trinity.menu
index 8187a30d3..e12f773c6 100644
--- a/debian/lenny/tdepim/debian/korn-trinity.menu
+++ b/debian/lenny/tdepim/debian/korn-trinity.menu
@@ -1,7 +1,7 @@
?package(korn):\
needs="X11"\
section="Applications/Network/Web News"\
- hints="KDE"\
+ hints="TDE"\
title="KOrn"\
icon32x32="/usr/share/pixmaps/korn.xpm"\
icon16x16="/usr/share/pixmaps/korn-16.xpm"\
diff --git a/debian/lenny/tdepim/debian/ktnef-trinity.menu b/debian/lenny/tdepim/debian/ktnef-trinity.menu
index df93e1181..8a1cbda31 100644
--- a/debian/lenny/tdepim/debian/ktnef-trinity.menu
+++ b/debian/lenny/tdepim/debian/ktnef-trinity.menu
@@ -1,7 +1,7 @@
?package(ktnef):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE"\
+ hints="TDE"\
title="KTnef"\
icon32x32="/usr/share/pixmaps/ktnef.xpm"\
icon16x16="/usr/share/pixmaps/ktnef-16.xpm"\
diff --git a/debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu b/debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu
index b86640432..8d8c937df 100644
--- a/debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu
+++ b/debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu
@@ -1,41 +1,41 @@
?package(tdepim-wizards):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE"\
+ hints="TDE"\
title="EGroupware Setup Wizard"\
command="/opt/trinity/bin/egroupwarewizard"
?package(tdepim-wizards):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE"\
+ hints="TDE"\
title="MS Exchange Setup Wizard"\
command="/opt/trinity/bin/exchangewizard"
?package(tdepim-wizards):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE"\
+ hints="TDE"\
title="KDE Groupware Wizard"\
command="/opt/trinity/bin/groupwarewizard"
?package(tdepim-wizards):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE"\
+ hints="TDE"\
title="Novell GroupWise Setup Wizard"\
command="/opt/trinity/bin/groupwisewizard"
?package(tdepim-wizards):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE"\
+ hints="TDE"\
title="KOLab Setup Wizard"\
command="/opt/trinity/bin/kolabwizard"
?package(tdepim-wizards):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE"\
+ hints="TDE"\
title="Openexchange Setup Wizard"\
command="/opt/trinity/bin/sloxwizard"
diff --git a/debian/lenny/tdesdk/debian/desktop-i18n/createdesktop.pl b/debian/lenny/tdesdk/debian/desktop-i18n/createdesktop.pl
index 0d6c5cc92..1e2ff4bdb 100644
--- a/debian/lenny/tdesdk/debian/desktop-i18n/createdesktop.pl
+++ b/debian/lenny/tdesdk/debian/desktop-i18n/createdesktop.pl
@@ -53,7 +53,7 @@ sub processfiles
#warn("Using $filename");
#my $regexp = qr{^(Name|Comment|Language|Keywords|About|Description|GenericName)=};
- my $regexp = qr{^(Name|Comment|Language|Keywords|About|Description|GenericName|Query|ExtraNames|X-KDE-Submenu)=};
+ my $regexp = qr{^(Name|Comment|Language|Keywords|About|Description|GenericName|Query|ExtraNames|X-TDE-Submenu)=};
while( <FH> )
{
diff --git a/debian/lenny/tdesdk/debian/kbugbuster-trinity.menu b/debian/lenny/tdesdk/debian/kbugbuster-trinity.menu
index 47f13168d..d03ad5010 100644
--- a/debian/lenny/tdesdk/debian/kbugbuster-trinity.menu
+++ b/debian/lenny/tdesdk/debian/kbugbuster-trinity.menu
@@ -1,7 +1,7 @@
?package(kbugbuster):\
needs="x11"\
section="Applications/Project Management"\
- hints="KDE"\
+ hints="TDE"\
title="KBugBuster"\
longtitle="KBugBuster (KDE Bug Management)"\
icon="/usr/share/pixmaps/kbugbuster.xpm"\
diff --git a/debian/lenny/tdesdk/debian/kompare-trinity.menu b/debian/lenny/tdesdk/debian/kompare-trinity.menu
index ddf617f34..d8cee1e5f 100644
--- a/debian/lenny/tdesdk/debian/kompare-trinity.menu
+++ b/debian/lenny/tdesdk/debian/kompare-trinity.menu
@@ -1,7 +1,7 @@
?package(kompare):\
needs="x11"\
section="Applications/Text"\
- hints="KDE"\
+ hints="TDE"\
title="Kompare"\
longtitle="Kompare (Diff/Patch Frontend)"\
icon="/usr/share/pixmaps/kompare.xpm"\
diff --git a/debian/lenny/tdesdk/debian/kuiviewer-trinity.menu b/debian/lenny/tdesdk/debian/kuiviewer-trinity.menu
index d493d6157..6b0c16029 100644
--- a/debian/lenny/tdesdk/debian/kuiviewer-trinity.menu
+++ b/debian/lenny/tdesdk/debian/kuiviewer-trinity.menu
@@ -1,7 +1,7 @@
?package(kuiviewer):\
needs="x11"\
section="Applications/Programming"\
- hints="KDE"\
+ hints="TDE"\
title="KUIViewer"\
longtitle="KUIViewer (Qt Designer UI File Viewer)"\
icon="/usr/share/pixmaps/kuiviewer.xpm"\
diff --git a/debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu
index bde1e7a53..c23fa742b 100644
--- a/debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu
+++ b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu
@@ -1,7 +1,7 @@
?package(tdecachegrind):\
needs="x11"\
section="Applications/Programming"\
- hints="KDE"\
+ hints="TDE"\
title="KCachegrind"\
longtitle="KCachegrind (Profiler Frontend)"\
icon="/usr/share/pixmaps/tdecachegrind.xpm"\
diff --git a/debian/lenny/tdesdk/debian/umbrello-trinity.menu b/debian/lenny/tdesdk/debian/umbrello-trinity.menu
index 1c8e990b1..b31aa1af8 100644
--- a/debian/lenny/tdesdk/debian/umbrello-trinity.menu
+++ b/debian/lenny/tdesdk/debian/umbrello-trinity.menu
@@ -1,7 +1,7 @@
?package(umbrello):\
needs="x11"\
section="Applications/Programming"\
- hints="KDE"\
+ hints="TDE"\
title="Umbrello"\
longtitle="Umbrello (UML Modeller)"\
icon="/usr/share/pixmaps/umbrello.xpm"\
diff --git a/debian/lenny/tdetoys/debian/amor-trinity.menu b/debian/lenny/tdetoys/debian/amor-trinity.menu
index e9e9144ca..02e6afeac 100644
--- a/debian/lenny/tdetoys/debian/amor-trinity.menu
+++ b/debian/lenny/tdetoys/debian/amor-trinity.menu
@@ -1,7 +1,7 @@
?package(amor):\
needs="x11"\
section="Games/Toys"\
- hints="KDE"\
+ hints="TDE"\
title="AMOR"\
longtitle="AMOR (Amusing Misuse Of Resources)"\
icon="/opt/trinity/share/pixmaps/amor.xpm"\
diff --git a/debian/lenny/tdetoys/debian/kodo-trinity.menu b/debian/lenny/tdetoys/debian/kodo-trinity.menu
index f9017ae75..f88e51917 100644
--- a/debian/lenny/tdetoys/debian/kodo-trinity.menu
+++ b/debian/lenny/tdetoys/debian/kodo-trinity.menu
@@ -1,7 +1,7 @@
?package(kodo):\
needs="x11"\
section="Games/Toys"\
- hints="KDE"\
+ hints="TDE"\
title="KOdometer"\
longtitle="KOdometer (Measure Your Desktop Mileage)"\
icon="/opt/trinity/share/pixmaps/kodo.xpm"\
diff --git a/debian/lenny/tdetoys/debian/kteatime-trinity.menu b/debian/lenny/tdetoys/debian/kteatime-trinity.menu
index c0c53fcde..f844129b5 100644
--- a/debian/lenny/tdetoys/debian/kteatime-trinity.menu
+++ b/debian/lenny/tdetoys/debian/kteatime-trinity.menu
@@ -1,7 +1,7 @@
?package(kteatime):\
needs="x11"\
section="Games/Toys"\
- hints="KDE"\
+ hints="TDE"\
title="KTeaTime"\
longtitle="KTeaTime (Tea Cooker)"\
icon="/opt/trinity/share/pixmaps/kteatime.xpm"\
diff --git a/debian/lenny/tdetoys/debian/ktux-trinity.menu b/debian/lenny/tdetoys/debian/ktux-trinity.menu
index 9e6c517a8..ce6d524ee 100644
--- a/debian/lenny/tdetoys/debian/ktux-trinity.menu
+++ b/debian/lenny/tdetoys/debian/ktux-trinity.menu
@@ -1,7 +1,7 @@
?package(ktux):\
needs="x11"\
section="Screen/Saving"\
- hints="KDE"\
+ hints="TDE"\
title="KTux"\
icon="/opt/trinity/share/pixmaps/ktux.xpm"\
command="/opt/trinity/bin/ktux -root"
diff --git a/debian/lenny/tdetoys/debian/kworldclock-trinity.menu b/debian/lenny/tdetoys/debian/kworldclock-trinity.menu
index 127766bf5..e80de7941 100644
--- a/debian/lenny/tdetoys/debian/kworldclock-trinity.menu
+++ b/debian/lenny/tdetoys/debian/kworldclock-trinity.menu
@@ -1,7 +1,7 @@
?package(kworldclock):\
needs="x11"\
section="Games/Toys"\
- hints="KDE"\
+ hints="TDE"\
title="KWorldClock"\
icon="/opt/trinity/share/pixmaps/kworldclock.xpm"\
command="/opt/trinity/bin/kworldclock"
diff --git a/debian/lenny/tdeutils/debian/ark-trinity.menu b/debian/lenny/tdeutils/debian/ark-trinity.menu
index e6d567e2e..8b8cfe9ac 100644
--- a/debian/lenny/tdeutils/debian/ark-trinity.menu
+++ b/debian/lenny/tdeutils/debian/ark-trinity.menu
@@ -1,7 +1,7 @@
?package(ark):\
needs="X11"\
section="Apps/Tools"\
- hints="KDE"\
+ hints="TDE"\
title="Ark"\
icon32x32="/usr/share/pixmaps/ark.xpm"\
icon16x16="/usr/share/pixmaps/ark-16.xpm"\
diff --git a/debian/lenny/tdeutils/debian/kdf-trinity.menu b/debian/lenny/tdeutils/debian/kdf-trinity.menu
index 7edf7e1c1..b8faa3bd4 100644
--- a/debian/lenny/tdeutils/debian/kdf-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kdf-trinity.menu
@@ -1,7 +1,7 @@
?package(kdf):\
needs="X11"\
section="Apps/System"\
- hints="KDE"\
+ hints="TDE"\
title="KDiskFree"\
icon32x32="/usr/share/pixmaps/kdf.xpm"\
icon16x16="/usr/share/pixmaps/kdf-16.xpm"\
@@ -10,7 +10,7 @@
?package(kdf):\
needs="X11"\
section="Apps/System"\
- hints="KDE"\
+ hints="TDE"\
title="kwikdisk"\
icon32x32="/usr/share/pixmaps/kwikdisk.xpm"\
icon16x16="/usr/share/pixmaps/kwikdisk-16.xpm"\
diff --git a/debian/lenny/tdeutils/debian/kfloppy-trinity.menu b/debian/lenny/tdeutils/debian/kfloppy-trinity.menu
index 33faffe31..60c18c954 100644
--- a/debian/lenny/tdeutils/debian/kfloppy-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kfloppy-trinity.menu
@@ -1,7 +1,7 @@
?package(kfloppy):\
needs="X11"\
section="Apps/System"\
- hints="KDE"\
+ hints="TDE"\
title="KFloppy"\
icon32x32="/usr/share/pixmaps/kfloppy.xpm"\
icon16x16="/usr/share/pixmaps/kfloppy-16.xpm"\
diff --git a/debian/lenny/tdeutils/debian/kgpg-trinity.menu b/debian/lenny/tdeutils/debian/kgpg-trinity.menu
index 533bb9117..eb33f37ea 100644
--- a/debian/lenny/tdeutils/debian/kgpg-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kgpg-trinity.menu
@@ -1,7 +1,7 @@
?package(kgpg):\
needs="X11"\
section="Apps/Tools"\
- hints="KDE"\
+ hints="TDE"\
title="Kgpg"\
icon32x32="/usr/share/pixmaps/kgpg.xpm"\
icon16x16="/usr/share/pixmaps/kgpg-16.xpm"\
diff --git a/debian/lenny/tdeutils/debian/khexedit-trinity.menu b/debian/lenny/tdeutils/debian/khexedit-trinity.menu
index 7e75828dc..68dc4dc04 100644
--- a/debian/lenny/tdeutils/debian/khexedit-trinity.menu
+++ b/debian/lenny/tdeutils/debian/khexedit-trinity.menu
@@ -1,7 +1,7 @@
?package(khexedit):\
needs="X11"\
section="Apps/Tools"\
- hints="KDE"\
+ hints="TDE"\
title="KHexEdit"\
icon32x32="/usr/share/pixmaps/khexedit.xpm"\
icon16x16="/usr/share/pixmaps/khexedit-16.xpm"\
diff --git a/debian/lenny/tdeutils/debian/kjots-trinity.menu b/debian/lenny/tdeutils/debian/kjots-trinity.menu
index c303fa2f4..7133b6e69 100644
--- a/debian/lenny/tdeutils/debian/kjots-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kjots-trinity.menu
@@ -1,7 +1,7 @@
?package(kjots):\
needs="X11"\
section="Apps/Tools"\
- hints="KDE"\
+ hints="TDE"\
title="KJots"\
icon32x32="/usr/share/pixmaps/kjots.xpm"\
icon16x16="/usr/share/pixmaps/kjots-16.xpm"\
diff --git a/debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu b/debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu
index 3c95d33ec..ccf18b04c 100644
--- a/debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu
@@ -1,7 +1,7 @@
?package(kregexpeditor):\
needs="X11"\
section="Apps/Tools"\
- hints="KDE"\
+ hints="TDE"\
title="Kregexpeditor"\
icon32x32="/usr/share/pixmaps/kregexpeditor.xpm"\
icon16x16="/usr/share/pixmaps/kregexpeditor-16.xpm"\
diff --git a/debian/lenny/tdeutils/debian/ktimer-trinity.menu b/debian/lenny/tdeutils/debian/ktimer-trinity.menu
index f120b78df..bcae05384 100644
--- a/debian/lenny/tdeutils/debian/ktimer-trinity.menu
+++ b/debian/lenny/tdeutils/debian/ktimer-trinity.menu
@@ -1,7 +1,7 @@
?package(ktimer):\
needs="X11"\
section="Apps/Tools"\
- hints="KDE"\
+ hints="TDE"\
title="KTimer"\
icon32x32="/usr/share/pixmaps/ktimer.xpm"\
icon16x16="/usr/share/pixmaps/ktimer-16.xpm"\
diff --git a/debian/lenny/tdeutils/debian/man/kgpg-trinity.1 b/debian/lenny/tdeutils/debian/man/kgpg-trinity.1
index 113143963..bda0a6561 100644
--- a/debian/lenny/tdeutils/debian/man/kgpg-trinity.1
+++ b/debian/lenny/tdeutils/debian/man/kgpg-trinity.1
@@ -1,4 +1,4 @@
-.TH KGPG "1" "December 2002" "KDE" "KDE Application"
+.TH KGPG "1" "December 2002" "TDE" "KDE Application"
.SH NAME
kgpg \- a KDE frontend for GNU Privacy Guard (GnuPG)
.SH SYNOPSIS
diff --git a/debian/lenny/tdeutils/debian/superkaramba-trinity.menu b/debian/lenny/tdeutils/debian/superkaramba-trinity.menu
index 1a03b78dd..fe8fb9c8d 100644
--- a/debian/lenny/tdeutils/debian/superkaramba-trinity.menu
+++ b/debian/lenny/tdeutils/debian/superkaramba-trinity.menu
@@ -1,7 +1,7 @@
?package(superkaramba):\
needs="X11"\
section="Apps/Tools"\
- hints="KDE"\
+ hints="TDE"\
title="Superkaramba"\
icon32x32="/usr/share/pixmaps/superkaramba.xpm"\
icon16x16="/usr/share/pixmaps/superkaramba-16.xpm"\
diff --git a/debian/lenny/tdevelop/debian/changelog b/debian/lenny/tdevelop/debian/changelog
index 937fcc409..2511a3b86 100644
--- a/debian/lenny/tdevelop/debian/changelog
+++ b/debian/lenny/tdevelop/debian/changelog
@@ -268,7 +268,7 @@ tdevelop (4:3.3.4-1) unstable; urgency=low
* New upstream release
* Suggest khelpcenter (Closes: #273664)
* Clean up tdevelop-doc dependencies
- * No longer remove X-KDE-KDevelopIDE from *.desktop files
+ * No longer remove X-TDE-KDevelopIDE from *.desktop files
* Fix C++ curses template project (Closes: #378336)
* Add support for autoconf 2.6 in KDE templates (Closes: #378762)
* Fix "Qt XIM bug that breaks tdevelop" (Closes: #369291)
@@ -469,7 +469,7 @@ tdevelop3 (4:3.2.2-0.1) unstable; urgency=low
- Add Vietnamese debconf translation (Closes: #312160)
- Update Brazilian translation (Closes: #304419)
* Fix adding new classes to qmake projects (Closes: #315170)
- * Remove X-KDE-KDevelopIDE category from .desktop entries
+ * Remove X-TDE-KDevelopIDE category from .desktop entries
* Add --disable-rpath to configure flags (Closes: #327710)
* Fix debian/menu , package is 'tdevelop3' not 'tdevelop' (Closes: #311153)
* Fix some references to 'tdevelop' in .desktop files (Closes: #304203)
diff --git a/debian/lenny/tdewebdev/debian/kimagemapeditor-trinity.menu b/debian/lenny/tdewebdev/debian/kimagemapeditor-trinity.menu
index 04b796670..8252b382f 100644
--- a/debian/lenny/tdewebdev/debian/kimagemapeditor-trinity.menu
+++ b/debian/lenny/tdewebdev/debian/kimagemapeditor-trinity.menu
@@ -1,6 +1,6 @@
?package(kimagemapeditor):\
needs="X11"\
- hints="KDE"\
+ hints="TDE"\
section="Apps/Editors"\
title="KImageMapEditor"\
longtitle="KImageMapEditor (HTML Image Map Editor)"\
diff --git a/debian/lenny/tdewebdev/debian/klinkstatus-trinity.menu b/debian/lenny/tdewebdev/debian/klinkstatus-trinity.menu
index 742018cf6..b93e74555 100644
--- a/debian/lenny/tdewebdev/debian/klinkstatus-trinity.menu
+++ b/debian/lenny/tdewebdev/debian/klinkstatus-trinity.menu
@@ -1,6 +1,6 @@
?package(klinkstatus):\
needs="X11"\
- hints="KDE"\
+ hints="TDE"\
section="Apps/Net"\
title="KLinkStatus"\
longtitle="KLinkStatus (Link Checker)"\
diff --git a/debian/lenny/tdewebdev/debian/kommander-trinity.menu b/debian/lenny/tdewebdev/debian/kommander-trinity.menu
index 7b7a2de10..4d7596c0b 100644
--- a/debian/lenny/tdewebdev/debian/kommander-trinity.menu
+++ b/debian/lenny/tdewebdev/debian/kommander-trinity.menu
@@ -1,6 +1,6 @@
?package(kommander):\
needs="X11"\
- hints="KDE"\
+ hints="TDE"\
section="Apps/Tools"\
title="Kommander Editor"\
longtitle="Kommander Editor (Dynamic Dialog Editor)"\
diff --git a/debian/lenny/tdewebdev/debian/kxsldbg-trinity.menu b/debian/lenny/tdewebdev/debian/kxsldbg-trinity.menu
index d9d4957f7..d1c9f6f0c 100644
--- a/debian/lenny/tdewebdev/debian/kxsldbg-trinity.menu
+++ b/debian/lenny/tdewebdev/debian/kxsldbg-trinity.menu
@@ -1,6 +1,6 @@
?package(kxsldbg):\
needs="X11"\
- hints="KDE"\
+ hints="TDE"\
section="Apps/Text"\
title="KXSLDbg"\
longtitle="KXSLDbg (XSLT Debugger)"\
diff --git a/debian/lenny/tdewebdev/debian/quanta-trinity.menu b/debian/lenny/tdewebdev/debian/quanta-trinity.menu
index 1d0a29249..65cfbdbea 100644
--- a/debian/lenny/tdewebdev/debian/quanta-trinity.menu
+++ b/debian/lenny/tdewebdev/debian/quanta-trinity.menu
@@ -1,6 +1,6 @@
?package(quanta):\
needs="X11"\
- hints="KDE"\
+ hints="TDE"\
section="Apps/Editors"\
title="Quanta Plus"\
longtitle="Quanta Plus (Web Development Environment)"\