merge

23 files changed, 131 insertions, 131 deletions

diff --git a/debian/lenny/tdetoys/debian/amor-trinity.README.Debian b/debian/lenny/tdetoys/debian/amor-trinity.README.Debian
index 1473c9b12..a68a70f45 100644
--- a/debian/lenny/tdetoys/debian/amor-trinity.README.Debian
+++ b/debian/lenny/tdetoys/debian/amor-trinity.README.Debian
@@ -1,7 +1,7 @@
 AMOR for Debian
 ---------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdetoys-doc-html.
 
diff --git a/debian/lenny/tdetoys/debian/amor-trinity.menu b/debian/lenny/tdetoys/debian/amor-trinity.menu
index 02e6afeac..d154e69cb 100644
--- a/debian/lenny/tdetoys/debian/amor-trinity.menu
+++ b/debian/lenny/tdetoys/debian/amor-trinity.menu
@@ -1,4 +1,4 @@
-?package(amor):\
+?package(amor-trinity):\
 	needs="x11"\
 	section="Games/Toys"\
 	hints="TDE"\
diff --git a/debian/lenny/tdetoys/debian/cdbs/versions.pl b/debian/lenny/tdetoys/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/debian/lenny/tdetoys/debian/cdbs/versions.pl
+++ b/debian/lenny/tdetoys/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/debian/lenny/tdetoys/debian/control b/debian/lenny/tdetoys/debian/control
index 9a3ce55cf..8c89a0a83 100644
--- a/debian/lenny/tdetoys/debian/control
+++ b/debian/lenny/tdetoys/debian/control
@@ -15,7 +15,7 @@ Breaks: kdetoys-trinity (<< 4:14.0.0~)
 Depends: amor-trinity (>= ${Source-Version}), eyesapplet-trinity (>= ${Source-Version}), fifteenapplet-trinity (>= ${Source-Version}), kmoon-trinity (>= ${Source-Version}), kodo-trinity (>= ${Source-Version}), kteatime-trinity (>= ${Source-Version}), ktux-trinity (>= ${Source-Version}), kweather-trinity (>= ${Source-Version}), kworldclock-trinity (>= ${Source-Version})
 Suggests: tdetoys-trinity-doc-html (>= ${Source-Version})
 Description: toys 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.
@@ -30,18 +30,18 @@ Replaces: kdetoys-trinity-doc-html (<< 4:14.0.0~)
 Breaks: kdetoys-trinity-doc-html (<< 4:14.0.0~)
 Suggests: konqueror-trinity | www-browser, tdetoys-trinity
 Description: Trinity toys 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 toys 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 toys 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/amor/. Documentation is provided for most
- KDE toys packages.
+ TDE toys packages.
  .
- This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE toys module.
+ See the 'tde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: amor-trinity
 Architecture: any
@@ -57,10 +57,10 @@ Description: a Trinity creature for your desktop
  characters who prance around your X screen doing tricks and giving you tips.
  .
  Note that AMOR will only work with some window managers. Both KWin (the
- KDE window manager) and Metacity (a GTK2 window manager) are supported.
+ TDE window manager) and Metacity (a GTK2 window manager) are supported.
  .
- This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE toys module.
+ See the 'tde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: eyesapplet-trinity
 Architecture: any
@@ -71,11 +71,11 @@ Depends: ${shlibs:Depends}
 Recommends: kicker-trinity
 Conflicts: task-tdetoys-trinity
 Description: eyes applet for Trinity
- An applet for the KDE panel containing a pair of eyes that follow your mouse
+ An applet for the TDE panel containing a pair of eyes that follow your mouse
  around the screen.
  .
- This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE toys module.
+ See the 'tde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: fifteenapplet-trinity
 Architecture: any
@@ -85,12 +85,12 @@ Breaks: fifteenapplet-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Recommends: kicker-trinity
 Description: fifteen pieces puzzle for Trinity
- An applet for the KDE panel that lets you play the Fifteen Pieces
+ An applet for the TDE panel that lets you play the Fifteen Pieces
  sliding block puzzle. You have to order 15 pieces in a 4x4 square by
  moving them around.
  .
- This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE toys module.
+ See the 'tde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: kmoon-trinity
 Architecture: any
@@ -102,10 +102,10 @@ Recommends: kicker-trinity
 Suggests: khelpcenter-trinity
 Conflicts: task-tdetoys-trinity
 Description: moon phase indicator for Trinity
- An applet for the KDE panel that displays the current phase of the moon.
+ An applet for the TDE panel that displays the current phase of the moon.
  .
- This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE toys module.
+ See the 'tde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: kodo-trinity
 Architecture: any
@@ -120,8 +120,8 @@ Description: mouse odometer for Trinity
  pointer across your desktop and renders it in inches/feet/miles! It can
  do cm/metres/km too. Its most exciting feature is the tripometer.
  .
- This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE toys module.
+ See the 'tde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: kteatime-trinity
 Architecture: any
@@ -140,11 +140,11 @@ Description: Trinity utility for making a fine cup of tea
  KTeaTime sits in the Trinity system tray.
  .
  Please note that KTeaTime is written explicitly for Trinity. If you are
- using a non-KDE window manager or desktop environment then it is quite
+ using a non-TDE window manager or desktop environment then it is quite
  possible that KTeaTime will not work on your system.
  .
- This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE toys module.
+ See the 'tde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: ktux-trinity
 Architecture: any
@@ -155,10 +155,10 @@ Depends: ${shlibs:Depends}
 Suggests: twin-trinity
 Conflicts: task-tdetoys-trinity
 Description: Tux screensaver for Trinity
- A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE).
+ A neat Tux-in-a-spaceship screensaver for the Trinity Desktop Environment (TDE).
  .
- This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE toys module.
+ See the 'tde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: kweather-trinity
 Architecture: any
@@ -169,7 +169,7 @@ Depends: ${shlibs:Depends}
 Recommends: kicker-trinity
 Suggests: khelpcenter-trinity
 Description: weather display applet for Trinity
- An applet for the KDE panel that displays your area's current weather.
+ An applet for the TDE panel that displays your area's current weather.
  Information shown includes the temperature, wind speed, air pressure
  and more. By pressing a button a full weather report can be obtained.
  .
@@ -177,8 +177,8 @@ Description: weather display applet for Trinity
  stations and provide this information to other applications, including
  Konqueror's sidebar and Kontact's summary page.
  .
- This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE toys module.
+ See the 'tde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: kworldclock-trinity
 Architecture: any
@@ -192,13 +192,13 @@ Provides: kworldwatch-trinity
 Description: earth watcher for Trinity
  Displays where in the world it is light and dark depending on time, as
  well as offering the time in all of the major cities of the world.
- This can be run standalone, as an applet in the KDE panel or as a
+ This can be run standalone, as an applet in the TDE panel or as a
  desktop background.
  .
  Additional kworldclock themes are available in the tdeartwork-misc package.
  .
- This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE toys module.
+ See the 'tde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: tdetoys-trinity-dbg
 Section: libdevel
diff --git a/debian/lenny/tdetoys/debian/control.in b/debian/lenny/tdetoys/debian/control.in
index 62da248a9..fa01c0f9a 100644
--- a/debian/lenny/tdetoys/debian/control.in
+++ b/debian/lenny/tdetoys/debian/control.in
@@ -12,33 +12,33 @@ Architecture: all
 Section: tde
 Depends: amor (>= ${Source-Version}), eyesapplet (>= ${Source-Version}), fifteenapplet (>= ${Source-Version}), kmoon (>= ${Source-Version}), kodo (>= ${Source-Version}), kteatime (>= ${Source-Version}), ktux (>= ${Source-Version}), kweather (>= ${Source-Version}), kworldclock (>= ${Source-Version})
 Suggests: tdetoys-doc-html (>= ${Source-Version})
-Description: toys from the official KDE release
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+Description: toys 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 toys and fun extras provided
- with the official release of KDE.
+ with the official release of TDE.
 
 Package: tdetoys-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror | www-browser, tdetoys
 Replaces: amor (<< 4:2.2.0-0), kmoon (<< 4:2.2.0-0), kodo (<< 4:2.2.0-0), kteatime (<< 4:2.2.0-0), kweather (<< 4:3.0.0-0), kworldclock (<< 4:2.2.0-0)
-Description: KDE toys 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 toys documentation converted to
+Description: TDE toys 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 toys 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/amor/. Documentation is provided for most
- KDE toys packages.
+ TDE toys packages.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: amor
 Architecture: any
@@ -48,15 +48,15 @@ Recommends: twin
 Suggests: khelpcenter
 Conflicts: task-tdetoys
 Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
-Description: a KDE creature for your desktop
+Description: a TDE creature for your desktop
  AMOR stands for Amusing Misuse Of Resources. It provides several different
  characters who prance around your X screen doing tricks and giving you tips.
  .
  Note that AMOR will only work with some window managers. Both KWin (the
- KDE window manager) and Metacity (a GTK2 window manager) are supported.
+ TDE window manager) and Metacity (a GTK2 window manager) are supported.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: eyesapplet
 Architecture: any
@@ -65,25 +65,25 @@ Depends: ${shlibs:Depends}
 Recommends: kicker
 Conflicts: task-tdetoys
 Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
-Description: eyes applet for KDE
- An applet for the KDE panel containing a pair of eyes that follow your mouse
+Description: eyes applet for TDE
+ An applet for the TDE panel containing a pair of eyes that follow your mouse
  around the screen.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: fifteenapplet
 Architecture: any
 Section: tde
 Depends: ${shlibs:Depends}
 Recommends: kicker
-Description: fifteen pieces puzzle for KDE
- An applet for the KDE panel that lets you play the Fifteen Pieces
+Description: fifteen pieces puzzle for TDE
+ An applet for the TDE panel that lets you play the Fifteen Pieces
  sliding block puzzle. You have to order 15 pieces in a 4x4 square by
  moving them around.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: kmoon
 Architecture: any
@@ -93,11 +93,11 @@ Recommends: kicker
 Suggests: khelpcenter
 Conflicts: task-tdetoys
 Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
-Description: moon phase indicator for KDE
- An applet for the KDE panel that displays the current phase of the moon.
+Description: moon phase indicator for TDE
+ An applet for the TDE panel that displays the current phase of the moon.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: kodo
 Architecture: any
@@ -106,13 +106,13 @@ Depends: ${shlibs:Depends}
 Suggests: khelpcenter
 Conflicts: task-tdetoys
 Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
-Description: mouse odometer for KDE
+Description: mouse odometer for TDE
  KOdometer measures your desktop mileage. It tracks the movement of your mouse
  pointer across your desktop and renders it in inches/feet/miles! It can
  do cm/metres/km too. Its most exciting feature is the tripometer.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: kteatime
 Architecture: any
@@ -121,20 +121,20 @@ Depends: ${shlibs:Depends}, kicker
 Suggests: khelpcenter
 Conflicts: task-tdetoys
 Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
-Description: KDE utility for making a fine cup of tea
+Description: TDE utility for making a fine cup of tea
  KTeaTime is a handy timer for steeping tea. No longer will you have to
  guess at how long it takes for your tea to be ready. Simply select the
  type of tea you have, and it will alert you when the tea is ready to
  drink.
  .
- KTeaTime sits in the KDE system tray.
+ KTeaTime sits in the TDE system tray.
  .
- Please note that KTeaTime is written explicitly for KDE. If you are
- using a non-KDE window manager or desktop environment then it is quite
+ Please note that KTeaTime is written explicitly for TDE. If you are
+ using a non-TDE window manager or desktop environment then it is quite
  possible that KTeaTime will not work on your system.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: ktux
 Architecture: any
@@ -143,11 +143,11 @@ Depends: ${shlibs:Depends}
 Suggests: twin
 Conflicts: task-tdetoys
 Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
-Description: Tux screensaver for KDE
- A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE).
+Description: Tux screensaver for TDE
+ A neat Tux-in-a-spaceship screensaver for the Trinity Desktop Environment (TDE).
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: kweather
 Architecture: any
@@ -155,8 +155,8 @@ Section: tde
 Depends: ${shlibs:Depends}
 Recommends: kicker
 Suggests: khelpcenter
-Description: weather display applet for KDE
- An applet for the KDE panel that displays your area's current weather.
+Description: weather display applet for TDE
+ An applet for the TDE panel that displays your area's current weather.
  Information shown includes the temperature, wind speed, air pressure
  and more. By pressing a button a full weather report can be obtained.
  .
@@ -164,8 +164,8 @@ Description: weather display applet for KDE
  stations and provide this information to other applications, including
  Konqueror's sidebar and Kontact's summary page.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: kworldclock
 Architecture: any
@@ -175,16 +175,16 @@ Suggests: tdeartwork-misc, kicker, kdesktop, khelpcenter
 Conflicts: task-tdetoys, kworldwatch (<= 4:2.2-beta1-1)
 Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys, kworldwatch (<= 4:2.2-beta1-1)
 Provides: kworldwatch
-Description: earth watcher for KDE
+Description: earth watcher for TDE
  Displays where in the world it is light and dark depending on time, as
  well as offering the time in all of the major cities of the world.
- This can be run standalone, as an applet in the KDE panel or as a
+ This can be run standalone, as an applet in the TDE panel or as a
  desktop background.
  .
  Additional kworldclock themes are available in the tdeartwork-misc package.
  .
- This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'tdetoys' packages for more information.
+ This package is part of TDE, and a component of the TDE toys module.
+ See the 'tde' and 'tdetoys' packages for more information.
 
 Package: tdetoys-dbg
 Section: libdevel
diff --git a/debian/lenny/tdetoys/debian/kmoon-trinity.README.Debian b/debian/lenny/tdetoys/debian/kmoon-trinity.README.Debian
index b57e946fe..ccd25e20e 100644
--- a/debian/lenny/tdetoys/debian/kmoon-trinity.README.Debian
+++ b/debian/lenny/tdetoys/debian/kmoon-trinity.README.Debian
@@ -1,7 +1,7 @@
 KMoon for Debian
 ----------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdetoys-doc-html.
 
diff --git a/debian/lenny/tdetoys/debian/kodo-trinity.README.Debian b/debian/lenny/tdetoys/debian/kodo-trinity.README.Debian
index 089f5e120..e79552248 100644
--- a/debian/lenny/tdetoys/debian/kodo-trinity.README.Debian
+++ b/debian/lenny/tdetoys/debian/kodo-trinity.README.Debian
@@ -1,7 +1,7 @@
 KOdometer for Debian
 --------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdetoys-doc-html.
 
diff --git a/debian/lenny/tdetoys/debian/kodo-trinity.menu b/debian/lenny/tdetoys/debian/kodo-trinity.menu
index f88e51917..f4e9ffc63 100644
--- a/debian/lenny/tdetoys/debian/kodo-trinity.menu
+++ b/debian/lenny/tdetoys/debian/kodo-trinity.menu
@@ -1,4 +1,4 @@
-?package(kodo):\
+?package(kodo-trinity):\
 	needs="x11"\
 	section="Games/Toys"\
 	hints="TDE"\
diff --git a/debian/lenny/tdetoys/debian/kteatime-trinity.README.Debian b/debian/lenny/tdetoys/debian/kteatime-trinity.README.Debian
index 36dae62f2..5a1d210a8 100644
--- a/debian/lenny/tdetoys/debian/kteatime-trinity.README.Debian
+++ b/debian/lenny/tdetoys/debian/kteatime-trinity.README.Debian
@@ -1,15 +1,15 @@
 KTeaTime for Debian
 -------------------
 
-Non-KDE Users:
+Non-TDE Users:
 
-  Please note that KTeaTime is written explicitly for KDE.  If you are
-  using a non-KDE window manager or desktop environment then it is quite
+  Please note that KTeaTime is written explicitly for TDE.  If you are
+  using a non-TDE window manager or desktop environment then it is quite
   possible that KTeaTime will not work on your system.
 
 HTML Documentation:
 
-  This application provides documentation in a docbook format that the KDE
+  This application provides documentation in a docbook format that the TDE
   Help Centre can display.  For HTML documentation that can be read in any
   web browser, see the package tdetoys-doc-html.
 
diff --git a/debian/lenny/tdetoys/debian/kteatime-trinity.menu b/debian/lenny/tdetoys/debian/kteatime-trinity.menu
index f844129b5..14846163d 100644
--- a/debian/lenny/tdetoys/debian/kteatime-trinity.menu
+++ b/debian/lenny/tdetoys/debian/kteatime-trinity.menu
@@ -1,4 +1,4 @@
-?package(kteatime):\
+?package(kteatime-trinity):\
 	needs="x11"\
 	section="Games/Toys"\
 	hints="TDE"\
diff --git a/debian/lenny/tdetoys/debian/ktux-trinity.menu b/debian/lenny/tdetoys/debian/ktux-trinity.menu
index ce6d524ee..bac06eccf 100644
--- a/debian/lenny/tdetoys/debian/ktux-trinity.menu
+++ b/debian/lenny/tdetoys/debian/ktux-trinity.menu
@@ -1,4 +1,4 @@
-?package(ktux):\
+?package(ktux-trinity):\
 	needs="x11"\
 	section="Screen/Saving"\
 	hints="TDE"\
diff --git a/debian/lenny/tdetoys/debian/kweather-trinity.README.Debian b/debian/lenny/tdetoys/debian/kweather-trinity.README.Debian
index 466b880d0..c4fa8f41b 100644
--- a/debian/lenny/tdetoys/debian/kweather-trinity.README.Debian
+++ b/debian/lenny/tdetoys/debian/kweather-trinity.README.Debian
@@ -1,7 +1,7 @@
 KWeather for Debian
 -------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdetoys-doc-html.
 
diff --git a/debian/lenny/tdetoys/debian/kworldclock-trinity.README.Debian b/debian/lenny/tdetoys/debian/kworldclock-trinity.README.Debian
index e1ffc4599..fad42290f 100644
--- a/debian/lenny/tdetoys/debian/kworldclock-trinity.README.Debian
+++ b/debian/lenny/tdetoys/debian/kworldclock-trinity.README.Debian
@@ -1,7 +1,7 @@
 KWorldClock for Debian
 ----------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdetoys-doc-html.
 
diff --git a/debian/lenny/tdetoys/debian/kworldclock-trinity.menu b/debian/lenny/tdetoys/debian/kworldclock-trinity.menu
index e80de7941..2ddfdeb7e 100644
--- a/debian/lenny/tdetoys/debian/kworldclock-trinity.menu
+++ b/debian/lenny/tdetoys/debian/kworldclock-trinity.menu
@@ -1,4 +1,4 @@
-?package(kworldclock):\
+?package(kworldclock-trinity):\
 	needs="x11"\
 	section="Games/Toys"\
 	hints="TDE"\
diff --git a/debian/lenny/tdetoys/debian/man/amor-trinity.1 b/debian/lenny/tdetoys/debian/man/amor-trinity.1
index 66dc790e4..f74abf34c 100644
--- a/debian/lenny/tdetoys/debian/man/amor-trinity.1
+++ b/debian/lenny/tdetoys/debian/man/amor-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-amor \- a KDE creature for your desktop
+amor \- a TDE creature for your desktop
 .SH SYNOPSIS
 .B amor
 .RI "[ " generic-options " ]"
@@ -25,21 +25,21 @@ amor \- a KDE creature for your desktop
 characters who prance around your X screen doing tricks and
 giving you tips.
 .PP
-Note AMOR will only work with some window managers.  Both KWin (the KDE
+Note AMOR will only work with some window managers.  Both KWin (the TDE
 window manager) and Metacity (a GTK2 window manager) are supported.
 .PP
-This program is part of the official KDE toys module.
+This program is part of the official TDE toys module.
 .SH OPTIONS
 For a full summary of options, run \fIamor \-\-help\fP.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/amor/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/amor/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdetoys-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/amor/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdetoys/debian/man/kodo-trinity.1 b/debian/lenny/tdetoys/debian/man/kodo-trinity.1
index eba9c14e2..ae14d9fca 100644
--- a/debian/lenny/tdetoys/debian/man/kodo-trinity.1
+++ b/debian/lenny/tdetoys/debian/man/kodo-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kodo \- mouse odometer for KDE
+kodo \- mouse odometer for TDE
 .SH SYNOPSIS
 .B kodo
 .RI "[ " generic-options " ]"
@@ -26,18 +26,18 @@ your mouse pointer across your desktop and renders it in
 inches/feet/miles!  It can do cm/metres/km too.  Its most exciting
 feature is the tripometer, and its utter uselessness.
 .PP
-This program is part of the official KDE toys module.
+This program is part of the official TDE toys module.
 .SH OPTIONS
 For a full summary of options, run \fIkodo \-\-help\fP.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kodo/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kodo/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdetoys-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kodo/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdetoys/debian/man/kteatime-trinity.1 b/debian/lenny/tdetoys/debian/man/kteatime-trinity.1
index 5b6e37965..a6fe145a3 100644
--- a/debian/lenny/tdetoys/debian/man/kteatime-trinity.1
+++ b/debian/lenny/tdetoys/debian/man/kteatime-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kteatime \- KDE utility for making a fine cup of tea
+kteatime \- TDE utility for making a fine cup of tea
 .SH SYNOPSIS
 .B kteatime
 .RI "[ " generic-options " ]"
@@ -25,20 +25,20 @@ kteatime \- KDE utility for making a fine cup of tea
 guess at how long it takes for your tea to be ready.  Simply select the
 type of tea you have, and it will alert you when the tea is ready to drink.
 .PP
-KTeaTime sits in the KDE system tray.
+KTeaTime sits in the TDE system tray.
 .PP
-This program is part of the official KDE toys module.
+This program is part of the official TDE toys module.
 .SH OPTIONS
 For a full summary of options, run \fIkteatime \-\-help\fP.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kteatime/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kteatime/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdetoys-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kteatime/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdetoys/debian/man/ktux-trinity.1 b/debian/lenny/tdetoys/debian/man/ktux-trinity.1
index bb26dc867..3a1789786 100644
--- a/debian/lenny/tdetoys/debian/man/ktux-trinity.1
+++ b/debian/lenny/tdetoys/debian/man/ktux-trinity.1
@@ -16,16 +16,16 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-ktux \- Tux screen saver for KDE
+ktux \- Tux screen saver for TDE
 .SH SYNOPSIS
 .B ktux
 .RI "[ " generic-options " ]"
 [ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
 \fB\-\-demo\fP ]
 .SH DESCRIPTION
-\fBKTux\fP is a neat Tux screen saver for the K Desktop Environment (KDE).
+\fBKTux\fP is a neat Tux screen saver for the Trinity Desktop Environment (TDE).
 .PP
-This program is part of the official KDE toys module.
+This program is part of the official TDE toys module.
 .SH OPTIONS
 Below are the ktux-specific options.
 For a full summary of options, run \fIktux \-\-help\fP.
diff --git a/debian/lenny/tdetoys/debian/man/kweatherreport-trinity.1 b/debian/lenny/tdetoys/debian/man/kweatherreport-trinity.1
index e607a59c0..1b76019f7 100644
--- a/debian/lenny/tdetoys/debian/man/kweatherreport-trinity.1
+++ b/debian/lenny/tdetoys/debian/man/kweatherreport-trinity.1
@@ -30,7 +30,7 @@ stations to provide weather data.  There is no need to start
 KWeatherService separately; kweatherreport will start the service
 itself if needed.
 .PP
-This program is part of the official KDE toys module.
+This program is part of the official TDE toys module.
 .SH OPTIONS
 Below are the kweather-specific options.
 For a full summary of options, run \fIkweatherreport \-\-help\fP.
@@ -40,12 +40,12 @@ The METAR location code for the weather station to display.
 .SH SEE ALSO
 .BR kweatherservice (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL \fIhelp:/kweather/\fP
 directly into konqueror or you can run `\fIkhelpcenter help:/kweather/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdetoys-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kweather/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdetoys/debian/man/kweatherservice-trinity.1 b/debian/lenny/tdetoys/debian/man/kweatherservice-trinity.1
index 59c3ef33a..c8dd85af9 100644
--- a/debian/lenny/tdetoys/debian/man/kweatherservice-trinity.1
+++ b/debian/lenny/tdetoys/debian/man/kweatherservice-trinity.1
@@ -23,7 +23,7 @@ kweatherservice \- a DCOP service to provide weather data
 .SH DESCRIPTION
 \fBKWeatherService\fP is a DCOP service that can track multiple weather
 stations and provide this weather data to other applications.  It is
-used by the \fBKWeather\fP applet for the KDE panel, by the
+used by the \fBKWeather\fP applet for the TDE panel, by the
 \fBkweatherreport\fP application and by weather plugins for other
 applications such as \fBKonqueror\fP and \fBKontact\fP.
 .PP
@@ -31,18 +31,18 @@ This program is for KWeather's internal use and should not be
 run directly.  To obtain a weather report, use the KWeather panel applet or
 run kweatherreport instead.
 .PP
-This program is part of the official KDE toys module.
+This program is part of the official TDE toys module.
 .SH OPTIONS
 For a full summary of options, run \fIkweatherservice \-\-help\fP.
 .SH SEE ALSO
 .BR kweatherreport (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL \fIhelp:/kweather/\fP
 directly into konqueror or you can run `\fIkhelpcenter help:/kweather/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdetoys-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kweather/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdetoys/debian/man/kworldclock-trinity.1 b/debian/lenny/tdetoys/debian/man/kworldclock-trinity.1
index 4cea81146..bf0257218 100644
--- a/debian/lenny/tdetoys/debian/man/kworldclock-trinity.1
+++ b/debian/lenny/tdetoys/debian/man/kworldclock-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kworldclock \- earth watcher for KDE
+kworldclock \- earth watcher for TDE
 .SH SYNOPSIS
 .B kworldclock
 .RI "[ " generic-options " ]"
@@ -30,9 +30,9 @@ kworldclock \- earth watcher for KDE
 \fBKWorldClock\fP displays where in the world it is light and dark
 depending on time, as well as offering the time in all of the major
 cities of the world.  This can be run standalone, as an applet in the
-KDE panel or as a desktop background.
+TDE panel or as a desktop background.
 .PP
-This program is part of the official KDE toys module.
+This program is part of the official TDE toys module.
 .SH OPTIONS
 Below are the kworldclock-specific options.
 For a full summary of options, run \fIkworldclock \-\-help\fP.
@@ -52,14 +52,14 @@ The name of the file to write to for a map dump (default: dump.ppm).
 \fB\-\-size\fP\ \fIW\fP\fBx\fP\fIH\fP
 The size of the map to dump.
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kworldclock/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kworldclock/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdetoys-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kworldclock/\fP.
 .SH AUTHOR
diff --git a/debian/lenny/tdetoys/debian/tdetoys-doc-html.doc-base.kteatime b/debian/lenny/tdetoys/debian/tdetoys-doc-html.doc-base.kteatime
index 0b3e3f7bf..98856674c 100644
--- a/debian/lenny/tdetoys/debian/tdetoys-doc-html.doc-base.kteatime
+++ b/debian/lenny/tdetoys/debian/tdetoys-doc-html.doc-base.kteatime
@@ -1,7 +1,7 @@
 Document: tdetoys-doc-html-kteatime
 Title: KTeaTime Handbook
 Author: Michael Korman <michael.korman@uconn.edu>
-Abstract: This Handbook describes KTeaTime, the KDE Tea Cooker.
+Abstract: This Handbook describes KTeaTime, the TDE Tea Cooker.
 Section: Games/Toys
 
 Format: HTML
diff --git a/debian/lenny/tdetoys/debian/tdetoys-trinity.README.Debian b/debian/lenny/tdetoys/debian/tdetoys-trinity.README.Debian
index 35fef25d1..564c3d11e 100644
--- a/debian/lenny/tdetoys/debian/tdetoys-trinity.README.Debian
+++ b/debian/lenny/tdetoys/debian/tdetoys-trinity.README.Debian
@@ -1,10 +1,10 @@
-KDE Toys for Debian
+TDE Toys for Debian
 -------------------
 
 Package tdetoys is a metapackage that depends on the full set of toys
-provided with the official release of KDE.
+provided with the official release of TDE.
 
-Each application provides documentation in a docbook format that the KDE
+Each application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdetoys-doc-html.