merge

24 files changed, 202 insertions, 202 deletions

diff --git a/ubuntu/maverick/tdemultimedia/debian/artsbuilder-trinity.menu b/ubuntu/maverick/tdemultimedia/debian/artsbuilder-trinity.menu
index 93ba5a776..e8eed049c 100644
--- a/ubuntu/maverick/tdemultimedia/debian/artsbuilder-trinity.menu
+++ b/ubuntu/maverick/tdemultimedia/debian/artsbuilder-trinity.menu
@@ -1,4 +1,4 @@
-?package(artsbuilder):\
+?package(artsbuilder-trinity):\
 	needs="X11"\
 	section="Apps/Sound"\
 	hints="TDE"\
@@ -6,7 +6,7 @@
 	icon="/opt/trinity/share/pixmaps/artsbuilder.xpm"\
 	command="/opt/trinity/bin/artsbuilder"
 
-?package(artsbuilder):\
+?package(artsbuilder-trinity):\
 	needs="X11"\
 	section="Apps/Sound"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdemultimedia/debian/cdbs/versions.pl b/ubuntu/maverick/tdemultimedia/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/tdemultimedia/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdemultimedia/debian/cdbs/versions.pl
@@ -13,7 +13,7 @@ my ($version2, $version2_next);
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
 ($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
 
-print "KDE-Version3=$version3\n";
-print "KDE-Version2=$version2\n";
-print "KDE-Next-Version3=$version3_next\n";
-print "KDE-Next-Version2=$version2_next\n";
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/maverick/tdemultimedia/debian/control b/ubuntu/maverick/tdemultimedia/debian/control
index 0ba74285a..f5e76fbc2 100644
--- a/ubuntu/maverick/tdemultimedia/debian/control
+++ b/ubuntu/maverick/tdemultimedia/debian/control
@@ -15,14 +15,14 @@ Breaks: kdemultimedia-kde3 (<< 4:14.0.0~), kdemultimedia-trinity (<< 4:14.0.0~)
 Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-tdefile-plugins-trinity (>= ${Source-Version}), tdemultimedia-tdeio-plugins-trinity (>= ${Source-Version}), tdemid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version})
 Suggests: tdemultimedia-trinity-doc-html (>= ${Source-Version})
 Description: multimedia apps from the official Trinity release 
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+ TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
  This metapackage includes a collection of multimedia applications
  (such as sound and movie player, mixers and plugins) provided with
- the official release of KDE.
+ the official release of TDE.
  .
  Homepage: http://www.kde.org/areas/multimedia
 
@@ -36,8 +36,8 @@ Conflicts: libmpeg-trinity-dev
 Description: development files for the Trinity multimedia module
  Development files and headers for the Trinity multimedia module.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: tdemultimedia-trinity-doc-html
 Architecture: all
@@ -46,18 +46,18 @@ Replaces: kdemultimedia-kde3-doc-html (<< 4:14.0.0~), kdemultimedia-trinity-doc-
 Breaks: kdemultimedia-kde3-doc-html (<< 4:14.0.0~), kdemultimedia-trinity-doc-html (<< 4:14.0.0~)
 Suggests: konqueror-trinity | www-browser, tdebase-trinity
 Description: Trinity multimedia documentation in HTML format
- By default the modules provided by KDE only provide their documentation
- in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
- This package provides all of the KDE multimedia documentation converted to
+ By default the modules provided by TDE only provide their documentation
+ in TDE docbook format, which can only be read by Konqueror or KHelpCenter.
+ This package provides all of the TDE multimedia documentation converted to
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
  /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
  /opt/trinity/share/doc/tde/HTML/en/juk/. Documentation is provided for most
- KDE multimedia packages.
+ TDE multimedia packages.
  .
- This package is part of Trinity, and a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: artsbuilder-trinity
 Section: sound
@@ -69,8 +69,8 @@ Suggests: khelpcenter-trinity
 Description: synthesizer designer for aRts
  This is the analog Realtime synthesizer's graphical design tool.
  .
- This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: juk-trinity
 Section: tde
@@ -80,7 +80,7 @@ Breaks: juk-kde3 (<< 4:14.0.0~), juk-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Description: music organizer and player for Trinity
- JuK (pronounced "jook") is a jukebox and music manager for the KDE
+ JuK (pronounced "jook") is a jukebox and music manager for the TDE
  desktop similar to jukebox software on other platforms such as
  iTunes or RealOne.
  .
@@ -89,16 +89,16 @@ Description: music organizer and player for Trinity
   * Tag editing support for both formats, including ID3v2 for MP3 files.
     Multitagging or editing a selection of multiple files at once is also
     supported
-  * Output to either the aRts, default KDE sound system, or GStreamer
+  * Output to either the aRts, default TDE sound system, or GStreamer
   * Management of your "collection" and multiple playlists
   * Import and export to m3u playlists
   * Binary caching of audio meta-data and playlist information for faster
     load times (starting with the second time you run JuK)
-  * Integration into KDE that allows drag-and-drop and clipboard usage
-    with other KDE and X apps
+  * Integration into TDE that allows drag-and-drop and clipboard usage
+    with other TDE and X apps
  .
- This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: kaboodle-trinity
 Section: sound
@@ -110,10 +110,10 @@ Recommends: libarts1-xine-trinity
 Suggests: khelpcenter-trinity
 Description: light, embedded media player for Trinity
  Kaboodle is a light, embedded media player, supporting both video and audio,
- for KDE. It uses the aRts framework for playing media files.
+ for TDE. It uses the aRts framework for playing media files.
  .
- This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: kaudiocreator-trinity
 Section: sound
@@ -128,8 +128,8 @@ Description: CD ripper and audio encoder frontend for Trinity
  keep your WAV files, or convert them to Ogg/Vorbis, MP3, or FLAC. It also
  searches CDDB to retrieve the information of the disk.
  .
- This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: tdemultimedia-tdefile-plugins-trinity
 Section: tde
@@ -140,8 +140,8 @@ Depends: ${shlibs:Depends}
 Description: au/avi/m3u/mp3/ogg/wav plugins for tdefile
  au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
  .
- This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: tdemultimedia-kappfinder-data-trinity
 Section: tde
@@ -152,8 +152,8 @@ Depends: kappfinder-trinity
 Description: multimedia data for kappfinder-trinity
  This package provides data on multimedia applications for kappfinder-trinity.
  .
- This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: tdemultimedia-tdeio-plugins-trinity
 Section: tde
@@ -166,8 +166,8 @@ Description: enables the browsing of audio CDs under Konqueror
  This package allow audio CDs to be browsed like a file system using
  Konqueror and the audiocd:/ URL.
  .
- This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: tdemid-trinity
 Section: sound
@@ -177,10 +177,10 @@ Breaks: kmid-kde3 (<< 4:14.0.0~), kmid-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Description: MIDI/karaoke player for Trinity
- This package provides a MIDI and karaoke player for KDE.
+ This package provides a MIDI and karaoke player for TDE.
  .
- This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: kmix-trinity
 Section: sound
@@ -191,10 +191,10 @@ Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Provides: x-audio-mixer
 Description: sound mixer applet for Trinity
- This package includes KDE's dockable sound mixer applet.
+ This package includes TDE's dockable sound mixer applet.
  .
- This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: krec-trinity
 Section: sound
@@ -206,8 +206,8 @@ Suggests: khelpcenter-trinity
 Description: sound recorder utility for Trinity
  This is a sound recording utility for Trinity.
  .
- This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: kscd-trinity
 Section: sound
@@ -219,8 +219,8 @@ Suggests: khelpcenter
 Description: audio CD player for Trinity
  This is Trinity's audio CD player.
  .
- This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: libarts1-akode-trinity
 Section: libs
@@ -231,8 +231,8 @@ Depends: ${shlibs:Depends}
 Description: akode plugin for aRts
  This package contains akode plugins for aRts.
  .
- This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information
+ This package is part of Trinity, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information
 
 Package: libarts1-audiofile-trinity
 Section: libs
@@ -243,8 +243,8 @@ Depends: ${shlibs:Depends}
 Description: audiofile plugin for aRts
  This package contains audiofile plugins for aRts.
  .
- This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: libarts1-mpeglib-trinity
 Section: libs
@@ -256,10 +256,10 @@ Description: mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
  This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
  audio and video.
  .
- This is the arts (KDE Sound daemon) plugin.
+ This is the arts (TDE Sound daemon) plugin.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: libarts1-xine-trinity
 Section: libs
@@ -271,8 +271,8 @@ Description: aRts plugin enabling xine support
  This package contains aRts' xine plugin, allowing the use of the xine
  multimedia engine though aRts.
  .
- This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: libkcddb1-trinity
 Section: libs
@@ -283,10 +283,10 @@ Depends: ${shlibs:Depends}
 Description: CDDB library for Trinity
  The Trinity native CDDB (CD Data Base) library, providing easy access to Audio
  CD meta-information (track titles, artist information, etc.) from on-line
- databases, for KDE applications.
+ databases, for TDE applications.
  .
- This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: mpeglib-trinity
 Section: libs
@@ -300,8 +300,8 @@ Description: MP3 and MPEG-1 audio and video library
  MPEG-1 audio (layers 1, 2, 3), MPEG-1 video, MPEG-1 system layer,
  and WAV playback
  .
- This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: noatun-trinity
 Section: sound
@@ -314,8 +314,8 @@ Description: media player for Trinity
  Noatun is an aRts-based audio and video player for Trinity. It supports all
  formats supported by your installation of aRts (including aRts plugins).
  .
- This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE multimedia module.
+ See the 'tde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: tdemultimedia-trinity-dbg
 Section: libdevel
diff --git a/ubuntu/maverick/tdemultimedia/debian/control.in b/ubuntu/maverick/tdemultimedia/debian/control.in
index 0fb3e254a..c4813b792 100644
--- a/ubuntu/maverick/tdemultimedia/debian/control.in
+++ b/ubuntu/maverick/tdemultimedia/debian/control.in
@@ -12,15 +12,15 @@ Section: tde
 Architecture: all
 Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-tdefile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), tdemid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version})
 Suggests: tdemultimedia-doc-html (>= ${Source-Version})
-Description: multimedia apps from the official KDE release 
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+Description: multimedia apps from the official TDE release 
+ TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
  This metapackage includes a collection of multimedia applications
  (such as sound and movie player, mixers and plugins) provided with
- the official release of KDE.
+ the official release of TDE.
  .
  Homepage: http://www.kde.org/areas/multimedia
 
@@ -30,29 +30,29 @@ Architecture: any
 Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), tdemid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version})
 Conflicts: libmpeg-dev
 Replaces: artsbuilder (<< 4:3.0.0), mpeglib (<< 4:3.0.0), noatun (<< 4:3.0.0)
-Description: development files for the KDE multimedia module
- Development files and headers for the KDE multimedia module.
+Description: development files for the TDE multimedia module
+ Development files and headers for the TDE multimedia module.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: tdemultimedia-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror | www-browser, tdebase
-Description: KDE multimedia documentation in HTML format
- By default the modules provided by KDE only provide their documentation
- in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
- This package provides all of the KDE multimedia documentation converted to
+Description: TDE multimedia documentation in HTML format
+ By default the modules provided by TDE only provide their documentation
+ in TDE docbook format, which can only be read by Konqueror or KHelpCenter.
+ This package provides all of the TDE multimedia documentation converted to
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
  /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
  /opt/trinity/share/doc/tde/HTML/en/juk/. Documentation is provided for most
- KDE multimedia packages.
+ TDE multimedia packages.
  .
- This package is part of KDE, and a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, and a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: artsbuilder
 Section: sound
@@ -63,16 +63,16 @@ Replaces: tdebase-data (<< 4:3.3.91), tdemultimedia-dev (<< 4:3.5.0-2)
 Description: synthesizer designer for aRts
  This is the analog Realtime synthesizer's graphical design tool.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: juk
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: music organizer and player for KDE
- JuK (pronounced "jook") is a jukebox and music manager for the KDE
+Description: music organizer and player for TDE
+ JuK (pronounced "jook") is a jukebox and music manager for the TDE
  desktop similar to jukebox software on other platforms such as
  iTunes or RealOne.
  .
@@ -81,16 +81,16 @@ Description: music organizer and player for KDE
   * Tag editing support for both formats, including ID3v2 for MP3 files.
     Multitagging or editing a selection of multiple files at once is also
     supported
-  * Output to either the aRts, default KDE sound system, or GStreamer
+  * Output to either the aRts, default TDE sound system, or GStreamer
   * Management of your "collection" and multiple playlists
   * Import and export to m3u playlists
   * Binary caching of audio meta-data and playlist information for faster
     load times (starting with the second time you run JuK)
-  * Integration into KDE that allows drag-and-drop and clipboard usage
-    with other KDE and X apps
+  * Integration into TDE that allows drag-and-drop and clipboard usage
+    with other TDE and X apps
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: kaboodle
 Section: sound
@@ -98,12 +98,12 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: libarts1-xine
 Suggests: khelpcenter
-Description: light, embedded media player for KDE
+Description: light, embedded media player for TDE
  Kaboodle is a light, embedded media player, supporting both video and audio,
- for KDE. It uses the aRts framework for playing media files.
+ for TDE. It uses the aRts framework for playing media files.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: kaudiocreator
 Section: sound
@@ -111,13 +111,13 @@ Architecture: any
 Depends: ${shlibs:Depends}, tdemultimedia-kio-plugins (= ${Source-Version})
 Recommends: vorbis-tools, flac
 Suggests: lame
-Description: CD ripper and audio encoder frontend for KDE
+Description: CD ripper and audio encoder frontend for TDE
  KAudioCreator is a tool for audio extraction (ripping) and encoding. It can
  keep your WAV files, or convert them to Ogg/Vorbis, MP3, or FLAC. It also
  searches CDDB to retrieve the information of the disk.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: tdemultimedia-tdefile-plugins
 Section: tde
@@ -125,10 +125,10 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: tdemultimedia-kio-plugins (<< 4:3.4.1-1)
 Description: au/avi/m3u/mp3/ogg/wav plugins for tdefile
- au/avi/m3u/mp3/ogg/wav file metainformation plugins for KDE.
+ au/avi/m3u/mp3/ogg/wav file metainformation plugins for TDE.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: tdemultimedia-kappfinder-data
 Section: tde
@@ -137,8 +137,8 @@ Depends: kappfinder
 Description: multimedia data for kappfinder
  This package provides data on multimedia applications for kappfinder.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: tdemultimedia-kio-plugins
 Section: tde
@@ -151,19 +151,19 @@ Description: enables the browsing of audio CDs under Konqueror
  This package allow audio CDs to be browsed like a file system using
  Konqueror and the audiocd:/ URL.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: tdemid
 Section: sound
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: MIDI/karaoke player for KDE
- This package provides a MIDI and karaoke player for KDE.
+Description: MIDI/karaoke player for TDE
+ This package provides a MIDI and karaoke player for TDE.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: kmix
 Section: sound
@@ -171,33 +171,33 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
 Provides: x-audio-mixer
-Description: sound mixer applet for KDE
- This package includes KDE's dockable sound mixer applet.
+Description: sound mixer applet for TDE
+ This package includes TDE's dockable sound mixer applet.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: krec
 Section: sound
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: sound recorder utility for KDE
- This is a sound recording utility for KDE.
+Description: sound recorder utility for TDE
+ This is a sound recording utility for TDE.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: kscd
 Section: sound
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: audio CD player for KDE
- This is KDE's audio CD player.
+Description: audio CD player for TDE
+ This is TDE's audio CD player.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: libarts1-akode
 Section: libs
@@ -207,8 +207,8 @@ Replaces: libakode2 (<< 2-beta3-2), akode
 Description: akode plugin for aRts
  This package contains akode plugins for aRts.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information
 
 Package: libarts1-audiofile
 Section: libs
@@ -217,8 +217,8 @@ Depends: ${shlibs:Depends}
 Description: audiofile plugin for aRts
  This package contains audiofile plugins for aRts.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: libarts1-mpeglib
 Section: libs
@@ -230,10 +230,10 @@ Description: mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
  This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
  audio and video.
  .
- This is the arts (KDE Sound daemon) plugin.
+ This is the arts (TDE Sound daemon) plugin.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: libarts1-xine
 Section: libs
@@ -243,20 +243,20 @@ Description: aRts plugin enabling xine support
  This package contains aRts' xine plugin, allowing the use of the xine
  multimedia engine though aRts.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: libkcddb1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: CDDB library for KDE
- The KDE native CDDB (CD Data Base) library, providing easy access to Audio
+Description: CDDB library for TDE
+ The TDE native CDDB (CD Data Base) library, providing easy access to Audio
  CD meta-information (track titles, artist information, etc.) from on-line
- databases, for KDE applications.
+ databases, for TDE applications.
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: mpeglib
 Section: libs
@@ -269,20 +269,20 @@ Description: MP3 and MPEG-1 audio and video library
  MPEG-1 audio (layers 1, 2, 3), MPEG-1 video, MPEG-1 system layer,
  and WAV playback
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: noatun
 Section: sound
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter, noatun-plugins
-Description: media player for KDE
- Noatun is an aRts-based audio and video player for KDE. It supports all
+Description: media player for TDE
+ Noatun is an aRts-based audio and video player for TDE. It supports all
  formats supported by your installation of aRts (including aRts plugins).
  .
- This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'tdemultimedia' packages for more information.
+ This package is part of TDE, as a component of the TDE multimedia module.
+ See the 'tde' and 'tdemultimedia' packages for more information.
 
 Package: tdemultimedia-dbg
 Section: libdevel
diff --git a/ubuntu/maverick/tdemultimedia/debian/juk-trinity.menu b/ubuntu/maverick/tdemultimedia/debian/juk-trinity.menu
index 29dec4a1f..459902f1f 100644
--- a/ubuntu/maverick/tdemultimedia/debian/juk-trinity.menu
+++ b/ubuntu/maverick/tdemultimedia/debian/juk-trinity.menu
@@ -1,4 +1,4 @@
-?package(juk):\
+?package(juk-trinity):\
 	needs="X11"\
 	section="Apps/Sound"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdemultimedia/debian/kaboodle-trinity.menu b/ubuntu/maverick/tdemultimedia/debian/kaboodle-trinity.menu
index ddbeac283..9791f632c 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kaboodle-trinity.menu
+++ b/ubuntu/maverick/tdemultimedia/debian/kaboodle-trinity.menu
@@ -1,4 +1,4 @@
-?package(kaboodle):\
+?package(kaboodle-trinity):\
 	needs="X11"\
 	section="Apps/Sound"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.menu b/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.menu
index d3b75bcbe..91b9a6848 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.menu
+++ b/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.menu
@@ -1,4 +1,4 @@
-?package(kaudiocreator):\
+?package(kaudiocreator-trinity):\
 	needs="X11"\
 	section="Apps/Sound"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.menu b/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.menu
index 6c7f65fbf..36993f3b9 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.menu
+++ b/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.menu
@@ -1,4 +1,4 @@
-?package(kmix):\
+?package(kmix-trinity):\
 	needs="X11"\
 	section="Apps/Sound"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.menu b/ubuntu/maverick/tdemultimedia/debian/krec-trinity.menu
index 8601b3562..c5aa31173 100644
--- a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.menu
+++ b/ubuntu/maverick/tdemultimedia/debian/krec-trinity.menu
@@ -1,4 +1,4 @@
-?package(krec):\
+?package(krec-trinity):\
 	needs="X11"\
 	section="Apps/Sound"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdemultimedia/debian/kscd-trinity.menu b/ubuntu/maverick/tdemultimedia/debian/kscd-trinity.menu
index 8252bea38..03d4a5e47 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kscd-trinity.menu
+++ b/ubuntu/maverick/tdemultimedia/debian/kscd-trinity.menu
@@ -1,4 +1,4 @@
-?package(kscd):\
+?package(kscd-trinity):\
 	needs="X11"\
 	section="Apps/Sound"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdemultimedia/debian/man/juk-trinity.1 b/ubuntu/maverick/tdemultimedia/debian/man/juk-trinity.1
index 040844523..0981892b5 100644
--- a/ubuntu/maverick/tdemultimedia/debian/man/juk-trinity.1
+++ b/ubuntu/maverick/tdemultimedia/debian/man/juk-trinity.1
@@ -1,12 +1,12 @@
 .TH "JuK" "1" "April 2006"
 .SH "NAME"
-juk \- music organizer and player for KDE
+juk \- music organizer and player for TDE
 .SH "SYNOPSIS"
 \fBjuk\fR
 .SH "DESCRIPTION"
 .LP 
 
-JuK (pronounced "jook") is a jukebox and music manager for the KDE
+JuK (pronounced "jook") is a jukebox and music manager for the TDE
 desktop similar to jukebox software on other platforms such as
 iTunes or RealOne.
 
diff --git a/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 b/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1
index 2e9e5704d..13745bc95 100644
--- a/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1
+++ b/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1
@@ -1,19 +1,19 @@
 .lf 1 info/tdemultimedia.kaboodle.1
-.TH KABOODLE 1 "May 2003" KDE "KDE Application"
+.TH KABOODLE 1 "May 2003" TDE "TDE Application"
 .SH NAME
-kaboodle \- KDE simple and lean Media Player
+kaboodle \- TDE simple and lean Media Player
 .SH SYNOPSIS
 .B kaboodle
-[\fIQt-options\fR] [\fIKDE-options\fR] [\fIURL\fR]
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIURL\fR]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B kaboodle
-KDE Application.
+TDE Application.
 This manual page was written for the Debian GNU/Linux distribution
 because the original program does not have a manual page.
 .PP
 .B Kaboodle
-is a simple KMedia (aRts) player for KDE, which can play standalone,
+is a simple KMedia (aRts) player for TDE, which can play standalone,
 or embedded in Konqueror. The embedded player should work for media embedded in tdehtml, too.
 It is meant for simple stuff like playing a quick video or sound file. 
 .B Kaboodle
@@ -33,8 +33,8 @@ Show help about options
 .B \-\-help\-qt
 Show Qt specific options
 .TP
-.B \-\-help\-kde
-Show KDE specific options
+.B \-\-help\-tde
+Show TDE specific options
 .TP
 .B \-\-help\-all
 Show all options
@@ -51,7 +51,7 @@ Show license information
 .B \-\-
 End of options
 .lf 1 info/kdeqtoptions
-.SS "KDE options"
+.SS "TDE options"
 .TP 12
 .BI \-\-caption \ caption
 Use \fIcaption\fP as name in the titlebar.
@@ -59,7 +59,7 @@ Use \fIcaption\fP as name in the titlebar.
 .BI \-\-icon \ icon
 Use \fIicon\fP as the application icon. \fIicon\fP is the name of the
 icon, which can either be an absolute filename path, or otherwise the
-icon is sought for in places according to the normal KDE rules.
+icon is sought for in places according to the normal TDE rules.
 .TP
 .BI \-\-miniicon \ icon
 Use \fIicon\fP as the icon in the titlebar. \fIicon\fP is the filename
@@ -77,7 +77,7 @@ Set the address of the DCOP server to attach to.
 .TP
 .B \-\-nocrashhandler
 Disable crash handler, to get core dumps. This option has the same
-effect as definiting the environment variable KDE_DEBUG.
+effect as definiting the environment variable TDE_DEBUG.
 .TP
 .B \-\-waitforwm
 Waits for a WM_NET compatible windowmanager.
@@ -183,48 +183,48 @@ scroll bar will be on the left side and so on.
 .lf 53 info/tdemultimedia.kaboodle.1
 .SH ENVIRONMENT
 .lf 1 info/kdeenviron
-.SS "standard KDE environment variables"
-.IP KDE_LANG
+.SS "standard TDE environment variables"
+.IP TDE_LANG
 Language locale setting to use. This option makes it possible to set
 another language environment for a program than what is the default. The
 correct language pack for this language has to be installed for this option
 to work. The default language when there is none set is en_US. When
 deciding upon a language, the following resources are looked up, in
-order: KDE_LANG, configuration file, LC_CTYPE, LC_MESSAGES, LC_ALL,
+order: TDE_LANG, configuration file, LC_CTYPE, LC_MESSAGES, LC_ALL,
 LANG.
-.IP KDE_UTF8_FILENAMES
+.IP TDE_UTF8_FILENAMES
 Assume that all filenames are in UTF-8 format regardless of the
 current language setting. Otherwise the filename format is defined by
 the language.
 .IP TDE_MULTIHEAD
 If this variable has the value
 .B true
-multihead multiple display mode is enabled. The KDE display will be
+multihead multiple display mode is enabled. The TDE display will be
 shared over more than one screen.
 .IP DISPLAY
-Specifies the X display to run KDE on.
-.IP KDESYCOCA
+Specifies the X display to run TDE on.
+.IP TDESYCOCA
 Specifies and alternative path for the 
 .I tdesycoca
-KDE system configuration cache file.
+TDE system configuration cache file.
 The default path is
-/tmp/kde-$USER/tdesycoca
+/tmp/tde-$USER/tdesycoca
 .IP DCOPSERVER
 Specifies an alternative path for the DCOP server file. The default
 file is
 $HOME/.DCOPserver_\fIhostname\fP_\fIdisplayname\fP
 .IP SESSION_MANAGER
-The session manager to use. This option is set automatically by KDE
+The session manager to use. This option is set automatically by TDE
 and is a network path to the session manager socket.
 .IP HOME
 Path to the home directory for the current user. 
 .IP TDEHOME
-The KDE per-user setting directory. Default if not specified is
-.I $HOME/.kde
+The TDE per-user setting directory. Default if not specified is
+.I $HOME/.trinity
 .lf 55 info/tdemultimedia.kaboodle.1
 .SH FILES
 .TP
-.I $HOME/.kde/share/config/kaboodlerc
+.I $HOME/.trinity/share/config/kaboodlerc
 configuration file.
 .SH AUTHOR
 Kaboodle was written by
@@ -235,7 +235,7 @@ Nikolas Zimmermann <wildfox@kde.org>,
 and Charles Samuels <charles@kde.org>.
 .hy
 .br
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
 .br
 This manual page was prepared by
 .nh
diff --git a/ubuntu/maverick/tdemultimedia/debian/man/kaudiocreator-trinity.1 b/ubuntu/maverick/tdemultimedia/debian/man/kaudiocreator-trinity.1
index 4e0fb9433..35600bcda 100644
--- a/ubuntu/maverick/tdemultimedia/debian/man/kaudiocreator-trinity.1
+++ b/ubuntu/maverick/tdemultimedia/debian/man/kaudiocreator-trinity.1
@@ -1,11 +1,11 @@
-.TH kaudiocreator 1 "Nov 2005" "K Desktop Environment" ""
+.TH kaudiocreator 1 "Nov 2005" "Trinity Desktop Environment" ""
 .SH NAME
 kaudiocreator \- CD ripper and audio encoder front-end
 .SH SYNOPSIS
-kaudiocreator [Qt-options] [KDE-options] 
+kaudiocreator [Qt-options] [TDE-options] 
 .SH DESCRIPTION
 .B kaudiocreator 
-is the CD ripper and audio encoder front-end for the K Desktop Environment. It
+is the CD ripper and audio encoder front-end for the Trinity Desktop Environment. It
 supports many encoders like 
 .BR lame (1),
 .BR oggenc (1),
@@ -21,8 +21,8 @@ Show help about options
 .B  --help-qt  
 Show Qt specific options
 .TP
-.B  --help-kde  
-Show KDE specific options
+.B  --help-tde  
+Show TDE specific options
 .TP
 .B  --help-all  
 Show all options
@@ -39,7 +39,7 @@ Show license information
 .B  --  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  --caption  <caption>
 Use 'caption' as name in the title bar
@@ -138,7 +138,7 @@ mirrors the whole layout of widgets
 .SH AUTHOR
 Benjamin Meyer <ben+kaudiocreator@meyerhome.net>
 
-Please use <http://bugs.kde.org> to report bugs, do not mail the authors
+Please use <http://bugs.trinitydesktop.org> to report bugs, do not mail the authors
 directly.
 
 
diff --git a/ubuntu/maverick/tdemultimedia/debian/man/kmix-trinity.1 b/ubuntu/maverick/tdemultimedia/debian/man/kmix-trinity.1
index a5b2607f2..e603facb3 100644
--- a/ubuntu/maverick/tdemultimedia/debian/man/kmix-trinity.1
+++ b/ubuntu/maverick/tdemultimedia/debian/man/kmix-trinity.1
@@ -1,6 +1,6 @@
 .TH KMIX 1 "August, 15 2003"
 .SH NAME
-Kmix \- KDE audio mini-mixer
+Kmix \- TDE audio mini-mixer
 .SH SYNOPSIS
 .B kmix 
 .RI [ OPTIONS ]
@@ -11,7 +11,7 @@ command.
 This manual page was written for the Debian distribution
 because the original program does not have a manual page.
 .PP
-\fBKmix\fP is a mini audio mixer for kde. It allows the user to change
+\fBKmix\fP is a mini audio mixer for TDE. It allows the user to change
 volume settings for each sound device (master, CD, line, mic, ...).
 .SH OPTIONS
 A summary of options for Kmix is included below.
@@ -25,8 +25,8 @@ Show summary of options.
 .B \-\-help\-qt
 Show QT specific help (common for all QT apps).
 .TP
-.B \-\-help\-kde
-Show KDE specific help (common for all KDE apps).
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
 .TP
 .B \-\-help\-all
 Show the complete help.
@@ -40,8 +40,8 @@ Show program license.
 .SH SEE ALSO
 .BR kmixctrl (1),
 .PP
-For more details, you should have a look at the KDE Help center, available
-from the K menu.
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
 .SH AUTHOR
 This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
 for the Debian GNU/Linux project (but may be used by others).
diff --git a/ubuntu/maverick/tdemultimedia/debian/man/kmixctrl-trinity.1 b/ubuntu/maverick/tdemultimedia/debian/man/kmixctrl-trinity.1
index 8b4602809..58a586b18 100644
--- a/ubuntu/maverick/tdemultimedia/debian/man/kmixctrl-trinity.1
+++ b/ubuntu/maverick/tdemultimedia/debian/man/kmixctrl-trinity.1
@@ -24,8 +24,8 @@ Show summary of options.
 .B \-\-help\-qt
 Show QT specific help (common for all QT apps).
 .TP
-.B \-\-help\-kde
-Show KDE specific help (common for all KDE apps).
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
 .TP
 .B \-\-help\-all
 Show the complete help.
@@ -45,8 +45,8 @@ Restores the default settings
 .SH SEE ALSO
 .BR kmix (1),
 .PP
-For more details, you should have a look at the KDE Help center, available
-from the K menu.
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
 .SH AUTHOR
 This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
 for the Debian GNU/Linux project (but may be used by others).
diff --git a/ubuntu/maverick/tdemultimedia/debian/man/krec-trinity.1 b/ubuntu/maverick/tdemultimedia/debian/man/krec-trinity.1
index 7528c7d68..9e2c57e3c 100644
--- a/ubuntu/maverick/tdemultimedia/debian/man/krec-trinity.1
+++ b/ubuntu/maverick/tdemultimedia/debian/man/krec-trinity.1
@@ -6,7 +6,7 @@ krec \- A voice recording program
 .B krec
 [\fIoptions\fR]
 .SH DESCRIPTION
-This is a recording tool for KDE.
+This is a recording tool for TDE.
 It uses aRts, just look at the audiomanager
 and you will find it there accepting sound
 for recording.
@@ -18,8 +18,8 @@ Show help about options
 \fB\-\-help\-qt\fR
 Show Qt specific options
 .TP
-\fB\-\-help\-kde\fR
-Show KDE specific options
+\fB\-\-help\-tde\fR
+Show TDE specific options
 .TP
 \fB\-\-help\-all\fR
 Show all options
diff --git a/ubuntu/maverick/tdemultimedia/debian/man/noatun-trinity.1 b/ubuntu/maverick/tdemultimedia/debian/man/noatun-trinity.1
index e1fecd54b..1ed42ae02 100644
--- a/ubuntu/maverick/tdemultimedia/debian/man/noatun-trinity.1
+++ b/ubuntu/maverick/tdemultimedia/debian/man/noatun-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH NOATUN 1 "June 2006" "K Desktop Environment" "Media Player"
+.TH NOATUN 1 "June 2006" "Trinity Desktop Environment" "Media Player"
 .SH NAME
 noatun
-\- fully-featured plugin-based media player for KDE
+\- fully-featured plugin-based media player for TDE
 .SH SYNOPSIS
-\fBnoatun\fP [Qt\-options] [KDE\-options] [URL] 
+\fBnoatun\fP [Qt\-options] [TDE\-options] [URL] 
 .SH DESCRIPTION
-\fBNoatun\fP is a fully\-featured plugin\-based media player for KDE.
+\fBNoatun\fP is a fully\-featured plugin\-based media player for TDE.
 It is an elaborate front-end to aRts - the Analog Real\-Time Synthesizer.
 By default aRts supports MP3 and MPEG\-1. Vorbis is also supported.
 .SH OPTIONS
@@ -23,8 +23,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -107,7 +107,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -143,7 +143,7 @@ Don't run in the background.
 .SH SEE ALSO
 To find additional playobjects, go to \fBhttp://noatun.kde.org/plugins.phtml\fP, or \fBhttp://mpeglib.sf.net\fP.
 .sp 1
-Full user documentation is available through the KDE Help Center.  You can enter the URL
+Full user documentation is available through the TDE Help Center.  You can enter the URL
 .BR help:/noatun/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/noatun/"
@@ -168,7 +168,7 @@ Stefan Gehn <metz@gehn.net>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.menu b/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.menu
index e7e7e697c..62e70362b 100644
--- a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.menu
+++ b/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.menu
@@ -1,4 +1,4 @@
-?package(noatun):\
+?package(noatun-trinity):\
 	needs="X11"\
 	section="Apps/Sound"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.menu b/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.menu
index 5f3ec9248..210d049f7 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.menu
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.menu
@@ -1,4 +1,4 @@
-?package(tdemid):\
+?package(tdemid-trinity):\
 	needs="X11"\
 	section="Apps/Sound"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kaboodle b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kaboodle
index 2ec2f33ab..292148961 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kaboodle
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kaboodle
@@ -1,7 +1,7 @@
 Document: tdemultimedia-doc-html-kaboodle
 Title: Kaboodle Handbook
 Author: The KDE team.
-Abstract: Kaboodle is a one file quick media player for KDE.
+Abstract: Kaboodle is a one file quick media player for TDE.
 Section: Apps/Sound
 
 Format: HTML
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.krec b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.krec
index 79a5e454b..ffc9dc616 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.krec
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.krec
@@ -1,7 +1,7 @@
 Document: tdemultimedia-doc-html-krec
 Title: KRec Handbook
 Author: Arnold Krille
-Abstract: KRec is a sound recording application for aRts and KDE.
+Abstract: KRec is a sound recording application for aRts and TDE.
 Section: Apps/Sound
 
 Format: HTML
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kscd b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kscd
index ad86a8341..6a8d63c70 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kscd
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kscd
@@ -2,7 +2,7 @@ Document: tdemultimedia-doc-html-kscd
 Title: KsCD Handbook
 Author: Jonathan Singer, David White, Bernd Johannes Wuebben,
  Dirk Foersterling, Lauri Watts
-Abstract: KsCD is a small, fast, CDDB-enabled audio CD player for KDE.
+Abstract: KsCD is a small, fast, CDDB-enabled audio CD player for TDE.
 Section: Apps/Music
 
 Format: HTML
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.noatun b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.noatun
index 841551248..f27d836e4 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.noatun
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.noatun
@@ -1,7 +1,7 @@
 Document: tdemultimedia-doc-html-noatun
 Title: NoAtun Handbook
 Author: Charles Samuels
-Abstract: NoAtun is a fully-featured plugin-based media player for KDE.
+Abstract: NoAtun is a fully-featured plugin-based media player for TDE.
 Section: Apps/Sound
 
 Format: HTML
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid
index e4d54da22..9d12a9c46 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid
@@ -1,7 +1,7 @@
 Document: tdemultimedia-doc-html-tdemid
 Title: KMid Handbook
 Author: Antonio Larrosa Jimenez
-Abstract: KMid is a midi/karaoke multimedia player for KDE.
+Abstract: KMid is a midi/karaoke multimedia player for TDE.
 Section: Apps/Music
 
 Format: HTML