Rename a bunch of kde names to tde

111 files changed, 431 insertions, 431 deletions

diff --git a/debian/lenny/tdeedu/debian/blinken-trinity.README.Debian b/debian/lenny/tdeedu/debian/blinken-trinity.README.Debian
index 987b4e48b..2301e6877 100644
--- a/debian/lenny/tdeedu/debian/blinken-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/blinken-trinity.README.Debian
@@ -3,7 +3,7 @@ Blinken for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
 The package recommends kcontrol, which contains a plugin needed to
 install a custom font used by the game the first time a user runs it.
diff --git a/debian/lenny/tdeedu/debian/blinken-trinity.docs b/debian/lenny/tdeedu/debian/blinken-trinity.docs
index e1c76b889..8fce6fbad 100644
--- a/debian/lenny/tdeedu/debian/blinken-trinity.docs
+++ b/debian/lenny/tdeedu/debian/blinken-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/blinken/AUTHORS
-build-tree/kdeedu-*/blinken/README.packagers
+build-tree/tdeedu-*/blinken/AUTHORS
+build-tree/tdeedu-*/blinken/README.packagers
diff --git a/debian/lenny/tdeedu/debian/changelog b/debian/lenny/tdeedu/debian/changelog
index c2bf5435e..4850c6255 100644
--- a/debian/lenny/tdeedu/debian/changelog
+++ b/debian/lenny/tdeedu/debian/changelog
@@ -1,63 +1,63 @@
-kdeedu-trinity (4:3.5.10-0ubuntu5) karmic; urgency=low
+tdeedu-trinity (4:3.5.10-0ubuntu5) karmic; urgency=low
 
   * Karmic rebuild number 2
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 13 Dec 2009 01:19:00 -0600
 
-kdeedu-trinity (4:3.5.10-0ubuntu4) karmic; urgency=low
+tdeedu-trinity (4:3.5.10-0ubuntu4) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdeedu-trinity (4:3.5.10-0ubuntu1~intrepid4) intrepid; urgency=low
+tdeedu-trinity (4:3.5.10-0ubuntu1~intrepid4) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 17:24:00 -0600
 
-kdeedu-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
+tdeedu-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
   * SVN Import
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 29 Sep 2008 15:17:00 -0600
 
-kdeedu (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdeedu (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
-    - Bump version of kdelibs4-dev build-dep to 3.5.10
+    - Bump version of tdelibs4-dev build-dep to 3.5.10
     - Drop usr/bin/test_extdate and usr/bin/test_extdatepicker from
-      debian/libkdeedu-dev.install
+      debian/libtdeedu-dev.install
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:41:56 -0400
 
-kdeedu (4:3.5.9-0ubuntu2) hardy; urgency=low
+tdeedu (4:3.5.9-0ubuntu2) hardy; urgency=low
 
   * Fix overwrite, kalzium-data conflicts/replaces old kalzium
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 18 Mar 2008 20:41:48 +0000
 
-kdeedu (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdeedu (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:06 +0000
 
-kdeedu (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdeedu (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 10:45:18 +0000
 
-kdeedu (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdeedu (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining change:
    - No omcal build-dep
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:43 +0000
 
-kdeedu (4:3.5.8-1) unstable; urgency=low
+tdeedu (4:3.5.8-1) unstable; urgency=low
 
   * New upstream release.
     + Patches: remove 11_kig+boost_autoconf_check, merged upstream.
@@ -68,19 +68,19 @@ kdeedu (4:3.5.8-1) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 16 Oct 2007 16:19:11 +0200
 
-kdeedu (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdeedu (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:25 +0100
 
-kdeedu (4:3.5.7-1ubuntu2) gutsy; urgency=low
+tdeedu (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
   * Rebuild for boost 1.34.0 -> 1.34.1 transistion.
 
  -- Steve Kowalik <stevenk@ubuntu.com>  Thu, 13 Sep 2007 11:06:00 +1000
 
-kdeedu (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdeedu (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * New Upstream Version
   * Modify Maintainer value to match Debian-Maintainer-Field Spec
@@ -88,7 +88,7 @@ kdeedu (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 23 May 2007 12:49:14 +1000
 
-kdeedu (4:3.5.7-1) unstable; urgency=low
+tdeedu (4:3.5.7-1) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -101,35 +101,35 @@ kdeedu (4:3.5.7-1) unstable; urgency=low
 
   +++ Changes by Daniel Schepler:
 
-  * debian/control: Add kgeography to the kdeedu metapackage.
+  * debian/control: Add kgeography to the tdeedu metapackage.
 
  -- Sune Vuorela <debian@pusling.com>  Wed, 16 May 2007 12:29:33 +0200
 
-kdeedu (4:3.5.6-3ubuntu1) gutsy; urgency=low
+tdeedu (4:3.5.6-3ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 20:32:54 +0100
 
-kdeedu (4:3.5.6-3) unstable; urgency=low
+tdeedu (4:3.5.6-3) unstable; urgency=low
 
   +++ Changes by Daniel Schepler:
 
-  * debian/control: Add kgeography to the kdeedu metapackage.
+  * debian/control: Add kgeography to the tdeedu metapackage.
 
  -- Daniel Schepler <schepler@debian.org>  Tue, 24 Apr 2007 22:37:43 -0400
 
-kdeedu (4:3.5.6-2) unstable; urgency=low
+tdeedu (4:3.5.6-2) unstable; urgency=low
 
   * Upload to unstable after Etch release.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 18 Apr 2007 17:06:10 +0100
 
-kdeedu (4:3.5.6-1) experimental; urgency=low
+tdeedu (4:3.5.6-1) experimental; urgency=low
 
   * New upstream version.
     - fixes typo in Hercules constellation in kstars. (Closes: #395849)
-  * Make kdeedu-dbg depend on kdelibs-dbg to get useful backtraces when
+  * Make tdeedu-dbg depend on tdelibs-dbg to get useful backtraces when
     debugging.
 
   +++ Changes by Sune Vuorela:
@@ -144,7 +144,7 @@ kdeedu (4:3.5.6-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 20 Jan 2007 16:55:45 +0100
 
-kdeedu (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdeedu (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
   * Remove 12_fr_keyboard.diff
@@ -152,27 +152,27 @@ kdeedu (4:3.5.6-0ubuntu1) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:30 +0000
 
-kdeedu (4:3.5.5-1ubuntu3) feisty; urgency=low
+tdeedu (4:3.5.5-1ubuntu3) feisty; urgency=low
 
   * Rebuild for python2.5.
   * Teach kig about python2.5.
 
  -- Matthias Klose <doko@ubuntu.com>  Mon, 15 Jan 2007 00:57:51 +0000
 
-kdeedu (4:3.5.5-1ubuntu2) feisty; urgency=low
+tdeedu (4:3.5.5-1ubuntu2) feisty; urgency=low
 
   * Up the replaces on indi of kstars to fix https://launchpad.net/bugs/78964
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 14 Jan 2007 12:49:44 +0000
 
-kdeedu (4:3.5.5-1ubuntu1) feisty; urgency=low
+tdeedu (4:3.5.5-1ubuntu1) feisty; urgency=low
 
   * Merge with Debian
   * Compile with --enable-gcc-hidden-visibility
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 20:14:40 +0000
 
-kdeedu (4:3.5.5-1) unstable; urgency=low
+tdeedu (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
   * Remove obsolete Recommends: kcontrol, along with the accompanying
@@ -181,7 +181,7 @@ kdeedu (4:3.5.5-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sun,  8 Oct 2006 14:26:21 +0200
 
-kdeedu (4:3.5.4-2) unstable; urgency=low
+tdeedu (4:3.5.4-2) unstable; urgency=low
 
   * KDE_3_5_BRANCH update (up to r577498).
 
@@ -191,7 +191,7 @@ kdeedu (4:3.5.4-2) unstable; urgency=low
     package descriptions, sync debian-qt-kde.mk and other CDBS
     stuff (should help building on slow architectures).
 
-  * Rather than having packages recommend kdeedu-data, just depend
+  * Rather than having packages recommend tdeedu-data, just depend
     on it.
 
   * Apply the still-relevant kstars/indi part of the kFreeBSD build
@@ -209,7 +209,7 @@ kdeedu (4:3.5.4-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 26 Aug 2006 17:07:38 -0400
 
-kdeedu (4:3.5.4-1) unstable; urgency=low
+tdeedu (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
     + Fixes detection of autoconf 2.60.  Closes: #379817.
@@ -217,47 +217,47 @@ kdeedu (4:3.5.4-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sat, 29 Jul 2006 13:21:27 -0400
 
-kdeedu (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdeedu (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:07 +0000
 
-kdeedu (4:3.5.4-0ubuntu4) edgy; urgency=low
+tdeedu (4:3.5.4-0ubuntu4) edgy; urgency=low
 
   * Rebuild with latest cdbs to add gettext domain to .desktop files for
     langpacks-desktopfiles-kde, no source changes
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Sep 2006 22:53:10 +0000
 
-kdeedu (4:3.5.4-0ubuntu3) edgy; urgency=low
+tdeedu (4:3.5.4-0ubuntu3) edgy; urgency=low
 
   * Add kalzium-data Replaces: kalzium (<< 4:3.5.4)
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  1 Aug 2006 15:15:09 +0000
 
-kdeedu (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdeedu (4:3.5.4-0ubuntu2) edgy; urgency=low
 
   * Remove 30_libtool.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 30 Jul 2006 16:15:24 +0100
 
-kdeedu (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdeedu (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:18 +0000
 
-kdeedu (4:3.5.3-0ubuntu1) edgy; urgency=low
+tdeedu (4:3.5.3-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Oliver Grawert <ogra@ubuntu.com>  Mon, 03 Jul 2006 19:57:21 +0100
 
-kdeedu (4:3.5.2-1) unstable; urgency=low
+tdeedu (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
-  * Add blinken to kdeedu dependencies.
+  * Add blinken to tdeedu dependencies.
   * Remove copy of steve.ttf from blinken, and instead depend on
     the new ttf-sjfonts package.  Closes: #344377.
   * Do the same for khangman: remove the copies of Domestic_Manners.ttf
@@ -265,64 +265,64 @@ kdeedu (4:3.5.2-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Wed, 29 Mar 2006 21:31:41 +0200
 
-kdeedu (4:3.5.2-0ubuntu9) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu9) dapper; urgency=low
 
   * debian/rules:
     - added dh_iconcache.
 
  -- Daniel Holbach <daniel.holbach@ubuntu.com>  Thu, 18 May 2006 15:16:34 +0200
 
-kdeedu (4:3.5.2-0ubuntu8) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu8) dapper; urgency=low
 
   * Add EXTRACTATTR to .pot generation rule
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  9 May 2006 18:31:07 +0300
 
-kdeedu (4:3.5.2-0ubuntu7) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu7) dapper; urgency=low
 
   * Add build-dep on gawk so that kstars.pot gets generated
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  9 May 2006 17:42:58 +0300
 
-kdeedu (4:3.5.2-0ubuntu6) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu6) dapper; urgency=low
 
-  * Remove html docs in kanagram, they are in kdeedu-doc-html.
-  * Move kgeography html docs to kdeedu-doc-html. 
+  * Remove html docs in kanagram, they are in tdeedu-doc-html.
+  * Move kgeography html docs to tdeedu-doc-html. 
 
  -- Frode M. Doeving <frode@lnix.net>  Tue,  2 May 2006 18:41:09 +0200
 
-kdeedu (4:3.5.2-0ubuntu5) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu5) dapper; urgency=low
 
   * Make kgeorgraphy Replaces kgeography-data, closes Malone #42192
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  1 May 2006 17:20:59 +0100
 
-kdeedu (4:3.5.2-0ubuntu4) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu4) dapper; urgency=low
 
-  * Remove references in debian/kdeedu-doc-html* to KMessedwords,
+  * Remove references in debian/tdeedu-doc-html* to KMessedwords,
     now Kanagram, Closes Malone #30732
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 28 Apr 2006 16:25:37 +0100
 
-kdeedu (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Updated debian/rules to install docs for the correct list of packages
 
  -- Frode M. Doeving <frode@lnix.net>  Wed, 26 Apr 2006 19:11:21 +0200
 
-kdeedu (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu2) dapper; urgency=low
 
   * Edit debian/rules to mark .po files as UTF-8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Apr 2006 19:11:11 +0100
 
-kdeedu (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:28 +0000
 
-kdeedu (4:3.5.1-1) unstable; urgency=low
+tdeedu (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
   * Adjust dependencies on *-data to be binNMU-safe.
@@ -334,41 +334,41 @@ kdeedu (4:3.5.1-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Thu,  2 Feb 2006 09:49:13 +0100
 
-kdeedu (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdeedu (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:06 +0000
 
-kdeedu (4:3.5.0-4) unstable; urgency=low
+tdeedu (4:3.5.0-4) unstable; urgency=low
 
-  * New package: kdeedu-dbg, to make debugging symbols available.
+  * New package: tdeedu-dbg, to make debugging symbols available.
   * Include uuencoded tar file of binary files changed on branch.
   * Rebuild against boost 1.33.1.
 
  -- Daniel Schepler <schepler@debian.org>  Tue, 17 Jan 2006 09:44:35 +0100
 
-kdeedu (4:3.5.0-3) unstable; urgency=low
+tdeedu (4:3.5.0-3) unstable; urgency=low
 
   * Upload to unstable.
   * No longer build with g++-3.4 on any architecture, since g++-4.0
     should be fixed.
   * Update to SVN branches/KDE/3.5, up to revision 496050.
-  * Tighten versioning of Build-Depends on kdelibs4-dev.  Closes: #344765.
+  * Tighten versioning of Build-Depends on tdelibs4-dev.  Closes: #344765.
 
  -- Daniel Schepler <schepler@debian.org>  Mon,  9 Jan 2006 22:39:22 +0100
 
-kdeedu (4:3.5.0-2) experimental; urgency=low
+tdeedu (4:3.5.0-2) experimental; urgency=low
 
   * Upload to experimental.
 
  -- Daniel Schepler <schepler@debian.org>  Tue, 20 Dec 2005 10:47:44 +0100
 
-kdeedu (4:3.5.0-1) alioth; urgency=low
+tdeedu (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
   * Rename package kmessedwords to kanagram.
-  * Rename libkdeedu1 to libkdeedu3 due to SONAME change of libkdeeduui.
+  * Rename libtdeedu1 to libtdeedu3 due to SONAME change of libtdeeduui.
   * New packages: blinken, kgeography, kgeography-data.
   * New split-off data package: kalzium-data.
   * Regenerate all Debian menu icons, since several of the upstream icons
@@ -376,20 +376,20 @@ kdeedu (4:3.5.0-1) alioth; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Wed, 14 Dec 2005 00:31:49 +0100
 
-kdeedu (4:3.5.0-0ubuntu2) dapper; urgency=low
+tdeedu (4:3.5.0-0ubuntu2) dapper; urgency=low
 
   * rebuild for new libboost 
 
  -- Oliver Grawert <ogra@ubuntu.com>  Fri, 13 Jan 2006 15:31:57 +0100
 
-kdeedu (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdeedu (4:3.5.0-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Remove GCC 3.4 on hppa
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Dec 2005 12:27:39 +0000
 
-kdeedu (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdeedu (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Generate .pot files
@@ -397,27 +397,27 @@ kdeedu (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 19:43:59 +0000
 
-kdeedu (4:3.5-rc1-0ubuntu1) dapper; urgency=low
+tdeedu (4:3.5-rc1-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * kmessedwords replaced with kanagram
-  * libkdeedu1 becomes libkdeedu3
+  * libtdeedu1 becomes libtdeedu3
   * New packages kgeography, blinken
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 13 Nov 2005 20:53:20 +0000
 
-kdeedu (4:3.4.3-2) unstable; urgency=low
+tdeedu (4:3.4.3-2) unstable; urgency=low
 
   * New maintainer: I'll be the primary maintainer although I'm listing
     the Debian QT/KDE group as the official maintainer.  Thanks to
     Ben Burton for maintaining the package up until now.
   * Switch to CDBS.
   * Update Build-Depends to ensure getting c2a-transitioned versions of
-    kdelibs and boost-python.
+    tdelibs and boost-python.
 
  -- Daniel Schepler <schepler@debian.org>  Mon,  5 Dec 2005 21:25:51 +0100
 
-kdeedu (4:3.4.3-1) unstable; urgency=low
+tdeedu (4:3.4.3-1) unstable; urgency=low
 
   * New upstream release.
   * Changed Maintainer to Debian Qt/KDE Maintainers
@@ -425,25 +425,25 @@ kdeedu (4:3.4.3-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  3 Dec 2005 16:17:55 +0100
 
-kdeedu (4:3.4.2-2.1) unstable; urgency=low
+tdeedu (4:3.4.2-2.1) unstable; urgency=low
 
   * NMU
   * Use gcc-3.4 to build in arm, m68k and hppa, closes: #334986
 
  -- Isaac Clerencia <isaac@debian.org>  Fri, 21 Oct 2005 13:14:31 +0200
 
-kdeedu (4:3.4.2-2) unstable; urgency=low
+tdeedu (4:3.4.2-2) unstable; urgency=low
 
   * Built against libfam-dev, not libgamin-dev.
 
  -- Ben Burton <bab@debian.org>  Sun,  4 Sep 2005 10:58:17 +1000
 
-kdeedu (4:3.4.2-1) unstable; urgency=low
+tdeedu (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
   * First g++-4 upload to sid.
   * Adjusted build-dependencies and shlibs files for the C++ ABI transition.
-    Note that the libkdeedu1 and libkiten1 package names do not need to change.
+    Note that the libtdeedu1 and libkiten1 package names do not need to change.
   * Fixed tempfile handling in langen2kvtml, which is shipped in the kvoctrain
     package.  See the following URL for further information:
     - http://www.kde.org/info/security/advisory-20050815-1.txt
@@ -459,20 +459,20 @@ kdeedu (4:3.4.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Thu,  1 Sep 2005 09:04:24 +1000
 
-kdeedu (4:3.4.3-0ubuntu2) breezy; urgency=low
+tdeedu (4:3.4.3-0ubuntu2) breezy; urgency=low
 
   * Do not try to install missing man pages
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun,  9 Oct 2005 13:12:42 +0100
 
-kdeedu (4:3.4.3-0ubuntu1) breezy; urgency=low
+tdeedu (4:3.4.3-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Build with GCC 3.4 on hppa etc
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  7 Oct 2005 18:35:59 +0000
 
-kdeedu (4:3.4.2-0ubuntu4) breezy; urgency=low
+tdeedu (4:3.4.2-0ubuntu4) breezy; urgency=low
 
   * SECURITY UPDATE: fix insecure temporary file creation
   * The script uses known filenames in /tmp which allow an
@@ -486,40 +486,40 @@ kdeedu (4:3.4.2-0ubuntu4) breezy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 13 Aug 2005 12:35:52 +0000
 
-kdeedu (4:3.4.2-0ubuntu3) breezy; urgency=low
+tdeedu (4:3.4.2-0ubuntu3) breezy; urgency=low
 
   * last rebuild didnt work it seems...
     rebuild for new boost again to make kig installable in edubuntu
 
  -- Oliver Grawert <ogra@ubuntu.com>  Mon,  8 Aug 2005 12:08:34 +0200
 
-kdeedu (4:3.4.2-0ubuntu2) breezy; urgency=low
+tdeedu (4:3.4.2-0ubuntu2) breezy; urgency=low
 
   * Rebuild for new boost upload.
 
  -- Matthias Klose <doko@ubuntu.com>  Wed,  3 Aug 2005 23:24:48 +0200
 
-kdeedu (4:3.4.2-0ubuntu1) breezy; urgency=low
+tdeedu (4:3.4.2-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Build using unsermake
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 16:24:24 +0000
 
-kdeedu (4:3.4.1-0ubuntu1) breezy; urgency=low
+tdeedu (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number following KDE 3.4.1 release
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed,  1 Jun 2005 00:32:27 +0000
 
-kdeedu (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+tdeedu (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
 
   * New upstream release.
   * Sync with Debian.
 
  -- Jonathan Riddell <jr@jriddell.org>  Sat, 28 May 2005 19:08:44 +0000
 
-kdeedu (4:3.4.0-0pre2) unstable; urgency=low
+tdeedu (4:3.4.0-0pre2) unstable; urgency=low
 
   * Merge in recent packaging changes from the 3.3 branch.
   * Now that KDE has moved to subversion, disable cvs-clean in debian/rules
@@ -527,7 +527,7 @@ kdeedu (4:3.4.0-0pre2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 14 May 2005 19:20:58 +1000
 
-kdeedu (4:3.4.0-0pre1) unstable; urgency=low
+tdeedu (4:3.4.0-0pre1) unstable; urgency=low
 
   * New major upstream release.
   * New binary packages libkiten1 and libkiten-dev.
@@ -535,7 +535,7 @@ kdeedu (4:3.4.0-0pre1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Tue,  8 Mar 2005 07:43:35 +1100
 
-kdeedu (4:3.3.2-3) unstable; urgency=low
+tdeedu (4:3.3.2-3) unstable; urgency=low
 
   * Included the full GFDL text in debian/copyright, since all of the docbook
     documentation is under this license.
@@ -543,7 +543,7 @@ kdeedu (4:3.3.2-3) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 26 Mar 2005 10:15:48 +1100
 
-kdeedu (4:3.3.2-2) unstable; urgency=high
+tdeedu (4:3.3.2-2) unstable; urgency=high
 
   * Fixed buffer overflows in fliccd, one of the INDI drivers shipped with
     kstars (closes: #295499).  See the following URL for further information:
@@ -555,7 +555,7 @@ kdeedu (4:3.3.2-2) unstable; urgency=high
 
  -- Ben Burton <bab@debian.org>  Thu, 17 Feb 2005 07:53:09 +1100
 
-kdeedu (4:3.3.2-1) unstable; urgency=low
+tdeedu (4:3.3.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
   * The moon images are now licensed under the GPL (closes: #266404).
@@ -567,23 +567,23 @@ kdeedu (4:3.3.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun, 16 Jan 2005 20:45:11 +1100
 
-kdeedu (4:3.4.0-0ubuntu1) hoary; urgency=low
+tdeedu (4:3.4.0-0ubuntu1) hoary; urgency=low
 
-  * Add directory /opt/trinity/share/doc/kde/HTML/en/flashkard to kdeedu-doc-html
+  * Add directory /opt/trinity/share/doc/kde/HTML/en/flashkard to tdeedu-doc-html
     to prevent .dhelp problem.
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 18:35:25 +0000
 
-kdeedu (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+tdeedu (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
 
   * New upstream release
   * cleanup debian/patches dir
 
  -- Andreas Mueller <amu@ubuntu.com>  Wed,  9 Mar 2005 18:09:17 +0000
 
-kdeedu (4:3.3.2-1ubuntu2) hoary; urgency=low
+tdeedu (4:3.3.2-1ubuntu2) hoary; urgency=low
 
-  * SECURITY UPDATE: Buffer overflow in fliccd of kdeedu/kstars/indi
+  * SECURITY UPDATE: Buffer overflow in fliccd of tdeedu/kstars/indi
   * added 01-kstars-indi-fliccd-overflows.diff which fixes buffer overflows
   * References:
     CAN-2005-0011
@@ -591,26 +591,26 @@ kdeedu (4:3.3.2-1ubuntu2) hoary; urgency=low
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 17 Feb 2005 02:44:19 +0000
 
-kdeedu (4:3.3.2-1ubuntu1) hoary; urgency=low
+tdeedu (4:3.3.2-1ubuntu1) hoary; urgency=low
 
   * New upstream release.
 
  -- Andreas Mueller <amu@canonical.com>  Sun, 16 Jan 2005 03:38:05 +0100
 
-kdeedu (4:3.3.1-3) unstable; urgency=medium
+tdeedu (4:3.3.1-3) unstable; urgency=medium
 
   * Sigh.  Patched kstars platform tests for m68k.  This _really_ is
     every arch dealt with.
 
  -- Ben Burton <bab@debian.org>  Fri, 12 Nov 2004 07:39:04 +1100
 
-kdeedu (4:3.3.1-2) unstable; urgency=medium
+tdeedu (4:3.3.1-2) unstable; urgency=medium
 
   * Patched platform tests in kstars to include mips and mipsel.
 
  -- Ben Burton <bab@debian.org>  Wed, 10 Nov 2004 07:45:35 +1100
 
-kdeedu (4:3.3.1-1) unstable; urgency=medium
+tdeedu (4:3.3.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.
   * Platform tests in kstars code now expanded to include s390 and powerpc
@@ -626,40 +626,40 @@ kdeedu (4:3.3.1-1) unstable; urgency=medium
 
  -- Ben Burton <bab@debian.org>  Thu, 28 Oct 2004 08:35:18 +1000
 
-kdeedu (4:3.3.0-1) unstable; urgency=low
+tdeedu (4:3.3.0-1) unstable; urgency=low
 
   * New upstream release.
   * New binary packages klatin, kturtle and kwordquiz.
-  * Package flashkard is no longer shipped with kdeedu.
+  * Package flashkard is no longer shipped with tdeedu.
   * There is no longer a need to pull data out of the upstream tarball,
     since upstream no longer ships with the (non-free) Messier images.
-  * Made libkdeedu-dev depend on kdelibs4-dev.
+  * Made libtdeedu-dev depend on tdelibs4-dev.
   * KStars now shows borders between constellations (closes: #241930) and
     supports full-screen mode (closes: #219649).
   * KTouch now waits for a keypress before starting and also provides a
     pause button (closes: #129523).
-  * A little more documentation is now installed for libkdeedu-dev.
+  * A little more documentation is now installed for libtdeedu-dev.
 
  -- Ben Burton <bab@debian.org>  Sat, 16 Oct 2004 15:32:36 +1000
 
-kdeedu (4:3.2.3-2) unstable; urgency=low
+tdeedu (4:3.2.3-2) unstable; urgency=low
 
   * Disable kig scripting on arm while boost.python remains broken on
     that architecture.
 
  -- Ben Burton <bab@debian.org>  Sat, 17 Jul 2004 11:19:00 +1000
 
-kdeedu (4:3.2.3-1) unstable; urgency=low
+tdeedu (4:3.2.3-1) unstable; urgency=low
 
   * New upstream bugfix release.
   * Added manpages for KStars INDI server and device drivers.
-  * Suggests (konqueror | www-browser) for kdeedu-doc-html instead of
+  * Suggests (konqueror | www-browser) for tdeedu-doc-html instead of
     just www-browser.
   * Added debian/clean-sources to simplify removal of non-DFSG-free material.
 
  -- Ben Burton <bab@debian.org>  Sun, 20 Jun 2004 09:48:28 +1000
 
-kdeedu (4:3.2.2-1) unstable; urgency=low
+tdeedu (4:3.2.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
   * Built against Boost.Python 1.31.0, which in turn is built against
@@ -667,30 +667,30 @@ kdeedu (4:3.2.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Thu, 22 Apr 2004 18:15:48 +1000
 
-kdeedu (4:3.2.1-2) unstable; urgency=low
+tdeedu (4:3.2.1-2) unstable; urgency=low
 
   * Don't use Conflicts/Replaces where we should just use Replaces.
 
  -- Ben Burton <bab@debian.org>  Tue, 16 Mar 2004 09:15:01 +1100
 
-kdeedu (4:3.2.1-1) unstable; urgency=low
+tdeedu (4:3.2.1-1) unstable; urgency=low
 
   * First KDE 3.2 upload to sid.
 
  -- Ben Burton <bab@debian.org>  Sun,  7 Mar 2004 17:42:59 +1100
 
-kdeedu (4:3.2.0.1-1) experimental; urgency=low
+tdeedu (4:3.2.0.1-1) experimental; urgency=low
 
   * First KDE 3.2 upload to experimental.
   * Sync from KDE_3_2_BRANCH for recent bugfixes (this requires an upstream
     version change since some binary files have been updated).
   * Split kstars into kstars / kstars-data.
   * Split klettres into klettres / klettres-data.
-  * Using versioned dependencies for the kdeedu metapackage.
+  * Using versioned dependencies for the tdeedu metapackage.
 
  -- Ben Burton <bab@debian.org>  Mon, 23 Feb 2004 08:14:22 +1100
 
-kdeedu (4:3.2.0-1) unstable; urgency=low
+tdeedu (4:3.2.0-1) unstable; urgency=low
 
   * New upstream release.
   * Many thanks to Ralf Nolden for all his help with packaging KDE 3.2.
@@ -698,19 +698,19 @@ kdeedu (4:3.2.0-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
 
-kdeedu (4:3.1.5-2) unstable; urgency=low
+tdeedu (4:3.1.5-2) unstable; urgency=low
 
   * Building with -mieee on alpha to avoid kstars SIGFPE (closes: #226966).
 
  -- Ben Burton <bab@debian.org>  Tue, 20 Jan 2004 09:52:13 +1100
 
-kdeedu (4:3.1.5-1) unstable; urgency=low
+tdeedu (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <bab@debian.org>  Sun, 18 Jan 2004 12:55:12 +1100
 
-kdeedu (4:3.1.4-3) unstable; urgency=low
+tdeedu (4:3.1.4-3) unstable; urgency=low
 
   * Kiten recommends Japanese fonts (closes: #216440).
   * Kiten depends on edict and kanjidic instead of supplying its own
@@ -718,7 +718,7 @@ kdeedu (4:3.1.4-3) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun, 21 Dec 2003 20:03:28 +1100
 
-kdeedu (4:3.1.4-2) unstable; urgency=low
+tdeedu (4:3.1.4-2) unstable; urgency=low
 
   * New pull from BRANCH; includes bugfixes for kstars.
   * Fixed Saskatchewan time zones (closes: #206642).
@@ -726,7 +726,7 @@ kdeedu (4:3.1.4-2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Fri, 12 Dec 2003 11:02:33 +1100
 
-kdeedu (4:3.1.4-1) unstable; urgency=low
+tdeedu (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
   * Using the new debian_branch for kstars, which now uses the Hipparcos
@@ -741,7 +741,7 @@ kdeedu (4:3.1.4-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Mon, 13 Oct 2003 11:29:44 +1000
 
-kdeedu (4:3.1.2-1) unstable; urgency=low
+tdeedu (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
   * Libtool updated (closes: #194479).
@@ -752,20 +752,20 @@ kdeedu (4:3.1.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun,  1 Jun 2003 14:15:47 +1000
 
-kdeedu (4:3.1.1-1) unstable; urgency=low
+tdeedu (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release.
   * Removed alpha compile flags.
 
  -- Ben Burton <bab@debian.org>  Sun, 23 Mar 2003 15:23:23 +1100
 
-kdeedu (4:3.1.0-3) unstable; urgency=low
+tdeedu (4:3.1.0-3) unstable; urgency=low
 
   * Uses full paths in doc-base files instead of symlinks (closes: #180332).
 
  -- Ben Burton <bab@debian.org>  Tue, 11 Feb 2003 14:45:59 +1100
 
-kdeedu (4:3.1.0-2) unstable; urgency=low
+tdeedu (4:3.1.0-2) unstable; urgency=low
 
   * First Trinity upload to debian (closes: #119019).
   * Rolled the epoch to aid upgrades from the unofficial repository on
@@ -773,13 +773,13 @@ kdeedu (4:3.1.0-2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun,  2 Feb 2003 19:40:16 +1100
 
-kdeedu (3.1.0-1) unstable; urgency=low
+tdeedu (3.1.0-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <bab@debian.org>  Mon, 18 Nov 2002 14:15:59 +1100
 
-kdeedu (3.0.9-1) unstable; urgency=low
+tdeedu (3.0.9-1) unstable; urgency=low
 
   * New upstream release.
   * Built with g++-3.2.
@@ -787,7 +787,7 @@ kdeedu (3.0.9-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Tue, 22 Oct 2002 11:57:39 +1000
 
-kdeedu (3.0.8-1) unstable; urgency=low
+tdeedu (3.0.8-1) unstable; urgency=low
 
   * New upstream release.
   * Moved to Chris Cheney's style of debian/rules.
@@ -795,20 +795,20 @@ kdeedu (3.0.8-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sun, 22 Sep 2002 17:57:55 +1000
 
-kdeedu (3.0.3-1) unstable; urgency=low
+tdeedu (3.0.3-1) unstable; urgency=low
 
   * New upstream release.
   * Build-depends on automake1.5.
 
  -- Ben Burton <benb@acm.org>  Thu, 15 Aug 2002 13:22:22 +1000
 
-kdeedu (3.0.2-1) unstable; urgency=low
+tdeedu (3.0.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Thu,  4 Jul 2002 19:36:49 +1000
 
-kdeedu (3.0.1-1) unstable; urgency=low
+tdeedu (3.0.1-1) unstable; urgency=low
 
   * Initial Debian release (closes: Bug#119019).
 
diff --git a/debian/lenny/tdeedu/debian/control b/debian/lenny/tdeedu/debian/control
index 85fee7dc0..4f9345340 100644
--- a/debian/lenny/tdeedu/debian/control
+++ b/debian/lenny/tdeedu/debian/control
@@ -1,17 +1,17 @@
-Source: kdeedu-trinity
+Source: tdeedu-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: ocaml-nox, libfacile-ocaml-dev, libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libboost-python-dev (>= 1.33.1), libusb-dev, sharutils, doxygen, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: ocaml-nox, libfacile-ocaml-dev, libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libboost-python-dev (>= 1.33.1), libusb-dev, sharutils, doxygen, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kdeedu-trinity
+Package: tdeedu-trinity
 Architecture: all
 Section: kde
-Depends: blinken-trinity (>= ${Source-Version}), kalzium-trinity (>= ${Source-Version}), kanagram-trinity (>= ${Source-Version}), kbruch-trinity (>= ${Source-Version}), kdeedu-data-trinity (>= ${Source-Version}), keduca-trinity (>= ${Source-Version}), kgeography-trinity (>= ${Source-Version}), khangman-trinity (>= ${Source-Version}), kig-trinity (>= ${Source-Version}), kiten-trinity (>= ${Source-Version}), klatin-trinity (>= ${Source-Version}), klettres-trinity (>= ${Source-Version}), kmplot-trinity (>= ${Source-Version}), kpercentage-trinity (>= ${Source-Version}), kstars-trinity (>= ${Source-Version}), ktouch-trinity (>= ${Source-Version}), kturtle-trinity (>= ${Source-Version}), kverbos-trinity (>= ${Source-Version}), kvoctrain-trinity (>= ${Source-Version}), kwordquiz-trinity (>= ${Source-Version}), indi-trinity (>= ${Source-Version})
-Suggests: kdeedu-trinity-doc-html
+Depends: blinken-trinity (>= ${Source-Version}), kalzium-trinity (>= ${Source-Version}), kanagram-trinity (>= ${Source-Version}), kbruch-trinity (>= ${Source-Version}), tdeedu-data-trinity (>= ${Source-Version}), keduca-trinity (>= ${Source-Version}), kgeography-trinity (>= ${Source-Version}), khangman-trinity (>= ${Source-Version}), kig-trinity (>= ${Source-Version}), kiten-trinity (>= ${Source-Version}), klatin-trinity (>= ${Source-Version}), klettres-trinity (>= ${Source-Version}), kmplot-trinity (>= ${Source-Version}), kpercentage-trinity (>= ${Source-Version}), kstars-trinity (>= ${Source-Version}), ktouch-trinity (>= ${Source-Version}), kturtle-trinity (>= ${Source-Version}), kverbos-trinity (>= ${Source-Version}), kvoctrain-trinity (>= ${Source-Version}), kwordquiz-trinity (>= ${Source-Version}), indi-trinity (>= ${Source-Version})
+Suggests: tdeedu-trinity-doc-html
 Description: educational apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -21,7 +21,7 @@ Description: educational apps from the official Trinity release
  This metapackage includes educational applications provided with the
  official release of Trinity.
 
-Package: kdeedu-data-trinity
+Package: tdeedu-data-trinity
 Architecture: all
 Section: kde
 Description: shared data for Trinity educational applications
@@ -30,22 +30,22 @@ Description: shared data for Trinity educational applications
  Environment).
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
-Package: kdeedu-trinity-dbg
+Package: tdeedu-trinity-dbg
 Architecture: any
 Priority: extra
-Depends: kdelibs-trinity-dbg
+Depends: tdelibs-trinity-dbg
 Section: libdevel
-Description: debugging symbols for kdeedu-trinity
- This package contains the debugging symbols associated with kdeedu-trinity.
- They will automatically be used by gdb for debugging kdeedu-related
+Description: debugging symbols for tdeedu-trinity
+ This package contains the debugging symbols associated with tdeedu-trinity.
+ They will automatically be used by gdb for debugging tdeedu-related
  issues.
 
-Package: kdeedu-trinity-doc-html
+Package: tdeedu-trinity-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror-trinity | www-browser, kdeedu-trinity
+Suggests: konqueror-trinity | www-browser, tdeedu-trinity
 Description: Trinity edutainment documentation in HTML format
  By default the educational applications provided with KDE (the K
  Desktop Environment) only provide their documentation in KDE docbook
@@ -59,13 +59,13 @@ Description: Trinity edutainment documentation in HTML format
  most KDE educational packages.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: blinken-trinity
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, ttf-sjfonts, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, ttf-sjfonts, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: Trinity version of the Simon Says electronic memory game
  Blinken is based on an electronic game released in 1978, which
  challenges players to remember sequences of increasing length.  On
@@ -77,13 +77,13 @@ Description: Trinity version of the Simon Says electronic memory game
  sequence with one extra step is presented.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kalzium-trinity
 Architecture: any
 Section: science
-Depends: ${shlibs:Depends}, kalzium-data-trinity (>> ${KDE-Version3}), kalzium-data-trinity (<< ${KDE-Next-Version3}), kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, kalzium-data-trinity (>> ${KDE-Version3}), kalzium-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: chemistry teaching tool for Trinity
  Kalzium is a program which shows you the Periodic System of Elements
  (PSE).  You can use Kalzium to search for information about the
@@ -102,7 +102,7 @@ Description: chemistry teaching tool for Trinity
  equation solver.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kalzium-data-trinity
 Architecture: all
@@ -116,13 +116,13 @@ Description: data files for Kalzium
  See the kalzium package for further information.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kanagram-trinity
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: letter order game for Trinity
  KAnagram is a game that is based on the word/letter puzzles that the
  author played as a child.  A word is picked at random and displayed
@@ -137,38 +137,38 @@ Description: letter order game for Trinity
  is welcome to try.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kbruch-trinity
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: fraction calculation teaching tool for Trinity
  KBruch is a small program to practice calculating with fractions.
  Different exercises are provided for this purpose.  The program
  checks the user's input and gives feedback.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: keduca-trinity
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: interactive form-based tests for Trinity
  KEduca is a flash-card application which allows you to make
  interactive form-based tests.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kgeography-trinity
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kgeography-data-trinity (>> ${KDE-Version3}), kgeography-data-trinity (<< ${KDE-Next-Version3}), kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, kgeography-data-trinity (>> ${KDE-Version3}), kgeography-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: Geography learning tool for Trinity
  KGeography contains maps allowing you to learn various countries or
  the political divisions of several countries.  It has several modes,
@@ -176,7 +176,7 @@ Description: Geography learning tool for Trinity
  flags of the map divisions.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kgeography-data-trinity
 Architecture: all
@@ -189,13 +189,13 @@ Description: data files for KGeography
  See the kgeography package for further information.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: khangman-trinity
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, ttf-dustin, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: the classical hangman game for Trinity
  KHangMan is a game based on the well known hangman game.  It is aimed
  for children aged 6 and above.  It has four levels of difficulty:
@@ -207,13 +207,13 @@ Description: the classical hangman game for Trinity
  guess the word before getting hanged!  You have 10 tries.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kig-trinity
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: interactive geometry program for KDE
  Kig is an application for interactive geometry.  It is intended to
  serve two purposes:
@@ -233,13 +233,13 @@ Description: interactive geometry program for KDE
  KGeo, KSeg and XFig.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kiten-trinity
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3}), ttf-kochi-gothic | ttf-kochi-mincho
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}), ttf-kochi-gothic | ttf-kochi-mincho
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: Japanese reference/study tool for Trinity
  Kiten is a Japanese reference and study tool for KDE.  It is an
  application with multiple functions.  Firstly, it is a convenient
@@ -248,13 +248,13 @@ Description: Japanese reference/study tool for Trinity
  characters.  Thirdly, it is a tool to help you learn Kanji.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: klatin-trinity
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: application to help revise/teach Latin
  KLatin is a program to help revise Latin.  There are three "sections"
  in which different aspects of the language can be revised.  These are
@@ -271,13 +271,13 @@ Description: application to help revise/teach Latin
  indicative passive plural", and is not multiple choice.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: klettres-trinity
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, klettres-data-trinity (>> ${KDE-Version3}), klettres-data-trinity (<< ${KDE-Next-Version3}), kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, klettres-data-trinity (>> ${KDE-Version3}), klettres-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: foreign alphabet tutor for Trinity
  KLettres is an application specially designed to help the user to
  learn the alphabet in a new language and then to learn to read simple
@@ -288,7 +288,7 @@ Description: foreign alphabet tutor for Trinity
  English, French, Italian and Slovak.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: klettres-data-trinity
 Architecture: all
@@ -302,13 +302,13 @@ Description: data files for KLettres foreign alphabet tutor
  See the klettres package for further information.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kmplot-trinity
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: mathematical function plotter for Trinity
  KmPlot is a mathematical function plotter for KDE.  It has a powerful
  built-in parser.  You can plot different functions simultaneously and
@@ -324,13 +324,13 @@ Description: mathematical function plotter for Trinity
  and plotting derivatives and integral functions.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kpercentage-trinity
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: percentage calculation teaching tool for Trinity
  KPercentage is a small math application that will help pupils to
  improve their skills in calculating percentages.
@@ -340,13 +340,13 @@ Description: percentage calculation teaching tool for Trinity
  are mixed randomly.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kstars-trinity
 Architecture: any
 Section: science
-Depends: ${shlibs:Depends}, kstars-data-trinity (>> ${KDE-Version3}), kstars-data-trinity (<< ${KDE-Next-Version3}), kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3}), indi-trinity (= ${Source-Version})
-Suggests: konqueror-trinity, khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, kstars-data-trinity (>> ${KDE-Version3}), kstars-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}), indi-trinity (= ${Source-Version})
+Suggests: konqueror-trinity, khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: desktop planetarium for Trinity
  KStars is a graphical desktop planetarium for KDE.  It depicts an
  accurate simulation of the night sky, including stars,
@@ -361,7 +361,7 @@ Description: desktop planetarium for Trinity
  use.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kstars-data-trinity
 Architecture: all
@@ -375,13 +375,13 @@ Description: data files for KStars desktop planetarium
  See the kstars package for further information.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: ktouch-trinity
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: touch typing tutor for Trinity
  KTouch is a program for learning touch typing - it helps you learn to
  type on a keyboard quickly and correctly.  Every finger has its place
@@ -393,13 +393,13 @@ Description: touch typing tutor for Trinity
  to use.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kturtle-trinity
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: educational Logo programming environment
  KTurtle is an educational programming environment using the Logo
  programming language.  It tries to make programming as easy and
@@ -419,13 +419,13 @@ Description: educational Logo programming environment
  professional programmers' needs.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kverbos-trinity
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: Spanish verb form study application for Trinity
  Kverbos allows the user to learn the forms of Spanish verbs.  The
  program suggests a verb and a time and the user enters the different
@@ -436,13 +436,13 @@ Description: Spanish verb form study application for Trinity
  have to be entered by the user.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kvoctrain-trinity
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: vocabulary trainer for Trinity
  KVocTrain is a little utility to help you train your vocabulary when
  you are trying to learn a foreign language.  You can create your own
@@ -460,13 +460,13 @@ Description: vocabulary trainer for Trinity
  application.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kwordquiz-trinity
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: flashcard and vocabulary learning program for Trinity
  KWordQuiz is a flashcard-based tool that helps you to master new
  vocabularies. It may be a language or any other kind of terminology.
@@ -477,33 +477,33 @@ Description: flashcard and vocabulary learning program for Trinity
  and xml.gz files created by Pauker (http://pauker.sourceforge.net).
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
-Package: libkdeedu3-trinity
+Package: libtdeedu3-trinity
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
 Description: library for use with Trinity educational apps
- The KDE-based library libkdeedu is used with educational
+ The KDE-based library libtdeedu is used with educational
  applications.  It currently provides support for data plotting and
  vocabulary items (including a parser for kvtml vocabulary files).
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
-Package: libkdeedu-trinity-dev
+Package: libtdeedu-trinity-dev
 Architecture: any
 Section: libdevel
-Depends: libkdeedu3-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libtdeedu3-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
 Description: development files for Trinity educational library
- The KDE-based library libkdeedu is used with educational
+ The KDE-based library libtdeedu is used with educational
  applications.  It currently provides support for data plotting and
  vocabulary items (including a parser for kvtml vocabulary files).
  .
- Development files for libkdeedu are included in this package.
+ Development files for libtdeedu are included in this package.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: libkiten1-trinity
 Architecture: any
@@ -522,12 +522,12 @@ Description: library for Kiten Japanese reference/study tool
  For further information, see the kiten package.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: libkiten-trinity-dev
 Architecture: any
 Section: libdevel
-Depends: libkiten1-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libkiten1-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
 Description: development files for Kiten library
  Kiten is a Japanese reference/study tool for KDE.  The library
  libkiten contains portions of Kiten that may be useful for other
@@ -538,7 +538,7 @@ Description: development files for Kiten library
  further information, see the kiten package.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: indi-trinity
 Architecture: any
@@ -554,4 +554,4 @@ Description: Instrument Neutral Distributed Interface for astronomical devices
  based on the services provided by the device.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
diff --git a/debian/lenny/tdeedu/debian/control.in b/debian/lenny/tdeedu/debian/control.in
index 00ddf325b..020c34ea1 100644
--- a/debian/lenny/tdeedu/debian/control.in
+++ b/debian/lenny/tdeedu/debian/control.in
@@ -1,17 +1,17 @@
-Source: kdeedu
+Source: tdeedu
 Section: kde
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), libboost-python-dev (>= 1.33.1), libfacile-ocaml-dev [alpha amd64 arm hppa i386 ia64 powerpc sparc], libusb-dev, sharutils, doxygen
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libboost-python-dev (>= 1.33.1), libfacile-ocaml-dev [alpha amd64 arm hppa i386 ia64 powerpc sparc], libusb-dev, sharutils, doxygen
 Standards-Version: 3.7.2
 
-Package: kdeedu
+Package: tdeedu
 Architecture: all
 Section: kde
-Depends: blinken (>= ${Source-Version}), kalzium (>= ${Source-Version}), kanagram (>= ${Source-Version}), kbruch (>= ${Source-Version}), kdeedu-data (>= ${Source-Version}), keduca (>= ${Source-Version}), kgeography (>= ${Source-Version}), khangman (>= ${Source-Version}), kig (>= ${Source-Version}), kiten (>= ${Source-Version}), klatin (>= ${Source-Version}), klettres (>= ${Source-Version}), kmplot (>= ${Source-Version}), kpercentage (>= ${Source-Version}), kstars (>= ${Source-Version}), ktouch (>= ${Source-Version}), kturtle (>= ${Source-Version}), kverbos (>= ${Source-Version}), kvoctrain (>= ${Source-Version}), kwordquiz (>= ${Source-Version}), indi (>= ${Source-Version})
-Suggests: kdeedu-doc-html
+Depends: blinken (>= ${Source-Version}), kalzium (>= ${Source-Version}), kanagram (>= ${Source-Version}), kbruch (>= ${Source-Version}), tdeedu-data (>= ${Source-Version}), keduca (>= ${Source-Version}), kgeography (>= ${Source-Version}), khangman (>= ${Source-Version}), kig (>= ${Source-Version}), kiten (>= ${Source-Version}), klatin (>= ${Source-Version}), klettres (>= ${Source-Version}), kmplot (>= ${Source-Version}), kpercentage (>= ${Source-Version}), kstars (>= ${Source-Version}), ktouch (>= ${Source-Version}), kturtle (>= ${Source-Version}), kverbos (>= ${Source-Version}), kvoctrain (>= ${Source-Version}), kwordquiz (>= ${Source-Version}), indi (>= ${Source-Version})
+Suggests: tdeedu-doc-html
 Description: educational apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -21,7 +21,7 @@ Description: educational apps from the official KDE release
  This metapackage includes educational applications provided with the
  official release of KDE.
 
-Package: kdeedu-data
+Package: tdeedu-data
 Architecture: all
 Section: kde
 Description: shared data for KDE educational applications
@@ -30,22 +30,22 @@ Description: shared data for KDE educational applications
  Environment).
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
-Package: kdeedu-dbg
+Package: tdeedu-dbg
 Architecture: any
 Priority: extra
-Depends: kdelibs-dbg
+Depends: tdelibs-dbg
 Section: libdevel
-Description: debugging symbols for kdeedu
- This package contains the debugging symbols associated with kdeedu.
- They will automatically be used by gdb for debugging kdeedu-related
+Description: debugging symbols for tdeedu
+ This package contains the debugging symbols associated with tdeedu.
+ They will automatically be used by gdb for debugging tdeedu-related
  issues.
 
-Package: kdeedu-doc-html
+Package: tdeedu-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror | www-browser, kdeedu
+Suggests: konqueror | www-browser, tdeedu
 Description: KDE edutainment documentation in HTML format
  By default the educational applications provided with KDE (the K
  Desktop Environment) only provide their documentation in KDE docbook
@@ -59,13 +59,13 @@ Description: KDE edutainment documentation in HTML format
  most KDE educational packages.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: blinken
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, ttf-sjfonts, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, ttf-sjfonts, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: KDE version of the Simon Says electronic memory game
  Blinken is based on an electronic game released in 1978, which
  challenges players to remember sequences of increasing length.  On
@@ -77,13 +77,13 @@ Description: KDE version of the Simon Says electronic memory game
  sequence with one extra step is presented.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kalzium
 Architecture: any
 Section: science
-Depends: ${shlibs:Depends}, kalzium-data (>> ${KDE-Version3}), kalzium-data (<< ${KDE-Next-Version3}), kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, kalzium-data (>> ${KDE-Version3}), kalzium-data (<< ${KDE-Next-Version3}), tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: chemistry teaching tool for KDE
  Kalzium is a program which shows you the Periodic System of Elements
  (PSE).  You can use Kalzium to search for information about the
@@ -102,7 +102,7 @@ Description: chemistry teaching tool for KDE
  equation solver.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kalzium-data
 Architecture: all
@@ -117,13 +117,13 @@ Description: data files for Kalzium
  See the kalzium package for further information.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kanagram
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: letter order game for KDE
  KAnagram is a game that is based on the word/letter puzzles that the
  author played as a child.  A word is picked at random and displayed
@@ -138,38 +138,38 @@ Description: letter order game for KDE
  is welcome to try.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kbruch
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: fraction calculation teaching tool for KDE
  KBruch is a small program to practice calculating with fractions.
  Different exercises are provided for this purpose.  The program
  checks the user's input and gives feedback.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: keduca
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: interactive form-based tests for KDE
  KEduca is a flash-card application which allows you to make
  interactive form-based tests.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kgeography
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kgeography-data (>> ${KDE-Version3}), kgeography-data (<< ${KDE-Next-Version3}), kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, kgeography-data (>> ${KDE-Version3}), kgeography-data (<< ${KDE-Next-Version3}), tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: Geography learning tool for KDE
  KGeography contains maps allowing you to learn various countries or
  the political divisions of several countries.  It has several modes,
@@ -177,7 +177,7 @@ Description: Geography learning tool for KDE
  flags of the map divisions.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kgeography-data
 Architecture: all
@@ -190,13 +190,13 @@ Description: data files for KGeography
  See the kgeography package for further information.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: khangman
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, ttf-dustin, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, ttf-dustin, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: the classical hangman game for KDE
  KHangMan is a game based on the well known hangman game.  It is aimed
  for children aged 6 and above.  It has four levels of difficulty:
@@ -208,13 +208,13 @@ Description: the classical hangman game for KDE
  guess the word before getting hanged!  You have 10 tries.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kig
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: interactive geometry program for KDE
  Kig is an application for interactive geometry.  It is intended to
  serve two purposes:
@@ -234,13 +234,13 @@ Description: interactive geometry program for KDE
  KGeo, KSeg and XFig.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kiten
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3}), ttf-kochi-gothic | ttf-kochi-mincho
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3}), ttf-kochi-gothic | ttf-kochi-mincho
+Suggests: khelpcenter, tdeedu-doc-html
 Description: Japanese reference/study tool for KDE
  Kiten is a Japanese reference and study tool for KDE.  It is an
  application with multiple functions.  Firstly, it is a convenient
@@ -249,13 +249,13 @@ Description: Japanese reference/study tool for KDE
  characters.  Thirdly, it is a tool to help you learn Kanji.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: klatin
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: application to help revise/teach Latin
  KLatin is a program to help revise Latin.  There are three "sections"
  in which different aspects of the language can be revised.  These are
@@ -272,13 +272,13 @@ Description: application to help revise/teach Latin
  indicative passive plural", and is not multiple choice.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: klettres
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, klettres-data (>> ${KDE-Version3}), klettres-data (<< ${KDE-Next-Version3}), kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, klettres-data (>> ${KDE-Version3}), klettres-data (<< ${KDE-Next-Version3}), tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: foreign alphabet tutor for KDE
  KLettres is an application specially designed to help the user to
  learn the alphabet in a new language and then to learn to read simple
@@ -289,7 +289,7 @@ Description: foreign alphabet tutor for KDE
  English, French, Italian and Slovak.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: klettres-data
 Architecture: all
@@ -303,13 +303,13 @@ Description: data files for KLettres foreign alphabet tutor
  See the klettres package for further information.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kmplot
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: mathematical function plotter for KDE
  KmPlot is a mathematical function plotter for KDE.  It has a powerful
  built-in parser.  You can plot different functions simultaneously and
@@ -325,13 +325,13 @@ Description: mathematical function plotter for KDE
  and plotting derivatives and integral functions.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kpercentage
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: percentage calculation teaching tool for KDE
  KPercentage is a small math application that will help pupils to
  improve their skills in calculating percentages.
@@ -341,13 +341,13 @@ Description: percentage calculation teaching tool for KDE
  are mixed randomly.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kstars
 Architecture: any
 Section: science
-Depends: ${shlibs:Depends}, kstars-data (>> ${KDE-Version3}), kstars-data (<< ${KDE-Next-Version3}), kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3}), indi (= ${Source-Version})
-Suggests: konqueror, khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, kstars-data (>> ${KDE-Version3}), kstars-data (<< ${KDE-Next-Version3}), tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3}), indi (= ${Source-Version})
+Suggests: konqueror, khelpcenter, tdeedu-doc-html
 Description: desktop planetarium for KDE
  KStars is a graphical desktop planetarium for KDE.  It depicts an
  accurate simulation of the night sky, including stars,
@@ -362,7 +362,7 @@ Description: desktop planetarium for KDE
  use.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kstars-data
 Architecture: all
@@ -376,13 +376,13 @@ Description: data files for KStars desktop planetarium
  See the kstars package for further information.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: ktouch
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: touch typing tutor for KDE
  KTouch is a program for learning touch typing - it helps you learn to
  type on a keyboard quickly and correctly.  Every finger has its place
@@ -394,13 +394,13 @@ Description: touch typing tutor for KDE
  to use.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kturtle
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: educational Logo programming environment
  KTurtle is an educational programming environment using the Logo
  programming language.  It tries to make programming as easy and
@@ -420,13 +420,13 @@ Description: educational Logo programming environment
  professional programmers' needs.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kverbos
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: Spanish verb form study application for KDE
  Kverbos allows the user to learn the forms of Spanish verbs.  The
  program suggests a verb and a time and the user enters the different
@@ -437,13 +437,13 @@ Description: Spanish verb form study application for KDE
  have to be entered by the user.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kvoctrain
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: vocabulary trainer for KDE
  KVocTrain is a little utility to help you train your vocabulary when
  you are trying to learn a foreign language.  You can create your own
@@ -461,13 +461,13 @@ Description: vocabulary trainer for KDE
  application.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kwordquiz
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: flashcard and vocabulary learning program for KDE
  KWordQuiz is a flashcard-based tool that helps you to master new
  vocabularies. It may be a language or any other kind of terminology.
@@ -478,35 +478,35 @@ Description: flashcard and vocabulary learning program for KDE
  and xml.gz files created by Pauker (http://pauker.sourceforge.net).
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
-Package: libkdeedu3
+Package: libtdeedu3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Conflicts: libkdeedu1
-Replaces: libkdeedu1
+Conflicts: libtdeedu1
+Replaces: libtdeedu1
 Description: library for use with KDE educational apps
- The KDE-based library libkdeedu is used with educational
+ The KDE-based library libtdeedu is used with educational
  applications.  It currently provides support for data plotting and
  vocabulary items (including a parser for kvtml vocabulary files).
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
-Package: libkdeedu-dev
+Package: libtdeedu-dev
 Architecture: any
 Section: libdevel
-Depends: libkdeedu3 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: libtdeedu3 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
 Description: development files for KDE educational library
- The KDE-based library libkdeedu is used with educational
+ The KDE-based library libtdeedu is used with educational
  applications.  It currently provides support for data plotting and
  vocabulary items (including a parser for kvtml vocabulary files).
  .
- Development files for libkdeedu are included in this package.
+ Development files for libtdeedu are included in this package.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: libkiten1
 Architecture: any
@@ -525,12 +525,12 @@ Description: library for Kiten Japanese reference/study tool
  For further information, see the kiten package.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: libkiten-dev
 Architecture: any
 Section: libdevel
-Depends: libkiten1 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: libkiten1 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
 Description: development files for Kiten library
  Kiten is a Japanese reference/study tool for KDE.  The library
  libkiten contains portions of Kiten that may be useful for other
@@ -541,7 +541,7 @@ Description: development files for Kiten library
  further information, see the kiten package.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: indi
 Architecture: any
@@ -557,4 +557,4 @@ Description: Instrument Neutral Distributed Interface for astronomical devices
  based on the services provided by the device.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
diff --git a/debian/lenny/tdeedu/debian/copyright b/debian/lenny/tdeedu/debian/copyright
index 272e4f376..7d67a2bfe 100644
--- a/debian/lenny/tdeedu/debian/copyright
+++ b/debian/lenny/tdeedu/debian/copyright
@@ -51,7 +51,7 @@ Upstream Authors:
   KVocTrain: Ewald Arnold <kvoctrain@ewald-arnold.de>,
       Peter Hedlund <peter@peterandlinda.com>
   KWordQuiz: Peter Hedlund <peter@peterandlinda.com>
-  libkdeedu: Scott Wheeler <wheeler@kde.org>,
+  libtdeedu: Scott Wheeler <wheeler@kde.org>,
       Jason Harris <jharris@30doradus.org>
 
 Copyright:
@@ -66,7 +66,7 @@ Copyright:
     KWordQuiz: GPL, though many source files are under the LGPL
     Libraries:
       libextdate.so: Sources under a mixture of GPL and LGPL
-      libkdeeducore.so: LGPL
+      libtdeeducore.so: LGPL
     DocBook documentation: (see below)
 
   On Debian GNU/Linux systems, the complete texts of the GPL and the LGPL
diff --git a/debian/lenny/tdeedu/debian/indi-trinity.docs b/debian/lenny/tdeedu/debian/indi-trinity.docs
index 4972ae664..352a6403d 100644
--- a/debian/lenny/tdeedu/debian/indi-trinity.docs
+++ b/debian/lenny/tdeedu/debian/indi-trinity.docs
@@ -1 +1 @@
-build-tree/kdeedu-*/kstars/kstars/indi/README
+build-tree/tdeedu-*/kstars/kstars/indi/README
diff --git a/debian/lenny/tdeedu/debian/kalzium-trinity.README.Debian b/debian/lenny/tdeedu/debian/kalzium-trinity.README.Debian
index ab3aedfb9..d65c1bcb3 100644
--- a/debian/lenny/tdeedu/debian/kalzium-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kalzium-trinity.README.Debian
@@ -3,6 +3,6 @@ Kalzium for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/debian/lenny/tdeedu/debian/kalzium-trinity.docs b/debian/lenny/tdeedu/debian/kalzium-trinity.docs
index a7127e507..d4bedeb0c 100644
--- a/debian/lenny/tdeedu/debian/kalzium-trinity.docs
+++ b/debian/lenny/tdeedu/debian/kalzium-trinity.docs
@@ -1 +1 @@
-build-tree/kdeedu-*/kalzium/TODO
+build-tree/tdeedu-*/kalzium/TODO
diff --git a/debian/lenny/tdeedu/debian/kanagram-trinity.README.Debian b/debian/lenny/tdeedu/debian/kanagram-trinity.README.Debian
index 5c94d6832..1af240471 100644
--- a/debian/lenny/tdeedu/debian/kanagram-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kanagram-trinity.README.Debian
@@ -3,6 +3,6 @@ KMessedWords for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/debian/lenny/tdeedu/debian/kanagram-trinity.docs b/debian/lenny/tdeedu/debian/kanagram-trinity.docs
index 99ffc3dc2..1557c8035 100644
--- a/debian/lenny/tdeedu/debian/kanagram-trinity.docs
+++ b/debian/lenny/tdeedu/debian/kanagram-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/kanagram/DATA_FILE_TRANSLATION.readme
-build-tree/kdeedu-*/kanagram/TODO
+build-tree/tdeedu-*/kanagram/DATA_FILE_TRANSLATION.readme
+build-tree/tdeedu-*/kanagram/TODO
diff --git a/debian/lenny/tdeedu/debian/kbruch-trinity.README.Debian b/debian/lenny/tdeedu/debian/kbruch-trinity.README.Debian
index 3c67ecb17..424617cfe 100644
--- a/debian/lenny/tdeedu/debian/kbruch-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kbruch-trinity.README.Debian
@@ -3,6 +3,6 @@ KBruch for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sat, 31 Jan 2004 12:08:48 +1100
diff --git a/debian/lenny/tdeedu/debian/kbruch-trinity.docs b/debian/lenny/tdeedu/debian/kbruch-trinity.docs
index 9affc1576..336e1abbb 100644
--- a/debian/lenny/tdeedu/debian/kbruch-trinity.docs
+++ b/debian/lenny/tdeedu/debian/kbruch-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/kbruch/AUTHORS
-build-tree/kdeedu-*/kbruch/TODO
+build-tree/tdeedu-*/kbruch/AUTHORS
+build-tree/tdeedu-*/kbruch/TODO
diff --git a/debian/lenny/tdeedu/debian/keduca-trinity.README.Debian b/debian/lenny/tdeedu/debian/keduca-trinity.README.Debian
index 042f785f1..b061f1f0a 100644
--- a/debian/lenny/tdeedu/debian/keduca-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/keduca-trinity.README.Debian
@@ -3,6 +3,6 @@ KEduca for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/debian/lenny/tdeedu/debian/keduca-trinity.docs b/debian/lenny/tdeedu/debian/keduca-trinity.docs
index 8999d5487..7741881ce 100644
--- a/debian/lenny/tdeedu/debian/keduca-trinity.docs
+++ b/debian/lenny/tdeedu/debian/keduca-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/keduca/AUTHORS
-build-tree/kdeedu-*/keduca/TODO
+build-tree/tdeedu-*/keduca/AUTHORS
+build-tree/tdeedu-*/keduca/TODO
diff --git a/debian/lenny/tdeedu/debian/kgeography-trinity.README.Debian b/debian/lenny/tdeedu/debian/kgeography-trinity.README.Debian
index 90b3dd1a4..69c1e534f 100644
--- a/debian/lenny/tdeedu/debian/kgeography-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kgeography-trinity.README.Debian
@@ -3,6 +3,6 @@ KGeography for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Daniel Schepler <schepler@debian.org>, Tue Dec 13 23:02:33 2005
diff --git a/debian/lenny/tdeedu/debian/kgeography-trinity.docs b/debian/lenny/tdeedu/debian/kgeography-trinity.docs
index 1e7ef4e27..aebb229cb 100644
--- a/debian/lenny/tdeedu/debian/kgeography-trinity.docs
+++ b/debian/lenny/tdeedu/debian/kgeography-trinity.docs
@@ -1,3 +1,3 @@
-build-tree/kdeedu-*/kgeography/AUTHORS
-build-tree/kdeedu-*/kgeography/README
-build-tree/kdeedu-*/kgeography/TODO
+build-tree/tdeedu-*/kgeography/AUTHORS
+build-tree/tdeedu-*/kgeography/README
+build-tree/tdeedu-*/kgeography/TODO
diff --git a/debian/lenny/tdeedu/debian/khangman-trinity.README.Debian b/debian/lenny/tdeedu/debian/khangman-trinity.README.Debian
index 3f9ecc785..da2935ff1 100644
--- a/debian/lenny/tdeedu/debian/khangman-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/khangman-trinity.README.Debian
@@ -3,6 +3,6 @@ KHangMan for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/debian/lenny/tdeedu/debian/khangman-trinity.docs b/debian/lenny/tdeedu/debian/khangman-trinity.docs
index 9b12a19b3..af4ab50be 100644
--- a/debian/lenny/tdeedu/debian/khangman-trinity.docs
+++ b/debian/lenny/tdeedu/debian/khangman-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/khangman/AUTHORS
-build-tree/kdeedu-*/khangman/TODO
+build-tree/tdeedu-*/khangman/AUTHORS
+build-tree/tdeedu-*/khangman/TODO
diff --git a/debian/lenny/tdeedu/debian/kig-trinity.README.Debian b/debian/lenny/tdeedu/debian/kig-trinity.README.Debian
index 567300de0..00bf214c7 100644
--- a/debian/lenny/tdeedu/debian/kig-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kig-trinity.README.Debian
@@ -3,6 +3,6 @@ Kig for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sat, 31 Jan 2004 12:08:48 +1100
diff --git a/debian/lenny/tdeedu/debian/kig-trinity.docs b/debian/lenny/tdeedu/debian/kig-trinity.docs
index 0226b94bb..940a47920 100644
--- a/debian/lenny/tdeedu/debian/kig-trinity.docs
+++ b/debian/lenny/tdeedu/debian/kig-trinity.docs
@@ -1,3 +1,3 @@
-build-tree/kdeedu-*/kig/AUTHORS
-build-tree/kdeedu-*/kig/FEATURES
-build-tree/kdeedu-*/kig/TODO
+build-tree/tdeedu-*/kig/AUTHORS
+build-tree/tdeedu-*/kig/FEATURES
+build-tree/tdeedu-*/kig/TODO
diff --git a/debian/lenny/tdeedu/debian/kiten-trinity.README.Debian b/debian/lenny/tdeedu/debian/kiten-trinity.README.Debian
index e860870ca..4efd3659b 100644
--- a/debian/lenny/tdeedu/debian/kiten-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kiten-trinity.README.Debian
@@ -3,6 +3,6 @@ Kiten for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/debian/lenny/tdeedu/debian/kiten-trinity.docs b/debian/lenny/tdeedu/debian/kiten-trinity.docs
index 92cb85823..3c9f2f3bf 100644
--- a/debian/lenny/tdeedu/debian/kiten-trinity.docs
+++ b/debian/lenny/tdeedu/debian/kiten-trinity.docs
@@ -1,3 +1,3 @@
-build-tree/kdeedu-*/kiten/AUTHORS
-build-tree/kdeedu-*/kiten/README
-build-tree/kdeedu-*/kiten/TODO
+build-tree/tdeedu-*/kiten/AUTHORS
+build-tree/tdeedu-*/kiten/README
+build-tree/tdeedu-*/kiten/TODO
diff --git a/debian/lenny/tdeedu/debian/klatin-trinity.README.Debian b/debian/lenny/tdeedu/debian/klatin-trinity.README.Debian
index 30c214675..f03b75aef 100644
--- a/debian/lenny/tdeedu/debian/klatin-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/klatin-trinity.README.Debian
@@ -3,6 +3,6 @@ KLatin for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sat, 16 Oct 2004 15:32:36 +1000
diff --git a/debian/lenny/tdeedu/debian/klatin-trinity.docs b/debian/lenny/tdeedu/debian/klatin-trinity.docs
index df25d33f1..22306e756 100644
--- a/debian/lenny/tdeedu/debian/klatin-trinity.docs
+++ b/debian/lenny/tdeedu/debian/klatin-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/klatin/AUTHORS
-build-tree/kdeedu-*/klatin/TODO
+build-tree/tdeedu-*/klatin/AUTHORS
+build-tree/tdeedu-*/klatin/TODO
diff --git a/debian/lenny/tdeedu/debian/klettres-data-trinity.docs b/debian/lenny/tdeedu/debian/klettres-data-trinity.docs
index 3f3b2d265..865db67c0 100644
--- a/debian/lenny/tdeedu/debian/klettres-data-trinity.docs
+++ b/debian/lenny/tdeedu/debian/klettres-data-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/klettres/AUTHORS
-build-tree/kdeedu-*/klettres/TODO
+build-tree/tdeedu-*/klettres/AUTHORS
+build-tree/tdeedu-*/klettres/TODO
diff --git a/debian/lenny/tdeedu/debian/klettres-trinity.README.Debian b/debian/lenny/tdeedu/debian/klettres-trinity.README.Debian
index 2b3b8944e..0208d8dff 100644
--- a/debian/lenny/tdeedu/debian/klettres-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/klettres-trinity.README.Debian
@@ -3,6 +3,6 @@ KLettres for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/debian/lenny/tdeedu/debian/klettres-trinity.docs b/debian/lenny/tdeedu/debian/klettres-trinity.docs
index 3f3b2d265..865db67c0 100644
--- a/debian/lenny/tdeedu/debian/klettres-trinity.docs
+++ b/debian/lenny/tdeedu/debian/klettres-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/klettres/AUTHORS
-build-tree/kdeedu-*/klettres/TODO
+build-tree/tdeedu-*/klettres/AUTHORS
+build-tree/tdeedu-*/klettres/TODO
diff --git a/debian/lenny/tdeedu/debian/kmplot-trinity.README.Debian b/debian/lenny/tdeedu/debian/kmplot-trinity.README.Debian
index f1e947ca3..85a642d3a 100644
--- a/debian/lenny/tdeedu/debian/kmplot-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kmplot-trinity.README.Debian
@@ -3,6 +3,6 @@ KmPlot for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/debian/lenny/tdeedu/debian/kmplot-trinity.docs b/debian/lenny/tdeedu/debian/kmplot-trinity.docs
index 3c0de4f5d..f4e45eafe 100644
--- a/debian/lenny/tdeedu/debian/kmplot-trinity.docs
+++ b/debian/lenny/tdeedu/debian/kmplot-trinity.docs
@@ -1 +1 @@
-build-tree/kdeedu-*/kmplot/TODO
+build-tree/tdeedu-*/kmplot/TODO
diff --git a/debian/lenny/tdeedu/debian/kpercentage-trinity.README.Debian b/debian/lenny/tdeedu/debian/kpercentage-trinity.README.Debian
index 2864356e4..60cbe6af6 100644
--- a/debian/lenny/tdeedu/debian/kpercentage-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kpercentage-trinity.README.Debian
@@ -3,6 +3,6 @@ KPercentage for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/debian/lenny/tdeedu/debian/kpercentage-trinity.docs b/debian/lenny/tdeedu/debian/kpercentage-trinity.docs
index 4c4a6a22e..33cdf33c0 100644
--- a/debian/lenny/tdeedu/debian/kpercentage-trinity.docs
+++ b/debian/lenny/tdeedu/debian/kpercentage-trinity.docs
@@ -1 +1 @@
-build-tree/kdeedu-*/kpercentage/TODO
+build-tree/tdeedu-*/kpercentage/TODO
diff --git a/debian/lenny/tdeedu/debian/kstars-data-trinity.docs b/debian/lenny/tdeedu/debian/kstars-data-trinity.docs
index 498ca09be..1666af4b8 100644
--- a/debian/lenny/tdeedu/debian/kstars-data-trinity.docs
+++ b/debian/lenny/tdeedu/debian/kstars-data-trinity.docs
@@ -1,7 +1,7 @@
-build-tree/kdeedu-*/kstars/AUTHORS
-build-tree/kdeedu-*/kstars/README
-build-tree/kdeedu-*/kstars/README.customize
-build-tree/kdeedu-*/kstars/README.ephemerides
-build-tree/kdeedu-*/kstars/README.planetmath
-build-tree/kdeedu-*/kstars/README.timekeeping
-build-tree/kdeedu-*/kstars/TODO
+build-tree/tdeedu-*/kstars/AUTHORS
+build-tree/tdeedu-*/kstars/README
+build-tree/tdeedu-*/kstars/README.customize
+build-tree/tdeedu-*/kstars/README.ephemerides
+build-tree/tdeedu-*/kstars/README.planetmath
+build-tree/tdeedu-*/kstars/README.timekeeping
+build-tree/tdeedu-*/kstars/TODO
diff --git a/debian/lenny/tdeedu/debian/kstars-trinity.README.Debian b/debian/lenny/tdeedu/debian/kstars-trinity.README.Debian
index f709389fa..5969718d5 100644
--- a/debian/lenny/tdeedu/debian/kstars-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kstars-trinity.README.Debian
@@ -3,6 +3,6 @@ KStars for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/debian/lenny/tdeedu/debian/kstars-trinity.docs b/debian/lenny/tdeedu/debian/kstars-trinity.docs
index 498ca09be..1666af4b8 100644
--- a/debian/lenny/tdeedu/debian/kstars-trinity.docs
+++ b/debian/lenny/tdeedu/debian/kstars-trinity.docs
@@ -1,7 +1,7 @@
-build-tree/kdeedu-*/kstars/AUTHORS
-build-tree/kdeedu-*/kstars/README
-build-tree/kdeedu-*/kstars/README.customize
-build-tree/kdeedu-*/kstars/README.ephemerides
-build-tree/kdeedu-*/kstars/README.planetmath
-build-tree/kdeedu-*/kstars/README.timekeeping
-build-tree/kdeedu-*/kstars/TODO
+build-tree/tdeedu-*/kstars/AUTHORS
+build-tree/tdeedu-*/kstars/README
+build-tree/tdeedu-*/kstars/README.customize
+build-tree/tdeedu-*/kstars/README.ephemerides
+build-tree/tdeedu-*/kstars/README.planetmath
+build-tree/tdeedu-*/kstars/README.timekeeping
+build-tree/tdeedu-*/kstars/TODO
diff --git a/debian/lenny/tdeedu/debian/ktouch-trinity.README.Debian b/debian/lenny/tdeedu/debian/ktouch-trinity.README.Debian
index 7f42f52c0..1e9011ebd 100644
--- a/debian/lenny/tdeedu/debian/ktouch-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/ktouch-trinity.README.Debian
@@ -3,6 +3,6 @@ KTouch for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/debian/lenny/tdeedu/debian/ktouch-trinity.docs b/debian/lenny/tdeedu/debian/ktouch-trinity.docs
index b24780ab4..f62a18074 100644
--- a/debian/lenny/tdeedu/debian/ktouch-trinity.docs
+++ b/debian/lenny/tdeedu/debian/ktouch-trinity.docs
@@ -1 +1 @@
-build-tree/kdeedu-*/ktouch/AUTHORS
+build-tree/tdeedu-*/ktouch/AUTHORS
diff --git a/debian/lenny/tdeedu/debian/kturtle-trinity.README.Debian b/debian/lenny/tdeedu/debian/kturtle-trinity.README.Debian
index 122150a00..6cfc8dbac 100644
--- a/debian/lenny/tdeedu/debian/kturtle-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kturtle-trinity.README.Debian
@@ -3,6 +3,6 @@ KTurtle for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sat, 16 Oct 2004 15:32:36 +1000
diff --git a/debian/lenny/tdeedu/debian/kturtle-trinity.docs b/debian/lenny/tdeedu/debian/kturtle-trinity.docs
index ef5b58bc9..b66109b8a 100644
--- a/debian/lenny/tdeedu/debian/kturtle-trinity.docs
+++ b/debian/lenny/tdeedu/debian/kturtle-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/kturtle/AUTHORS
-build-tree/kdeedu-*/kturtle/TODO
+build-tree/tdeedu-*/kturtle/AUTHORS
+build-tree/tdeedu-*/kturtle/TODO
diff --git a/debian/lenny/tdeedu/debian/kverbos-trinity.README.Debian b/debian/lenny/tdeedu/debian/kverbos-trinity.README.Debian
index a2a469e40..197071f05 100644
--- a/debian/lenny/tdeedu/debian/kverbos-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kverbos-trinity.README.Debian
@@ -3,6 +3,6 @@ Kverbos for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/debian/lenny/tdeedu/debian/kverbos-trinity.docs b/debian/lenny/tdeedu/debian/kverbos-trinity.docs
index 950e6d59f..52c3fa74e 100644
--- a/debian/lenny/tdeedu/debian/kverbos-trinity.docs
+++ b/debian/lenny/tdeedu/debian/kverbos-trinity.docs
@@ -1 +1 @@
-build-tree/kdeedu-*/kverbos/AUTHORS
+build-tree/tdeedu-*/kverbos/AUTHORS
diff --git a/debian/lenny/tdeedu/debian/kvoctrain-trinity.README.Debian b/debian/lenny/tdeedu/debian/kvoctrain-trinity.README.Debian
index 6dcfee0ed..d9f42d1fe 100644
--- a/debian/lenny/tdeedu/debian/kvoctrain-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kvoctrain-trinity.README.Debian
@@ -3,6 +3,6 @@ KVocTrain for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/debian/lenny/tdeedu/debian/kvoctrain-trinity.docs b/debian/lenny/tdeedu/debian/kvoctrain-trinity.docs
index a6f1a9161..4a4aa3f2d 100644
--- a/debian/lenny/tdeedu/debian/kvoctrain-trinity.docs
+++ b/debian/lenny/tdeedu/debian/kvoctrain-trinity.docs
@@ -1 +1 @@
-build-tree/kdeedu-*/kvoctrain/AUTHORS
+build-tree/tdeedu-*/kvoctrain/AUTHORS
diff --git a/debian/lenny/tdeedu/debian/kwordquiz-trinity.README.Debian b/debian/lenny/tdeedu/debian/kwordquiz-trinity.README.Debian
index cf3009383..681ee1b28 100644
--- a/debian/lenny/tdeedu/debian/kwordquiz-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/kwordquiz-trinity.README.Debian
@@ -3,6 +3,6 @@ KWordQuiz for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sat, 16 Oct 2004 15:32:36 +1000
diff --git a/debian/lenny/tdeedu/debian/kwordquiz-trinity.docs b/debian/lenny/tdeedu/debian/kwordquiz-trinity.docs
index cb0875fed..124d517c7 100644
--- a/debian/lenny/tdeedu/debian/kwordquiz-trinity.docs
+++ b/debian/lenny/tdeedu/debian/kwordquiz-trinity.docs
@@ -1 +1 @@
-build-tree/kdeedu-*/kwordquiz/AUTHORS
+build-tree/tdeedu-*/kwordquiz/AUTHORS
diff --git a/debian/lenny/tdeedu/debian/libkdeedu-dev-trinity.docs b/debian/lenny/tdeedu/debian/libkdeedu-dev-trinity.docs
deleted file mode 100644
index 16da301c1..000000000
--- a/debian/lenny/tdeedu/debian/libkdeedu-dev-trinity.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-build-tree/kdeedu-*/libkdeedu/AUTHORS
-build-tree/kdeedu-*/libkdeedu/README
diff --git a/debian/lenny/tdeedu/debian/libkdeedu-dev-trinity.install b/debian/lenny/tdeedu/debian/libkdeedu-dev-trinity.install
deleted file mode 100644
index 50fcf50ea..000000000
--- a/debian/lenny/tdeedu/debian/libkdeedu-dev-trinity.install
+++ /dev/null
@@ -1,9 +0,0 @@
-/opt/trinity/include/kde/libkdeedu
-opt/trinity/lib/libextdate.la
-opt/trinity/lib/libextdate.so
-opt/trinity/lib/libkdeeducore.la
-opt/trinity/lib/libkdeeducore.so
-opt/trinity/lib/libkdeeduui.la
-opt/trinity/lib/libkdeeduui.so
-opt/trinity/lib/libkdeeduplot.la
-opt/trinity/lib/libkdeeduplot.so
diff --git a/debian/lenny/tdeedu/debian/libkdeedu3-trinity.docs b/debian/lenny/tdeedu/debian/libkdeedu3-trinity.docs
deleted file mode 100644
index 16da301c1..000000000
--- a/debian/lenny/tdeedu/debian/libkdeedu3-trinity.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-build-tree/kdeedu-*/libkdeedu/AUTHORS
-build-tree/kdeedu-*/libkdeedu/README
diff --git a/debian/lenny/tdeedu/debian/libkdeedu3-trinity.install b/debian/lenny/tdeedu/debian/libkdeedu3-trinity.install
deleted file mode 100644
index 13f432e0e..000000000
--- a/debian/lenny/tdeedu/debian/libkdeedu3-trinity.install
+++ /dev/null
@@ -1,8 +0,0 @@
-opt/trinity/lib/libextdate.so.1
-opt/trinity/lib/libextdate.so.1.2.0
-opt/trinity/lib/libkdeeducore.so.1
-opt/trinity/lib/libkdeeducore.so.1.2.0
-opt/trinity/lib/libkdeeduplot.so.1
-opt/trinity/lib/libkdeeduplot.so.1.2.0
-opt/trinity/lib/libkdeeduui.so.3
-opt/trinity/lib/libkdeeduui.so.3.0.5
diff --git a/debian/lenny/tdeedu/debian/libkdeedu3-trinity.override b/debian/lenny/tdeedu/debian/libkdeedu3-trinity.override
deleted file mode 100644
index 348d4ae74..000000000
--- a/debian/lenny/tdeedu/debian/libkdeedu3-trinity.override
+++ /dev/null
@@ -1,2 +0,0 @@
-# This package contains several libraries.
-libkdeedu3-trinity: package-name-doesnt-match-sonames libkdeeduplot1-trinity libkdeeducore1-trinity libextdate1-trinity libkdeeduui3-trinity
diff --git a/debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.docs b/debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.docs
new file mode 100644
index 000000000..81fca1df6
--- /dev/null
+++ b/debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.docs
@@ -0,0 +1,2 @@
+build-tree/tdeedu-*/libtdeedu/AUTHORS
+build-tree/tdeedu-*/libtdeedu/README
diff --git a/debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.install b/debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.install
new file mode 100644
index 000000000..be3af1e7b
--- /dev/null
+++ b/debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.install
@@ -0,0 +1,9 @@
+/opt/trinity/include/kde/libtdeedu
+opt/trinity/lib/libextdate.la
+opt/trinity/lib/libextdate.so
+opt/trinity/lib/libtdeeducore.la
+opt/trinity/lib/libtdeeducore.so
+opt/trinity/lib/libtdeeduui.la
+opt/trinity/lib/libtdeeduui.so
+opt/trinity/lib/libtdeeduplot.la
+opt/trinity/lib/libtdeeduplot.so
diff --git a/debian/lenny/tdeedu/debian/libkdeedu-dev-trinity.manpages b/debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.manpages
index b1292516f..b1292516f 100644
--- a/debian/lenny/tdeedu/debian/libkdeedu-dev-trinity.manpages
+++ b/debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.manpages
diff --git a/debian/lenny/tdeedu/debian/libtdeedu3-trinity.docs b/debian/lenny/tdeedu/debian/libtdeedu3-trinity.docs
new file mode 100644
index 000000000..81fca1df6
--- /dev/null
+++ b/debian/lenny/tdeedu/debian/libtdeedu3-trinity.docs
@@ -0,0 +1,2 @@
+build-tree/tdeedu-*/libtdeedu/AUTHORS
+build-tree/tdeedu-*/libtdeedu/README
diff --git a/debian/lenny/tdeedu/debian/libtdeedu3-trinity.install b/debian/lenny/tdeedu/debian/libtdeedu3-trinity.install
new file mode 100644
index 000000000..0d3dced21
--- /dev/null
+++ b/debian/lenny/tdeedu/debian/libtdeedu3-trinity.install
@@ -0,0 +1,8 @@
+opt/trinity/lib/libextdate.so.1
+opt/trinity/lib/libextdate.so.1.2.0
+opt/trinity/lib/libtdeeducore.so.1
+opt/trinity/lib/libtdeeducore.so.1.2.0
+opt/trinity/lib/libtdeeduplot.so.1
+opt/trinity/lib/libtdeeduplot.so.1.2.0
+opt/trinity/lib/libtdeeduui.so.3
+opt/trinity/lib/libtdeeduui.so.3.0.5
diff --git a/debian/lenny/tdeedu/debian/libtdeedu3-trinity.override b/debian/lenny/tdeedu/debian/libtdeedu3-trinity.override
new file mode 100644
index 000000000..0c60daec8
--- /dev/null
+++ b/debian/lenny/tdeedu/debian/libtdeedu3-trinity.override
@@ -0,0 +1,2 @@
+# This package contains several libraries.
+libtdeedu3-trinity: package-name-doesnt-match-sonames libtdeeduplot1-trinity libtdeeducore1-trinity libextdate1-trinity libtdeeduui3-trinity
diff --git a/debian/lenny/tdeedu/debian/man/blinken-trinity.1 b/debian/lenny/tdeedu/debian/man/blinken-trinity.1
index 2709e95d1..fb910889e 100644
--- a/debian/lenny/tdeedu/debian/man/blinken-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/blinken-trinity.1
@@ -42,7 +42,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/blinken/\fP.
 .SH AUTHOR
 Blinken was written by Albert Astals Cid <tsdgeos@terra.es> and
diff --git a/debian/lenny/tdeedu/debian/man/celestrongps-trinity.1 b/debian/lenny/tdeedu/debian/man/celestrongps-trinity.1
index 74dbb9a9a..97c930e5b 100644
--- a/debian/lenny/tdeedu/debian/man/celestrongps-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/celestrongps-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/debian/lenny/tdeedu/debian/man/fliccd-trinity.1 b/debian/lenny/tdeedu/debian/man/fliccd-trinity.1
index 68ccee902..bddac3b61 100644
--- a/debian/lenny/tdeedu/debian/man/fliccd-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/fliccd-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/debian/lenny/tdeedu/debian/man/indiserver-trinity.1 b/debian/lenny/tdeedu/debian/man/indiserver-trinity.1
index 8177f5464..35ecd6952 100644
--- a/debian/lenny/tdeedu/debian/man/indiserver-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/indiserver-trinity.1
@@ -109,7 +109,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/debian/lenny/tdeedu/debian/man/kalzium-trinity.1 b/debian/lenny/tdeedu/debian/man/kalzium-trinity.1
index 76cb8ab42..2f1fa5a44 100644
--- a/debian/lenny/tdeedu/debian/man/kalzium-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kalzium-trinity.1
@@ -46,7 +46,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kalzium/\fP.
 .SH AUTHOR
 Kalzium was written by Carsten Niehaus <cniehaus@kde.org>.
diff --git a/debian/lenny/tdeedu/debian/man/kanagram-trinity.1 b/debian/lenny/tdeedu/debian/man/kanagram-trinity.1
index 69416a922..3990c7e98 100644
--- a/debian/lenny/tdeedu/debian/man/kanagram-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kanagram-trinity.1
@@ -43,7 +43,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kanagram/\fP.
 .SH AUTHOR
 KAnagram was written by Joshua Keel <joshuakeel@gmail.com> and
diff --git a/debian/lenny/tdeedu/debian/man/kbruch-trinity.1 b/debian/lenny/tdeedu/debian/man/kbruch-trinity.1
index 78feef9cb..c57370906 100644
--- a/debian/lenny/tdeedu/debian/man/kbruch-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kbruch-trinity.1
@@ -37,7 +37,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kbruch/\fP.
 .SH AUTHOR
 KBruch was written by Sebastian Stein <seb.kde@hpfsc.de>,
diff --git a/debian/lenny/tdeedu/debian/man/keduca-trinity.1 b/debian/lenny/tdeedu/debian/man/keduca-trinity.1
index 60e31066d..4f265e43b 100644
--- a/debian/lenny/tdeedu/debian/man/keduca-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/keduca-trinity.1
@@ -42,7 +42,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/keduca/\fP.
 .SH AUTHOR
 KEduca was written by Javier Campos <javi@asyris.org>,
diff --git a/debian/lenny/tdeedu/debian/man/keducabuilder-trinity.1 b/debian/lenny/tdeedu/debian/man/keducabuilder-trinity.1
index 39c9a04d6..8ebe53045 100644
--- a/debian/lenny/tdeedu/debian/man/keducabuilder-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/keducabuilder-trinity.1
@@ -42,7 +42,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/keduca/\fP.
 .SH AUTHOR
 KEduca was written by Javier Campos <javi@asyris.org>,
diff --git a/debian/lenny/tdeedu/debian/man/kgeography-trinity.1 b/debian/lenny/tdeedu/debian/man/kgeography-trinity.1
index 45ee113fe..4f340d39f 100644
--- a/debian/lenny/tdeedu/debian/man/kgeography-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kgeography-trinity.1
@@ -38,7 +38,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kgeography/\fP.
 .SH AUTHOR
 KGeography was written by Albert Astals Cid <tsdgeos@terra.es>.
diff --git a/debian/lenny/tdeedu/debian/man/khangman-trinity.1 b/debian/lenny/tdeedu/debian/man/khangman-trinity.1
index 8b0ad5df2..be0f29cbf 100644
--- a/debian/lenny/tdeedu/debian/man/khangman-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/khangman-trinity.1
@@ -42,7 +42,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/khangman/\fP.
 .SH AUTHOR
 KHangMan was written by Primoz Anzur <zerokode@gmx.net> and
diff --git a/debian/lenny/tdeedu/debian/man/kig-trinity.1 b/debian/lenny/tdeedu/debian/man/kig-trinity.1
index aa1916852..1c9089adb 100644
--- a/debian/lenny/tdeedu/debian/man/kig-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kig-trinity.1
@@ -69,7 +69,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kig/\fP.
 .SH AUTHOR
 Kig was written by Dominique Devriese <devriese@kde.org>,
diff --git a/debian/lenny/tdeedu/debian/man/kiten-trinity.1 b/debian/lenny/tdeedu/debian/man/kiten-trinity.1
index f3802f2f7..51942642e 100644
--- a/debian/lenny/tdeedu/debian/man/kiten-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kiten-trinity.1
@@ -41,7 +41,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kiten/\fP.
 .SH AUTHOR
 Kiten was written by Jason Katz-Brown <jason@katzbrown.com>,
diff --git a/debian/lenny/tdeedu/debian/man/kitengen-trinity.1 b/debian/lenny/tdeedu/debian/man/kitengen-trinity.1
index 8614e64a4..b3926aec9 100644
--- a/debian/lenny/tdeedu/debian/man/kitengen-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kitengen-trinity.1
@@ -44,7 +44,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kiten/\fP.
 .SH AUTHOR
 Kiten was written by Jason Katz-Brown <jason@katzbrown.com>,
diff --git a/debian/lenny/tdeedu/debian/man/klatin-trinity.1 b/debian/lenny/tdeedu/debian/man/klatin-trinity.1
index 1df356b85..7ce6d33a0 100644
--- a/debian/lenny/tdeedu/debian/man/klatin-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/klatin-trinity.1
@@ -47,7 +47,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/klatin/\fP.
 .SH AUTHOR
 KLatin was written by George Wright <gwright@kde.org> and others.
diff --git a/debian/lenny/tdeedu/debian/man/klettres-trinity.1 b/debian/lenny/tdeedu/debian/man/klettres-trinity.1
index 957860b1e..a241fa4f0 100644
--- a/debian/lenny/tdeedu/debian/man/klettres-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/klettres-trinity.1
@@ -41,7 +41,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/klettres/\fP.
 .SH AUTHOR
 KLettres was written by Anne-Marie Mahfouf <annma@kde.org> and many others.
diff --git a/debian/lenny/tdeedu/debian/man/kmplot-trinity.1 b/debian/lenny/tdeedu/debian/man/kmplot-trinity.1
index 9c6ece5df..427e97137 100644
--- a/debian/lenny/tdeedu/debian/man/kmplot-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kmplot-trinity.1
@@ -48,7 +48,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kmplot/\fP.
 .SH AUTHOR
 KmPlot was written by Klaus-Dieter Moeller <kdmoeller@foni.net>,
diff --git a/debian/lenny/tdeedu/debian/man/kpercentage-trinity.1 b/debian/lenny/tdeedu/debian/man/kpercentage-trinity.1
index 9d1fd916c..00eead897 100644
--- a/debian/lenny/tdeedu/debian/man/kpercentage-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kpercentage-trinity.1
@@ -40,7 +40,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kpercentage/\fP.
 .SH AUTHOR
 KPercentage was written by Matthias Messmer <bmlmessmer@web.de>,
diff --git a/debian/lenny/tdeedu/debian/man/kstars-trinity.1 b/debian/lenny/tdeedu/debian/man/kstars-trinity.1
index 2049ba113..28e2769a6 100644
--- a/debian/lenny/tdeedu/debian/man/kstars-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kstars-trinity.1
@@ -103,7 +103,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/debian/lenny/tdeedu/debian/man/ktouch-trinity.1 b/debian/lenny/tdeedu/debian/man/ktouch-trinity.1
index 52735f459..f16100d86 100644
--- a/debian/lenny/tdeedu/debian/man/ktouch-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/ktouch-trinity.1
@@ -46,7 +46,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/ktouch/\fP.
 .SH AUTHOR
 KTouch was written by Haavard Froeiland <haavard@users.sourceforge.net>
diff --git a/debian/lenny/tdeedu/debian/man/kturtle-trinity.1 b/debian/lenny/tdeedu/debian/man/kturtle-trinity.1
index 1131b08b3..87142fc2d 100644
--- a/debian/lenny/tdeedu/debian/man/kturtle-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kturtle-trinity.1
@@ -50,7 +50,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kturtle/\fP.
 .SH AUTHOR
 KTurtle was written by Cies Breijs <cies # kde.nl>,
diff --git a/debian/lenny/tdeedu/debian/man/kverbos-trinity.1 b/debian/lenny/tdeedu/debian/man/kverbos-trinity.1
index 607896ac6..3dc070868 100644
--- a/debian/lenny/tdeedu/debian/man/kverbos-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kverbos-trinity.1
@@ -45,7 +45,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kverbos/\fP.
 .SH AUTHOR
 Kverbos was written by Arnold Kraschinski <arnold.k67@gmx.de>.
diff --git a/debian/lenny/tdeedu/debian/man/kvoctrain-trinity.1 b/debian/lenny/tdeedu/debian/man/kvoctrain-trinity.1
index 0c6556b8d..9a738f419 100644
--- a/debian/lenny/tdeedu/debian/man/kvoctrain-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kvoctrain-trinity.1
@@ -50,7 +50,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kvoctrain/\fP.
 .SH AUTHOR
 KVocTrain was written by Ewald Arnold <kvoctrain@ewald-arnold.de>
diff --git a/debian/lenny/tdeedu/debian/man/kwordquiz-trinity.1 b/debian/lenny/tdeedu/debian/man/kwordquiz-trinity.1
index fb5a8f6db..dd2d9d1c6 100644
--- a/debian/lenny/tdeedu/debian/man/kwordquiz-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/kwordquiz-trinity.1
@@ -60,7 +60,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kwordquiz/\fP.
 .SH AUTHOR
 KWordQuiz was written by Peter Hedlund <peter@peterandlinda.com>.
diff --git a/debian/lenny/tdeedu/debian/man/lx200_16-trinity.1 b/debian/lenny/tdeedu/debian/man/lx200_16-trinity.1
index 81e31dce1..a15ba93f1 100644
--- a/debian/lenny/tdeedu/debian/man/lx200_16-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/lx200_16-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/debian/lenny/tdeedu/debian/man/lx200autostar-trinity.1 b/debian/lenny/tdeedu/debian/man/lx200autostar-trinity.1
index e95529bf9..2067b14a5 100644
--- a/debian/lenny/tdeedu/debian/man/lx200autostar-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/lx200autostar-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/debian/lenny/tdeedu/debian/man/lx200classic-trinity.1 b/debian/lenny/tdeedu/debian/man/lx200classic-trinity.1
index dc49b1cdd..1adef37dd 100644
--- a/debian/lenny/tdeedu/debian/man/lx200classic-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/lx200classic-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/debian/lenny/tdeedu/debian/man/lx200generic-trinity.1 b/debian/lenny/tdeedu/debian/man/lx200generic-trinity.1
index 20271620f..d1a78b97e 100644
--- a/debian/lenny/tdeedu/debian/man/lx200generic-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/lx200generic-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/debian/lenny/tdeedu/debian/man/lx200gps-trinity.1 b/debian/lenny/tdeedu/debian/man/lx200gps-trinity.1
index 0a9543b2d..edd53b5de 100644
--- a/debian/lenny/tdeedu/debian/man/lx200gps-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/lx200gps-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/debian/lenny/tdeedu/debian/man/temma-trinity.1 b/debian/lenny/tdeedu/debian/man/temma-trinity.1
index 6b48dba6b..6bdcc633a 100644
--- a/debian/lenny/tdeedu/debian/man/temma-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/temma-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/debian/lenny/tdeedu/debian/man/test_extdate-trinity.1 b/debian/lenny/tdeedu/debian/man/test_extdate-trinity.1
index f515e0d87..cf2006585 100644
--- a/debian/lenny/tdeedu/debian/man/test_extdate-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/test_extdate-trinity.1
@@ -37,7 +37,7 @@ This library is part of the official KDE edutainment module.
 .SH SEE ALSO
 .BR test_extdatepicker (1).
 .PP
-See \fI/opt/trinity/share/doc/libkdeedu-dev/README.extdate\fP for further
+See \fI/opt/trinity/share/doc/libtdeedu-dev/README.extdate\fP for further
 information on this library.
 .SH AUTHOR
 The ExtDate library was written by Jason Harris <jharris@30doradus.org>
diff --git a/debian/lenny/tdeedu/debian/man/test_extdatepicker-trinity.1 b/debian/lenny/tdeedu/debian/man/test_extdatepicker-trinity.1
index c207c51d8..f2112913e 100644
--- a/debian/lenny/tdeedu/debian/man/test_extdatepicker-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/test_extdatepicker-trinity.1
@@ -40,7 +40,7 @@ For a full summary of options, run \fItest_extdatepicker \-\-help\fP.
 .SH SEE ALSO
 .BR test_extdate (1).
 .PP
-See \fI/opt/trinity/share/doc/libkdeedu-dev/README.extdate\fP for further
+See \fI/opt/trinity/share/doc/libtdeedu-dev/README.extdate\fP for further
 information on this library.
 .SH AUTHOR
 The ExtDate library was written by Jason Harris <jharris@30doradus.org>
diff --git a/debian/lenny/tdeedu/debian/man/v4ldriver-trinity.1 b/debian/lenny/tdeedu/debian/man/v4ldriver-trinity.1
index 8a2ae5136..b53755563 100644
--- a/debian/lenny/tdeedu/debian/man/v4ldriver-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/v4ldriver-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/debian/lenny/tdeedu/debian/man/v4lphilips-trinity.1 b/debian/lenny/tdeedu/debian/man/v4lphilips-trinity.1
index 222a3ee9e..b56ca96cf 100644
--- a/debian/lenny/tdeedu/debian/man/v4lphilips-trinity.1
+++ b/debian/lenny/tdeedu/debian/man/v4lphilips-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/debian/lenny/tdeedu/debian/rules b/debian/lenny/tdeedu/debian/rules
index 9cdc7b73e..b19d3d32f 100755
--- a/debian/lenny/tdeedu/debian/rules
+++ b/debian/lenny/tdeedu/debian/rules
@@ -49,7 +49,7 @@ DEB_INSTALL_DOCS_ALL :=
 
 DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done)
 
-DEB_DH_MAKESHLIBS_ARGS_libkdeedu3-trinity := -V'libkdeedu3-trinity (>= 4:3.5.8)'
+DEB_DH_MAKESHLIBS_ARGS_libtdeedu3-trinity := -V'libtdeedu3-trinity (>= 4:3.5.8)'
 DEB_DH_MAKESHLIBS_ARGS_libkiten1-trinity := -V'libkiten1-trinity (>= 4:3.5.8)'
 
-PACKAGES_WITH_LIBS := libkdeedu3-trinity libkiten1-trinity kvoctrain-trinity
+PACKAGES_WITH_LIBS := libtdeedu3-trinity libkiten1-trinity kvoctrain-trinity
diff --git a/debian/lenny/tdeedu/debian/kdeedu-data-trinity.install b/debian/lenny/tdeedu/debian/tdeedu-data-trinity.install
index 021e2b38d..021e2b38d 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-data-trinity.install
+++ b/debian/lenny/tdeedu/debian/tdeedu-data-trinity.install
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.blinken b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.blinken
index 4391fbe96..4391fbe96 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.blinken
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.blinken
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kalzium b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kalzium
index c7a3e23a3..c7a3e23a3 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kalzium
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kalzium
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kbruch b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kbruch
index 3a2ca7ed2..3a2ca7ed2 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kbruch
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kbruch
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.keduca b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.keduca
index f8ef86fbb..f8ef86fbb 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.keduca
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.keduca
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kgeography b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kgeography
index 5f263705b..5f263705b 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kgeography
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kgeography
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.khangman b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.khangman
index f01c66ba2..f01c66ba2 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.khangman
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.khangman
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kig b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kig
index f7f63bac4..f7f63bac4 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kig
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kig
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kiten b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kiten
index 9339500ee..9339500ee 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kiten
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kiten
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.klatin b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.klatin
index ba3750a70..ba3750a70 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.klatin
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.klatin
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.klettres b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.klettres
index 504bd1cca..504bd1cca 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.klettres
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.klettres
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kmplot b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kmplot
index 8e8350ba8..8e8350ba8 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kmplot
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kmplot
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kpercentage b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kpercentage
index 1f8972434..1f8972434 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kpercentage
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kpercentage
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kstars b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kstars
index 2c0544de6..2c0544de6 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kstars
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kstars
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.ktouch b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.ktouch
index 9908362ca..9908362ca 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.ktouch
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.ktouch
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kturtle b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kturtle
index cde120379..cde120379 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kturtle
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kturtle
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kverbos b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kverbos
index 49faf645e..49faf645e 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kverbos
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kverbos
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kvoctrain b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kvoctrain
index af4dca29e..af4dca29e 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kvoctrain
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kvoctrain
diff --git a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kwordquiz b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kwordquiz
index 290adbc1f..290adbc1f 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-doc-html.doc-base.kwordquiz
+++ b/debian/lenny/tdeedu/debian/tdeedu-doc-html.doc-base.kwordquiz
diff --git a/debian/lenny/tdeedu/debian/kdeedu-trinity.README.Debian b/debian/lenny/tdeedu/debian/tdeedu-trinity.README.Debian
index f608d0cfb..0e0c0b0a5 100644
--- a/debian/lenny/tdeedu/debian/kdeedu-trinity.README.Debian
+++ b/debian/lenny/tdeedu/debian/tdeedu-trinity.README.Debian
@@ -1,11 +1,11 @@
 KDE Educational Applications for Debian
 ---------------------------------------
 
-Package kdeedu is a metapackage that depends on the full set of
+Package tdeedu is a metapackage that depends on the full set of
 edutainment applications provided with the official release of KDE.
 
 Each application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000