Rename a bunch of kde names to tde

44 files changed, 405 insertions, 405 deletions

diff --git a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.README.Debian
index d9a31b41e..522b2eb7f 100644
--- a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.README.Debian
@@ -3,6 +3,6 @@ Cervisia 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 kdesdk-doc-html.
+web browser, see the package tdesdk-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdesdk/debian/changelog b/ubuntu/maverick/tdesdk/debian/changelog
index e78025460..e041b19d5 100644
--- a/ubuntu/maverick/tdesdk/debian/changelog
+++ b/ubuntu/maverick/tdesdk/debian/changelog
@@ -1,80 +1,80 @@
-kdesdk-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
+tdesdk-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdesdk-trinity (4:3.5.10-0ubuntu1~intrepid5) intrepid; urgency=low
+tdesdk-trinity (4:3.5.10-0ubuntu1~intrepid5) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 02 March 2009 21:41:00 -0600
 
-kdesdk-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
+tdesdk-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
   * SVN import
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 28 Nov 2008 12:28:00 -0600
 
-kdesdk (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdesdk (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * Upstream bug fix release (LP: #261366)
-    - Bump build-dep versions for kdelibs4-dev, kdepim-dev, libkcal2-dev,
+    - Bump build-dep versions for tdelibs4-dev, tdepim-dev, libkcal2-dev,
       and libktnef1-dev to 3.5.10 
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:52:27 -0400
 
-kdesdk (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdesdk (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:08 +0000
 
-kdesdk (4:3.5.8-1ubuntu7) hardy; urgency=low
+tdesdk (4:3.5.8-1ubuntu7) hardy; urgency=low
 
   * Rebuild to get rid of libdb4.4.
 
  -- Matthias Klose <doko@ubuntu.com>  Mon, 04 Feb 2008 20:41:27 +0000
 
-kdesdk (4:3.5.8-1ubuntu6) hardy; urgency=low
+tdesdk (4:3.5.8-1ubuntu6) hardy; urgency=low
 
   * Add desktop i18n scripts to /usr/lib/kubuntu-desktop-i18n/
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Dec 2007 16:41:08 +0000
 
-kdesdk (4:3.5.8-1ubuntu5) hardy; urgency=low
+tdesdk (4:3.5.8-1ubuntu5) hardy; urgency=low
 
-  * Build-dep on kdepim 3.5.7enterprise20070926-1ubuntu4
+  * Build-dep on tdepim 3.5.7enterprise20070926-1ubuntu4
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 23 Nov 2007 14:50:30 +0000
 
-kdesdk (4:3.5.8-1ubuntu4) hardy; urgency=low
+tdesdk (4:3.5.8-1ubuntu4) hardy; urgency=low
 
   * Downgrade build-dep version of libktnef1-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 23 Nov 2007 11:27:44 +0000
 
-kdesdk (4:3.5.8-1ubuntu3) hardy; urgency=low
+tdesdk (4:3.5.8-1ubuntu3) hardy; urgency=low
 
   * Downgrade libkcal2-dev dependency to 3.5.8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 15:11:08 +0000
 
-kdesdk (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdesdk (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
-  * Downgrade kdepim dependency to 3.5.7
+  * Downgrade tdepim dependency to 3.5.7
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 11:03:22 +0000
 
-kdesdk (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdesdk (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, no changes except LP translations patch
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:47 +0000
 
-kdesdk (4:3.5.8-1) unstable; urgency=low
+tdesdk (4:3.5.8-1) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
   
@@ -89,19 +89,19 @@ kdesdk (4:3.5.8-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 15 Oct 2007 16:17:11 +0200
 
-kdesdk (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdesdk (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:27 +0100
 
-kdesdk (4:3.5.7-2ubuntu1) gutsy; urgency=low
+tdesdk (4:3.5.7-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian for new Umbrello upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 27 Jul 2007 13:36:44 +0100
 
-kdesdk (4:3.5.7-3) unstable; urgency=low
+tdesdk (4:3.5.7-3) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -116,20 +116,20 @@ kdesdk (4:3.5.7-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 23 Jul 2007 23:27:56 +0200
 
-kdesdk (4:3.5.7-2) unstable; urgency=low
+tdesdk (4:3.5.7-2) unstable; urgency=low
 
   * Install new images in kompare documentation. Thanks to Jonathan Riddell 
     for the pointer.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 23 May 2007 22:03:38 +0100
 
-kdesdk (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdesdk (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * Merge with Debian for new upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 May 2007 17:42:32 +0100
 
-kdesdk (4:3.5.7-1) unstable; urgency=low
+tdesdk (4:3.5.7-1) unstable; urgency=low
 
   * New upstream release. (Closes: #421918, #417309)
 
@@ -141,32 +141,32 @@ kdesdk (4:3.5.7-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 16 May 2007 16:08:05 +0100
 
-kdesdk (4:3.5.6-2ubuntu1) gutsy; urgency=low
+tdesdk (4:3.5.6-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 20:32:57 +0100
 
-kdesdk (4:3.5.6-2) unstable; urgency=low
+tdesdk (4:3.5.6-2) unstable; urgency=low
 
   * Upload to unstable after Etch release.
 
   +++ Changes by Sune Vuorela:
 
   * Promote graphviz from kcachegrind Suggests to Recommends. (Closes: #407043)
-  * Don't install the licensecheck script in kdesdk. The devscripts package
-    has taken it and is working actively on it. Let kdesdk-scripts suggest
+  * Don't install the licensecheck script in tdesdk. The devscripts package
+    has taken it and is working actively on it. Let tdesdk-scripts suggest
     devscripts instead. (Closes: #420154)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 23 Apr 2007 11:53:44 +0100
 
-kdesdk (4:3.5.6-1) experimental; urgency=low
+tdesdk (4:3.5.6-1) experimental; urgency=low
 
   * New upstream release.
   
   +++ Changes by Josh Metzler:
 
-  * Make kdesdk-dbg depend on kdelibs-dbg to get useful backtraces when
+  * Make tdesdk-dbg depend on tdelibs-dbg to get useful backtraces when
     debugging.
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
@@ -176,27 +176,27 @@ kdesdk (4:3.5.6-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 18 Jan 2007 18:32:21 +0100
 
-kdesdk (4:3.5.5-3) unstable; urgency=low
+tdesdk (4:3.5.5-3) unstable; urgency=low
 
   * Update automake 1.10 support patch as cdbs runs patch with -p1 before -p0
     and patches the wrong file. (Closes: #396985)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 16 Nov 2006 17:01:23 -0500
 
-kdesdk (4:3.5.6-0ubuntu2) feisty; urgency=low
+tdesdk (4:3.5.6-0ubuntu2) feisty; urgency=low
 
   * Added kubuntu_01_umbrello_1.5.61.diff, brings Umbrello up to 1.5.61 release
 
  -- Juan Carlos G. Torres <jucato@kubuntu.org>  Fri, 30 Mar 2007 22:57:02 +0800
 
-kdesdk (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdesdk (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
   * Remove 07_support_automake1-10_in_template.diff, applied upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:31 +0000
 
-kdesdk (4:3.5.5-3ubuntu2) feisty; urgency=low
+tdesdk (4:3.5.5-3ubuntu2) feisty; urgency=low
 
   * Merge back Ubuntu changes
    - build with --enable-gcc-hidden-visibility
@@ -206,13 +206,13 @@ kdesdk (4:3.5.5-3ubuntu2) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 24 Nov 2006 12:36:00 +0000
 
-kdesdk (4:3.5.5-3ubuntu1) feisty; urgency=low
+tdesdk (4:3.5.5-3ubuntu1) feisty; urgency=low
 
   * Fake sync.
 
  -- Scott James Remnant <scott@ubuntu.com>  Fri, 24 Nov 2006 11:13:09 +0000
 
-kdesdk (4:3.5.5-2) unstable; urgency=low
+tdesdk (4:3.5.5-2) unstable; urgency=low
 
   +++ Changes by Fathi Boudra:
 
@@ -222,15 +222,15 @@ kdesdk (4:3.5.5-2) unstable; urgency=low
   +++ Changes by Sune Vuorela:
 
   * Add support for automake 1.10 to kapptemplate. (Closes: #396985)
-  * Add Suggests: kdelibs4-doc to kunittest. kdelibs4-doc contains kunittest
+  * Add Suggests: tdelibs4-doc to kunittest. tdelibs4-doc contains kunittest
     documentation. (Closes: #386040)
   * Don't install /usr/bin/kunittest and /usr/bin/kunittest_debughelper. These
     are not useful without the dcopperl bindings which are not built in the
-    Debian kdebindings packages. (Closes: #386039)
+    Debian tdebindings packages. (Closes: #386039)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 14 Nov 2006 17:34:11 -0500
 
-kdesdk (4:3.5.5-1) unstable; urgency=low
+tdesdk (4:3.5.5-1) unstable; urgency=low
 
   [ Debian Qt/KDE Maintainers ]
   * New upstream release.
@@ -250,7 +250,7 @@ kdesdk (4:3.5.5-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 10 Oct 2006 00:53:47 +0200
 
-kdesdk (4:3.5.4-1) unstable; urgency=low
+tdesdk (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
     + Contains up-to-date KDE admin dir in kapptemplate. This includes
@@ -266,26 +266,26 @@ kdesdk (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 26 Aug 2006 13:20:23 -0400
 
-kdesdk (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdesdk (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:07 +0000
 
-kdesdk (4:3.5.4-0ubuntu4) edgy; urgency=low
+tdesdk (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:11 +0000
 
-kdesdk (4:3.5.4-0ubuntu3) edgy; urgency=low
+tdesdk (4:3.5.4-0ubuntu3) edgy; urgency=low
 
   * Remove broken kolf rules from debian/desktop-i18n/findfiles
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 30 Aug 2006 16:44:06 +0000
 
-kdesdk (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdesdk (4:3.5.4-0ubuntu2) edgy; urgency=low
 
   * Add desktop i18n scripts to /usr/lib/kubuntu-desktop-i18n/
     for building packages, see 
@@ -293,32 +293,32 @@ kdesdk (4:3.5.4-0ubuntu2) edgy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  2 Aug 2006 10:42:16 +0000
 
-kdesdk (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdesdk (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:19 +0000
 
-kdesdk (4:3.5.3-1ubuntu3) edgy; urgency=low
+tdesdk (4:3.5.3-1ubuntu3) edgy; urgency=low
 
-  * Build-dep on kdepim-dev 3.5.3-2ubuntu3 to avoid libfam.la breakage
+  * Build-dep on tdepim-dev 3.5.3-2ubuntu3 to avoid libfam.la breakage
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Jul 2006 15:20:07 +0000
 
-kdesdk (4:3.5.3-1ubuntu2) edgy; urgency=low
+tdesdk (4:3.5.3-1ubuntu2) edgy; urgency=low
 
   * Rebuild without lifam.la, no changes
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 12 Jul 2006 10:42:52 +0000
 
-kdesdk (4:3.5.3-1ubuntu1) edgy; urgency=low
+tdesdk (4:3.5.3-1ubuntu1) edgy; urgency=low
 
   * New upstream release
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Jul 2006 16:03:08 +0000
 
-kdesdk (4:3.5.2-1) unstable; urgency=low
+tdesdk (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -326,17 +326,17 @@ kdesdk (4:3.5.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 30 Mar 2006 08:43:32 -0500
 
-kdesdk (4:3.5.1-1) unstable; urgency=low
+tdesdk (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
 
   +++ Changes by Christopher Martin:
 
-  * Allow kdesvn-kio-plugins to satisfy kdesdk's dependencies instead of
-    kdesdk-kio-plugins, since it is a replacement for kdesdk-kio-plugins
+  * Allow tdesvn-kio-plugins to satisfy tdesdk's dependencies instead of
+    tdesdk-kio-plugins, since it is a replacement for tdesdk-kio-plugins
     and provides equivalent functionality. (Closes: #347903)
 
-  * Eliminate libcvsservice0's Recommends on kdelibs-bin.
+  * Eliminate libcvsservice0's Recommends on tdelibs-bin.
 
   * Upload to unstable.
 
@@ -346,7 +346,7 @@ kdesdk (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  2 Feb 2006 11:06:25 -0500
 
-kdesdk (4:3.5.0-3) unstable; urgency=low
+tdesdk (4:3.5.0-3) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -356,7 +356,7 @@ kdesdk (4:3.5.0-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 12 Jan 2006 20:12:15 -0500
 
-kdesdk (4:3.5.0-2) experimental; urgency=low
+tdesdk (4:3.5.0-2) experimental; urgency=low
 
   * Upload to experimental.
 
@@ -373,39 +373,39 @@ kdesdk (4:3.5.0-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 21 Dec 2005 08:28:13 -0500
 
-kdesdk (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdesdk (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Edit debian/cdbs/debian-qt-kde.mk to use dh_iconcache
 
  -- Gauvain Pocentek <gauvainpocentek@ubuntu.com>  Tue, 23 May 2006 19:34:53 +0200
 
-kdesdk (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdesdk (4:3.5.2-0ubuntu2) dapper; urgency=low
 
   * Edit debian/cdbs/kde.mk to generate .po files
   * Edit debian/cdbs/kde.mk to mark .po files as UTF-8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Apr 2006 16:29:18 +0100
 
-kdesdk (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdesdk (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:31 +0000
 
-kdesdk (4:3.5.1-0ubuntu3) dapper; urgency=low
+tdesdk (4:3.5.1-0ubuntu3) dapper; urgency=low
 
   * Remove build-dep on libdb4.x, correct versin will be
     brought in by other packages
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 21 Feb 2006 14:55:07 +0000
 
-kdesdk (4:3.5.1-0ubuntu2) dapper; urgency=low
+tdesdk (4:3.5.1-0ubuntu2) dapper; urgency=low
 
   * Don't use GCC 3.4 on hppa
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Feb 2006 12:03:17 +0000
 
-kdesdk (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdesdk (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Update Replaces on libcvsservice0 for cervisia
@@ -413,29 +413,29 @@ kdesdk (4:3.5.1-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:07 +0000
 
-kdesdk (4:3.5.0-1ubuntu1) dapper; urgency=low
+tdesdk (4:3.5.0-1ubuntu1) dapper; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  8 Dec 2005 17:54:03 +0000
 
-kdesdk (4:3.5.0-1) alioth; urgency=low
+tdesdk (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
 
   +++ Changes by Christopher Martin:
 
-  * Add a kdesdk-dbg package for helping to trace problems.
+  * Add a tdesdk-dbg package for helping to trace problems.
 
-  * New packages: kunittest, and kdesdk-kio-plugins, which splits
-    out the svn ioslave from kdesdk-misc.
+  * New packages: kunittest, and tdesdk-kio-plugins, which splits
+    out the svn ioslave from tdesdk-misc.
 
   * Re-libtoolize. This fixes GNU/kFreeBSD, and prunes poxml's
     excessive dependencies. (Closes: #327706, #329902)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue,  6 Dec 2005 13:10:37 -0500
 
-kdesdk (4:3.4.3-1) unstable; urgency=low
+tdesdk (4:3.4.3-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -446,48 +446,48 @@ kdesdk (4:3.4.3-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon,  5 Dec 2005 07:23:04 -0500
 
-kdesdk (4:3.5.0-0ubuntu2) dapper; urgency=low
+tdesdk (4:3.5.0-0ubuntu2) dapper; urgency=low
 
   * Change libdb4.2 build-dep to libdb4.3
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  8 Dec 2005 02:48:59 +0000
 
-kdesdk (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdesdk (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:28:57 +0000
 
-kdesdk (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdesdk (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * Sync with Debian
   * New upstream pre-release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 Nov 2005 15:00:05 +0000
 
-kdesdk (4:3.4.2-2.1) unstable; urgency=medium
+tdesdk (4:3.4.2-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
   * Build-dep on g++-3.4 on arm, hppa and m68k (closes:#330934). 
 
  -- Luk Claes <luk@debian.org>  Sat,  1 Oct 2005 20:21:41 +0200
 
-kdesdk (4:3.4.2-2) unstable; urgency=low
+tdesdk (4:3.4.2-2) unstable; urgency=low
 
   * Built against libfam-dev, not libgamin-dev (closes: #326547).
   * Updated overrides files to account for kdeinit black magic.
 
  -- Ben Burton <bab@debian.org>  Sun,  4 Sep 2005 10:58:17 +1000
 
-kdesdk (4:3.4.2-1) unstable; urgency=low
+tdesdk (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 libcvsservice0 package name does not need to change.
   * Updated FSF address in the copyright file.
-  * Changed the conflicts on kdevelop3-plugins to a versioned replaces as
+  * Changed the conflicts on tdevelop3-plugins to a versioned replaces as
     described in the changelog for 4:3.4.0-0pre2.
   * Removed redundant xlibs-dev recommendation from kapptemplate.
   * Adjusted Ivan's changelog entry from 29 Feb 2001 to 01 Mar 2001 so the
@@ -497,68 +497,68 @@ kdesdk (4:3.4.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun,  4 Sep 2005 01:14:27 +1000
 
-kdesdk (4:3.4.3-0ubuntu1) breezy; urgency=low
+tdesdk (4:3.4.3-0ubuntu1) breezy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat,  8 Oct 2005 21:59:11 +0000
 
-kdesdk (4:3.4.2-0ubuntu2) breezy; urgency=low
+tdesdk (4:3.4.2-0ubuntu2) breezy; urgency=low
 
-  * Add missing files to libcvsserver0, kdesdk-scripts and kompare.
+  * Add missing files to libcvsserver0, tdesdk-scripts and kompare.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 28 Jul 2005 17:55:43 +0000
 
-kdesdk (4:3.4.2-0ubuntu1) breezy; urgency=low
+tdesdk (4:3.4.2-0ubuntu1) breezy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 16:25:16 +0000
 
-kdesdk (4:3.4.1-0ubuntu5) breezy; urgency=low
+tdesdk (4:3.4.1-0ubuntu5) breezy; urgency=low
 
   * Rebuild for removed libXcursor.la and libXrender.la
-    and tighten kdelibs dependency.
+    and tighten tdelibs dependency.
 
  -- Jonathan Riddell <jr@jriddell.org>  Sun, 24 Jul 2005 23:54:37 +0000
 
-kdesdk (4:3.4.1-0ubuntu4) breezy; urgency=low
+tdesdk (4:3.4.1-0ubuntu4) breezy; urgency=low
 
   * Add build-depend on libxi-dev
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 30 Jun 2005 13:42:22 +0000
 
-kdesdk (4:3.4.1-0ubuntu3) breezy; urgency=low
+tdesdk (4:3.4.1-0ubuntu3) breezy; urgency=low
 
-  * Add version to kdesdk-misc conflict on kdevelop3-plugins
+  * Add version to tdesdk-misc conflict on tdevelop3-plugins
 
  -- Jonathan Riddell <jr@jriddell.org>  Mon,  6 Jun 2005 22:45:10 +0000
 
-kdesdk (4:3.4.1-0ubuntu2) breezy; urgency=low
+tdesdk (4:3.4.1-0ubuntu2) breezy; urgency=low
 
   * Add libkdeinit_cvsservice.so to libcvsservice0.install
   * Add cervisia.so and libkdeinit_cervisia.so to cervisia.install
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu,  2 Jun 2005 01:33:59 +0000
 
-kdesdk (4:3.4.1-0ubuntu1) breezy; urgency=low
+tdesdk (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:56:16 +0000
 
-kdesdk (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+tdesdk (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 26 May 2005 16:34:06 +0000
 
-kdesdk (4:3.4.0-0pre2) unstable; urgency=low
+tdesdk (4:3.4.0-0pre2) unstable; urgency=low
 
   * Merge in recent packaging changes from the 3.3 branch.
-  * Introduce a temporary conflicts against kdevelop3-plugins, which provides
-    a copy of the subversion I/O slave taken from kdesdk-misc.  This will be
-    removed once kdevelop has been rebuilt against KDE 3.4 (without the
+  * Introduce a temporary conflicts against tdevelop3-plugins, which provides
+    a copy of the subversion I/O slave taken from tdesdk-misc.  This will be
+    removed once tdevelop has been rebuilt against KDE 3.4 (without the
     subversion I/O slave), and a versioned replaces will be put in place
     instead.
   * Now that KDE has moved to subversion, disable cvs-clean in debian/rules
@@ -566,11 +566,11 @@ kdesdk (4:3.4.0-0pre2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 14 May 2005 19:20:58 +1000
 
-kdesdk (4:3.4.0-0pre1) unstable; urgency=low
+tdesdk (4:3.4.0-0pre1) unstable; urgency=low
 
   * New major upstream release.
-  * Note that although libktnef.la has moved from kdepim-dev to libktnef1-dev,
-    a build-dependency on kdepim-dev is still required for some header files.
+  * Note that although libktnef.la has moved from tdepim-dev to libktnef1-dev,
+    a build-dependency on tdepim-dev is still required for some header files.
   * Removed cvs dependency from cervisia, since this comes indirectly through
     libcvsservice0 anyway.  Updated the cvs dependency for libcvsservice
     to require cvs (>= 1.11), as cervisia used to when it handled cvs itself.
@@ -578,38 +578,38 @@ kdesdk (4:3.4.0-0pre1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Fri, 25 Mar 2005 12:56:49 +1100
 
-kdesdk (4:3.4.0-0ubuntu5) hoary; urgency=low
+tdesdk (4:3.4.0-0ubuntu5) hoary; urgency=low
 
   * Update cdbs/kde.mk
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue, 29 Mar 2005 22:58:09 +0000
 
-kdesdk (4:3.4.0-0ubuntu4) hoary; urgency=low
+tdesdk (4:3.4.0-0ubuntu4) hoary; urgency=low
 
   * Add paths.diff
 
  -- Jonathan Riddell <jr@jriddell.org>  Mon, 28 Mar 2005 23:01:12 +0000
 
-kdesdk (4:3.4.0-0ubuntu3) hoary; urgency=low
+tdesdk (4:3.4.0-0ubuntu3) hoary; urgency=low
 
   * added empty empty patches 
 
  -- Andreas Mueller <amu@ubuntu.com>  Wed, 23 Mar 2005 10:46:56 +0000
 
-kdesdk (4:3.4.0-0ubuntu2) hoary; urgency=low
+tdesdk (4:3.4.0-0ubuntu2) hoary; urgency=low
 
   * fixed broken patchdir
   * added KDE branch patches   
 
  -- Andreas Mueller <amu@ubuntu.com>  Tue, 22 Mar 2005 20:57:56 +0000
 
-kdesdk (4:3.4.0-0ubuntu1) hoary; urgency=low
+tdesdk (4:3.4.0-0ubuntu1) hoary; urgency=low
 
   * New upstream release.
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 17 Mar 2005 04:18:57 +0000
 
-kdesdk (4:3.3.2-3) unstable; urgency=high
+tdesdk (4:3.3.2-3) unstable; urgency=high
 
   * Fresh pull from KDE_3_3_BRANCH for recent bugfixes.
   * Many thanks to upstream who have relicensed cervisia under the GPL
@@ -622,12 +622,12 @@ kdesdk (4:3.3.2-3) unstable; urgency=high
 
  -- Ben Burton <bab@debian.org>  Thu, 31 Mar 2005 19:59:13 +1000
 
-kdesdk (4:3.3.2-2) unstable; urgency=high
+tdesdk (4:3.3.2-2) unstable; urgency=high
 
   * Fixed drag-and-drop problems in umbrello that can cause a real and/or
     apparent loss of data (closes: #296433).
   * Patched kbabel spell-check-as-you-go to use checkWord() instead of check(),
-    which seems to protect it from the kdelibs crash described in #289646.
+    which seems to protect it from the tdelibs crash described in #289646.
   * Added the full text of the GFDL to debian/copyright, since all of the
     docbook documentation is under this license.
   * Added a note to README.Debian in the poxml package regarding the
@@ -636,10 +636,10 @@ kdesdk (4:3.3.2-2) unstable; urgency=high
 
  -- Ben Burton <bab@debian.org>  Thu, 24 Mar 2005 07:59:47 +1100
 
-kdesdk (4:3.3.2-1) unstable; urgency=low
+tdesdk (4:3.3.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
-  * Rebuilt against libkcal2a and reversioned kdepim-dev and libkcal2-dev
+  * Rebuilt against libkcal2a and reversioned tdepim-dev and libkcal2-dev
     build-depends to >= 4:3.3.2 accordingly (closes: #291592).
   * Fixed setupGUI() typo in kapptemplate (part of #289304).
   * Added a README.Debian for poxml that outlines the available binaries
@@ -649,9 +649,9 @@ kdesdk (4:3.3.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 22 Jan 2005 07:29:29 +1100
 
-kdesdk (4:3.3.1-2) unstable; urgency=medium
+tdesdk (4:3.3.1-2) unstable; urgency=medium
 
-  * Build-depends on kdepim-dev (>= 4:3.3.1), which provides libktnef.la.
+  * Build-depends on tdepim-dev (>= 4:3.3.1), which provides libktnef.la.
     When building against libkcal2-dev (>= 4:3.3.1), libktnef.la is needed
     at link time.
   * Also changed libkcal2-dev in the build-depends to the versioned
@@ -659,7 +659,7 @@ kdesdk (4:3.3.1-2) unstable; urgency=medium
 
  -- Ben Burton <bab@debian.org>  Thu,  9 Dec 2004 08:16:17 +1100
 
-kdesdk (4:3.3.1-1) unstable; urgency=medium
+tdesdk (4:3.3.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.
   * Build-conflicts with autoconf2.13, which does not play well with
@@ -669,7 +669,7 @@ kdesdk (4:3.3.1-1) unstable; urgency=medium
 
  -- Ben Burton <bab@debian.org>  Thu, 28 Oct 2004 19:03:02 +1000
 
-kdesdk (4:3.3.0-1) unstable; urgency=low
+tdesdk (4:3.3.0-1) unstable; urgency=low
 
   * New upstream release.
   * New package kcachegrind-converters.  These foreign format converters
@@ -678,36 +678,36 @@ kdesdk (4:3.3.0-1) unstable; urgency=low
     for debian are now installed in /usr/lib/kmtrace, not in /usr/lib as
     is done upstream.
   * Versioned libqt3-mt-dev build-depends is no longer necessary since
-    kdelibs4-dev already forces Qt 3.3.
-  * Made libcvsservice-dev depend on kdelibs4-dev.
+    tdelibs4-dev already forces Qt 3.3.
+  * Made libcvsservice-dev depend on tdelibs4-dev.
   * Removed python dependency from poxml, since all apps are now compiled
     binaries.
-  * Added a sample kde-buildrc to the kdesdk-scripts documentation.
+  * Added a sample kde-buildrc to the tdesdk-scripts documentation.
 
  -- Ben Burton <bab@debian.org>  Fri, 15 Oct 2004 09:55:26 +1000
 
-kdesdk (4:3.2.3-2) unstable; urgency=low
+tdesdk (4:3.2.3-2) unstable; urgency=low
 
   * Fixed C++ code generator to use keyword "virtual" when declaring
     abstract operations (closes: #255552).
 
  -- Ben Burton <bab@debian.org>  Thu, 24 Jun 2004 08:35:22 +1000
 
-kdesdk (4:3.2.3-1) unstable; urgency=low
+tdesdk (4:3.2.3-1) unstable; urgency=low
 
   * New upstream bugfix release.
-  * Rebuilt against STL-enabled Qt and corresponding kdelibs.
+  * Rebuilt against STL-enabled Qt and corresponding tdelibs.
   * Added manpages for cvs2dist and build-progress.sh.
   * Use real paths for doc-base entries instead of symlinked paths
     (closes: #247690).
-  * Suggests (konqueror | www-browser) for kdesdk-doc-html instead of
+  * Suggests (konqueror | www-browser) for tdesdk-doc-html instead of
     just www-browser.
   * KBabel catalogue manager no longer opens spurious empty windows
     (closes: #237031).
 
  -- Ben Burton <bab@debian.org>  Wed, 16 Jun 2004 08:41:42 +1000
 
-kdesdk (4:3.2.2-1) unstable; urgency=low
+tdesdk (4:3.2.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
   * Add Conflicts/Replaces for umbrello-manual (closes: #237173).
@@ -716,45 +716,45 @@ kdesdk (4:3.2.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Tue, 16 Mar 2004 09:15:01 +1100
 
-kdesdk (4:3.2.1-1) unstable; urgency=low
+tdesdk (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
 
-kdesdk (4:3.2.0-2) experimental; urgency=low
+tdesdk (4:3.2.0-2) experimental; urgency=low
 
   * First KDE 3.2 upload to experimental.
   * Sync from KDE_3_2_BRANCH for recent bugfixes.
-  * Using versioned dependencies for the kdesdk metapackage.
+  * Using versioned dependencies for the tdesdk metapackage.
 
  -- Ben Burton <bab@debian.org>  Mon, 23 Feb 2004 08:14:22 +1100
 
-kdesdk (4:3.2.0-1) unstable; urgency=low
+tdesdk (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.
   * Thanks to Robert Lemmen for previous packaging work on umbrello and
     to Philipp Frauenfelder for previous packaging work on kcachegrind.
   * New binary packages kcachegrind, kuiviewer and umbrello.
-  * Created a new package kdesdk-doc-html for HTML documentation.
+  * Created a new package tdesdk-doc-html for HTML documentation.
 
  -- Ben Burton <bab@debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
 
-kdesdk (4:3.1.5-1) unstable; urgency=low
+tdesdk (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <bab@debian.org>  Sun, 18 Jan 2004 12:55:12 +1100
 
-kdesdk (4:3.1.4-3) unstable; urgency=low
+tdesdk (4:3.1.4-3) unstable; urgency=low
 
   * New pull from BRANCH; includes bugfixes for kbabel and kompare.
   * Fixed freeze in KBabel spellcheck (closes: #209397).
 
  -- Ben Burton <bab@debian.org>  Fri, 12 Dec 2003 10:42:10 +1100
 
-kdesdk (4:3.1.4-2) unstable; urgency=low
+tdesdk (4:3.1.4-2) unstable; urgency=low
 
   * Patched split2po to handle entities inside attributes correctly;
     thanks to Denis Barbier (closes: #213036).
@@ -764,14 +764,14 @@ kdesdk (4:3.1.4-2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Tue, 14 Oct 2003 16:26:05 +1000
 
-kdesdk (4:3.1.4-1) unstable; urgency=low
+tdesdk (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
   * Bumped standards-version to 3.6.1.
 
  -- Ben Burton <bab@debian.org>  Mon, 29 Sep 2003 15:08:53 +1000
 
-kdesdk (4:3.1.3-2) unstable; urgency=low
+tdesdk (4:3.1.3-2) unstable; urgency=low
 
   * Rebuilt against Qt 3.2 so kbabel no longer crashes (closes: #208509).
   * Added versioned build-depends on libqt3-mt-dev (>= 3:3.2.1).
@@ -779,7 +779,7 @@ kdesdk (4:3.1.3-2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Fri,  5 Sep 2003 12:07:17 +1000
 
-kdesdk (4:3.1.3-1) unstable; urgency=low
+tdesdk (4:3.1.3-1) unstable; urgency=low
 
   * New upstream release.
   * Split menu titles into title/longtitle.
@@ -787,7 +787,7 @@ kdesdk (4:3.1.3-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Wed, 13 Aug 2003 11:02:26 +1000
 
-kdesdk (4:3.1.2-1) unstable; urgency=low
+tdesdk (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
   * Build-depends on flex-old instead of flex (closes: #193871).
@@ -796,7 +796,7 @@ kdesdk (4:3.1.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun,  1 Jun 2003 14:15:47 +1000
 
-kdesdk (4:3.1.1-1) unstable; urgency=low
+tdesdk (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release.
   * Removed binary package kmtrace which claims not to work with
@@ -804,7 +804,7 @@ kdesdk (4:3.1.1-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 22 Mar 2003 16:18:51 +1100
 
-kdesdk (4:3.1.0-5) unstable; urgency=low
+tdesdk (4:3.1.0-5) unstable; urgency=low
 
   * Renamed symbolmatch to kmmatch and kdefixincludes to fixkdeincludes;
     these will be the upstream names in KDE 3.2.
@@ -812,25 +812,25 @@ kdesdk (4:3.1.0-5) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Mon, 17 Mar 2003 08:35:19 +1100
 
-kdesdk (4:3.1.0-4) unstable; urgency=low
+tdesdk (4:3.1.0-4) unstable; urgency=low
 
   * Updated admin/ so that kapptemplate's admin/ works with the new Qt
     packaging style.
 
  -- Ben Burton <bab@debian.org>  Wed, 12 Mar 2003 13:28:16 +1100
 
-kdesdk (4:3.1.0-3) unstable; urgency=low
+tdesdk (4:3.1.0-3) unstable; urgency=low
 
   * Changed /usr/bin/match to /usr/bin/symbolmatch to avoid filename
     conflicts (closes: #181840).
   * Build-depends on libqt3-compat-headers for now until obsolete
-    #includes are removed from both kdesdk and kdelibs.
+    #includes are removed from both tdesdk and tdelibs.
   * Added patch to work around flex's namespace problems until the
     flex package is fixed.
 
  -- Ben Burton <bab@debian.org>  Tue, 25 Feb 2003 11:50:26 +1100
 
-kdesdk (4:3.1.0-2) unstable; urgency=low
+tdesdk (4:3.1.0-2) unstable; urgency=low
 
   * First Trinity upload to debian (closes: #167062).
   * Rolled the epoch to aid upgrades from the unofficial repository on
@@ -838,16 +838,16 @@ kdesdk (4:3.1.0-2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun,  2 Feb 2003 19:40:16 +1100
 
-kdesdk (3.1.0-1) unstable; urgency=low
+tdesdk (3.1.0-1) unstable; urgency=low
 
   * New upstream release.
-  * Merged kdepalettes package into kdesdk-misc.
+  * Merged kdepalettes package into tdesdk-misc.
   * Installs shell completion controls.
   * Replaced the old kde-devel-emacs.el with the new kde-emacs.el.
 
  -- Ben Burton <bab@debian.org>  Mon, 18 Nov 2002 14:15:59 +1100
 
-kdesdk (3.0.9-1) unstable; urgency=low
+tdesdk (3.0.9-1) unstable; urgency=low
 
   * New upstream release.
   * Built with g++-3.2.
@@ -855,7 +855,7 @@ kdesdk (3.0.9-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Tue, 22 Oct 2002 11:57:39 +1000
 
-kdesdk (3.0.8-1) unstable; urgency=low
+tdesdk (3.0.8-1) unstable; urgency=low
 
   * New upstream release.
   * Moved to Chris Cheney's style of debian/rules.
@@ -864,7 +864,7 @@ kdesdk (3.0.8-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sun, 22 Sep 2002 17:57:55 +1000
 
-kdesdk (3.0.3-2) unstable; urgency=low
+tdesdk (3.0.3-2) unstable; urgency=low
 
   * Rename static kmtrace library to libktrace_s.a.
   * Install vim helper file.
@@ -872,13 +872,13 @@ kdesdk (3.0.3-2) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sat,  7 Sep 2002 19:03:33 +1000
 
-kdesdk (3.0.3-1) unstable; urgency=low
+tdesdk (3.0.3-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Thu, 15 Aug 2002 13:22:22 +1000
 
-kdesdk (3.0.2-2) unstable; urgency=low
+tdesdk (3.0.2-2) unstable; urgency=low
 
   * Build-depends on automake1.5.
   * Install cvschanged.
@@ -886,69 +886,69 @@ kdesdk (3.0.2-2) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sat,  6 Jul 2002 14:58:13 +1000
 
-kdesdk (3.0.2-1) unstable; urgency=low
+tdesdk (3.0.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Thu,  4 Jul 2002 19:36:49 +1000
 
-kdesdk (3.0.1-1) unstable; urgency=low
+tdesdk (3.0.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Mon, 13 May 2002 03:15:24 +1000
 
-kdesdk (2.2.2-7) unstable; urgency=low
+tdesdk (2.2.2-7) unstable; urgency=low
 
-  * kdesdk-scripts recommends gawk for kdekillall (closes: Bug#156109).
+  * tdesdk-scripts recommends gawk for kdekillall (closes: Bug#156109).
 
  -- Ben Burton <benb@acm.org>  Sat, 10 Aug 2002 14:25:35 +1000
 
-kdesdk (2.2.2-6) unstable; urgency=low
+tdesdk (2.2.2-6) unstable; urgency=low
 
-  * Emptied kdesdk-scripts.links instead of removing it so the diff works
+  * Emptied tdesdk-scripts.links instead of removing it so the diff works
     correctly (closes: Bug#154803).
 
  -- Ben Burton <benb@acm.org>  Fri,  2 Aug 2002 14:28:27 +1000
 
-kdesdk (2.2.2-5) unstable; urgency=low
+tdesdk (2.2.2-5) unstable; urgency=low
 
   * Fixed manpage section for kdelnk2desktop.py.1 (closes: #148371).
 
  -- Ben Burton <benb@acm.org>  Sat,  6 Jul 2002 14:02:27 +1000
 
-kdesdk (2.2.2-4) unstable; urgency=low
+tdesdk (2.2.2-4) unstable; urgency=low
 
-  * Package kspy depends on kdelibs-dev (closes: Bug#150707).
+  * Package kspy depends on tdelibs-dev (closes: Bug#150707).
 
  -- Ben Burton <benb@acm.org>  Sun, 23 Jun 2002 13:02:06 +1000
 
-kdesdk (2.2.2-3) unstable; urgency=low
+tdesdk (2.2.2-3) unstable; urgency=low
 
   * Fixed gcc3 build (closes: Bug#138177).
 
  -- Ben Burton <benb@acm.org>  Tue, 19 Mar 2002 17:01:44 +1100
 
-kdesdk (2.2.2-2) unstable; urgency=low
+tdesdk (2.2.2-2) unstable; urgency=low
 
   * Moved kspy.h to /usr/include/kde (closes: Bug#122448, Bug#122449).
 
  -- Ben Burton <benb@acm.org>  Thu,  6 Dec 2001 09:50:47 -0600
 
-kdesdk (2.2.2-1) unstable; urgency=low
+tdesdk (2.2.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Wed,  7 Nov 2001 10:49:53 -0600
 
-kdesdk (2.2.1-4) unstable; urgency=low
+tdesdk (2.2.1-4) unstable; urgency=low
 
   * Uses automake again to solve new alpha problems.
   * Updated to reflect new python policy.
 
  -- Ben Burton <benb@acm.org>  Tue,  6 Nov 2001 23:51:27 -0600
 
-kdesdk (2.2.1-3) unstable; urgency=low
+tdesdk (2.2.1-3) unstable; urgency=low
 
   * Builds with automake 1.5.
   * Installs .py.1 man pages in the correct locations (requires newer
@@ -956,23 +956,23 @@ kdesdk (2.2.1-3) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Thu, 11 Oct 2001 15:31:32 -0500
 
-kdesdk (2.2.1-2) unstable; urgency=low
+tdesdk (2.2.1-2) unstable; urgency=low
 
   * Updated parameters for alpha build (closes: Bug#113110).
 
  -- Ben Burton <benb@acm.org>  Sat, 22 Sep 2001 12:00:37 -0500
 
-kdesdk (2.2.1-1) unstable; urgency=low
+tdesdk (2.2.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Fri, 31 Aug 2001 21:08:56 -0500
 
-kdesdk (2.2.0-final-1) unstable; urgency=low
+tdesdk (2.2.0-final-1) unstable; urgency=low
 
   * New upstream release.
   * Generating HTML docs for users who can't view KDE docbook files.
-  * Build-Depends: requires newer kdelibs-dev for working meinproc.
+  * Build-Depends: requires newer tdelibs-dev for working meinproc.
   * Suggests: konqueror for packages with docs to view through khelpcenter.
   * Reinstating doc-base entries.
   * Bumped standards-version to 3.5.6.
@@ -980,54 +980,54 @@ kdesdk (2.2.0-final-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sun, 29 Jul 2001 17:48:59 +1000
 
-kdesdk (2.2-beta1-4) unstable; urgency=low
+tdesdk (2.2-beta1-4) unstable; urgency=low
 
   * Builds on alpha.
 
  -- Ben Burton <benb@acm.org>  Sun, 29 Jul 2001 00:20:23 +1000
 
-kdesdk (2.2-beta1-3) unstable; urgency=low
+tdesdk (2.2-beta1-3) unstable; urgency=low
 
-  * Build-Depends: added version to kdebase-dev (closes: Bug#103514).
+  * Build-Depends: added version to tdebase-dev (closes: Bug#103514).
 
  -- Ben Burton <benb@acm.org>  Wed,  4 Jul 2001 11:41:50 -0500
 
-kdesdk (2.2-beta1-2) unstable; urgency=low
+tdesdk (2.2-beta1-2) unstable; urgency=low
 
-  * Build-Depends: added kdebase-dev (closes: Bug#103255).
+  * Build-Depends: added tdebase-dev (closes: Bug#103255).
   * Build-Depends: changed libdb-dev back to libdb2-dev since libdb3-dev
     doesn't work.
 
  -- Ben Burton <benb@acm.org>  Mon,  2 Jul 2001 22:15:53 -0500
 
-kdesdk (2.2-beta1-1) unstable; urgency=low
+tdesdk (2.2-beta1-1) unstable; urgency=low
 
   * New upstream release.
-  * Added packages kdesdk-doc, kspy and poxml.
+  * Added packages tdesdk-doc, kspy and poxml.
   * Build-Depends: added uic.
 
  -- Ben Burton <benb@acm.org>  Sun, 17 Jun 2001 14:44:38 -0500
 
-kdesdk (2.1.1-8) unstable; urgency=low
+tdesdk (2.1.1-8) unstable; urgency=low
 
   * Added arm/m68k to the libtool linux arch list (closes: Bug#99498).
 
  -- Ben Burton <benb@acm.org>  Fri,  1 Jun 2001 18:29:27 -0500
 
-kdesdk (2.1.1-7) unstable; urgency=low
+tdesdk (2.1.1-7) unstable; urgency=low
 
   * Build-Depends: replaced libdb2-dev with libdb-dev; removed sed
     which is build-essential.
-  * Changed kdesdk to Architecture: any to please the autobuilders.
+  * Changed tdesdk to Architecture: any to please the autobuilders.
   * Minor cosmetic changes.
 
  -- Ben Burton <benb@acm.org>  Thu, 31 May 2001 12:21:41 -0500
 
-kdesdk (2.1.1-6) unstable; urgency=low
+tdesdk (2.1.1-6) unstable; urgency=low
 
-  * Added man pages for kdesdk-scripts (closes: Bug#92451).
+  * Added man pages for tdesdk-scripts (closes: Bug#92451).
   * Added gdb macros and emacs helper files.
-  * Added suggestions and recommendations for kdesdk-scripts
+  * Added suggestions and recommendations for tdesdk-scripts
     to satisfy requirements of individual scripts.
   * Fixed location of KDE docs in /usr/bin/kdedoc.
   * Fixed location of Qt docs in /usr/bin/qtdoc.
@@ -1036,7 +1036,7 @@ kdesdk (2.1.1-6) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sun, 29 Apr 2001 15:52:54 -0500
 
-kdesdk (2.1.1-5) unstable; urgency=low
+tdesdk (2.1.1-5) unstable; urgency=low
  
   * Updated Standards-Version to 3.5.2.
   * Added kderemove="1" to the debian menu items.
@@ -1044,44 +1044,44 @@ kdesdk (2.1.1-5) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Fri, 27 Apr 2001 14:56:02 -0500
 
-kdesdk (2.1.1-4) unstable; urgency=low
+tdesdk (2.1.1-4) unstable; urgency=low
 
-  * Ensures /usr/bin/extractrc is installed (needed by kdevelop) and
-    conflicts with earlier versions of kdevelop (which provided its own
+  * Ensures /usr/bin/extractrc is installed (needed by tdevelop) and
+    conflicts with earlier versions of tdevelop (which provided its own
     /usr/bin/extractrc).
 
  -- Ben Burton <benb@acm.org>  Thu,  5 Apr 2001 15:19:13 -0500
 
-kdesdk (2.1.1-3) unstable; urgency=low
+tdesdk (2.1.1-3) unstable; urgency=low
 
   * Added man page for /usr/bin/extractmsg (closes: Bug#92450).
   * Tidied up various other man pages.
   * Build-Depends: now requires version (>> 3.0.0) of debhelper.
-  * Added Suggests: kdebase to packages kbabel, kexample.
+  * Added Suggests: tdebase to packages kbabel, kexample.
   * Replaced gimp, xpaint with gimp | xpaint in Suggests: for kdepalettes.
   * Upgraded to debian/rules DH_COMPAT=3 and removed postinst scripts.
   * Rebuilt using correct gcc/libc6 packages.
 
  -- Ben Burton <benb@acm.org>  Sun,  1 Apr 2001 22:30:27 -0500
 
-kdesdk (2.1.1-2) unstable; urgency=low
+tdesdk (2.1.1-2) unstable; urgency=low
 
   * Build-Depends: Added libdb2-dev (closes: Bug#92174).
-  * Conflicts (kexample): Added kdesdk-scripts (<< 2.1.1-1)
+  * Conflicts (kexample): Added tdesdk-scripts (<< 2.1.1-1)
     (closes: Bug#92432).
 
  -- Ben Burton <benb@acm.org>  Sun,  1 Apr 2001 11:59:48 -0500
 
-kdesdk (2.1.1-1) unstable; urgency=low
+tdesdk (2.1.1-1) unstable; urgency=low
 
   * New upstream sources.
   * Adopted by Ben Burton <benb@acm.org> (closes: Bug#84531).
-  * Added packages kdesdk, kapptemplate, kdepalettes.
-  * Split kexample from package kdesdk-scripts into a new package.
+  * Added packages tdesdk, kapptemplate, kdepalettes.
+  * Split kexample from package tdesdk-scripts into a new package.
   * Changed some package architectures to all.
   * Build-Depends: Removed autoconf and gettext which are redundant;
     required version (>> 2.0.0) of debhelper; added sed.
-  * Removed all Suggests: kdebase flags.
+  * Removed all Suggests: tdebase flags.
   * Completely reworked debian/rules.
   * Added a mime type for kbabel.
   * Added various man pages.
@@ -1093,26 +1093,26 @@ kdesdk (2.1.1-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Mon, 26 Mar 2001 09:10:56 -0600
 
-kdesdk (2.1.0-1) unstable; urgency=low
+tdesdk (2.1.0-1) unstable; urgency=low
  
   * New upstream CVS pull
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Mar 2001 02:00:00 -0700
 
-kdesdk (2.1-final-1.1) unstable; urgency=low
+tdesdk (2.1-final-1.1) unstable; urgency=low
 
   * Fix for doc link (Closes: #84075)
   * Fix the description of kbabel (Closes: #84078)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 01 Mar 2001 00:10:00 -0700
 
-kdesdk (2.1-final-1) unstable; urgency=low
+tdesdk (2.1-final-1) unstable; urgency=low
  
   * New upstream version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:00:00 +0100
 
-kdesdk (2.1-beta2-2) unstable; urgency=low
+tdesdk (2.1-beta2-2) unstable; urgency=low
 
   * Closes: #83652.
   * Package maintaner change.
@@ -1120,7 +1120,7 @@ kdesdk (2.1-beta2-2) unstable; urgency=low
 
  -- Mariusz Przygodzki <dune@home.pl>  Sat, 27 Jan 2001 17:18:53 +0100
 
-kdesdk (2.1-beta2-1) unstable; urgency=low
+tdesdk (2.1-beta2-1) unstable; urgency=low
  
   * New upstream beta
  
diff --git a/ubuntu/maverick/tdesdk/debian/control b/ubuntu/maverick/tdesdk/debian/control
index cd3d6c8fa..308320f7c 100644
--- a/ubuntu/maverick/tdesdk/debian/control
+++ b/ubuntu/maverick/tdesdk/debian/control
@@ -1,23 +1,23 @@
-Source: kdesdk-trinity
+Source: tdesdk-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>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
 Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk,
- gettext, pkg-config, kdelibs4-trinity-dev (>= 4:3.5.10), binutils-dev, bison, flex,
- kdepim-trinity-dev (>= 4:3.5.10), libapr1-dev, libkcal2-trinity-dev (>= 4:3.5.10),
+ gettext, pkg-config, tdelibs4-trinity-dev (>= 4:3.5.10), binutils-dev, bison, flex,
+ tdepim-trinity-dev (>= 4:3.5.10), libapr1-dev, libkcal2-trinity-dev (>= 4:3.5.10),
  libktnef1-trinity-dev (>= 4:3.5.10), libsvn-dev, libdb-dev,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kdesdk-trinity
+Package: tdesdk-trinity
 Architecture: all
 Section: kde
-Replaces: kdesdk-kde3 (<< 4:3.5.13)
-Breaks: kdesdk-kde3 (<< 4:3.5.13)
-Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), kcachegrind-trinity (>= ${Source-Version}), kdesdk-kfile-plugins-trinity (>= ${Source-Version}), kdesdk-kio-plugins-trinity (>= ${Source-Version}) | kdesvn-kio-plugins-trinity, kdesdk-misc-trinity (>= ${Source-Version}), kdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
-Suggests: kcachegrind-converters-trinity, kbabel-trinity-dev, kdesdk-trinity-doc-html
+Replaces: tdesdk-kde3 (<< 4:3.5.13)
+Breaks: tdesdk-kde3 (<< 4:3.5.13)
+Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), kcachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
+Suggests: kcachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html
 Description: software development kit 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,
@@ -27,12 +27,12 @@ Description: software development kit from the official Trinity release
  This metapackage includes the Trinity Software Development Kit, a collection
  of applications and tools useful for developing KDE applications.
 
-Package: kdesdk-trinity-doc-html
+Package: tdesdk-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: kdesdk-kde3-doc-html (<< 4:3.5.13)
-Breaks: kdesdk-kde3-doc-html (<< 4:3.5.13)
-Suggests: konqueror-trinity | www-browser, kdesdk-trinity
+Replaces: tdesdk-kde3-doc-html (<< 4:3.5.13)
+Breaks: tdesdk-kde3-doc-html (<< 4:3.5.13)
+Suggests: konqueror-trinity | www-browser, tdesdk-trinity
 Description: Trinity Software Development Kit documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -45,7 +45,7 @@ Description: Trinity Software Development Kit documentation in HTML format
  KDE SDK packages.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: cervisia-trinity
 Architecture: any
@@ -53,7 +53,7 @@ Section: devel
 Replaces: cervisia-kde3 (<< 4:3.5.13)
 Breaks: cervisia-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter-trinity, kdesdk-trinity-doc-html
+Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
 Conflicts: cervisia
 Description: a graphical CVS front end for Trinity
  Cervisia is a KDE-based graphical front end for the CVS client.
@@ -65,7 +65,7 @@ Description: a graphical CVS front end for Trinity
  with the commit dialog.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kapptemplate-trinity
 Architecture: all
@@ -73,7 +73,7 @@ Section: devel
 Replaces: kapptemplate-kde3 (<< 4:3.5.13)
 Breaks: kapptemplate-kde3 (<< 4:3.5.13)
 Conflicts: kapptemplate
-Recommends: automake1.9 | automaken, kdelibs4-trinity-dev (>= 4:3.5.8)
+Recommends: automake1.9 | automaken, tdelibs4-trinity-dev (>= 4:3.5.8)
 Description: creates a framework to develop a Trinity application
  KAppTemplate is a shell script that will create the necessary
  framework to develop various KDE applications.  It takes care of the
@@ -81,7 +81,7 @@ Description: creates a framework to develop a Trinity application
  what the code typically looks like.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kbabel-trinity
 Architecture: any
@@ -91,7 +91,7 @@ Breaks: kbabel-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Conflicts: kbabel
 Recommends: gettext
-Suggests: khelpcenter-trinity, kdesdk-trinity-doc-html
+Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
 Description: PO-file editing suite for Trinity
  This is a suite of programs for editing gettext message files (PO-files).
  It is designed to help you translate fast and consistently.
@@ -104,14 +104,14 @@ Description: PO-file editing suite for Trinity
  for common translations.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kbabel-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: kbabel-kde3-dev (<< 4:3.5.13)
 Breaks: kbabel-kde3-dev (<< 4:3.5.13)
-Depends: kbabel-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kbabel-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
 Conflicts: kbabel
 Description: PO-file editing suite for Trinity (development files)
  This is a suite of programs for editing gettext message files (PO-files).
@@ -127,7 +127,7 @@ Description: PO-file editing suite for Trinity (development files)
  This package contains the KBabel development files.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kbugbuster-trinity
 Architecture: any
@@ -143,7 +143,7 @@ Description: a front end for the Trinity bug tracking system
  variety of options for searching through reports.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kcachegrind-trinity
 Architecture: any
@@ -153,7 +153,7 @@ Breaks: kcachegrind-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Conflicts: kcachegrind
 Recommends: valgrind-callgrind-trinity | valgrind-calltree-trinity, graphviz
-Suggests: kcachegrind-converters-trinity, khelpcenter-trinity, kdesdk-trinity-doc-html
+Suggests: kcachegrind-converters-trinity, khelpcenter-trinity, tdesdk-trinity-doc-html
 Description: visualisation tool for valgrind profiling output
  KCachegrind is a visualisation tool for the profiling data generated
  by calltree, a profiling skin for valgrind.  Applications can be
@@ -164,7 +164,7 @@ Description: visualisation tool for valgrind profiling output
  can be found in the kcachegrind-converters package.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kcachegrind-converters-trinity
 Architecture: all
@@ -184,32 +184,32 @@ Description: format converters for KCachegrind profiling visualisation tool
  and plugin architectures are supported.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: kdesdk-kfile-plugins-trinity
+Package: tdesdk-kfile-plugins-trinity
 Architecture: any
 Section: kde
-Replaces: kdesdk-kfile-plugins-kde3 (<< 4:3.5.13)
-Breaks: kdesdk-kfile-plugins-kde3 (<< 4:3.5.13)
+Replaces: tdesdk-kfile-plugins-kde3 (<< 4:3.5.13)
+Breaks: tdesdk-kfile-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
-Conflicts: kdesdk-kfile-plugins
+Conflicts: tdesdk-kfile-plugins
 Description: Trinity file dialog plugins for software development files
  This is a collection of plugins for the KDE file dialog.  These plugins
  extend the file dialog to offer advanced meta-information for source files,
  patch files and Qt Linguist data.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: kdesdk-misc-trinity
+Package: tdesdk-misc-trinity
 Architecture: any
 Section: devel
-Replaces: kdesdk-misc-kde3 (<< 4:3.5.13)
-Breaks: kdesdk-misc-kde3 (<< 4:3.5.13)
+Replaces: tdesdk-misc-kde3 (<< 4:3.5.13)
+Breaks: tdesdk-misc-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Recommends: libqt3-mt-dev | libqt3-dev
 Suggests: gimp | xpaint
-Conflicts: kdepalettes-trinity (<= 4:3.1.0-1), scheck-trinity (<< 4:3.2.0-0), kdesdk-misc
+Conflicts: kdepalettes-trinity (<= 4:3.1.0-1), scheck-trinity (<< 4:3.2.0-0), tdesdk-misc
 Description: various goodies from the Trinity Software Development Kit
  This package contains miscellaneous goodies provided with the official
  KDE release to assist with KDE software development.
@@ -221,16 +221,16 @@ Description: various goodies from the Trinity Software Development Kit
   - a KDE address book plugin that reads the list of KDE CVS accounts.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: kdesdk-scripts-trinity
+Package: tdesdk-scripts-trinity
 Architecture: all
 Section: devel
-Replaces: kdesdk-scripts-kde3 (<< 4:3.5.13)
-Breaks: kdesdk-scripts-kde3 (<< 4:3.5.13)
+Replaces: tdesdk-scripts-kde3 (<< 4:3.5.13)
+Breaks: tdesdk-scripts-kde3 (<< 4:3.5.13)
 Depends: ${perl:Depends}, python
 Recommends: automake1.9 | automaken, cvs, gawk
-Suggests: khelpcenter-trinity, kdesdk-trinity-doc-html, dmalloc, gdb, kdelibs4-trinity-doc, qt3-doc, valgrind, devscripts
+Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html, dmalloc, gdb, tdelibs4-trinity-doc, qt3-doc, valgrind, devscripts
 Enhances: kate-trinity
 Description: a set of useful development scripts for Trinity
  This package contains a number of scripts which can be used to help in
@@ -245,7 +245,7 @@ Description: a set of useful development scripts for Trinity
   - valgrind error suppressions for KDE apps.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kmtrace-trinity
 Architecture: any
@@ -259,7 +259,7 @@ Description: a Trinity memory leak tracer
  "mtrace" functionality.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kompare-trinity
 Architecture: any
@@ -275,14 +275,14 @@ Description: a Trinity GUI for viewing differences between files
  file and/or blend a diff file back into the original documents.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kspy-trinity
 Architecture: any
 Section: devel
 Replaces: kspy-kde3 (<< 4:3.5.13)
 Breaks: kspy-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: ${shlibs:Depends}, tdelibs4-trinity-dev (>= 4:3.5.8)
 Conflicts: kspy
 Description: examines the internal state of a Qt/KDE app
  KSpy is a tiny library which can be used to graphically display
@@ -297,7 +297,7 @@ Description: examines the internal state of a Qt/KDE app
  See /usr/share/doc/kspy/README for usage instructions.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kuiviewer-trinity
 Architecture: any
@@ -315,7 +315,7 @@ Description: viewer for Qt Designer user interface files
  The Qt Designer itself is in the package qt3-designer.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: libcvsservice0-trinity
 Architecture: any
@@ -333,14 +333,14 @@ Description: DCOP service for accessing CVS repositories
  DCOP is the Desktop Communication Protocol used throughout KDE.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: libcvsservice-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: libcvsservice-kde3-dev (<< 4:3.5.13)
 Breaks: libcvsservice-kde3-dev (<< 4:3.5.13)
-Depends: libcvsservice0-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libcvsservice0-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
 Conflicts: libcvsservice-dev
 Description: development files for CVS DCOP service
  The library libcvsservice provides a DCOP service for accessing and
@@ -352,7 +352,7 @@ Description: development files for CVS DCOP service
  Development files for libcvsservice are included in this package.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: poxml-trinity
 Architecture: any
@@ -369,7 +369,7 @@ Description: tools for using PO-files to translate DocBook XML files
  manipulating DocBook XML files, PO-files and PO-template files.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: umbrello-trinity
 Architecture: any
@@ -377,7 +377,7 @@ Section: devel
 Replaces: umbrello-kde3 (<< 4:3.5.13)
 Breaks: umbrello-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter-trinity, kdesdk-trinity-doc-html
+Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
 Conflicts: umbrello-manual-trinity (<< 20040311), umbrello
 Description: UML modelling tool and code generator
  Umbrello UML Modeller is a Unified Modelling Language editor for KDE.
@@ -390,22 +390,22 @@ Description: UML modelling tool and code generator
  diagrams and deployment diagrams.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: kdesdk-kio-plugins-trinity
+Package: tdesdk-kio-plugins-trinity
 Architecture: any
 Section: devel
-Replaces: kdesdk-kio-plugins-kde3 (<< 4:3.5.13)
-Breaks: kdesdk-kio-plugins-kde3 (<< 4:3.5.13)
+Replaces: tdesdk-kio-plugins-kde3 (<< 4:3.5.13)
+Breaks: tdesdk-kio-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, subversion
-Conflicts: kdesdk-kio-plugins
+Conflicts: tdesdk-kio-plugins
 Description: subversion ioslave for Trinity
  This package provides easy access to remote SVN repositories from within
  Konqueror, and KDE generally, by browsing them as if they were a
  filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kunittest-trinity
 Architecture: any
@@ -414,7 +414,7 @@ Replaces: kunittest-kde3 (<< 4:3.5.13)
 Breaks: kunittest-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Conflicts: kunittest
-Suggests: kdelibs4-trinity-doc
+Suggests: tdelibs4-trinity-doc
 Description: unit testing library for Trinity
  KUnitTest is a small library that facilitates the writing of tests for
  KDE developers. There are two ways to use the KUnitTest library. One is
@@ -423,17 +423,17 @@ Description: unit testing library for Trinity
  libraries to create your own testing application.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: kdesdk-trinity-dbg
+Package: tdesdk-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: kdesdk-kde3-dbg (<< 4:3.5.13)
-Breaks: kdesdk-kde3-dbg (<< 4:3.5.13)
+Replaces: tdesdk-kde3-dbg (<< 4:3.5.13)
+Breaks: tdesdk-kde3-dbg (<< 4:3.5.13)
 Priority: extra
-Depends: kdelibs-trinity-dbg, libcvsservice-trinity-dev (= ${Source-Version}), kbabel-trinity-dev (= ${Source-Version})
-Conflicts: kdesdk-dbg
-Description: debugging symbols for kdesdk-trinity
- This package contains the debugging symbols associated with kdesdk-trinity.
- They will automatically be used by gdb for debugging kdesdk-related
+Depends: tdelibs-trinity-dbg, libcvsservice-trinity-dev (= ${Source-Version}), kbabel-trinity-dev (= ${Source-Version})
+Conflicts: tdesdk-dbg
+Description: debugging symbols for tdesdk-trinity
+ This package contains the debugging symbols associated with tdesdk-trinity.
+ They will automatically be used by gdb for debugging tdesdk-related
  issues.
diff --git a/ubuntu/maverick/tdesdk/debian/control.in b/ubuntu/maverick/tdesdk/debian/control.in
index 3a8aa1ced..c70b772a1 100644
--- a/ubuntu/maverick/tdesdk/debian/control.in
+++ b/ubuntu/maverick/tdesdk/debian/control.in
@@ -1,20 +1,20 @@
-Source: kdesdk
+Source: tdesdk
 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, pkg-config, kdelibs4-dev (>= 4:3.5.8), binutils-dev, bison, flex,
- kdepim-dev (>= 4:3.5.8), libapr1-dev, libkcal2-dev (>= 4:3.5.8),
+ gettext, pkg-config, tdelibs4-dev (>= 4:3.5.8), binutils-dev, bison, flex,
+ tdepim-dev (>= 4:3.5.8), libapr1-dev, libkcal2-dev (>= 4:3.5.8),
  libktnef1-dev (>= 4:3.5.8), libsvn-dev
 Standards-Version: 3.7.2
 
-Package: kdesdk
+Package: tdesdk
 Architecture: all
 Section: kde
-Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), kcachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version})
-Suggests: kcachegrind-converters, kbabel-dev, kdesdk-doc-html
+Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), kcachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version})
+Suggests: kcachegrind-converters, kbabel-dev, tdesdk-doc-html
 Description: software development kit 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,
@@ -24,10 +24,10 @@ Description: software development kit from the official KDE release
  This metapackage includes the KDE Software Development Kit, a collection
  of applications and tools useful for developing KDE applications.
 
-Package: kdesdk-doc-html
+Package: tdesdk-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror | www-browser, kdesdk
+Suggests: konqueror | www-browser, tdesdk
 Replaces: cervisia (<< 4:3.2.0), kbabel (<< 4:3.2.0), kbugbuster (<< 4:3.2.0), kompare (<< 4:3.2.0)
 Description: KDE Software Development Kit documentation in HTML format
  By default the modules provided by KDE only provide their documentation
@@ -41,13 +41,13 @@ Description: KDE Software Development Kit documentation in HTML format
  KDE SDK packages.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: cervisia
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter, kdesdk-doc-html
+Suggests: khelpcenter, tdesdk-doc-html
 Description: a graphical CVS front end for KDE
  Cervisia is a KDE-based graphical front end for the CVS client.
  .
@@ -58,12 +58,12 @@ Description: a graphical CVS front end for KDE
  with the commit dialog.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kapptemplate
 Architecture: all
 Section: devel
-Recommends: automake1.9 | automaken, kdelibs4-dev (>= 4:3.5.8)
+Recommends: automake1.9 | automaken, tdelibs4-dev (>= 4:3.5.8)
 Description: creates a framework to develop a KDE application
  KAppTemplate is a shell script that will create the necessary
  framework to develop various KDE applications.  It takes care of the
@@ -71,14 +71,14 @@ Description: creates a framework to develop a KDE application
  what the code typically looks like.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kbabel
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
 Recommends: gettext
-Suggests: khelpcenter, kdesdk-doc-html
+Suggests: khelpcenter, tdesdk-doc-html
 Description: PO-file editing suite for KDE
  This is a suite of programs for editing gettext message files (PO-files).
  It is designed to help you translate fast and consistently.
@@ -91,12 +91,12 @@ Description: PO-file editing suite for KDE
  for common translations.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kbabel-dev
 Architecture: any
 Section: libdevel
-Depends: kbabel (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: kbabel (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
 Replaces: kbabel (<< 4:3.0.8-0)
 Description: PO-file editing suite for KDE (development files)
  This is a suite of programs for editing gettext message files (PO-files).
@@ -112,7 +112,7 @@ Description: PO-file editing suite for KDE (development files)
  This package contains the KBabel development files.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kbugbuster
 Architecture: any
@@ -125,14 +125,14 @@ Description: a front end for the KDE bug tracking system
  variety of options for searching through reports.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kcachegrind
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
 Recommends: valgrind-callgrind | valgrind-calltree, graphviz
-Suggests: kcachegrind-converters, khelpcenter, kdesdk-doc-html
+Suggests: kcachegrind-converters, khelpcenter, tdesdk-doc-html
 Description: visualisation tool for valgrind profiling output
  KCachegrind is a visualisation tool for the profiling data generated
  by calltree, a profiling skin for valgrind.  Applications can be
@@ -143,7 +143,7 @@ Description: visualisation tool for valgrind profiling output
  can be found in the kcachegrind-converters package.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kcachegrind-converters
 Architecture: all
@@ -160,9 +160,9 @@ Description: format converters for KCachegrind profiling visualisation tool
  and plugin architectures are supported.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
-Package: kdesdk-kfile-plugins
+Package: tdesdk-kfile-plugins
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
@@ -172,16 +172,16 @@ Description: KDE file dialog plugins for software development files
  patch files and Qt Linguist data.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
-Package: kdesdk-misc
+Package: tdesdk-misc
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
 Recommends: libqt3-mt-dev | libqt3-dev
 Suggests: gimp | xpaint
 Conflicts: kdepalettes (<= 4:3.1.0-1), scheck (<< 4:3.2.0-0)
-Replaces: kdepalettes (<= 4:3.1.0-1), scheck (<< 4:3.2.0-0), kdevelop3-plugins (<= 4:3.2.0-3)
+Replaces: kdepalettes (<= 4:3.1.0-1), scheck (<< 4:3.2.0-0), tdevelop3-plugins (<= 4:3.2.0-3)
 Description: various goodies from the KDE Software Development Kit
  This package contains miscellaneous goodies provided with the official
  KDE release to assist with KDE software development.
@@ -193,16 +193,16 @@ Description: various goodies from the KDE Software Development Kit
   - a KDE address book plugin that reads the list of KDE CVS accounts.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
-Package: kdesdk-scripts
+Package: tdesdk-scripts
 Architecture: all
 Section: devel
 Depends: ${perl:Depends}, python
 Recommends: automake1.9 | automaken, cvs, gawk
-Suggests: khelpcenter, kdesdk-doc-html, dmalloc, gdb, kdelibs4-doc, qt3-doc, valgrind, devscripts
+Suggests: khelpcenter, tdesdk-doc-html, dmalloc, gdb, tdelibs4-doc, qt3-doc, valgrind, devscripts
 Enhances: kate
-Replaces: kdevelop (<< 1:1.4.0-3.2)
+Replaces: tdevelop (<< 1:1.4.0-3.2)
 Description: a set of useful development scripts for KDE
  This package contains a number of scripts which can be used to help in
  developing KDE-based applications.  Many of these scripts however are
@@ -216,7 +216,7 @@ Description: a set of useful development scripts for KDE
   - valgrind error suppressions for KDE apps.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kmtrace
 Architecture: any
@@ -227,7 +227,7 @@ Description: a KDE memory leak tracer
  "mtrace" functionality.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kompare
 Architecture: any
@@ -240,12 +240,12 @@ Description: a KDE GUI for viewing differences between files
  file and/or blend a diff file back into the original documents.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kspy
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, kdelibs4-dev (>= 4:3.5.8)
+Depends: ${shlibs:Depends}, tdelibs4-dev (>= 4:3.5.8)
 Description: examines the internal state of a Qt/KDE app
  KSpy is a tiny library which can be used to graphically display
  the QObjects in use by a Qt/KDE app.  In addition to the object tree,
@@ -259,7 +259,7 @@ Description: examines the internal state of a Qt/KDE app
  See /usr/share/doc/kspy/README for usage instructions.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kuiviewer
 Architecture: any
@@ -274,7 +274,7 @@ Description: viewer for Qt Designer user interface files
  The Qt Designer itself is in the package qt3-designer.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: libcvsservice0
 Architecture: any
@@ -290,12 +290,12 @@ Description: DCOP service for accessing CVS repositories
  DCOP is the Desktop Communication Protocol used throughout KDE.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: libcvsservice-dev
 Architecture: any
 Section: libdevel
-Depends: libcvsservice0 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: libcvsservice0 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
 Replaces: cervisia (<< 4:3.2.0)
 Description: development files for CVS DCOP service
  The library libcvsservice provides a DCOP service for accessing and
@@ -307,7 +307,7 @@ Description: development files for CVS DCOP service
  Development files for libcvsservice are included in this package.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: poxml
 Architecture: any
@@ -321,13 +321,13 @@ Description: tools for using PO-files to translate DocBook XML files
  manipulating DocBook XML files, PO-files and PO-template files.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: umbrello
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter, kdesdk-doc-html
+Suggests: khelpcenter, tdesdk-doc-html
 Conflicts: umbrello-manual (<< 20040311)
 Replaces: umbrello-manual (<< 20040311)
 Description: UML modelling tool and code generator
@@ -341,26 +341,26 @@ Description: UML modelling tool and code generator
  diagrams and deployment diagrams.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
-Package: kdesdk-kio-plugins
+Package: tdesdk-kio-plugins
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, subversion
-Replaces: kdesdk-misc (<< 4:3.5.0)
+Replaces: tdesdk-misc (<< 4:3.5.0)
 Description: subversion ioslave for KDE
  This package provides easy access to remote SVN repositories from within
  Konqueror, and KDE generally, by browsing them as if they were a
  filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kunittest
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Suggests: kdelibs4-doc
+Suggests: tdelibs4-doc
 Description: unit testing library for KDE
  KUnitTest is a small library that facilitates the writing of tests for
  KDE developers. There are two ways to use the KUnitTest library. One is
@@ -369,14 +369,14 @@ Description: unit testing library for KDE
  libraries to create your own testing application.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
-Package: kdesdk-dbg
+Package: tdesdk-dbg
 Section: libdevel
 Architecture: any
 Priority: extra
-Depends: kdelibs-dbg, libcvsservice-dev (= ${Source-Version}), kbabel-dev (= ${Source-Version})
-Description: debugging symbols for kdesdk
- This package contains the debugging symbols associated with kdesdk.
- They will automatically be used by gdb for debugging kdesdk-related
+Depends: tdelibs-dbg, libcvsservice-dev (= ${Source-Version}), kbabel-dev (= ${Source-Version})
+Description: debugging symbols for tdesdk
+ This package contains the debugging symbols associated with tdesdk.
+ They will automatically be used by gdb for debugging tdesdk-related
  issues.
diff --git a/ubuntu/maverick/tdesdk/debian/copyright b/ubuntu/maverick/tdesdk/debian/copyright
index 57c7c1593..ca64fadb8 100644
--- a/ubuntu/maverick/tdesdk/debian/copyright
+++ b/ubuntu/maverick/tdesdk/debian/copyright
@@ -9,7 +9,7 @@ It was downloaded from: http://www.kde.org/download
 
 Upstream authors:
 
-  Note that kdesdk has many contributers beyond those listed below.
+  Note that tdesdk has many contributers beyond those listed below.
 
   Cervisia: Bernd Gehrmann <bernd@mail.berlios.de>,
       Christian Loose <christian.loose@kdemail.net>,
diff --git a/ubuntu/maverick/tdesdk/debian/desktop-i18n/createdesktop.pl b/ubuntu/maverick/tdesdk/debian/desktop-i18n/createdesktop.pl
index 1705e7d4f..0d6c5cc92 100644
--- a/ubuntu/maverick/tdesdk/debian/desktop-i18n/createdesktop.pl
+++ b/ubuntu/maverick/tdesdk/debian/desktop-i18n/createdesktop.pl
@@ -34,7 +34,7 @@ sub prepare
     print "\"POT-Creation-Date: "; printdate( @now ); print "\\n\"\n";
     print "\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n";
     print "\"Last-Translator: FULL NAME <EMAIL\@ADDRESS>\\n\"\n";
-    print "\"Language-Team: LANGUAGE <kde-i18n-doc\@kde.org>\\n\"\n";
+    print "\"Language-Team: LANGUAGE <tde-i18n-doc\@kde.org>\\n\"\n";
     print "\"MIME-Version: 1.0\\n\"\n";
     print "\"Content-Type: text/plain; charset=UTF-8\\n\"\n";
     print "\"Content-Transfer-Encoding: 8bit\\n\"\n";
diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/kbabel-trinity.README.Debian
index f4eb38546..d54016dfa 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/kbabel-trinity.README.Debian
@@ -3,6 +3,6 @@ KBabel 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 kdesdk-doc-html.
+web browser, see the package tdesdk-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.README.Debian
index 3b9a9f290..25ddc2247 100644
--- a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.README.Debian
@@ -3,6 +3,6 @@ KCachegrind 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 kdesdk-doc-html.
+web browser, see the package tdesdk-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sat, 31 Jan 2004 12:08:48 +1100
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-misc-trinity.links b/ubuntu/maverick/tdesdk/debian/kdesdk-misc-trinity.links
deleted file mode 100644
index 160cea338..000000000
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-misc-trinity.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/kdepalettes/README usr/share/doc/kdesdk-misc/README.palettes
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.lintian b/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.lintian
deleted file mode 100644
index 97dd13989..000000000
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.lintian
+++ /dev/null
@@ -1,3 +0,0 @@
-# The syntax error is just perlpod docs appearing after the script exits.
-kdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
-kdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
diff --git a/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1 b/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1
index 3b942804f..943f2c4d5 100644
--- a/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1
+++ b/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1
@@ -52,7 +52,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
-\fIkdesdk-doc-html\fP and read this documentation in HTML format from
+\fItdesdk-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/kde/HTML/en/kbabel/\fP.
 .SH AUTHOR
 KBabel was written by Matthias Kiefer <kiefer@kde.org>,
diff --git a/ubuntu/maverick/tdesdk/debian/man/cheatmake.1 b/ubuntu/maverick/tdesdk/debian/man/cheatmake.1
index 8aa455f27..dcb8768ab 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cheatmake.1
+++ b/ubuntu/maverick/tdesdk/debian/man/cheatmake.1
@@ -53,16 +53,16 @@ the simpler variable OBJ_SUBDIR should be used.
 .TP
 OBJ_SUBDIR
 Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fIkdesdk\fP
-and the build directory is \fIkdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
+source directory.  For instance, if the source directory is \fItdesdk\fP
+and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
 should be set to \fIobj-i386-linux\fP.
 .TP
 OBJ_REPLACEMENT
 A \fBsed\fP expression that is used to transform the source directory
 into the build directory.
-For instance, if the source directory is \fI~/src/kdesdk\fP and the
-build directory is \fI~/src/kdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#kdesdk#kdesdk-obj#\fP.
+For instance, if the source directory is \fI~/src/tdesdk\fP and the
+build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
+be set to \fIs#tdesdk#tdesdk-obj#\fP.
 .SH SEE ALSO
 .BR make (1).
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdesdk/debian/man/create_makefile.1 b/ubuntu/maverick/tdesdk/debian/man/create_makefile.1
index c8d888e7f..96c9523c0 100644
--- a/ubuntu/maverick/tdesdk/debian/man/create_makefile.1
+++ b/ubuntu/maverick/tdesdk/debian/man/create_makefile.1
@@ -50,16 +50,16 @@ the simpler variable OBJ_SUBDIR should be used.
 .TP
 OBJ_SUBDIR
 Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fIkdesdk\fP
-and the build directory is \fIkdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
+source directory.  For instance, if the source directory is \fItdesdk\fP
+and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
 should be set to \fIobj-i386-linux\fP.
 .TP
 OBJ_REPLACEMENT
 A \fBsed\fP expression that is used to transform the source directory
 into the build directory.
-For instance, if the source directory is \fI~/src/kdesdk\fP and the
-build directory is \fI~/src/kdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#kdesdk#kdesdk-obj#\fP.
+For instance, if the source directory is \fI~/src/tdesdk\fP and the
+build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
+be set to \fIs#tdesdk#tdesdk-obj#\fP.
 .SH SEE ALSO
 .BR create_makefiles (1).
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdesdk/debian/man/create_makefiles.1 b/ubuntu/maverick/tdesdk/debian/man/create_makefiles.1
index 62ab39cfd..5a9f57ade 100644
--- a/ubuntu/maverick/tdesdk/debian/man/create_makefiles.1
+++ b/ubuntu/maverick/tdesdk/debian/man/create_makefiles.1
@@ -44,16 +44,16 @@ the simpler variable OBJ_SUBDIR should be used.
 .TP
 OBJ_SUBDIR
 Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fIkdesdk\fP
-and the build directory is \fIkdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
+source directory.  For instance, if the source directory is \fItdesdk\fP
+and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
 should be set to \fIobj-i386-linux\fP.
 .TP
 OBJ_REPLACEMENT
 A \fBsed\fP expression that is used to transform the source directory
 into the build directory.
-For instance, if the source directory is \fI~/src/kdesdk\fP and the
-build directory is \fI~/src/kdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#kdesdk#kdesdk-obj#\fP.
+For instance, if the source directory is \fI~/src/tdesdk\fP and the
+build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
+be set to \fIs#tdesdk#tdesdk-obj#\fP.
 .SH SEE ALSO
 .BR create_makefile (1).
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvs2dist.1 b/ubuntu/maverick/tdesdk/debian/man/cvs2dist.1
index 3c971c734..514fd6131 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvs2dist.1
+++ b/ubuntu/maverick/tdesdk/debian/man/cvs2dist.1
@@ -53,7 +53,7 @@ download, build and install.
 .PP
 By default, cvs2dist automatically tries to check out all translations
 of strings and documentation from the corresponding parts of the
-\fIkde-i18n\fP CVS module and include them in the final packages.
+\fItde-i18n\fP CVS module and include them in the final packages.
 This can be suppressed or modified using the options \-\-no-i18n or
 \-\-no-i18n-lang.
 .PP
@@ -173,7 +173,7 @@ The following example creates packages of the kolf picture plugin from
 the CVS source tree currently checked out in \fI/sources\fP.
 .PP
 .RS
-\fIexample$\fP cvs2dist /sources/kdegames kolf/objects/picture
+\fIexample$\fP cvs2dist /sources/tdegames kolf/objects/picture
 \-n kolf-picture \-v 0.9 \-r "kolf/game.h" \-\-log ~/tmp/extra-file
 .RE
 .PP
diff --git a/ubuntu/maverick/tdesdk/debian/man/findmissingcrystal.1 b/ubuntu/maverick/tdesdk/debian/man/findmissingcrystal.1
index f780c3ad0..46c479bb4 100644
--- a/ubuntu/maverick/tdesdk/debian/man/findmissingcrystal.1
+++ b/ubuntu/maverick/tdesdk/debian/man/findmissingcrystal.1
@@ -27,9 +27,9 @@ in the given KDE module and determines which Crystal icons from that
 module are identical to the old KDE Classic hicolor icons.
 .PP
 This script \fBmust\fP be run from the top-level directory of a KDE source
-tree (i.e., the directory containing \fIkdelibs\fP, \fIkdebase\fP, etc.).
+tree (i.e., the directory containing \fItdelibs\fP, \fItdebase\fP, etc.).
 It is assumed that \fImodule\fP is a top-level module in the source tree,
-and it is also assumed that the source tree contains the \fIkdeartwork\fP
+and it is also assumed that the source tree contains the \fItdeartwork\fP
 module (which contains the old hicolor icons).
 .PP
 For each Crystal icon in the given module, a message will be output
diff --git a/ubuntu/maverick/tdesdk/debian/man/kbabel.1 b/ubuntu/maverick/tdesdk/debian/man/kbabel.1
index f6f5d201b..a54fbea55 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kbabel.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kbabel.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
-\fIkdesdk-doc-html\fP and read this documentation in HTML format from
+\fItdesdk-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/kde/HTML/en/kbabel/\fP.
 .SH AUTHOR
 KBabel was written by Matthias Kiefer <kiefer@kde.org>,
diff --git a/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1 b/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1
index bedbd4fb0..7fbfff0d2 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1
@@ -52,7 +52,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
-\fIkdesdk-doc-html\fP and read this documentation in HTML format from
+\fItdesdk-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/kde/HTML/en/kbabel/\fP.
 .SH AUTHOR
 KBabel was written by Matthias Kiefer <kiefer@kde.org>,
diff --git a/ubuntu/maverick/tdesdk/debian/man/kcachegrind.1 b/ubuntu/maverick/tdesdk/debian/man/kcachegrind.1
index 4f7db6435..ce3296b8c 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kcachegrind.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kcachegrind.1
@@ -58,7 +58,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
-\fIkdesdk-doc-html\fP and read this documentation in HTML format from
+\fItdesdk-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/kde/HTML/en/kcachegrind/\fP.
 .SH AUTHOR
 KCachegrind was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
diff --git a/ubuntu/maverick/tdesdk/debian/man/kdedoc.1 b/ubuntu/maverick/tdesdk/debian/man/kdedoc.1
index 684a6ad47..0f62e55e1 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kdedoc.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kdedoc.1
@@ -23,7 +23,7 @@ kdedoc \- view documentation for a KDE class
 .SH DESCRIPTION
 \fBkdedoc\fP opens the documentation for the KDE class \fIclassname\fP
 in kfm/konqueror.  Note that the class name is case sensitive.  It is
-assumed that you have the kdelibs documentation installed.
+assumed that you have the tdelibs documentation installed.
 .PP
 This utility is part of the KDE Software Development Kit.
 .SH EXAMPLES
@@ -33,7 +33,7 @@ To bring up help on the class KAboutDialog:
 kdedoc KAboutDialog
 .RE
 .SH DEBIAN USERS
-The kdelibs documentation is in the Debian package \fIkdelibs4-doc\fP,
+The tdelibs documentation is in the Debian package \fItdelibs4-doc\fP,
 which will need to be installed.
 .SH SEE ALSO
 .BR qtdoc (1).
diff --git a/ubuntu/maverick/tdesdk/debian/man/kdemangen.pl.1 b/ubuntu/maverick/tdesdk/debian/man/kdemangen.pl.1
index 0570f4f5c..7d658a855 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kdemangen.pl.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kdemangen.pl.1
@@ -40,7 +40,7 @@ This utility will only work for a full KDE application that uses
 KCmdLineArgs (which most full KDE applications do).
 .SH EXAMPLE
 .RS
-cd /path/to/kde/srcs/kdeedu/debian
+cd /path/to/kde/srcs/tdeedu/debian
 .br
 kdemangen /usr/bin/kstars > kstars.1
 .RE
diff --git a/ubuntu/maverick/tdesdk/debian/man/makeobj.1 b/ubuntu/maverick/tdesdk/debian/man/makeobj.1
index 48f8d0adb..6af366855 100644
--- a/ubuntu/maverick/tdesdk/debian/man/makeobj.1
+++ b/ubuntu/maverick/tdesdk/debian/man/makeobj.1
@@ -46,16 +46,16 @@ the simpler variable OBJ_SUBDIR should be used.
 .TP
 OBJ_SUBDIR
 Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fIkdesdk\fP
-and the build directory is \fIkdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
+source directory.  For instance, if the source directory is \fItdesdk\fP
+and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
 should be set to \fIobj-i386-linux\fP.
 .TP
 OBJ_REPLACEMENT
 A \fBsed\fP expression that is used to transform the source directory
 into the build directory.
-For instance, if the source directory is \fI~/src/kdesdk\fP and the
-build directory is \fI~/src/kdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#src/kdesdk#src/kdesdk-obj#\fP.
+For instance, if the source directory is \fI~/src/tdesdk\fP and the
+build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
+be set to \fIs#src/tdesdk#src/tdesdk-obj#\fP.
 .SH SEE ALSO
 .BR make (1),
 .BR sed (1).
diff --git a/ubuntu/maverick/tdesdk/debian/man/package_crystalsvg.1 b/ubuntu/maverick/tdesdk/debian/man/package_crystalsvg.1
index 64e0f888c..0b0e97c5e 100644
--- a/ubuntu/maverick/tdesdk/debian/man/package_crystalsvg.1
+++ b/ubuntu/maverick/tdesdk/debian/man/package_crystalsvg.1
@@ -28,7 +28,7 @@ contain \fIFILES\fP (describing the contents of the tarball and which
 KDE modules/paths they were copied from) as well as some other bits and
 pieces.
 .PP
-Note that you must at least have kdelibs checked out for this utility to
+Note that you must at least have tdelibs checked out for this utility to
 run.
 .PP
 The final tarball will be created in the current working directory.
diff --git a/ubuntu/maverick/tdesdk/debian/man/pruneemptydirs.1 b/ubuntu/maverick/tdesdk/debian/man/pruneemptydirs.1
index 93c33cea9..b6875d861 100644
--- a/ubuntu/maverick/tdesdk/debian/man/pruneemptydirs.1
+++ b/ubuntu/maverick/tdesdk/debian/man/pruneemptydirs.1
@@ -48,16 +48,16 @@ the simpler variable OBJ_SUBDIR should be used.
 .TP
 OBJ_SUBDIR
 Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fIkdesdk\fP
-and the build directory is \fIkdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
+source directory.  For instance, if the source directory is \fItdesdk\fP
+and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
 should be set to \fIobj-i386-linux\fP.
 .TP
 OBJ_REPLACEMENT
 A \fBsed\fP expression that is used to transform the source directory
 into the build directory.
-For instance, if the source directory is \fI~/src/kdesdk\fP and the
-build directory is \fI~/src/kdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#kdesdk#kdesdk-obj#\fP.
+For instance, if the source directory is \fI~/src/tdesdk\fP and the
+build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
+be set to \fIs#tdesdk#tdesdk-obj#\fP.
 .SH AUTHOR
 pruneemptydirs was written by David Faure <faure@kde.org>.
 .br
diff --git a/ubuntu/maverick/tdesdk/debian/man/umbrello.1 b/ubuntu/maverick/tdesdk/debian/man/umbrello.1
index c39f72cf3..9034cabea 100644
--- a/ubuntu/maverick/tdesdk/debian/man/umbrello.1
+++ b/ubuntu/maverick/tdesdk/debian/man/umbrello.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
-\fIkdesdk-doc-html\fP and read this documentation in HTML format from
+\fItdesdk-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/kde/HTML/en/umbrello/\fP.
 .SH AUTHOR
 Umbrello was written by Paul Hensgen <phensgen@users.sourceforge.net> and
diff --git a/ubuntu/maverick/tdesdk/debian/not-installed.list b/ubuntu/maverick/tdesdk/debian/not-installed.list
index f801ede2f..77ec5e17d 100644
--- a/ubuntu/maverick/tdesdk/debian/not-installed.list
+++ b/ubuntu/maverick/tdesdk/debian/not-installed.list
@@ -7,7 +7,7 @@ This is deliberate.
 /usr/bin/kunittest
 /usr/bin/kunittest_debughelper
  - These are not useful without the dcopperl bindings which are not built
-   in the Debian kdebindings packages.
+   in the Debian tdebindings packages.
 
 /usr/bin/licensecheck
 and the associated manpage
diff --git a/ubuntu/maverick/tdesdk/debian/rules b/ubuntu/maverick/tdesdk/debian/rules
index 15d420b54..fc163e6d7 100755
--- a/ubuntu/maverick/tdesdk/debian/rules
+++ b/ubuntu/maverick/tdesdk/debian/rules
@@ -12,7 +12,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
 
 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
-DEB_DH_STRIP_ARGS := --dbg-package=kdesdk-trinity-dbg
+DEB_DH_STRIP_ARGS := --dbg-package=tdesdk-trinity-dbg
 
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
@@ -35,38 +35,38 @@ DEB_INSTALL_CHANGELOGS_kcachegrind-trinity := kcachegrind/ChangeLog
 DEB_INSTALL_CHANGELOGS_kompare-trinity := kompare/ChangeLog
 DEB_INSTALL_CHANGELOGS_umbrello-trinity := umbrello/ChangeLog
 
-binary-install/kdesdk-scripts-trinity::
-	mv -f debian/kdesdk-scripts-trinity/usr/share/man/pl/man1/kdemangen.1 \
-		debian/kdesdk-scripts-trinity/usr/share/man/man1/kdemangen.pl.1
-	mv -f debian/kdesdk-scripts-trinity/usr/share/man/pl/man1/png2mng.1 \
-		debian/kdesdk-scripts-trinity/usr/share/man/man1/png2mng.pl.1
-	mv -f debian/kdesdk-scripts-trinity/usr/share/man/py/man1/kdelnk2desktop.1 \
-		debian/kdesdk-scripts-trinity/usr/share/man/man1/kdelnk2desktop.py.1
-	mv -f debian/kdesdk-scripts-trinity/usr/share/man/py/man1/zonetab2pot.1 \
-		debian/kdesdk-scripts-trinity/usr/share/man/man1/zonetab2pot.py.1
-	mv -f debian/kdesdk-scripts-trinity/usr/share/man/sh/man1/build-progress.1 \
-		debian/kdesdk-scripts-trinity/usr/share/man/man1/build-progress.sh.1
-	mv -f debian/kdesdk-scripts-trinity/opt/trinity/bin/svn-clean \
-		debian/kdesdk-scripts-trinity/opt/trinity/bin/svn-clean-kde
-	mv -f debian/kdesdk-scripts-trinity/opt/trinity/bin/svnversions \
-		debian/kdesdk-scripts-trinity/opt/trinity/bin/svnversion-kde
-	rm -rf debian/kdesdk-scripts-trinity/opt/share/man/pl
-	rm -rf debian/kdesdk-scripts-trinity/opt/share/man/py
-	rm -rf debian/kdesdk-scripts-trinity/opt/share/man/sh
+binary-install/tdesdk-scripts-trinity::
+	mv -f debian/tdesdk-scripts-trinity/usr/share/man/pl/man1/kdemangen.1 \
+		debian/tdesdk-scripts-trinity/usr/share/man/man1/kdemangen.pl.1
+	mv -f debian/tdesdk-scripts-trinity/usr/share/man/pl/man1/png2mng.1 \
+		debian/tdesdk-scripts-trinity/usr/share/man/man1/png2mng.pl.1
+	mv -f debian/tdesdk-scripts-trinity/usr/share/man/py/man1/kdelnk2desktop.1 \
+		debian/tdesdk-scripts-trinity/usr/share/man/man1/kdelnk2desktop.py.1
+	mv -f debian/tdesdk-scripts-trinity/usr/share/man/py/man1/zonetab2pot.1 \
+		debian/tdesdk-scripts-trinity/usr/share/man/man1/zonetab2pot.py.1
+	mv -f debian/tdesdk-scripts-trinity/usr/share/man/sh/man1/build-progress.1 \
+		debian/tdesdk-scripts-trinity/usr/share/man/man1/build-progress.sh.1
+	mv -f debian/tdesdk-scripts-trinity/opt/trinity/bin/svn-clean \
+		debian/tdesdk-scripts-trinity/opt/trinity/bin/svn-clean-kde
+	mv -f debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversions \
+		debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversion-kde
+	rm -rf debian/tdesdk-scripts-trinity/opt/share/man/pl
+	rm -rf debian/tdesdk-scripts-trinity/opt/share/man/py
+	rm -rf debian/tdesdk-scripts-trinity/opt/share/man/sh
 	install -p -D -m644 scripts/kde-buildrc \
-		debian/kdesdk-scripts-trinity/opt/trinity/share/doc/kdesdk-scripts-trinity/kde-buildrc.example
+		debian/tdesdk-scripts-trinity/opt/trinity/share/doc/tdesdk-scripts-trinity/kde-buildrc.example
 
-binary-install/kdesdk-misc-trinity::
+binary-install/tdesdk-misc-trinity::
 	install -p -D -m644 kdeaccounts-plugin/README \
-		debian/kdesdk-misc-trinity/opt/trinity/share/doc/kdesdk-misc/README.kdeaccounts-plugin
+		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kdeaccounts-plugin
 	install -p -D -m644 kioslave/svn/AUTHORS \
-		debian/kdesdk-misc-trinity/opt/trinity/share/doc/kdesdk-misc/AUTHORS.kioslave-svn
+		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/AUTHORS.kioslave-svn
 	install -p -D -m644 kioslave/svn/README \
-		debian/kdesdk-misc-trinity/opt/trinity/share/doc/kdesdk-misc/README.kioslave-svn
+		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kioslave-svn
 	install -p -D -m644 kprofilemethod/README \
-		debian/kdesdk-misc-trinity/opt/trinity/share/doc/kdesdk-misc/README.kprofilemethod
+		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kprofilemethod
 	install -p -D -m644 scheck/README \
-		debian/kdesdk-misc-trinity/opt/trinity/share/doc/kdesdk-misc/README.scheck
+		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.scheck
 
 binary-install/kapptemplate-trinity::
 	rm -f debian/kapptemplate-trinity/opt/trinity/share/apps/kapptemplate/admin/*.cdbs-orig
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-doc-html.doc-base.cervisia b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.cervisia
index eb8e39df2..bc24f7dc3 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-doc-html.doc-base.cervisia
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.cervisia
@@ -1,4 +1,4 @@
-Document: kdesdk-doc-html-cervisia
+Document: tdesdk-doc-html-cervisia
 Title: Cervisia Manual
 Author: Bernd Gehrmann <bernd@mail.berlios.de> and Carlos Woelz <carloswoelz@imap-mail.com>
 Abstract: Cervisia provides a graphical view of CVS.
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-doc-html.doc-base.kbabel b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kbabel
index e65a793da..c02ae546a 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-doc-html.doc-base.kbabel
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kbabel
@@ -1,4 +1,4 @@
-Document: kdesdk-doc-html-kbabel
+Document: tdesdk-doc-html-kbabel
 Title: KBabel Handbook
 Author: Matthias Kiefer <matthias.kiefer@gmx.de>, Stanislav Visnovsky <visnovsky@kde.org>
 Abstract: KBabel is a suite of an advanced and easy to use PO-file
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kcachegrind
index d105a0bc8..1ce09cab0 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kcachegrind
@@ -1,4 +1,4 @@
-Document: kdesdk-doc-html-kcachegrind
+Document: tdesdk-doc-html-kcachegrind
 Title: KCachegrind Handbook
 Author: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
 Abstract: KCachegrind is a profile data visualization tool, written
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-doc-html.doc-base.umbrello b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.umbrello
index 22e6a2404..2d10a317c 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-doc-html.doc-base.umbrello
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.umbrello
@@ -1,4 +1,4 @@
-Document: kdesdk-doc-html-umbrello
+Document: tdesdk-doc-html-umbrello
 Title: Umbrello UML Modeller Handbook
 Author: Paul Hensgen and the Umbrello UML Modeller Authors
 Abstract: Umbrello UML Modeller helps the software development process
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-kfile-plugins-trinity.install b/ubuntu/maverick/tdesdk/debian/tdesdk-kfile-plugins-trinity.install
index 1ffa48c57..1ffa48c57 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-kfile-plugins-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-kfile-plugins-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-kio-plugins-trinity.docs b/ubuntu/maverick/tdesdk/debian/tdesdk-kio-plugins-trinity.docs
index bd4b4c270..bd4b4c270 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-kio-plugins-trinity.docs
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-kio-plugins-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-kio-plugins-trinity.install b/ubuntu/maverick/tdesdk/debian/tdesdk-kio-plugins-trinity.install
index f3f70394c..f3f70394c 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-kio-plugins-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-kio-plugins-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-misc-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.README.Debian
index 03a08c2d0..4fd8618d0 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-misc-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.README.Debian
@@ -1,7 +1,7 @@
 KDE Software Development Kit for Debian
 ---------------------------------------
 
-The kdesdk-misc package includes palettes for both the Gimp and Xpaint
+The tdesdk-misc package includes palettes for both the Gimp and Xpaint
 that match the KDE standard colour palette.  They may be useful for
 designing themes and icons.
 
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-misc-trinity.install b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install
index cc229ce19..cc229ce19 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-misc-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.links b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.links
new file mode 100644
index 000000000..156dabdf4
--- /dev/null
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.links
@@ -0,0 +1 @@
+usr/share/kdepalettes/README usr/share/doc/tdesdk-misc/README.palettes
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.README.Debian
index 7d0a6714d..ec8ff7295 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.README.Debian
@@ -1,14 +1,14 @@
-kdesdk-scripts for Debian
+tdesdk-scripts for Debian
 -------------------------
 
 Debugger macros:
 
   Some handy gdb macros (such as for printing QStrings from gdb)
-  have been placed in /usr/share/kdesdk-scripts/kde-devel-gdb.
+  have been placed in /usr/share/tdesdk-scripts/kde-devel-gdb.
 
   To use them, add this line to your ~/.gdbinit :
 
-    source /usr/share/kdesdk-scripts/kde-devel-gdb
+    source /usr/share/tdesdk-scripts/kde-devel-gdb
 
 Editor helper files:
 
@@ -17,30 +17,30 @@ Editor helper files:
 
   To use the vim helper file, add this line to your ~/.vimrc :
 
-    source /usr/share/kdesdk-scripts/kde-devel-vim.vim
+    source /usr/share/tdesdk-scripts/kde-devel-vim.vim
 
   To use the emacs helper files, add these lines to your ~/.emacs (with
   your real name and email address substituted as appropriate):
 
-    (add-to-list 'load-path "/usr/share/emacs/site-lisp/kdesdk-scripts")
+    (add-to-list 'load-path "/usr/share/emacs/site-lisp/tdesdk-scripts")
     (require 'kde-emacs)
 
     (setq kde-full-name "Your Name")
     (setq kde-email "Your Email")
 
-  See the file /usr/share/emacs/site-lisp/kdesdk-scripts/kde-emacs.el for
+  See the file /usr/share/emacs/site-lisp/tdesdk-scripts/kde-emacs.el for
   further information regarding emacs.
 
 Shell completion controls:
 
-  Completion controls are provided in /usr/share/kdesdk-scripts/completions/
+  Completion controls are provided in /usr/share/tdesdk-scripts/completions/
   for a variety of shells.
 
   To enable completion controls for zsh, you need to add the following
   lines to your ~/.zshrc :
 
     # Add the KDE completion controls to the zsh function path.
-    set -A fpath $fpath /usr/share/kdesdk-scripts/completions/zsh
+    set -A fpath $fpath /usr/share/tdesdk-scripts/completions/zsh
 
     # Initialise the zsh completion system.
     autoload -U compinit
@@ -49,7 +49,7 @@ Shell completion controls:
   To enable completion controls for bash, you must source each of the bash
   completion files from your ~/.bashrc .  A sample ~/.bashrc line is:
 
-    . /usr/share/kdesdk-scripts/completions/bash/dcop
+    . /usr/share/tdesdk-scripts/completions/bash/dcop
 
 Valgrind error suppressions:
 
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.docs b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.docs
index 490ab041d..490ab041d 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.docs
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.install b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.install
index 79b90254c..8b7f3c79f 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.install
@@ -38,7 +38,7 @@ debian/tmp/opt/trinity/bin/svn2dist
 debian/tmp/opt/trinity/bin/svnrevertlast
 debian/tmp/opt/trinity/bin/svnforwardport
 debian/tmp/opt/trinity/bin/nonsvnlist
-debian/tmp/opt/trinity/bin/kdesvn-build
+debian/tmp/opt/trinity/bin/tdesvn-build
 debian/tmp/opt/trinity/bin/svnlastlog
 debian/tmp/opt/trinity/bin/svnversions
 debian/tmp/opt/trinity/bin/create_svnignore
@@ -49,21 +49,21 @@ debian/tmp/opt/trinity/bin/svnbackport
 debian/tmp/opt/trinity/bin/svngettags
 debian/tmp/opt/trinity/bin/svnchangesince
 debian/tmp/opt/trinity/bin/svn-clean
-debian/tmp/opt/trinity/share/apps/katepart/syntax/kdesvn-buildrc.xml
+debian/tmp/opt/trinity/share/apps/katepart/syntax/tdesvn-buildrc.xml
 debian/tmp/opt/trinity/share/man/man1/cvsblame.1
 debian/tmp/opt/trinity/share/man/man1/cvsversion.1
 debian/tmp/opt/trinity/share/man/man1/kde-build.1
 debian/tmp/opt/trinity/share/man/man1/includemocs.1
 debian/tmp/opt/trinity/share/man/man1/noncvslist.1
-debian/tmp/opt/trinity/share/man/man1/kdesvn-build.1
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesvn-build/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesvn-build/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesvn-build/index.docbook
-scripts/kde-devel-gdb /opt/trinity/share/kdesdk-scripts
-scripts/kde-devel-vim.vim /opt/trinity/share/kdesdk-scripts
-scripts/kde-emacs/*.el /opt/trinity/share/emacs/site-lisp/kdesdk-scripts
+debian/tmp/opt/trinity/share/man/man1/tdesvn-build.1
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesvn-build/common
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesvn-build/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesvn-build/index.docbook
+scripts/kde-devel-gdb /opt/trinity/share/tdesdk-scripts
+scripts/kde-devel-vim.vim /opt/trinity/share/tdesdk-scripts
+scripts/kde-emacs/*.el /opt/trinity/share/emacs/site-lisp/tdesdk-scripts
 scripts/kde.supp /opt/trinity/lib/valgrind
-scripts/completions /opt/trinity/share/kdesdk-scripts
+scripts/completions /opt/trinity/share/tdesdk-scripts
 
 debian/desktop-i18n/createdesktop.pl /opt/trinity/lib/kubuntu-desktop-i18n/
 debian/desktop-i18n/findfiles /opt/trinity/lib/kubuntu-desktop-i18n/
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.lintian b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.lintian
new file mode 100644
index 000000000..e3136bc9c
--- /dev/null
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.lintian
@@ -0,0 +1,3 @@
+# The syntax error is just perlpod docs appearing after the script exits.
+tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
+tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.manpages b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.manpages
index 07337e200..07337e200 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.manpages
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.manpages
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/tdesdk-trinity.README.Debian
index 65a65a833..2f53456c9 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-trinity.README.Debian
@@ -1,11 +1,11 @@
 KDE Software Development Kit for Debian
 ---------------------------------------
 
-Package kdesdk is a metapackage that depends on the core components of
+Package tdesdk is a metapackage that depends on the core components of
 the KDE Software Development Kit and suggests the remaining components.
 
 Some applications provide 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 kdesdk-doc-html.
+web browser, see the package tdesdk-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/umbrello-trinity.README.Debian
index 0ba895e00..c151a589b 100644
--- a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/umbrello-trinity.README.Debian
@@ -3,6 +3,6 @@ Umbrello 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 kdesdk-doc-html.
+web browser, see the package tdesdk-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sat, 31 Jan 2004 12:08:48 +1100