Rename a bunch of kde names to tde

14 files changed, 210 insertions, 210 deletions

diff --git a/ubuntu/maverick/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
index da64a9233..4ce41232d 100644
--- a/ubuntu/maverick/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/maverick/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -6,5 +6,5 @@ Added debian/rules entry to remove /usr/share/apps/konqueror/servicemenus/media_
  install/konq-plugins::
  	rm -f debian/tmp/usr/share/apps/konqueror/servicemenus/media_realfolder.desktop
 
-  * Stop kdeaddons meta-package depending on knewsticker-scripts, 
+  * Stop tdeaddons meta-package depending on knewsticker-scripts, 
     it depends on stuff in universe
diff --git a/ubuntu/maverick/tdeaddons/debian/changelog b/ubuntu/maverick/tdeaddons/debian/changelog
index d7003caa9..8094804b6 100644
--- a/ubuntu/maverick/tdeaddons/debian/changelog
+++ b/ubuntu/maverick/tdeaddons/debian/changelog
@@ -1,81 +1,81 @@
-kdeaddons-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
+tdeaddons-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <[email protected]>  Thu, 02 July 2009 16:08:00 -0600
 
-kdeaddons-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
+tdeaddons-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
   * Fixed conflict with konqueror-plugin-imagerotation and konqueror-plugin-fsview
 
  -- Timothy Pearson <[email protected]>  Sun, 26 Apr 2009 13:57:00 -0600
 
-kdeaddons-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
+tdeaddons-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <[email protected]>  Wed, 03 March 2009 14:24:00 -0600
 
-kdeaddons-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
+tdeaddons-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
 
   * Import from SVN
 
  -- Timothy Pearson <[email protected]>  Sat, 29 Nov 2008 12:30:00 -0600
 
-kdeaddons (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdeaddons (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
     - Freshen kubuntu_06_dirfilter_plugin_fix.diff
-    - Bump required build-dep version for kdelibs4-dev, atlantik-dev,
-      kdebase-dev, kdemultimedia-dev, libkdegames-dev, libkonq4-dev, and
-      kdepim-dev to 3.5.10
+    - Bump required build-dep version for tdelibs4-dev, atlantik-dev,
+      tdebase-dev, tdemultimedia-dev, libtdegames-dev, libkonq4-dev, and
+      tdepim-dev to 3.5.10
 
  -- Scott Kitterman <[email protected]>  Tue, 26 Aug 2008 00:31:29 -0400
 
-kdeaddons (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdeaddons (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <[email protected]>  Thu, 14 Feb 2008 12:27:05 +0000
 
-kdeaddons (4:3.5.8-1ubuntu5) hardy; urgency=low
+tdeaddons (4:3.5.8-1ubuntu5) hardy; urgency=low
 
   * Fix build failures with g++-4.3.
 
  -- Matthias Klose <[email protected]>  Thu, 24 Jan 2008 12:18:22 +0000
 
-kdeaddons (4:3.5.8-1ubuntu4) hardy; urgency=low
+tdeaddons (4:3.5.8-1ubuntu4) hardy; urgency=low
 
   * Rebuild for botched shlibs, so kaddressbook-plugins is installable.
 
  -- Sarah Hobbs <[email protected]>  Wed, 28 Nov 2007 22:53:21 +1100
 
-kdeaddons (4:3.5.8-1ubuntu3) hardy; urgency=low
+tdeaddons (4:3.5.8-1ubuntu3) hardy; urgency=low
 
-  * Downgrade kdepim dependency to 3.5.7
+  * Downgrade tdepim dependency to 3.5.7
 
  -- Jonathan Riddell <[email protected]>  Thu, 15 Nov 2007 11:09:08 +0000
 
-kdeaddons (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdeaddons (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
 
  -- Jonathan Riddell <[email protected]>  Thu, 15 Nov 2007 11:00:37 +0000
 
-kdeaddons (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdeaddons (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining changes in debian/KUBUNTU-DEBIAN-DIFFERENCES
 
  -- Jonathan Riddell <[email protected]>  Wed, 14 Nov 2007 17:25:47 +0000
 
-kdeaddons (4:3.5.8-1) unstable; urgency=low
+tdeaddons (4:3.5.8-1) unstable; urgency=low
 
   * New upstream release. 
 
  -- Ana Beatriz Guerrero Lopez <[email protected]>  Sun, 14 Oct 2007 22:55:30 +0200
 
-kdeaddons (4:3.5.7-3) unstable; urgency=low
+tdeaddons (4:3.5.7-3) unstable; urgency=low
   
   * Implement uploaders.mk - and update control file based on it.
 
@@ -86,90 +86,90 @@ kdeaddons (4:3.5.7-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <[email protected]>  Mon, 23 Apr 2007 13:16:00 +0100
 
-kdeaddons (4:3.5.7-2) unstable; urgency=low
+tdeaddons (4:3.5.7-2) unstable; urgency=low
 
   * Add new documentation for ksig and some forgotten .hidden files to
     konq-plugins.
 
  -- Ana Beatriz Guerrero Lopez <[email protected]>  Wed, 23 May 2007 20:37:51 +0100
 
-kdeaddons (4:3.5.8-0ubuntu2) gutsy; urgency=low
+tdeaddons (4:3.5.8-0ubuntu2) gutsy; urgency=low
 
   * Added kubuntu_06_dirfilter_plugin_fix.diff, fixed kbuildsyscoca
     output reguarding to dirfilterplugin.desktop
 
  -- Anthony Mercatante <[email protected]>  Mon, 15 Oct 2007 11:54:28 +0200
 
-kdeaddons (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdeaddons (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <[email protected]>  Tue, 09 Oct 2007 11:41:27 +0100
 
-kdeaddons (4:3.5.7-1ubuntu5) gutsy; urgency=low
+tdeaddons (4:3.5.7-1ubuntu5) gutsy; urgency=low
 
   * Fixed fsview.desktop patch again, uses Hidden instead of NoDisplay
     to also hide fsview from konqueror's context menu
 
  -- Anthony Mercatante <[email protected]>  Sat, 30 Jun 2007 13:07:37 +0200
 
-kdeaddons (4:3.5.7-1ubuntu4) gutsy; urgency=low
+tdeaddons (4:3.5.7-1ubuntu4) gutsy; urgency=low
 
   * Renamed kubuntu_05_hide_fsview.desktop to
     kubuntu_05_hide_fsview.diff for the patch to apply
 
  -- Anthony Mercatante <[email protected]>  Sat, 30 Jun 2007 02:53:47 +0200
 
-kdeaddons (4:3.5.7-1ubuntu3) gutsy; urgency=low
+tdeaddons (4:3.5.7-1ubuntu3) gutsy; urgency=low
 
   * Hide fsview from menu with patch kubuntu_05_hide_fsview.desktop
 
  -- Jonathan Riddell <[email protected]>  Wed, 06 Jun 2007 18:45:56 +0100
 
-kdeaddons (4:3.5.7-1ubuntu2) gutsy; urgency=low
+tdeaddons (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
   * Add missing .desktop files to konq-plugins.install
 
  -- Jonathan Riddell <[email protected]>  Wed, 23 May 2007 19:32:32 +0100
 
-kdeaddons (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdeaddons (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * Merge with Debian for new upstream version
   * Build-dep on libdb4.4++-dev not libdb4.3++-dev
 
  -- Jonathan Riddell <[email protected]>  Wed, 23 May 2007 17:35:16 +0100
 
-kdeaddons (4:3.5.7-1) unstable; urgency=low
+tdeaddons (4:3.5.7-1) unstable; urgency=low
 
   * New upstream release. (Closes: #417271) 
-  * Remove patch 10_kdeaddons-r626814.diff, merged upstream.
+  * Remove patch 10_tdeaddons-r626814.diff, merged upstream.
 
  -- Ana Beatriz Guerrero Lopez <[email protected]>  Wed, 16 May 2007 17:04:12 +0200
 
-kdeaddons (4:3.5.6-2ubuntu1) gutsy; urgency=low
+tdeaddons (4:3.5.6-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <[email protected]>  Mon, 30 Apr 2007 20:32:56 +0100
 
-kdeaddons (4:3.5.6-2) unstable; urgency=low
+tdeaddons (4:3.5.6-2) unstable; urgency=low
 
   * Upload to unstable after Etch release.
 
  -- Debian Qt/KDE Maintainers <[email protected]>  Mon, 23 Apr 2007 13:16:00 +0100
 
-kdeaddons (4:3.5.6-1) experimental; urgency=low
+tdeaddons (4:3.5.6-1) experimental; urgency=low
 
   * New upstream release.
-  * Make kdeaddons-dbg depend on kdelibs-dbg to get useful backtraces when
+  * Make tdeaddons-dbg depend on tdelibs-dbg to get useful backtraces when
     debugging. 
   * Update Uploaders.
-  * Add patch 10_kdeaddons-r626814.diff to fix a minor but annoying privacy
+  * Add patch 10_tdeaddons-r626814.diff to fix a minor but annoying privacy
     issue.
 
  -- Debian Qt/KDE Maintainers <[email protected]>  Thu, 18 Jan 2007 01:02:53 +0100
 
-kdeaddons (4:3.5.6-0ubuntu2) feisty; urgency=low
+tdeaddons (4:3.5.6-0ubuntu2) feisty; urgency=low
 
   * Add kubuntu_04_webarchiver.diff for correct names on war archives.
     Patch from Shriramana Sharma
@@ -177,7 +177,7 @@ kdeaddons (4:3.5.6-0ubuntu2) feisty; urgency=low
 
  -- Anthony Mercatante <[email protected]>  Fri, 23 Feb 2007 11:26:02 +0100
 
-kdeaddons (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdeaddons (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
   * Remove kubuntu_03_ark.diff, applied upstream
@@ -186,20 +186,20 @@ kdeaddons (4:3.5.6-0ubuntu1) feisty; urgency=low
 
  -- Jonathan Riddell <[email protected]>  Wed, 17 Jan 2007 11:22:31 +0000
 
-kdeaddons (4:3.5.5-1ubuntu2) feisty; urgency=low
+tdeaddons (4:3.5.5-1ubuntu2) feisty; urgency=low
 
-  * Stop kdeaddons meta-package depending on knewsticker-scripts, 
+  * Stop tdeaddons meta-package depending on knewsticker-scripts, 
     it depends on stuff in universe
 
  -- Jonathan Riddell <[email protected]>  Wed,  3 Jan 2007 12:37:46 +0000
 
-kdeaddons (4:3.5.5-1ubuntu1) feisty; urgency=low
+tdeaddons (4:3.5.5-1ubuntu1) feisty; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <[email protected]>  Thu, 16 Nov 2006 22:25:37 +0000
 
-kdeaddons (4:3.5.5-1) unstable; urgency=low
+tdeaddons (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
     + Doesn't force use of gmake. (Closes: 364214)
@@ -210,7 +210,7 @@ kdeaddons (4:3.5.5-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <[email protected]>  Tue, 10 Oct 2006 01:29:11 +0200
 
-kdeaddons (4:3.5.4-1) unstable; urgency=low
+tdeaddons (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -218,85 +218,85 @@ kdeaddons (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <[email protected]>  Sat, 26 Aug 2006 14:26:46 -0400
 
-kdeaddons (4:3.5.5-0ubuntu2) feisty; urgency=low
+tdeaddons (4:3.5.5-0ubuntu2) feisty; urgency=low
 
   * Add kubuntu_03_ark.diff for better 7z management.
 
  -- Anthony Mercatante <[email protected]>  Fri,  20 Oct 2006 18:36:06 +0200
 
-kdeaddons (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdeaddons (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <[email protected]>  Tue,  3 Oct 2006 10:56:06 +0000
 
-kdeaddons (4:3.5.4-0ubuntu6) edgy; urgency=low
+tdeaddons (4:3.5.4-0ubuntu6) edgy; urgency=low
 
   * Added kubuntu_02_adblock_kpart.diff for improved adblock
     management
 
  -- Anthony Mercatante <[email protected]>  Wed,  27 Sep 2006 01:13:12 +0200
 
-kdeaddons (4:3.5.4-0ubuntu5) edgy; urgency=low
+tdeaddons (4:3.5.4-0ubuntu5) edgy; urgency=low
 
   * Added debian/rules to also remove media_realfolder.desktop
     from the servicemenus
 
  -- Anthony Mercatante <[email protected]>  Sat,  16 Sep 2006 15:36:12 +0200
 
-kdeaddons (4:3.5.4-0ubuntu4) edgy; urgency=low
+tdeaddons (4:3.5.4-0ubuntu4) edgy; urgency=low
 
   * Removed media_realfolder.desktop from konq-plugins to match
     Simon Edwards patches to media:/
 
  -- Anthony Mercatante <[email protected]>  Thu,  14 Sep 2006 19:26:12 +0200
 
-kdeaddons (4:3.5.4-0ubuntu3) edgy; urgency=low
+tdeaddons (4:3.5.4-0ubuntu3) edgy; urgency=low
 
   * Rebuild with latest cdbs to add gettext domain to .desktop files for
     langpacks-desktopfiles-kde, no source changes
 
  -- Jonathan Riddell <[email protected]>  Tue,  5 Sep 2006 22:53:12 +0000
 
-kdeaddons (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdeaddons (4:3.5.4-0ubuntu2) edgy; urgency=low
 
   * Add kubuntu_01_google_suggest.diff from Stephan Binner
     adds Google suggest to existing search plugin, not creating a new one
 
  -- Jonathan Riddell <[email protected]>  Fri,  1 Sep 2006 15:52:19 +0000
 
-kdeaddons (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdeaddons (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <[email protected]>  Tue, 25 Jul 2006 10:12:17 +0000
 
-kdeaddons (4:3.5.3-0ubuntu4) edgy; urgency=low
+tdeaddons (4:3.5.3-0ubuntu4) edgy; urgency=low
 
   * Rebuild so it doesnt build-dep on libgamin0
 
  -- Brandon Holtsclaw <[email protected]>  Tue, 18 Jul 2006 12:09:26 -0500
 
-kdeaddons (4:3.5.3-0ubuntu3) edgy; urgency=low
+tdeaddons (4:3.5.3-0ubuntu3) edgy; urgency=low
 
-  * Up build-dep for kdepim to 3.5.3-2ubuntu3 to avoid libfam.la breakage
+  * Up build-dep for tdepim to 3.5.3-2ubuntu3 to avoid libfam.la breakage
 
  -- Jonathan Riddell <[email protected]>  Thu, 13 Jul 2006 15:12:47 +0000
 
-kdeaddons (4:3.5.3-0ubuntu2) edgy; urgency=low
+tdeaddons (4:3.5.3-0ubuntu2) edgy; urgency=low
 
   * Rebuild without libfam.la (no changes).
 
  -- Jonathan Riddell <[email protected]>  Wed, 12 Jul 2006 10:41:41 +0000
 
-kdeaddons (4:3.5.3-0ubuntu1) edgy; urgency=low
+tdeaddons (4:3.5.3-0ubuntu1) edgy; urgency=low
 
   * New upstream release
   * Sync with Debian
 
  -- Jonathan Riddell <[email protected]>  Tue,  4 Jul 2006 16:57:51 +0000
 
-kdeaddons (4:3.5.2-1) unstable; urgency=low
+tdeaddons (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -309,7 +309,7 @@ kdeaddons (4:3.5.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <[email protected]>  Wed,  5 Apr 2006 09:01:52 -0400
 
-kdeaddons (4:3.5.1-1) unstable; urgency=low
+tdeaddons (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -323,7 +323,7 @@ kdeaddons (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <[email protected]>  Sun, 19 Feb 2006 12:19:46 -0500
 
-kdeaddons (4:3.5.0-3) unstable; urgency=low
+tdeaddons (4:3.5.0-3) unstable; urgency=low
 
   * Upload to unstable.
 
@@ -331,7 +331,7 @@ kdeaddons (4:3.5.0-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <[email protected]>  Thu, 12 Jan 2006 14:20:02 +0100
 
-kdeaddons (4:3.5.0-2) experimental; urgency=low
+tdeaddons (4:3.5.0-2) experimental; urgency=low
 
   * Upload to experimental.
 
@@ -344,11 +344,11 @@ kdeaddons (4:3.5.0-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <[email protected]>  Wed, 28 Dec 2005 13:40:05 -0500
 
-kdeaddons (4:3.5.0-1) alioth; urgency=low
+tdeaddons (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
 
-  * vimpart has been removed from kdeaddons.
+  * vimpart has been removed from tdeaddons.
 
   * konq-plugins now includes a new Konqueror metabar, a media folder helper,
     a microformat availability indicator, and a del.icio.us bookmarks sidebar.
@@ -358,11 +358,11 @@ kdeaddons (4:3.5.0-1) alioth; urgency=low
   * Lower kicker-applet's dependency on xmms to a Recommends.
     (Closes: #238846, #314795)
 
-  * Add a kdeaddons-dbg package for helping to trace problems.
+  * Add a tdeaddons-dbg package for helping to trace problems.
 
  -- Debian Qt/KDE Maintainers <[email protected]>  Fri,  9 Dec 2005 13:42:29 -0500
 
-kdeaddons (4:3.4.3-1) unstable; urgency=low
+tdeaddons (4:3.4.3-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -378,14 +378,14 @@ kdeaddons (4:3.4.3-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <[email protected]>  Sun,  4 Dec 2005 23:07:51 -0500
 
-kdeaddons (4:3.5.2-0ubuntu4) dapper; urgency=low
+tdeaddons (4:3.5.2-0ubuntu4) dapper; urgency=low
 
   * debian/rules:
     - added dh_iconcache.
 
  -- Daniel Holbach <[email protected]>  Thu, 18 May 2006 15:13:32 +0200
 
-kdeaddons (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdeaddons (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Add build-dep on sharutils (for uuencode, uudecode).
   * Googlebar now suppresses the searchbar, so users upgrading from breezy
@@ -394,19 +394,19 @@ kdeaddons (4:3.5.2-0ubuntu3) dapper; urgency=low
 
  -- Tobi Vollebregt <[email protected]>  Mon,  1 May 2006 16:14:06 +0200
 
-kdeaddons (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdeaddons (4:3.5.2-0ubuntu2) dapper; urgency=low
 
   * Edit debian/rules to generate .po files
 
  -- Jonathan Riddell <[email protected]>  Fri, 21 Apr 2006 16:25:58 +0100
 
-kdeaddons (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdeaddons (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <[email protected]>  Mon, 20 Mar 2006 12:06:30 +0000
 
-kdeaddons (4:3.5.1-0ubuntu3) dapper; urgency=low
+tdeaddons (4:3.5.1-0ubuntu3) dapper; urgency=low
 
   * New google suggest bar patch kubuntu_01_googlebar_suggest.diff
   * Separates google suggest bar and searchbar, making it possible to use the
@@ -417,46 +417,46 @@ kdeaddons (4:3.5.1-0ubuntu3) dapper; urgency=low
 
  -- Tobi Vollebregt <[email protected]>  Tue,  7 Mar 2006 15:59:38 +0100
 
-kdeaddons (4:3.5.1-0ubuntu2) dapper; urgency=low
+tdeaddons (4:3.5.1-0ubuntu2) dapper; urgency=low
 
   * Remove build-dep on xmms-dev to get xmms out of main
 
  -- Jonathan Riddell <[email protected]>  Thu,  2 Feb 2006 22:37:52 +0000
 
-kdeaddons (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdeaddons (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <[email protected]>  Mon, 23 Jan 2006 14:26:06 +0000
 
-kdeaddons (4:3.5.0-0ubuntu3) dapper; urgency=low
+tdeaddons (4:3.5.0-0ubuntu3) dapper; urgency=low
 
   * Rebuild because libXft.la is gone
 
  -- Stephan Hermann <[email protected]>  Sat, 14 Jan 2006 16:17:16 +0100
 
-kdeaddons (4:3.5.0-0ubuntu2) dapper; urgency=low
+tdeaddons (4:3.5.0-0ubuntu2) dapper; urgency=low
 
   * Add back an updated kubuntu_01_googlebar_suggest.diff from 
     Tobi Vollebregt <[email protected]>
 
  -- Jonathan Riddell <[email protected]>  Wed,  7 Dec 2005 18:46:05 +0000
 
-kdeaddons (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdeaddons (4:3.5.0-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Remove GCC 3.4 on hppa
 
  -- Jonathan Riddell <[email protected]>  Tue,  6 Dec 2005 12:26:46 +0000
 
-kdeaddons (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdeaddons (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Sync with Debian
 
  -- Jonathan Riddell <[email protected]>  Thu, 24 Nov 2005 01:13:18 +0000
 
-kdeaddons (4:3.4.2-2.1) unstable; urgency=low
+tdeaddons (4:3.4.2-2.1) unstable; urgency=low
 
   * NMU.
   * Build with gcc-3.4 on arm, m68k, and hppa, to avoid ICEs.
@@ -464,20 +464,20 @@ kdeaddons (4:3.4.2-2.1) unstable; urgency=low
   
  -- Christopher Martin <[email protected]>  Fri, 21 Oct 2005 14:57:37 -0400
 
-kdeaddons (4:3.4.3-0ubuntu1) breezy; urgency=low
+tdeaddons (4:3.4.3-0ubuntu1) breezy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <[email protected]>  Sat,  8 Oct 2005 19:53:04 +0000
 
-kdeaddons (4:3.4.2-2ubuntu2) breezy; urgency=low
+tdeaddons (4:3.4.2-2ubuntu2) breezy; urgency=low
 
   * Update kubuntu_01_googlebar_suggest.diff fixes bar going blank
     when no suggest items are returned, and blank icons
 
  -- Jonathan Riddell <[email protected]>  Mon,  3 Oct 2005 19:41:44 +0100
 
-kdeaddons (4:3.4.2-2ubuntu1) breezy; urgency=low
+tdeaddons (4:3.4.2-2ubuntu1) breezy; urgency=low
 
   * Sync with Debian
   * Add kubuntu_01_googlebar_suggest.diff for Google suggest support
@@ -485,13 +485,13 @@ kdeaddons (4:3.4.2-2ubuntu1) breezy; urgency=low
 
  -- Jonathan Riddell <[email protected]>  Mon, 12 Sep 2005 16:52:21 +0100
 
-kdeaddons (4:3.4.2-2) unstable; urgency=low
+tdeaddons (4:3.4.2-2) unstable; urgency=low
 
   * Built against libfam-dev, not libgamin-dev (closes: #326535).
 
  -- Ben Burton <[email protected]>  Sun,  4 Sep 2005 10:58:17 +1000
 
-kdeaddons (4:3.4.2-1) unstable; urgency=low
+tdeaddons (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
   * First g++-4 upload to sid.
@@ -509,20 +509,20 @@ kdeaddons (4:3.4.2-1) unstable; urgency=low
 
  -- Ben Burton <[email protected]>  Sun,  4 Sep 2005 01:14:27 +1000
 
-kdeaddons (4:3.4.1-0ubuntu1) breezy; urgency=low
+tdeaddons (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number following KDE 3.4.1 release.
 
  -- Jonathan Riddell <[email protected]>  Tue, 31 May 2005 23:49:48 +0000
 
-kdeaddons (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+tdeaddons (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
 
   * New upstream release
   * Sync with Debian
 
  -- Jonathan Riddell <[email protected]>  Fri, 27 May 2005 09:26:43 +0000
 
-kdeaddons (4:3.4.0-0pre2) unstable; urgency=low
+tdeaddons (4:3.4.0-0pre2) unstable; urgency=low
 
   * Merge in recent packaging changes from the 3.3 branch.
   * Now that KDE has moved to subversion, disable cvs-clean in debian/rules
@@ -530,7 +530,7 @@ kdeaddons (4:3.4.0-0pre2) unstable; urgency=low
 
  -- Ben Burton <[email protected]>  Sat, 14 May 2005 19:20:58 +1000
 
-kdeaddons (4:3.4.0-0pre1) unstable; urgency=low
+tdeaddons (4:3.4.0-0pre1) unstable; urgency=low
 
   * New major upstream release.
   * Removed obsolete kderemove tags from menu items.
@@ -539,7 +539,7 @@ kdeaddons (4:3.4.0-0pre1) unstable; urgency=low
 
  -- Ben Burton <[email protected]>  Tue,  8 Mar 2005 07:43:35 +1100
 
-kdeaddons (4:3.3.2-4) unstable; urgency=low
+tdeaddons (4:3.3.2-4) unstable; urgency=low
 
   * Replaced vimpart's long list of GUI vim dependencies with the single
     (vim-gtk | gvim).  This removes an indirect (and unnecessary) conflict
@@ -548,25 +548,25 @@ kdeaddons (4:3.3.2-4) unstable; urgency=low
 
  -- Ben Burton <[email protected]>  Sun,  1 May 2005 13:41:04 +1000
 
-kdeaddons (4:3.4.0-0ubuntu2) hoary; urgency=low
+tdeaddons (4:3.4.0-0ubuntu2) hoary; urgency=low
 
   * Sync with Debian to install missing files
 
  -- Jonathan Riddell <[email protected]>  Wed,  6 Apr 2005 03:31:29 +0000
 
-kdeaddons (4:3.4.0-0ubuntu1) hoary; urgency=low
+tdeaddons (4:3.4.0-0ubuntu1) hoary; urgency=low
 
   * New upstream release
 
  -- Andreas Mueller <[email protected]>  Fri, 11 Mar 2005 10:29:39 +0000
 
-kdeaddons (4:3.3.2-1ubuntu1) hoary; urgency=low
+tdeaddons (4:3.3.2-1ubuntu1) hoary; urgency=low
 
   * New upstream bugfix release. 
 
  -- Andreas Mueller <[email protected]>  Sun, 16 Jan 2005 13:31:15 +0100
 
-kdeaddons (4:3.3.2-3) unstable; urgency=low
+tdeaddons (4:3.3.2-3) unstable; urgency=low
 
   * Made the default vimpart dependency vim-gtk (closes: #304189).
     Previously it was kvim, but kvim has since been removed from debian.
@@ -576,20 +576,20 @@ kdeaddons (4:3.3.2-3) unstable; urgency=low
 
  -- Ben Burton <[email protected]>  Mon, 25 Apr 2005 23:08:18 +1000
 
-kdeaddons (4:3.3.2-2) unstable; urgency=low
+tdeaddons (4:3.3.2-2) unstable; urgency=low
 
   * Include the full text of the GFDL in debian/copyright, since all of the
     docbook documentation is under this license.
 
  -- Ben Burton <[email protected]>  Sat, 26 Mar 2005 09:55:33 +1100
 
-kdeaddons (4:3.3.2-1) unstable; urgency=low
+tdeaddons (4:3.3.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
 
  -- Ben Burton <[email protected]>  Sat, 22 Jan 2005 06:53:59 +1100
 
-kdeaddons (4:3.3.1-1) unstable; urgency=medium
+tdeaddons (4:3.3.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.
   * Patched .lnk kfile plugin and /usr/bin/lnkforward so that they can
@@ -604,7 +604,7 @@ kdeaddons (4:3.3.1-1) unstable; urgency=medium
 
  -- Ben Burton <[email protected]>  Sat, 23 Oct 2004 15:17:56 +1000
 
-kdeaddons (4:3.3.0-1) unstable; urgency=low
+tdeaddons (4:3.3.0-1) unstable; urgency=low
 
   * New upstream release (closes: #270161).
   * Package kontact-plugins no longer exists (closes: #268892, #238971).
@@ -614,7 +614,7 @@ kdeaddons (4:3.3.0-1) unstable; urgency=low
 
  -- Ben Burton <[email protected]>  Thu, 14 Oct 2004 00:10:01 +1000
 
-kdeaddons (4:3.2.3-2) unstable; urgency=low
+tdeaddons (4:3.2.3-2) unstable; urgency=low
 
   * Patched vimpart so that the kvim process is reliably caught and embedded
     by the vimpart parent.  This is still hit-and-miss though when using
@@ -624,23 +624,23 @@ kdeaddons (4:3.2.3-2) unstable; urgency=low
 
  -- Ben Burton <[email protected]>  Thu,  1 Jul 2004 08:21:20 +1000
 
-kdeaddons (4:3.2.3-1) unstable; urgency=low
+tdeaddons (4:3.2.3-1) unstable; urgency=low
 
   * New upstream bugfix release.
   * Don't have atlantikdesigner suggest atlantik since it already depends
     on it.
-  * Suggests (konqueror | www-browser) for kdeaddons-doc-html instead of
+  * Suggests (konqueror | www-browser) for tdeaddons-doc-html instead of
     just www-browser.
 
  -- Ben Burton <[email protected]>  Sun, 20 Jun 2004 09:48:28 +1000
 
-kdeaddons (4:3.2.2-1) unstable; urgency=low
+tdeaddons (4:3.2.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
 
  -- Ben Burton <[email protected]>  Sat, 24 Apr 2004 08:53:43 +1000
 
-kdeaddons (4:3.2.1-1) unstable; urgency=low
+tdeaddons (4:3.2.1-1) unstable; urgency=low
 
   * First KDE 3.2 upload to sid.
   * Expanded list of vimpart dependencies to include all available graphical
@@ -652,15 +652,15 @@ kdeaddons (4:3.2.1-1) unstable; urgency=low
 
  -- Ben Burton <[email protected]>  Sat, 13 Mar 2004 09:58:54 +1100
 
-kdeaddons (4:3.2.0-2) experimental; urgency=low
+tdeaddons (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 kdeaddons metapackage.
+  * Using versioned dependencies for the tdeaddons metapackage.
 
  -- Ben Burton <[email protected]>  Mon, 23 Feb 2004 08:14:22 +1100
 
-kdeaddons (4:3.2.0-1) unstable; urgency=low
+tdeaddons (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.
@@ -668,24 +668,24 @@ kdeaddons (4:3.2.0-1) unstable; urgency=low
   * New binary packages kaddressbook-plugins, kontact-plugins, ksig and
     vimpart.
   * Note that the rename dialog plugins have been merged into the
-    kdeaddons-kfile-plugins package.
+    tdeaddons-kfile-plugins package.
 
  -- Ben Burton <[email protected]>  Sat, 31 Jan 2004 12:08:48 +1100
 
-kdeaddons (4:3.1.5-2) unstable; urgency=low
+tdeaddons (4:3.1.5-2) unstable; urgency=low
 
   * Build-depend on libxine-dev as a temporary workaround for
     libtool bug #199423.
 
  -- Ben Burton <[email protected]>  Wed, 21 Jan 2004 11:40:51 +1100
 
-kdeaddons (4:3.1.5-1) unstable; urgency=low
+tdeaddons (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <[email protected]>  Sun, 18 Jan 2004 12:55:12 +1100
 
-kdeaddons (4:3.1.4-2) unstable; urgency=low
+tdeaddons (4:3.1.4-2) unstable; urgency=low
 
   * New pull from BRANCH; includes bugfixes for atlantikdesigner and
     knewsticker-scripts.
@@ -693,7 +693,7 @@ kdeaddons (4:3.1.4-2) unstable; urgency=low
 
  -- Ben Burton <[email protected]>  Sat, 13 Dec 2003 09:10:25 +1100
 
-kdeaddons (4:3.1.4-1) unstable; urgency=low
+tdeaddons (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
   * Removed SDL patches which it seems are no longer necessary.
@@ -701,14 +701,14 @@ kdeaddons (4:3.1.4-1) unstable; urgency=low
 
  -- Ben Burton <[email protected]>  Sun, 12 Oct 2003 19:52:13 +1000
 
-kdeaddons (4:3.1.3-1) unstable; urgency=low
+tdeaddons (4:3.1.3-1) unstable; urgency=low
 
   * New upstream release.
   * Bumped standards-version to 3.6.0.
 
  -- Ben Burton <[email protected]>  Wed, 13 Aug 2003 11:02:26 +1000
 
-kdeaddons (4:3.1.2-1) unstable; urgency=low
+tdeaddons (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
   * Using new libtool (closes: #194647).
@@ -716,13 +716,13 @@ kdeaddons (4:3.1.2-1) unstable; urgency=low
 
  -- Ben Burton <[email protected]>  Sun,  1 Jun 2003 14:15:47 +1000
 
-kdeaddons (4:3.1.1-1) unstable; urgency=low
+tdeaddons (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <[email protected]>  Sun, 23 Mar 2003 15:23:23 +1100
 
-kdeaddons (4:3.1.0-4) unstable; urgency=low
+tdeaddons (4:3.1.0-4) unstable; urgency=low
 
   * Rebuilt against libvorbis0a (closes: #184713).
   * Removed alpha compile flags.
@@ -730,14 +730,14 @@ kdeaddons (4:3.1.0-4) unstable; urgency=low
 
  -- Ben Burton <[email protected]>  Sun, 16 Mar 2003 16:00:19 +1100
 
-kdeaddons (4:3.1.0-3) unstable; urgency=low
+tdeaddons (4:3.1.0-3) unstable; urgency=low
 
   * New binary package atlantikdesigner.
-  * Build-depends on atlantik-dev, libkdegames-dev and libqt3-compat-headers.
+  * Build-depends on atlantik-dev, libtdegames-dev and libqt3-compat-headers.
 
  -- Ben Burton <[email protected]>  Sat, 15 Feb 2003 15:47:37 +1100
 
-kdeaddons (4:3.1.0-2) unstable; urgency=low
+tdeaddons (4:3.1.0-2) unstable; urgency=low
 
   * First Trinity upload to debian!
   * Applied Ewald Snel's patch for xine support.
@@ -746,13 +746,13 @@ kdeaddons (4:3.1.0-2) unstable; urgency=low
 
  -- Ben Burton <[email protected]>  Thu,  6 Feb 2003 16:44:26 +1100
 
-kdeaddons (3.1.0-1) unstable; urgency=low
+tdeaddons (3.1.0-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <[email protected]>  Mon, 18 Nov 2002 14:15:59 +1100
 
-kdeaddons (3.0.9-1) unstable; urgency=low
+tdeaddons (3.0.9-1) unstable; urgency=low
 
   * New upstream release.
   * Built with g++-3.2.
@@ -760,7 +760,7 @@ kdeaddons (3.0.9-1) unstable; urgency=low
 
  -- Ben Burton <[email protected]>  Tue, 22 Oct 2002 11:57:39 +1000
 
-kdeaddons (3.0.8-1) unstable; urgency=low
+tdeaddons (3.0.8-1) unstable; urgency=low
 
   * New upstream release.
   * Moved to Chris Cheney's style of debian/rules.
@@ -768,58 +768,58 @@ kdeaddons (3.0.8-1) unstable; urgency=low
 
  -- Ben Burton <[email protected]>  Sun, 22 Sep 2002 17:57:55 +1000
 
-kdeaddons (3.0.3-1) unstable; urgency=low
+tdeaddons (3.0.3-1) unstable; urgency=low
 
   * New upstream release.
   * Build-depends on automake1.5.
 
  -- Ben Burton <[email protected]>  Thu, 15 Aug 2002 13:22:22 +1000
 
-kdeaddons (3.0.2-1) unstable; urgency=low
+tdeaddons (3.0.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <[email protected]>  Thu,  4 Jul 2002 19:36:49 +1000
 
-kdeaddons (3.0.1-1) unstable; urgency=low
+tdeaddons (3.0.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <[email protected]>  Sun, 19 May 2002 18:44:16 +1000
 
-kdeaddons (2.2.2-4) unstable; urgency=low
+tdeaddons (2.2.2-4) unstable; urgency=low
 
   * Fixed documentation conflicts.
 
  -- Ben Burton <[email protected]>  Mon,  1 Apr 2002 16:42:29 +1000
 
-kdeaddons (2.2.2-3) unstable; urgency=low
+tdeaddons (2.2.2-3) unstable; urgency=low
 
   * Build-Depends: xlibs-pic (closes: Bug#129716).
-  * Build requires newer kdemultimedia-dev to fix libesd0-dev bug.
+  * Build requires newer tdemultimedia-dev to fix libesd0-dev bug.
 
  -- Ben Burton <[email protected]>  Sun, 20 Jan 2002 22:10:37 +1100
 
-kdeaddons (2.2.2-2) unstable; urgency=low
+tdeaddons (2.2.2-2) unstable; urgency=low
 
   * Uses sdlconfig --plugin-libs (closes: Bug#117053).
 
  -- Ben Burton <[email protected]>  Sun, 30 Dec 2001 12:40:14 +1000
 
-kdeaddons (2.2.2-1) unstable; urgency=low
+tdeaddons (2.2.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <[email protected]>  Wed,  7 Nov 2001 10:49:53 -0600
 
-kdeaddons (2.2.1-4) unstable; urgency=low
+tdeaddons (2.2.1-4) unstable; urgency=low
 
   * Uses automake again to solve new alpha problems.
   * Updated to reflect new python policy.
 
  -- Ben Burton <[email protected]>  Tue,  6 Nov 2001 23:51:27 -0600
 
-kdeaddons (2.2.1-3) unstable; urgency=low
+tdeaddons (2.2.1-3) unstable; urgency=low
 
   * The "finally finished the AIC marking!" upload.
   * SDL scopes now included in noatun-plugins (closes: Bug#114307).
@@ -828,30 +828,30 @@ kdeaddons (2.2.1-3) unstable; urgency=low
 
  -- Ben Burton <[email protected]>  Tue, 23 Oct 2001 09:18:03 -0500
 
-kdeaddons (2.2.1-2) unstable; urgency=low
+tdeaddons (2.2.1-2) unstable; urgency=low
 
   * Updated parameters for alpha build (closes: Bug#113099).
 
  -- Ben Burton <[email protected]>  Sat, 22 Sep 2001 12:00:37 -0500
 
-kdeaddons (2.2.1-1) unstable; urgency=low
+tdeaddons (2.2.1-1) unstable; urgency=low
 
   * New upstream release.
   * Fixed doc-base entries to refer to real directories instead of symlinks.
 
  -- Ben Burton <[email protected]>  Fri, 31 Aug 2001 21:08:56 -0500
 
-kdeaddons (2.2.0-final-2) unstable; urgency=low
+tdeaddons (2.2.0-final-2) unstable; urgency=low
 
-  * Requires newer version of kdemultimedia-dev (closes: #104369).
+  * Requires newer version of tdemultimedia-dev (closes: #104369).
 
  -- Ben Burton <[email protected]>  Tue, 21 Aug 2001 22:59:30 -0500
 
-kdeaddons (2.2.0-final-1) unstable; urgency=low
+tdeaddons (2.2.0-final-1) unstable; urgency=low
 
   * New upstream release.
-  * Added packages knewsticker-scripts and kdeaddons-doc-html.
-  * Build-Depends: requires newer kdelibs-dev for working meinproc.
+  * Added packages knewsticker-scripts and tdeaddons-doc-html.
+  * Build-Depends: requires newer tdelibs-dev for working meinproc.
   * Added suggests: konqueror to packages including docbook documentation.
   * Ensures .bz2 files are not recompressed.
   * Bumped standards-version to 3.5.6.
@@ -859,26 +859,26 @@ kdeaddons (2.2.0-final-1) unstable; urgency=low
 
  -- Ben Burton <[email protected]>  Sun, 29 Jul 2001 17:48:59 +1000
 
-kdeaddons (2.2-beta1-4) unstable; urgency=low
+tdeaddons (2.2-beta1-4) unstable; urgency=low
 
   * Builds on alpha.
 
  -- Ben Burton <[email protected]>  Fri, 27 Jul 2001 03:23:10 +1000
 
-kdeaddons (2.2-beta1-3) unstable; urgency=low
+tdeaddons (2.2-beta1-3) unstable; urgency=low
 
-  * Build-Depends: added kdebase-dev (closes: Bug#104058).
+  * Build-Depends: added tdebase-dev (closes: Bug#104058).
 
  -- Ben Burton <[email protected]>  Tue, 10 Jul 2001 14:37:45 +1000
 
-kdeaddons (2.2-beta1-2) unstable; urgency=low
+tdeaddons (2.2-beta1-2) unstable; urgency=low
 
   * Build-Depends: versioned some KDE libraries; added kate
     (closes: Bug#103515).
 
  -- Ben Burton <[email protected]>  Wed,  4 Jul 2001 11:41:50 -0500
 
-kdeaddons (2.2-beta1-1) unstable; urgency=low
+tdeaddons (2.2-beta1-1) unstable; urgency=low
 
   * Initial Release (closes: Bug#101347).
 
diff --git a/ubuntu/maverick/tdeaddons/debian/control b/ubuntu/maverick/tdeaddons/debian/control
index 8e6600157..d106c2e74 100644
--- a/ubuntu/maverick/tdeaddons/debian/control
+++ b/ubuntu/maverick/tdeaddons/debian/control
@@ -1,19 +1,19 @@
-Source: kdeaddons-trinity
+Source: tdeaddons-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <[email protected]>
 Uploaders: Ana Beatriz Guerrero Lopez <[email protected]>, Christopher Martin <[email protected]>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.8++-dev | libdb++-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.8++-dev | libdb++-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kdeaddons-trinity
+Package: tdeaddons-trinity
 Architecture: all
 Section: kde
-Replaces: kdeaddons-kde3 (<< 4:3.5.13)
-Breaks: kdeaddons-kde3 (<< 4:3.5.13)
-Depends: atlantikdesigner-trinity (>= ${Source-Version}), kaddressbook-plugins-trinity (>= ${Source-Version}), kate-plugins-trinity (>= ${Source-Version}), kdeaddons-kfile-plugins-trinity (>= ${Source-Version}), kicker-applets-trinity (>= ${Source-Version}), konq-plugins-trinity (>= ${Source-Version}), ksig-trinity (>= ${Source-Version}), noatun-plugins-trinity (>= ${Source-Version})
-Suggests: kdeaddons-trinity-doc-html
+Replaces: tdeaddons-kde3 (<< 4:3.5.13)
+Breaks: tdeaddons-kde3 (<< 4:3.5.13)
+Depends: atlantikdesigner-trinity (>= ${Source-Version}), kaddressbook-plugins-trinity (>= ${Source-Version}), kate-plugins-trinity (>= ${Source-Version}), tdeaddons-kfile-plugins-trinity (>= ${Source-Version}), kicker-applets-trinity (>= ${Source-Version}), konq-plugins-trinity (>= ${Source-Version}), ksig-trinity (>= ${Source-Version}), noatun-plugins-trinity (>= ${Source-Version})
+Suggests: tdeaddons-trinity-doc-html
 Description: add-on plugins and applets provided with Trinity
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -23,12 +23,12 @@ Description: add-on plugins and applets provided with Trinity
  This metapackage includes a collection of add-on plugins and applets
  provided with the official release of Trinity.
 
-Package: kdeaddons-trinity-doc-html
+Package: tdeaddons-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: kdeaddons-kde3-doc-html (<< 4:3.5.13)
-Breaks: kdeaddons-kde3-doc-html (<< 4:3.5.13)
-Suggests: konqueror-trinity | www-browser, kdeaddons-trinity
+Replaces: tdeaddons-kde3-doc-html (<< 4:3.5.13)
+Breaks: tdeaddons-kde3-doc-html (<< 4:3.5.13)
+Suggests: konqueror-trinity | www-browser, tdeaddons-trinity
 Description: KDE add-ons 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.
@@ -41,7 +41,7 @@ Description: KDE add-ons documentation in HTML format
  most KDE addons packages.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: atlantikdesigner-trinity
 Architecture: any
@@ -60,7 +60,7 @@ Description: game board designer for Atlantik
  America and Europe.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: kaddressbook-plugins-trinity
 Architecture: any
@@ -68,7 +68,7 @@ Section: kde
 Replaces: kaddressbook-plugins-kde3 (<< 4:3.5.13)
 Breaks: kaddressbook-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
-Suggests: kworldclock-trinity, khelpcenter-trinity, kdeaddons-trinity-doc-html
+Suggests: kworldclock-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html
 Enhances: kaddressbook-trinity
 Description: plugins for KAddressBook, the Trinity address book
  This package contains a variety of useful plugins for the KDE address
@@ -79,7 +79,7 @@ Description: plugins for KAddressBook, the Trinity address book
  by the German freemail provider GMX.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: kate-plugins-trinity
 Architecture: any
@@ -87,7 +87,7 @@ Section: editors
 Replaces: kate-plugins-kde3 (<< 4:3.5.13)
 Breaks: kate-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, tidy
-Suggests: khelpcenter-trinity, kdeaddons-trinity-doc-html, kaddressbook-trinity
+Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html, kaddressbook-trinity
 Enhances: kate-trinity
 Description: plugins for Kate, the KDE Advanced Text Editor
  This package contains a variety of useful plugins for Kate, the KDE
@@ -100,13 +100,13 @@ Description: plugins for Kate, the KDE Advanced Text Editor
  a tab bar, a Python browser and even more.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
-Package: kdeaddons-kfile-plugins-trinity
+Package: tdeaddons-kfile-plugins-trinity
 Architecture: any
 Section: kde
-Replaces: kdeaddons-kfile-plugins-kde3 (<< 4:3.5.13)
-Breaks: kdeaddons-kfile-plugins-kde3 (<< 4:3.5.13)
+Replaces: tdeaddons-kfile-plugins-kde3 (<< 4:3.5.13)
+Breaks: tdeaddons-kfile-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Provides: renamedlg-plugins-trinity
 Description: Trinity file dialog plugins for text files and folders
@@ -121,7 +121,7 @@ Description: Trinity file dialog plugins for text files and folders
  provided for audio and image files.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: kicker-applets-trinity
 Architecture: any
@@ -129,7 +129,7 @@ Section: kde
 Replaces: kicker-applets-kde3 (<< 4:3.5.13)
 Breaks: kicker-applets-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, kicker-trinity
-Suggests: xmms-kde-trinity, khelpcenter-trinity, kdeaddons-trinity-doc-html
+Suggests: xmms-kde-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html
 Provides: ktimemon-trinity
 Enhances: kicker-trinity
 Description: applets for Kicker, the Trinity panel
@@ -144,7 +144,7 @@ Description: applets for Kicker, the Trinity panel
  controls XMMS, install the xmms-kde-trinity package.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: knewsticker-scripts-trinity
 Architecture: all
@@ -163,7 +163,7 @@ Description: scripts for KNewsTicker, the Trinity news ticker
  and various local news sources.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: konq-plugins-trinity
 Architecture: any
@@ -172,7 +172,7 @@ Replaces: konq-plugins-kde3 (<< 4:3.5.13)
 Breaks: konq-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, libjpeg-progs, python, rsync, unison
 Recommends: akregator-trinity, ark-trinity, imagemagick
-Suggests: khelpcenter-trinity, kdeaddons-trinity-doc-html
+Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html
 Enhances: konqueror-trinity, akregator-trinity
 Provides: akregator-konq-plugin-trinity
 Description: plugins for Konqueror, the Trinity file/web/doc browser
@@ -192,7 +192,7 @@ Description: plugins for Konqueror, the Trinity file/web/doc browser
  graphical disk usage viewer and image conversions and transformations.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: ksig-trinity
 Architecture: any
@@ -213,7 +213,7 @@ Description: graphical tool for managing multiple email signatures
  /opt/trinity/share/doc/ksig/README.Debian for details on how this can be done.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: noatun-plugins-trinity
 Architecture: any
@@ -232,16 +232,16 @@ Description: plugins for Noatun, the Trinity media player
  of user interfaces, playlists and visualisation plugins.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
-Package: kdeaddons-trinity-dbg
+Package: tdeaddons-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: kdeaddons-kde3-dbg (<< 4:3.5.13)
-Breaks: kdeaddons-kde3-dbg (<< 4:3.5.13)
-Depends: kdelibs-trinity-dbg
+Replaces: tdeaddons-kde3-dbg (<< 4:3.5.13)
+Breaks: tdeaddons-kde3-dbg (<< 4:3.5.13)
+Depends: tdelibs-trinity-dbg
 Priority: extra
-Description: debugging symbols for kdeaddons-trinity
- This package contains the debugging symbols associated with kdeaddons-trinity.
- They will automatically be used by gdb for debugging kdeaddons-related
+Description: debugging symbols for tdeaddons-trinity
+ This package contains the debugging symbols associated with tdeaddons-trinity.
+ They will automatically be used by gdb for debugging tdeaddons-related
  issues.
diff --git a/ubuntu/maverick/tdeaddons/debian/control.in b/ubuntu/maverick/tdeaddons/debian/control.in
index ba83c7f63..1911a0d6d 100644
--- a/ubuntu/maverick/tdeaddons/debian/control.in
+++ b/ubuntu/maverick/tdeaddons/debian/control.in
@@ -1,17 +1,17 @@
-Source: kdeaddons
+Source: tdeaddons
 Section: kde
 Priority: optional
 Maintainer: Ubuntu Core developers <[email protected]>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), atlantik-dev (>= 4:3.5.8), kdebase-dev (>= 4:3.5.8), kdemultimedia-dev (>= 4:3.5.8), libkdegames-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), kdepim-dev (>= 4:3.5.8), libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.6++-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), atlantik-dev (>= 4:3.5.8), tdebase-dev (>= 4:3.5.8), tdemultimedia-dev (>= 4:3.5.8), libtdegames-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), tdepim-dev (>= 4:3.5.8), libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.6++-dev
 Standards-Version: 3.7.2
 
-Package: kdeaddons
+Package: tdeaddons
 Architecture: all
 Section: kde
-Depends: atlantikdesigner (>= ${Source-Version}), kaddressbook-plugins (>= ${Source-Version}), kate-plugins (>= ${Source-Version}), kdeaddons-kfile-plugins (>= ${Source-Version}), kicker-applets (>= ${Source-Version}), knewsticker-scripts (>= ${Source-Version}), konq-plugins (>= ${Source-Version}), ksig (>= ${Source-Version}), noatun-plugins (>= ${Source-Version})
-Suggests: kdeaddons-doc-html
+Depends: atlantikdesigner (>= ${Source-Version}), kaddressbook-plugins (>= ${Source-Version}), kate-plugins (>= ${Source-Version}), tdeaddons-kfile-plugins (>= ${Source-Version}), kicker-applets (>= ${Source-Version}), knewsticker-scripts (>= ${Source-Version}), konq-plugins (>= ${Source-Version}), ksig (>= ${Source-Version}), noatun-plugins (>= ${Source-Version})
+Suggests: tdeaddons-doc-html
 Description: add-on plugins and applets provided with KDE
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -21,10 +21,10 @@ Description: add-on plugins and applets provided with KDE
  This metapackage includes a collection of add-on plugins and applets
  provided with the official release of KDE.
 
-Package: kdeaddons-doc-html
+Package: tdeaddons-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror | www-browser, kdeaddons
+Suggests: konqueror | www-browser, tdeaddons
 Description: KDE add-ons 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.
@@ -37,7 +37,7 @@ Description: KDE add-ons documentation in HTML format
  most KDE addons packages.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
 Package: atlantikdesigner
 Architecture: any
@@ -54,13 +54,13 @@ Description: game board designer for Atlantik
  America and Europe.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
 Package: kaddressbook-plugins
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
-Suggests: kworldclock, khelpcenter, kdeaddons-doc-html
+Suggests: kworldclock, khelpcenter, tdeaddons-doc-html
 Enhances: kaddressbook
 Description: plugins for KAddressBook, the KDE address book
  This package contains a variety of useful plugins for the KDE address
@@ -71,13 +71,13 @@ Description: plugins for KAddressBook, the KDE address book
  by the German freemail provider GMX.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
 Package: kate-plugins
 Architecture: any
 Section: editors
 Depends: ${shlibs:Depends}, tidy
-Suggests: khelpcenter, kdeaddons-doc-html, kaddressbook
+Suggests: khelpcenter, tdeaddons-doc-html, kaddressbook
 Enhances: kate
 Description: plugins for Kate, the KDE Advanced Text Editor
  This package contains a variety of useful plugins for Kate, the KDE
@@ -90,9 +90,9 @@ Description: plugins for Kate, the KDE Advanced Text Editor
  a tab bar, a Python browser and even more.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
-Package: kdeaddons-kfile-plugins
+Package: tdeaddons-kfile-plugins
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
@@ -111,13 +111,13 @@ Description: KDE file dialog plugins for text files and folders
  provided for audio and image files.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
 Package: kicker-applets
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, kicker
-Suggests: xmms-kde, khelpcenter, kdeaddons-doc-html
+Suggests: xmms-kde, khelpcenter, tdeaddons-doc-html
 Conflicts: ktimemon (<< 4:2.2-alpha1-0)
 Replaces: ktimemon (<< 4:2.2-alpha1-0)
 Provides: ktimemon
@@ -134,7 +134,7 @@ Description: applets for Kicker, the KDE panel
  controls XMMS, install the xmms-kde package.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
 Package: knewsticker-scripts
 Architecture: all
@@ -151,14 +151,14 @@ Description: scripts for KNewsTicker, the KDE news ticker
  and various local news sources.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
 Package: konq-plugins
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, libjpeg-progs, python
 Recommends: akregator, ark, imagemagick
-Suggests: khelpcenter, kdeaddons-doc-html
+Suggests: khelpcenter, tdeaddons-doc-html
 Enhances: konqueror, akregator
 Replaces: akregator (<< 1.1), akregator-konq-plugin (<< 1.1)
 Conflicts: akregator-konq-plugin (<< 1.1)
@@ -180,7 +180,7 @@ Description: plugins for Konqueror, the KDE file/web/doc browser
  graphical disk usage viewer and image conversions and transformations.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
 Package: ksig
 Architecture: any
@@ -199,7 +199,7 @@ Description: graphical tool for managing multiple email signatures
  /opt/trinity/share/doc/ksig/README.Debian for details on how this can be done.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
 Package: noatun-plugins
 Architecture: any
@@ -216,14 +216,14 @@ Description: plugins for Noatun, the KDE media player
  of user interfaces, playlists and visualisation plugins.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
-Package: kdeaddons-dbg
+Package: tdeaddons-dbg
 Section: libdevel
 Architecture: any
-Depends: kdelibs-dbg
+Depends: tdelibs-dbg
 Priority: extra
-Description: debugging symbols for kdeaddons
- This package contains the debugging symbols associated with kdeaddons.
- They will automatically be used by gdb for debugging kdeaddons-related
+Description: debugging symbols for tdeaddons
+ This package contains the debugging symbols associated with tdeaddons.
+ They will automatically be used by gdb for debugging tdeaddons-related
  issues.
diff --git a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.README.Debian b/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.README.Debian
index 933d86cd0..fae96c9fe 100644
--- a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.README.Debian
+++ b/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.README.Debian
@@ -3,6 +3,6 @@ Kate Plugins for Debian
 
 This package 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 kdeaddons-doc-html.
+web browser, see the package tdeaddons-doc-html.
 
  -- Ben Burton <[email protected]>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.README.Debian b/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.README.Debian
index 881d7b395..d095c4e14 100644
--- a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.README.Debian
+++ b/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.README.Debian
@@ -3,6 +3,6 @@ Kicker Applets for Debian
 
 This package 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 kdeaddons-doc-html.
+web browser, see the package tdeaddons-doc-html.
 
  -- Ben Burton <[email protected]>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.README.Debian b/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.README.Debian
index 75c1d8461..97fd38a7b 100644
--- a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.README.Debian
+++ b/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.README.Debian
@@ -3,6 +3,6 @@ Konqueror Plugins for Debian
 
 This package 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 kdeaddons-doc-html.
+web browser, see the package tdeaddons-doc-html.
 
  -- Ben Burton <[email protected]>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeaddons/debian/rules b/ubuntu/maverick/tdeaddons/debian/rules
index 8e11cd8a6..c872980f3 100755
--- a/ubuntu/maverick/tdeaddons/debian/rules
+++ b/ubuntu/maverick/tdeaddons/debian/rules
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_CONFIGURE_EXTRA_FLAGS := --without-xmms --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --mandir=/opt/trinity/share/man
 
-DEB_DH_STRIP_ARGS := --dbg-package=kdeaddons-trinity-dbg
+DEB_DH_STRIP_ARGS := --dbg-package=tdeaddons-trinity-dbg
 
 DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter
 
@@ -28,9 +28,9 @@ binary-install/konq-plugins-trinity::
 #		debian/konq-plugins-trinity/opt/trinity/share/man/man1/orient.py.1; \
 #	rm -rf debian/konq-plugins-trinity/opt/trinity/share/man/py;
 
-binary-install/kdeaddons-kfile-plugins-trinity::
+binary-install/tdeaddons-kfile-plugins-trinity::
 	install -p -D -m644 renamedlgplugins/README \
-		debian/kdeaddons-kfile-plugins-trinity/opt/trinity/share/doc/kdeaddons-kfile-plugins/README.renamedlgplugins
+		debian/tdeaddons-kfile-plugins-trinity/opt/trinity/share/doc/tdeaddons-kfile-plugins/README.renamedlgplugins
 
 binary-install/knewsticker-scripts-trinity::
 	chmod 755 debian/knewsticker-scripts-trinity/opt/trinity/share/apps/knewsticker/scripts/*.pl
diff --git a/ubuntu/maverick/tdeaddons/debian/kdeaddons-doc-html.doc-base.kate-plugins b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kate-plugins
index 17a559b85..f267f739c 100644
--- a/ubuntu/maverick/tdeaddons/debian/kdeaddons-doc-html.doc-base.kate-plugins
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kate-plugins
@@ -1,4 +1,4 @@
-Document: kdeaddons-doc-html_kate-plugins
+Document: tdeaddons-doc-html_kate-plugins
 Title: Kate Plugins Handbook
 Author: Various
 Abstract: This is the handbook for the plugins for Kate, KDE's Advanced Text
diff --git a/ubuntu/maverick/tdeaddons/debian/kdeaddons-doc-html.doc-base.kicker-applets b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kicker-applets
index d6b7c2d36..c83edbc2a 100644
--- a/ubuntu/maverick/tdeaddons/debian/kdeaddons-doc-html.doc-base.kicker-applets
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kicker-applets
@@ -1,4 +1,4 @@
-Document: kdeaddons-doc-html_kicker-applets
+Document: tdeaddons-doc-html_kicker-applets
 Title: Kicker Applets Handbook
 Author: Various
 Abstract: This is the handbook for the addon applets for Kicker, KDE's panel.
diff --git a/ubuntu/maverick/tdeaddons/debian/kdeaddons-doc-html.doc-base.konq-plugins b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.konq-plugins
index fa8870830..ac6bcd0fd 100644
--- a/ubuntu/maverick/tdeaddons/debian/kdeaddons-doc-html.doc-base.konq-plugins
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.konq-plugins
@@ -1,4 +1,4 @@
-Document: kdeaddons-doc-html_konq-plugins
+Document: tdeaddons-doc-html_konq-plugins
 Title: Konqueror Plugins Handbook
 Author: Lauri Watts <[email protected]> and others
 Abstract: This is the handbook for the additional plugins for Konqueror, the
diff --git a/ubuntu/maverick/tdeaddons/debian/kdeaddons-kfile-plugins-trinity.install b/ubuntu/maverick/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.install
index a85a16b55..0350b2f3e 100644
--- a/ubuntu/maverick/tdeaddons/debian/kdeaddons-kfile-plugins-trinity.install
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.install
@@ -28,4 +28,4 @@ debian/tmp/opt/trinity/share/services/kfile_mhtml.desktop
 debian/tmp/opt/trinity/share/services/kfile_txt.desktop
 debian/tmp/opt/trinity/share/services/renaudiodlg.desktop
 debian/tmp/opt/trinity/share/services/renimagedlg.desktop
-kfile-plugins/lnk/README /opt/trinity/share/doc/kdeaddons-kfile-plugins/lnk
+kfile-plugins/lnk/README /opt/trinity/share/doc/tdeaddons-kfile-plugins/lnk
diff --git a/ubuntu/maverick/tdeaddons/debian/kdeaddons-kfile-plugins-trinity.manpages b/ubuntu/maverick/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.manpages
index eda9949fb..eda9949fb 100644
--- a/ubuntu/maverick/tdeaddons/debian/kdeaddons-kfile-plugins-trinity.manpages
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.manpages
diff --git a/ubuntu/maverick/tdeaddons/debian/kdeaddons-trinity.README.Debian b/ubuntu/maverick/tdeaddons/debian/tdeaddons-trinity.README.Debian
index 0daab22b0..889a705e6 100644
--- a/ubuntu/maverick/tdeaddons/debian/kdeaddons-trinity.README.Debian
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-trinity.README.Debian
@@ -1,11 +1,11 @@
 KDE Add-On Plugins and Applets for Debian
 -----------------------------------------
 
-Package kdeaddons is a metapackage that depends on the full set of add-on
+Package tdeaddons is a metapackage that depends on the full set of add-on
 plugins and applets provided with the official release of KDE.
 
 Some packages 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 kdeaddons-doc-html.
+web browser, see the package tdeaddons-doc-html.
 
  -- Ben Burton <[email protected]>, Mon, 12 May 2003 12:29:39 +1000