merge

33 files changed, 272 insertions, 272 deletions

diff --git a/ubuntu/maverick/tdeutils/debian/ark-trinity.menu b/ubuntu/maverick/tdeutils/debian/ark-trinity.menu
index 5f567aced..a306b4732 100644
--- a/ubuntu/maverick/tdeutils/debian/ark-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/ark-trinity.menu
@@ -1,4 +1,4 @@
-?package(ark):\
+?package(ark-trinity):\
 	needs="X11"\
 	section="Apps/Tools"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdeutils/debian/cdbs/versions.pl b/ubuntu/maverick/tdeutils/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/tdeutils/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdeutils/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/tdeutils/debian/control b/ubuntu/maverick/tdeutils/debian/control
index 8f0ef45f4..47fe4f367 100644
--- a/ubuntu/maverick/tdeutils/debian/control
+++ b/ubuntu/maverick/tdeutils/debian/control
@@ -16,7 +16,7 @@ Breaks: kdeutils-kde3 (<< 4:14.0.0~), kdeutils-trinity (<< 4:14.0.0~)
 Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
 Suggests: tdeutils-trinity-doc-html (>= ${Source-Version})
 Description: general purpose utilities 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.
@@ -29,12 +29,12 @@ Section: doc
 Architecture: all
 Replaces: kdeutils-kde3-doc (<< 4:14.0.0~), kdeutils-trinity-doc (<< 4:14.0.0~)
 Breaks: kdeutils-kde3-doc (<< 4:14.0.0~), kdeutils-trinity-doc (<< 4:14.0.0~)
-Description: developer documentation for the KDE utilities module
- This package contains documentation for the KDE utilities module, of
+Description: developer documentation for the TDE utilities module
+ This package contains documentation for the TDE utilities module, of
  use more for developers creating applications than regular users.
  .
- This package is part of Trinity, and a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: tdeutils-trinity-doc-html
 Architecture: all
@@ -43,18 +43,18 @@ Replaces: kdeutils-kde3-doc-html (<< 4:14.0.0~), kdeutils-trinity-doc-html (<< 4
 Breaks: kdeutils-kde3-doc-html (<< 4:14.0.0~), kdeutils-trinity-doc-html (<< 4:14.0.0~)
 Suggests: konqueror-trinity | www-browser, tdebase-trinity
 Description: Trinity utilities 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 utilities documentation
+ 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 utilities documentation
  converted to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
  /usr/share/doc/tde/HTML/<language>/<app>/, for instance
  /usr/share/doc/tde/HTML/en/ark/. Documentation is provided for most
- KDE utilities packages.
+ TDE utilities packages.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: tdeutils-trinity-dev
 Section: utils
@@ -66,8 +66,8 @@ Description: development files for the Trinity utilities module
  This package contains development files needed to compile tdeutils
  applications.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: ark-trinity
 Section: utils
@@ -79,18 +79,18 @@ Recommends: ncompress, unzip, zip, zoo, bzip2, p7zip-full, xz-utils, lzma
 Suggests: khelpcenter-trinity, rar, unrar | unrar-free
 Description: graphical archiving tool for Trinity
  Ark is a graphical program for managing various archive formats within the
- KDE environment. Archives can be viewed, extracted, created and modified
+ TDE environment. Archives can be viewed, extracted, created and modified
  from within Ark.
  .
  The program can handle various formats such as tar, gzip, bzip2, zip, rar and
  lha (if appropriate command-line programs are installed).
  .
- Ark can work closely with Konqueror in the KDE environment to handle archives,
+ Ark can work closely with Konqueror in the TDE environment to handle archives,
  if you install the Konqueror Integration plugin available in the konq-plugins
  package.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kcalc-trinity
 Section: utils
@@ -100,7 +100,7 @@ Breaks: kcalc-kde3 (<< 4:14.0.0~), kcalc-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Description: calculator for Trinity
- KCalc is KDE's scientific calculator.
+ KCalc is TDE's scientific calculator.
  .
  It provides:
   * trigonometric functions, logic operations, and statistical calculations
@@ -108,8 +108,8 @@ Description: calculator for Trinity
   * a results-stack which lets you conveniently recall previous results
   * configurable precision, and number of digits after the period
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kcharselect-trinity
 Section: utils
@@ -119,10 +119,10 @@ Breaks: kcharselect-kde3 (<< 4:14.0.0~), kcharselect-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Description: character selector for Trinity
- A character set selector for KDE.
+ A character set selector for TDE.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: tdelirc-trinity
 Section: utils
@@ -132,10 +132,10 @@ Breaks: kdelirc-kde3 (<< 4:14.0.0~), kdelirc-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Description: infrared control for Trinity
- This is a frontend for the LIRC suite to use infrared devices with KDE.
+ This is a frontend for the LIRC suite to use infrared devices with TDE.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: tdessh-trinity
 Section: tde
@@ -144,10 +144,10 @@ Replaces: kdessh-kde3 (<< 4:14.0.0~), kdessh-trinity (<< 4:14.0.0~)
 Breaks: kdessh-kde3 (<< 4:14.0.0~), kdessh-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, openssh-client | ssh-client
 Description: ssh frontend for Trinity
- This package contains KDE's frontend for ssh.
+ This package contains TDE's frontend for ssh.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kdf-trinity
 Section: utils
@@ -162,8 +162,8 @@ Description: disk space utility for Trinity
  and mount point. It also allows you to mount and unmount drives and view them
  in a file manager.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kedit-trinity
 Section: editors
@@ -173,15 +173,15 @@ Breaks: kedit-kde3 (<< 4:14.0.0~), kedit-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Description: basic text editor for Trinity
- A simple text editor for KDE.
+ A simple text editor for TDE.
  .
  It can be used with Konqueror for text and configuration file browsing.
  KEdit also serves well for creating small plain text documents. KEdit's
  functionality will intentionally remain rather limited to ensure a
  reasonably fast start.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kfloppy-trinity
 Section: utils
@@ -190,12 +190,12 @@ Replaces: kfloppy-kde3 (<< 4:14.0.0~), kfloppy-trinity (<< 4:14.0.0~)
 Breaks: kfloppy-kde3 (<< 4:14.0.0~), kfloppy-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, dosfstools
 Suggests: khelpcenter-trinity
-Description: floppy formatter for KDE
+Description: floppy formatter for TDE
  Kfloppy is a utility that provides a straightforward graphical means
  to format 3.5" and 5.25" floppy disks.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kgpg-trinity
 Section: tde
@@ -219,8 +219,8 @@ Description: GnuPG frontend for Trinity
      signing)
    * decrypting clipboard contents, including integration with Klipper
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: khexedit-trinity
 Section: utils
@@ -234,8 +234,8 @@ Description: Trinity hex editor
  find/replace functions, bookmarks, many configuration options, drag and drop
  support and other powerful features.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kjots-trinity
 Section: utils
@@ -248,8 +248,8 @@ Description: note taking utility for Trinity
  Kjots is a small note taker program. Name and idea are taken from the jots
  program included in the tkgoodstuff package.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: klaptopdaemon-trinity
 Section: tde
@@ -258,12 +258,12 @@ Replaces: klaptopdaemon-kde3 (<< 4:14.0.0~), klaptopdaemon-trinity (<< 4:14.0.0~
 Breaks: klaptopdaemon-kde3 (<< 4:14.0.0~), klaptopdaemon-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: battery monitoring and management for laptops using KDE
+Description: battery monitoring and management for laptops using TDE
  This package contains utilities to monitor batteries and configure
- power management, for laptops, from within KDE.
+ power management, for laptops, from within TDE.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kmilo-trinity
 Section: utils
@@ -278,8 +278,8 @@ Description:  laptop special keys support for Trinity
  comes with plugins for Powerbooks, Thinkpads, Vaios and generic keyboards
  with special keys.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kmilo-legacy-trinity
 Section: utils
@@ -296,8 +296,8 @@ Description:  non-standard plugins for KMilo
  In Debian the intention is that all laptops work with the generic kmilo
  plugin, if you need this package please file a bug.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kregexpeditor-trinity
 Section: tde
@@ -308,10 +308,10 @@ Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Description: graphical regular expression editor plugin for Trinity
  This package contains a graphical regular expression editor plugin for use
- with KDE. It let you draw your regular expression in an unambiguous way.
+ with TDE. It let you draw your regular expression in an unambiguous way.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: ksim-trinity
 Section: utils
@@ -325,8 +325,8 @@ Description: system information monitor for Trinity
  for GKrellm skins. It allows users to follow uptime, memory usage, network
  connections, power, etc.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: ktimer-trinity
 Section: utils
@@ -336,12 +336,12 @@ Breaks: ktimer-kde3 (<< 4:14.0.0~), ktimer-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Description: timer utility for Trinity
- This is a timer application for KDE. It allows you to execute commands after
+ This is a timer application for TDE. It allows you to execute commands after
  a certain amount of time. It supports looping commands as well as delayed
  command execution.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: tdewalletmanager-trinity
 Section: utils
@@ -355,8 +355,8 @@ Description: wallet manager for Trinity
  store encrypted with passwords and can also serve as a password manager that
  keeps a master password to all wallets.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: superkaramba-trinity
 Section: tde
@@ -366,9 +366,9 @@ Breaks: superkaramba-kde3 (<< 4:14.0.0~), superkaramba-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Conflicts: karamba-trinity
-Description: a program based on karamba improving the eyecandy of KDE
+Description: a program based on karamba improving the eyecandy of TDE
  SuperKaramba is a tool based on karamba that allows anyone to easily create
- and run little interactive widgets on a KDE desktop. Widgets are defined in a
+ and run little interactive widgets on a Trinity desktop. Widgets are defined in a
  simple text file and can be augmented with Python code to make them
  interactive.
  .
@@ -379,8 +379,8 @@ Description: a program based on karamba improving the eyecandy of KDE
   * Create little games or virtual pets that live on your desktop.
   * Display information from the internet, such as weather and headlines.
  .
- This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: tdeutils-trinity-dbg
 Section: libdevel
diff --git a/ubuntu/maverick/tdeutils/debian/control.in b/ubuntu/maverick/tdeutils/debian/control.in
index 27b1a4a27..01a6a0559 100644
--- a/ubuntu/maverick/tdeutils/debian/control.in
+++ b/ubuntu/maverick/tdeutils/debian/control.in
@@ -11,55 +11,55 @@ Standards-Version: 3.7.2
 Package: tdeutils
 Section: tde
 Architecture: all
-Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), tdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), tdewalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version})
+Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), tdelirc (>= ${Source-Version}), tdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), tdewalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version})
 Suggests: tdeutils-doc-html (>= ${Source-Version})
-Description: general purpose utilities from the official KDE release
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+Description: general purpose utilities 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 general purpose utilities 
- provided with the official release of KDE.
+ provided with the official release of TDE.
 
 Package: tdeutils-doc
 Section: doc
 Architecture: all
-Description: developer documentation for the KDE utilities module
- This package contains documentation for the KDE utilities module, of
+Description: developer documentation for the TDE utilities module
+ This package contains documentation for the TDE utilities module, of
  use more for developers creating applications than regular users.
  .
- This package is part of KDE, and a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, and a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: tdeutils-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror | www-browser, tdebase
-Description: KDE utilities 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 utilities documentation
+Description: TDE utilities 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 utilities documentation
  converted to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
  /usr/share/doc/tde/HTML/<language>/<app>/, for instance
  /usr/share/doc/tde/HTML/en/ark/. Documentation is provided for most
- KDE utilities packages.
+ TDE utilities packages.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: tdeutils-dev
 Section: utils
 Architecture: any
-Depends: ark (= ${Source-Version}), kcalc (= ${Source-Version}), kdelirc (= ${Source-Version}), kedit (= ${Source-Version}), khexedit (= ${Source-Version}), klaptopdaemon (= ${Source-Version}), kmilo (= ${Source-Version}), kregexpeditor (= ${Source-Version}), ksim (= ${Source-Version}), tdelibs4-dev
-Description: development files for the KDE utilities module
+Depends: ark (= ${Source-Version}), kcalc (= ${Source-Version}), tdelirc (= ${Source-Version}), kedit (= ${Source-Version}), khexedit (= ${Source-Version}), klaptopdaemon (= ${Source-Version}), kmilo (= ${Source-Version}), kregexpeditor (= ${Source-Version}), ksim (= ${Source-Version}), tdelibs4-dev
+Description: development files for the TDE utilities module
  This package contains development files needed to compile tdeutils
  applications.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: ark
 Section: utils
@@ -68,20 +68,20 @@ Depends: ${shlibs:Depends}
 Recommends: ncompress, unzip, zip, zoo, bzip2, p7zip-full
 Suggests: khelpcenter, rar, unrar | unrar-free
 Replaces: tdebase-data (<< 4:3.3.91)
-Description: graphical archiving tool for KDE
+Description: graphical archiving tool for TDE
  Ark is a graphical program for managing various archive formats within the
- KDE environment. Archives can be viewed, extracted, created and modified
+ TDE environment. Archives can be viewed, extracted, created and modified
  from within Ark.
  .
  The program can handle various formats such as tar, gzip, bzip2, zip, rar and
  lha (if appropriate command-line programs are installed).
  .
- Ark can work closely with Konqueror in the KDE environment to handle archives,
+ Ark can work closely with Konqueror in the TDE environment to handle archives,
  if you install the Konqueror Integration plugin available in the konq-plugins
  package.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: kcalc
 Section: utils
@@ -89,8 +89,8 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
 Replaces: tdebase-data (<< 4:3.3.91)
-Description: calculator for KDE
- KCalc is KDE's scientific calculator.
+Description: calculator for TDE
+ KCalc is TDE's scientific calculator.
  .
  It provides:
   * trigonometric functions, logic operations, and statistical calculations
@@ -98,89 +98,89 @@ Description: calculator for KDE
   * a results-stack which lets you conveniently recall previous results
   * configurable precision, and number of digits after the period
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: kcharselect
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: character selector for KDE
- A character set selector for KDE.
+Description: character selector for TDE
+ A character set selector for TDE.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
-Package: kdelirc
+Package: tdelirc
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: infrared control for KDE
- This is a frontend for the LIRC suite to use infrared devices with KDE.
+Description: infrared control for TDE
+ This is a frontend for the LIRC suite to use infrared devices with TDE.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: tdessh
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}, openssh-client | ssh-client
-Description: ssh frontend for KDE
- This package contains KDE's frontend for ssh.
+Description: ssh frontend for TDE
+ This package contains TDE's frontend for ssh.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: kdf
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: disk space utility for KDE
+Description: disk space utility for TDE
  KDiskFree displays the available file devices (hard drive partitions, floppy
  and CD drives, etc.) along with information on their capacity, free space, type
  and mount point. It also allows you to mount and unmount drives and view them
  in a file manager.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: kedit
 Section: editors
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: basic text editor for KDE
- A simple text editor for KDE.
+Description: basic text editor for TDE
+ A simple text editor for TDE.
  .
  It can be used with Konqueror for text and configuration file browsing.
  KEdit also serves well for creating small plain text documents. KEdit's
  functionality will intentionally remain rather limited to ensure a
  reasonably fast start.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: kfloppy
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}, dosfstools
 Suggests: khelpcenter
-Description: floppy formatter for KDE
+Description: floppy formatter for TDE
  Kfloppy is a utility that provides a straightforward graphical means
  to format 3.5" and 5.25" floppy disks.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: kgpg
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}, konsole, gnupg
 Suggests: khelpcenter
-Description: GnuPG frontend for KDE
+Description: GnuPG frontend for TDE
  Kgpg is a frontend for GNU Privacy Guard (GnuPG). It provides file
  encryption, file decryption and key management.
  .
@@ -195,110 +195,110 @@ Description: GnuPG frontend for KDE
      signing)
    * decrypting clipboard contents, including integration with Klipper
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: khexedit
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: KDE hex editor
+Description: TDE hex editor
  KHexEdit is an editor for the raw data of binary files.  It includes
  find/replace functions, bookmarks, many configuration options, drag and drop
  support and other powerful features.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: kjots
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: note taking utility for KDE
+Description: note taking utility for TDE
  Kjots is a small note taker program. Name and idea are taken from the jots
  program included in the tkgoodstuff package.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: klaptopdaemon
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: battery monitoring and management for laptops using KDE
+Description: battery monitoring and management for laptops using TDE
  This package contains utilities to monitor batteries and configure
- power management, for laptops, from within KDE.
+ power management, for laptops, from within TDE.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: kmilo
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Description:  laptop special keys support for KDE
+Description:  laptop special keys support for TDE
  KMilo lets you use the special keys on some keyboards and laptops.
  .
  Usually this includes volume keys and other features. Currently, KMilo
  comes with plugins for Powerbooks, Thinkpads, Vaios and generic keyboards
  with special keys.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: kregexpeditor
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: graphical regular expression editor plugin for KDE
+Description: graphical regular expression editor plugin for TDE
  This package contains a graphical regular expression editor plugin for use
- with KDE. It let you draw your regular expression in an unambiguous way.
+ with TDE. It let you draw your regular expression in an unambiguous way.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: ksim
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: system information monitor for KDE
+Description: system information monitor for TDE
  KSim is a system monitor app which has its own plugin system with support
  for GKrellm skins. It allows users to follow uptime, memory usage, network
  connections, power, etc.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: ktimer
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: timer utility for KDE
- This is a timer application for KDE. It allows you to execute commands after
+Description: timer utility for TDE
+ This is a timer application for TDE. It allows you to execute commands after
  a certain amount of time. It supports looping commands as well as delayed
  command execution.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: tdewalletmanager
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: wallet manager for KDE
+Description: wallet manager for TDE
  This program keeps various wallets for any kind of data that the user can
  store encrypted with passwords and can also serve as a password manager that
  keeps a master password to all wallets.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: superkaramba
 Section: tde
@@ -306,9 +306,9 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
 Conflicts: karamba
-Description: a program based on karamba improving the eyecandy of KDE
+Description: a program based on karamba improving the eyecandy of TDE
  SuperKaramba is a tool based on karamba that allows anyone to easily create
- and run little interactive widgets on a KDE desktop. Widgets are defined in a
+ and run little interactive widgets on a Trinity desktop. Widgets are defined in a
  simple text file and can be augmented with Python code to make them
  interactive.
  .
@@ -319,8 +319,8 @@ Description: a program based on karamba improving the eyecandy of KDE
   * Create little games or virtual pets that live on your desktop.
   * Display information from the internet, such as weather and headlines.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'tdeutils' packages for more information.
+ This package is part of TDE, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
 
 Package: tdeutils-dbg
 Section: libdevel
diff --git a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.menu b/ubuntu/maverick/tdeutils/debian/kcalc-trinity.menu
index c5b8eb908..d3af6bc1f 100644
--- a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kcalc-trinity.menu
@@ -1,4 +1,4 @@
-?package(kcalc):\
+?package(kcalc-trinity):\
 	needs="X11"\
 	section="Apps/Math"\
 	hints="TDE,Calculators"\
diff --git a/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.menu b/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.menu
index 045b58017..523105d5a 100644
--- a/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.menu
@@ -1,4 +1,4 @@
-?package(kcharselect):\
+?package(kcharselect-trinity):\
 	needs="X11"\
 	section="Apps/Tools"\
 	hints="TDE,Characters"\
diff --git a/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu b/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu
index 62373d1df..5a7dbdefe 100644
--- a/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu
@@ -1,4 +1,4 @@
-?package(kdf):\
+?package(kdf-trinity):\
 	needs="X11"\
 	section="Apps/System"\
 	hints="TDE"\
@@ -7,7 +7,7 @@
 	icon16x16="/opt/trinity/share/pixmaps/kdf-16.xpm"\
 	command="/opt/trinity/bin/kdf"
 
-?package(kdf):\
+?package(kdf-trinity):\
 	needs="X11"\
 	section="Apps/System"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdeutils/debian/kedit-trinity.menu b/ubuntu/maverick/tdeutils/debian/kedit-trinity.menu
index 28d62014d..0f5f2fbe2 100644
--- a/ubuntu/maverick/tdeutils/debian/kedit-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kedit-trinity.menu
@@ -1,4 +1,4 @@
-?package(kedit):\
+?package(kedit-trinity):\
 	needs="X11"\
 	section="Apps/Editors"\
 	hints="TDE,Text"\
diff --git a/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.menu b/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.menu
index 66612d5bb..034dc4d38 100644
--- a/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.menu
@@ -1,4 +1,4 @@
-?package(kfloppy):\
+?package(kfloppy-trinity):\
 	needs="X11"\
 	section="Apps/System"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdeutils/debian/kgpg-trinity.menu b/ubuntu/maverick/tdeutils/debian/kgpg-trinity.menu
index 630a11407..aae18d3de 100644
--- a/ubuntu/maverick/tdeutils/debian/kgpg-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kgpg-trinity.menu
@@ -1,4 +1,4 @@
-?package(kgpg):\
+?package(kgpg-trinity):\
 	needs="X11"\
 	section="Apps/Tools"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdeutils/debian/khexedit-trinity.menu b/ubuntu/maverick/tdeutils/debian/khexedit-trinity.menu
index a22c59831..6e223ed41 100644
--- a/ubuntu/maverick/tdeutils/debian/khexedit-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/khexedit-trinity.menu
@@ -1,4 +1,4 @@
-?package(khexedit):\
+?package(khexedit-trinity):\
 	needs="X11"\
 	section="Apps/Tools"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdeutils/debian/kjots-trinity.menu b/ubuntu/maverick/tdeutils/debian/kjots-trinity.menu
index aa2e44bd3..46670623d 100644
--- a/ubuntu/maverick/tdeutils/debian/kjots-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kjots-trinity.menu
@@ -1,4 +1,4 @@
-?package(kjots):\
+?package(kjots-trinity):\
 	needs="X11"\
 	section="Apps/Tools"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdeutils/debian/klaptopdaemon.README.Debian b/ubuntu/maverick/tdeutils/debian/klaptopdaemon.README.Debian
index d6cf29558..04c3e1b4e 100644
--- a/ubuntu/maverick/tdeutils/debian/klaptopdaemon.README.Debian
+++ b/ubuntu/maverick/tdeutils/debian/klaptopdaemon.README.Debian
@@ -2,8 +2,8 @@ klaptopdaemon and SUID permissions
 ----------------------------------
 
 To allow ordinary users to control certain power management features,
-klaptopdaemon's panel in the KDE Control Center has a button which prompts
-the user to enter the root password (KDE Control Center --> Power Control
+klaptopdaemon's panel in the Trinity Control Center has a button which prompts
+the user to enter the root password (Trinity Control Center --> Power Control
 --> Laptop Battery, then the ACPI Config tab, then the Setup Helper
 Application button). This button changes the permissions of
 /usr/bin/klaptop_acpi_helper from "0755 root.root" to "6755 root.root",
diff --git a/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.menu b/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.menu
index fdfb1893f..d88d029df 100644
--- a/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.menu
@@ -1,4 +1,4 @@
-?package(kregexpeditor):\
+?package(kregexpeditor-trinity):\
 	needs="X11"\
 	section="Apps/Tools"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdeutils/debian/ktimer-trinity.menu b/ubuntu/maverick/tdeutils/debian/ktimer-trinity.menu
index e25f4cf9e..0fe0e99a7 100644
--- a/ubuntu/maverick/tdeutils/debian/ktimer-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/ktimer-trinity.menu
@@ -1,4 +1,4 @@
-?package(ktimer):\
+?package(ktimer-trinity):\
 	needs="X11"\
 	section="Apps/Tools"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdeutils/debian/man/ark-trinity.1 b/ubuntu/maverick/tdeutils/debian/man/ark-trinity.1
index f15b77b33..d738284f4 100644
--- a/ubuntu/maverick/tdeutils/debian/man/ark-trinity.1
+++ b/ubuntu/maverick/tdeutils/debian/man/ark-trinity.1
@@ -4,15 +4,15 @@
 Ark \- manual page for Ark
 .SH SYNOPSIS
 .B ark
-[\fIQt-options\fR] [\fIKDE-options\fR] [\fIKDE-tempfile-options\fR] [\fIoptions\fR] [\fIfolder\fR] [\fIfiles\fR] [\fIarchive\fR]
+[\fIQt-options\fR] [\fITDE-options\fR] [\fITDE-tempfile-options\fR] [\fIoptions\fR] [\fIfolder\fR] [\fIfiles\fR] [\fIarchive\fR]
 .SH DESCRIPTION
-KDE Archiving tool
+TDE Archiving tool
 Ark is a graphical program for managing various archive formats within the
-KDE environment. Archives can be viewed, extracted, created and modified
+TDE environment. Archives can be viewed, extracted, created and modified
 from within Ark.
 The program can handle various formats such as tar, gzip, bzip2, zip, rar and
 lha (if the appropriate command-line programs are installed).
-Ark can work closely with Konqueror in the KDE environment to handle archives,
+Ark can work closely with Konqueror in the TDE environment to handle archives,
 if you install the Konqueror Integration plugin available in the konq-plugins
 package.
 .SS "Generic options"
@@ -23,11 +23,11 @@ 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\-kde\-tempfile\fR
-Show KDE\-tempfile specific options
+\fB\-\-help\-tde\-tempfile\fR
+Show TDE\-tempfile specific options
 .TP
 \fB\-\-help\-all\fR
 Show all options
diff --git a/ubuntu/maverick/tdeutils/debian/man/kcalc-trinity.1 b/ubuntu/maverick/tdeutils/debian/man/kcalc-trinity.1
index d84088327..eff470650 100644
--- a/ubuntu/maverick/tdeutils/debian/man/kcalc-trinity.1
+++ b/ubuntu/maverick/tdeutils/debian/man/kcalc-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KCALC 1 "June 2006" "K Desktop Environment" "KDE Calculator"
+.TH KCALC 1 "June 2006" "Trinity Desktop Environment" "TDE Calculator"
 .SH NAME
 kcalc
-\- KDE Calculator
+\- TDE Calculator
 .SH SYNOPSIS
-\fBkcalc\fP [Qt\-options] [KDE\-options] 
+\fBkcalc\fP [Qt\-options] [TDE\-options] 
 .SH DESCRIPTION
-\fBKCalc\fP is a scientific calculator for KDE. In addition to the usual functionality offered by most scientific calculators, \fBKCalc\fP offers a number of features:
+\fBKCalc\fP is a scientific calculator for TDE. In addition to the usual functionality offered by most scientific calculators, \fBKCalc\fP offers a number of features:
 .br
 .IP "     \-"
 \fBKCalc\fP provides trigonometric functions, logic operations, and it is able to do statistical calculations.
@@ -32,8 +32,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
@@ -116,7 +116,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
@@ -147,11 +147,11 @@ sets the client geometry of the main widget \- see man X for the argument format
 
 .SH FILES
 .TP
-.I ~/.kde/share/config/kcalcrc
+.I ~/.trinity/share/config/kcalcrc
 \fBkcalc\fP configuration file
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/kcalc/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/kcalc/"
@@ -178,7 +178,7 @@ René Mérou <ochominutosdearco@yahoo.es>
 
 .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/tdeutils/debian/man/kcharselect-trinity.1 b/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1
index d6ba31cf5..cc54866fa 100644
--- a/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1
+++ b/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1
@@ -1,14 +1,14 @@
 .lf 1 info/tdeutils.kcharselect.1
-.TH KCHARSELECT 1 "May 2003" KDE "KDE Application"
+.TH KCHARSELECT 1 "May 2003" TDE "TDE Application"
 .SH NAME
-kcharselect \- KDE Character Selector
+kcharselect \- TDE Character Selector
 .SH SYNOPSIS
 .B kcharselect
-[\fIQt-options\fR] [\fIKDE-options\fR]
+[\fIQt-options\fR] [\fITDE-options\fR]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B KCharSelect
-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
@@ -23,7 +23,7 @@ later use.
 is helpful for determining which characters in a font have glyphs as well as
 for selecting characters that may be difficult to produce.
 .P
-This program is part of the official KDE utils module.
+This program is part of the official TDE utils module.
 .SH OPTIONS
 .SS "General Options"
 .B \-\-help
@@ -32,8 +32,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
@@ -50,7 +50,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.
@@ -58,7 +58,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
@@ -76,7 +76,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.
@@ -182,48 +182,48 @@ scroll bar will be on the left side and so on.
 .lf 48 info/tdeutils.kcharselect.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 50 info/tdeutils.kcharselect.1
 .SH FILES
 .TP
-.I $HOME/.kde/share/config/kcharselectrc
+.I $HOME/.trinity/share/config/kcharselectrc
 configuration file.
 .SH AUTHOR
 KCharSelect was written by
@@ -232,7 +232,7 @@ KCharSelect was written by
 Reginald Stadlbauer <reggie@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/tdeutils/debian/man/kdf-trinity.1 b/ubuntu/maverick/tdeutils/debian/man/kdf-trinity.1
index 50cabade4..58bbbec90 100644
--- a/ubuntu/maverick/tdeutils/debian/man/kdf-trinity.1
+++ b/ubuntu/maverick/tdeutils/debian/man/kdf-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDF 1 "June 2006" "K Desktop Environment" "KDE free disk space utility"
+.TH KDF 1 "June 2006" "Trinity Desktop Environment" "TDE free disk space utility"
 .SH NAME
 kdf
-\- KDE free disk space utility
+\- TDE free disk space utility
 .SH SYNOPSIS
-\fBkdf\fP [Qt\-options] [KDE\-options] 
+\fBkdf\fP [Qt\-options] [TDE\-options] 
 .SH DESCRIPTION
 \fBKDiskFree\fP displays available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their capacity, free space, type and mount point. It also allows you to mount and unmount drives and view them in a file manager.
 .sp 1
@@ -18,8 +18,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
@@ -102,7 +102,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
@@ -134,7 +134,7 @@ sets the client geometry of the main widget - see man X for the argument format
 .SH SEE ALSO
 \fBkwikdisk\fP(1)
 .sp 1
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/kdf/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/kdf/"
@@ -147,7 +147,7 @@ Michael Kropfberger <michael.kropfberger@gmx.net>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdeutils/debian/man/kedit-trinity.1 b/ubuntu/maverick/tdeutils/debian/man/kedit-trinity.1
index 26dafcbbd..ebf6a588b 100644
--- a/ubuntu/maverick/tdeutils/debian/man/kedit-trinity.1
+++ b/ubuntu/maverick/tdeutils/debian/man/kedit-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KEDIT 1 "June 2006" "K Desktop Environment" "KDE text editor"
+.TH KEDIT 1 "June 2006" "Trinity Desktop Environment" "TDE text editor"
 .SH NAME
 kedit
-\- KDE text editor
+\- TDE text editor
 .SH SYNOPSIS
-\fBkedit\fP [Qt\-options] [KDE\-options] [options] \fIfile\fP
+\fBkedit\fP [Qt\-options] [TDE\-options] [options] \fIfile\fP
 .SH DESCRIPTION
-\fBKEdit\fP is a text editor for the KDE Desktop. It is a small editor which can be used with \fBKonqueror\fP for text and configuration file browsing. \fBKEdit\fP also serves well for creating small plain text documents. It is not meant to be a programmers editor, in particular it is not meant to replace any of the more powerful editors such as \fBKate\fP, \fBXEmacs\fP or \fBEmacs\fP.
+\fBKEdit\fP is a text editor for the Trinity Desktop. It is a small editor which can be used with \fBKonqueror\fP for text and configuration file browsing. \fBKEdit\fP also serves well for creating small plain text documents. It is not meant to be a programmers editor, in particular it is not meant to replace any of the more powerful editors such as \fBKate\fP, \fBXEmacs\fP or \fBEmacs\fP.
 .sp 1
 \fBKEdit\fP's functionality will intentionally remain rather limited to ensure a reasonably fast start.
 .SH OPTIONS
@@ -28,8 +28,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
@@ -112,7 +112,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
@@ -145,7 +145,7 @@ sets the client geometry of the main widget \- see man X for the argument format
 .SH SEE ALSO
 \fBkate\fP(1), \fBkwrite\fP(1)
 .sp 1
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/kedit/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/kedit/"
@@ -158,7 +158,7 @@ Bernd Johannes Wuebben <wuebben@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdeutils/debian/man/kfloppy-trinity.1 b/ubuntu/maverick/tdeutils/debian/man/kfloppy-trinity.1
index b2b26a248..412893a1a 100644
--- a/ubuntu/maverick/tdeutils/debian/man/kfloppy-trinity.1
+++ b/ubuntu/maverick/tdeutils/debian/man/kfloppy-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KFLOPPY 1 "June 2006" "K Desktop Environment" "KDE Floppy Disk Utility"
+.TH KFLOPPY 1 "June 2006" "Trinity Desktop Environment" "TDE Floppy Disk Utility"
 .SH NAME
 kfloppy
-\- KDE Floppy Disk Utility
+\- TDE Floppy Disk Utility
 .SH SYNOPSIS
-\fBkfloppy\fP [Qt\-options] [KDE\-options] [device] 
+\fBkfloppy\fP [Qt\-options] [TDE\-options] [device] 
 .SH DESCRIPTION
 \fBKfloppy Formatter\fP is a utility that provides a straightforward graphical means to format 3.5" and 5.25" floppy disks.
 .sp 1
@@ -47,8 +47,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
@@ -131,7 +131,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
@@ -162,7 +162,7 @@ sets the client geometry of the main widget - see man X for the argument format
 .SS 
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/kfloppy/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/kfloppy/"
@@ -175,7 +175,7 @@ Bernd Johannes Wuebben <wuebben@kde.org>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdeutils/debian/man/kgpg-trinity.1 b/ubuntu/maverick/tdeutils/debian/man/kgpg-trinity.1
index bda0a6561..9ea82bb85 100644
--- a/ubuntu/maverick/tdeutils/debian/man/kgpg-trinity.1
+++ b/ubuntu/maverick/tdeutils/debian/man/kgpg-trinity.1
@@ -1,13 +1,13 @@
-.TH KGPG "1" "December 2002" "TDE" "KDE Application"
+.TH KGPG "1" "December 2002" "TDE" "TDE Application"
 .SH NAME
-kgpg \- a KDE frontend for GNU Privacy Guard (GnuPG)
+kgpg \- a TDE frontend for GNU Privacy Guard (GnuPG)
 .SH SYNOPSIS
 .B kgpg
-[\fIQt-options\fR] [\fIKDE-options\fR] [\fIoptions\fR] \fIfile\fR
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] \fIfile\fR
 .SH DESCRIPTION
 This manual page documents briefly the
 .B Kgpg
-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
@@ -47,8 +47,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
@@ -129,7 +129,7 @@ disable XIM.
 .TP
 .B \-\-reverse
 mirrors the whole layout of widgets.
-.SS "KDE options"
+.SS "TDE options"
 .TP 12
 .BI \-\-caption \ caption
 Use \fIcaption\fP as name in the titlebar.
diff --git a/ubuntu/maverick/tdeutils/debian/man/khexedit-trinity.1 b/ubuntu/maverick/tdeutils/debian/man/khexedit-trinity.1
index c77a34699..968d438f5 100644
--- a/ubuntu/maverick/tdeutils/debian/man/khexedit-trinity.1
+++ b/ubuntu/maverick/tdeutils/debian/man/khexedit-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KHEXEDIT 1 "June 2006" "K Desktop Environment" "KDE hex editor"
+.TH KHEXEDIT 1 "June 2006" "Trinity Desktop Environment" "TDE hex editor"
 .SH NAME
 khexedit
-\- KDE hex editor
+\- TDE hex editor
 .SH SYNOPSIS
-\fBkhexedit\fP [Qt\-options] [KDE\-options] [options] [file(s)] 
+\fBkhexedit\fP [Qt\-options] [TDE\-options] [options] [file(s)] 
 .SH DESCRIPTION
 \fBKHexEdit\fP is an editor for the raw data of binary files. It includes find/replace functions, bookmarks, many configuration options, drag and drop support and other powerful features.
 .sp 1
@@ -34,8 +34,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
@@ -118,7 +118,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
@@ -149,7 +149,7 @@ sets the client geometry of the main widget \- see man X for the argument format
 .SS 
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/khexedit/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/khexedit/"
@@ -162,7 +162,7 @@ Espen Sand <espensa@online.no>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the author directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author 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/tdeutils/debian/man/kwikdisk-trinity.1 b/ubuntu/maverick/tdeutils/debian/man/kwikdisk-trinity.1
index 15e727db6..74aaad6ca 100644
--- a/ubuntu/maverick/tdeutils/debian/man/kwikdisk-trinity.1
+++ b/ubuntu/maverick/tdeutils/debian/man/kwikdisk-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KWIKDISK 1 "June 2006" "K Desktop Environment" "KDE Free disk space utility"
+.TH KWIKDISK 1 "June 2006" "Trinity Desktop Environment" "TDE Free disk space utility"
 .SH NAME
 kwikdisk
-\- KDE Free disk space utility
+\- TDE Free disk space utility
 .SH SYNOPSIS
-\fBkwikdisk\fB [Qt\-options] [KDE\-options] 
+\fBkwikdisk\fB [Qt\-options] [TDE\-options] 
 .SH DESCRIPTION
 \fBkwikdisk\fP is a kicker applet to display the available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their free space, type and mount point. It also allows you to mount and unmount drives.
 .sp 1
@@ -18,8 +18,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
@@ -102,7 +102,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
@@ -144,7 +144,7 @@ Stanislav Karchebny <Stanislav.Karchebny@kdemail.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/tdeutils/debian/man/superkaramba-trinity.1 b/ubuntu/maverick/tdeutils/debian/man/superkaramba-trinity.1
index 134761ea5..ab0ec0f49 100644
--- a/ubuntu/maverick/tdeutils/debian/man/superkaramba-trinity.1
+++ b/ubuntu/maverick/tdeutils/debian/man/superkaramba-trinity.1
@@ -1,9 +1,9 @@
 .TH SUPERKARAMBA 1 "juli  27, 2003"
 .SH NAME
-superkaramba \- a program based on karamba improving the eyecandy of KDE.
+superkaramba \- a program based on karamba improving the eyecandy of TDE.
 .SH SYNOPSIS
 .B superkaramba
-[\fIQt-options\fR] [\fIKDE-options\fR] \fIfile\fR
+[\fIQt-options\fR] [\fITDE-options\fR] \fIfile\fR
 .SH DESCRIPTION
 This manual page documents briefly the
 .B superkaramba
@@ -14,7 +14,7 @@ Instead, it has documentation in the GNU Info format; see below.
 .PP
 .B Superkaramba
 is a tool based on karamba that allows anyone to easily create and run little
-interactive widgets on a KDE desktop. Widgets are defined in a simple text file
+interactive widgets on a Trinity desktop. Widgets are defined in a simple text file
 and can be augmented with Python code to make them interactive.
 .SH OPTIONS
 A summary of options are included below.
@@ -25,8 +25,8 @@ Show summary of 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
diff --git a/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.menu b/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.menu
index bd29663a0..781a1e036 100644
--- a/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.menu
@@ -1,4 +1,4 @@
-?package(superkaramba):\
+?package(superkaramba-trinity):\
 	needs="X11"\
 	section="Apps/Tools"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.ark b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.ark
index 4839265ea..220765a9c 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.ark
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.ark
@@ -1,7 +1,7 @@
 Document: tdeutils-doc-html-ark
 Title: Ark Handbook
 Author: Matt Johnston, Henrique Pinto
-Abstract: Ark is an archive manager for KDE
+Abstract: Ark is an archive manager for TDE
 Section: Tools
 
 Format: HTML
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.irkick b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.irkick
index 2fc211a4e..fe3652e36 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.irkick
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.irkick
@@ -1,7 +1,7 @@
 Document: tdeutils-doc-html-irkick
-Title: IRKick: The KDE LIRC Server Handbook
+Title: IRKick: The TDE LIRC Server Handbook
 Author: Gav Wood
-Abstract: KDE LIRC is the infrastructure for the KDE's Infrared Remote
+Abstract: TDE LIRC is the infrastructure for the TDE's Infrared Remote
  Control functionality; IRKick is the server component of that infrastructure.
 Section: Tools
 
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcalc b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcalc
index 110d46ab3..d9dcc4f3b 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcalc
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcalc
@@ -1,7 +1,7 @@
 Document: tdeutils-doc-html-kcalc
 Title: KCalc Handbook
 Author: Bernd Johannes Wuebben, Pamela Roberts
-Abstract: KCalc is a scientific calculator for KDE
+Abstract: KCalc is a scientific calculator for TDE
 Section: Tools
 
 Format: HTML
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcmlirc b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcmlirc
index 410d473c9..842e918f3 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcmlirc
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcmlirc
@@ -1,7 +1,7 @@
 Document: tdeutils-doc-html-kcmlirc
-Title: KDE Infrared Remote Control Configuration
+Title: TDE Infrared Remote Control Configuration
 Author: Gav Wood
-Abstract: The infrastructure for the KDE's Infrared Remote Control functionality.
+Abstract: The infrastructure for the TDE's Infrared Remote Control functionality.
 Section: Tools
 
 Format: HTML
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kedit b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kedit
index 1493ebe28..8be898e14 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kedit
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kedit
@@ -1,7 +1,7 @@
 Document: tdeutils-doc-html-kedit
 Title: KEdit Handbook
 Author: Thad McGinnis
-Abstract: KEdit is a simple text editor for KDE
+Abstract: KEdit is a simple text editor for TDE
 Section: Editors
 
 Format: HTML
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.khexedit b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.khexedit
index 983e2c3b7..2c4b8cf8d 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.khexedit
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.khexedit
@@ -1,7 +1,7 @@
 Document: tdeutils-doc-html-khexedit
 Title: KHexEdit Handbook
 Author: Jonathan Singer
-Abstract: KHexEdit is a hexadecimal editor for KDE
+Abstract: KHexEdit is a hexadecimal editor for TDE
 Section: Tools
 
 Format: HTML
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.superkaramba b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.superkaramba
index d9f8a21ce..9d4a685ac 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.superkaramba
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.superkaramba
@@ -3,7 +3,7 @@ Title: Superkaramba API
 Author: Adam Geitgey
 Abstract: This Handbook documents the Superkaramba API
  SuperKaramba is a tool based on karamba that allows anyone to easily create
- and run little interactive widgets on a KDE desktop. Widgets are defined in a
+ and run little interactive widgets on a Trinity desktop. Widgets are defined in a
  simple text file and can be augmented with Python code to make them
  interactive.
 Section: Tools