Rename a bunch of kde names to tde

11 files changed, 229 insertions, 229 deletions

diff --git a/ubuntu/maverick/tdeadmin/debian/changelog b/ubuntu/maverick/tdeadmin/debian/changelog
index 254472cd9..4c2296fcb 100644
--- a/ubuntu/maverick/tdeadmin/debian/changelog
+++ b/ubuntu/maverick/tdeadmin/debian/changelog
@@ -1,29 +1,29 @@
-kdeadmin-trinity (4:3.5.10-0ubuntu4) karmic; urgency=low
+tdeadmin-trinity (4:3.5.10-0ubuntu4) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdeadmin-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
+tdeadmin-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 01 March 2009 12:46:00 -0600
 
-kdeadmin-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
+tdeadmin-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
   * Improved KDE4 interop
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 21 Dec 2008 10:37:00 -0600
 
-kdeadmin-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
+tdeadmin-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
 
   * SVN import
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 27 Nov 2008 16:53:00 -0600
 
-kdeadmin (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdeadmin (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
     - Drop patches/01_really_recognize_etch.diff, etch and lenny added
@@ -32,7 +32,7 @@ kdeadmin (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:32:20 -0400
 
-kdeadmin (4:3.5.9-0ubuntu5) hardy; urgency=low
+tdeadmin (4:3.5.9-0ubuntu5) hardy; urgency=low
 
   * Added kubuntu_14_dhcp_knm_back.diff:
     Knetworkmanager ignores cards defined in /etc/network/interfaces
@@ -41,7 +41,7 @@ kdeadmin (4:3.5.9-0ubuntu5) hardy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 03 Apr 2008 18:25:48 +0200
 
-kdeadmin (4:3.5.9-0ubuntu4) hardy; urgency=low
+tdeadmin (4:3.5.9-0ubuntu4) hardy; urgency=low
 
   * Added kubuntu_13_no_samba_tweak.diff.
     Knetworkconf reads smb.conf parameters but doesn't write them
@@ -51,33 +51,33 @@ kdeadmin (4:3.5.9-0ubuntu4) hardy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 03 Apr 2008 15:30:44 +0200
 
-kdeadmin (4:3.5.9-0ubuntu3) hardy; urgency=low
+tdeadmin (4:3.5.9-0ubuntu3) hardy; urgency=low
 
   * Added workarround patch kubuntu_12_fix_localhost_for_sudo.patch
     Avoids sudo to break due to 127.0.*.* beeing deleted.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 28 Mar 2008 11:41:56 +0100
 
-kdeadmin (4:3.5.9-0ubuntu2) hardy; urgency=low
+tdeadmin (4:3.5.9-0ubuntu2) hardy; urgency=low
 
   * Add kubuntu_11_knetworkconf_icons.diff from Adam Spain, 
     closes LP: #93878  "low quality icons"
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 03 Mar 2008 14:20:34 +0000
 
-kdeadmin (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdeadmin (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:05 +0000
 
-kdeadmin (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdeadmin (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 09:40:36 +0000
 
-kdeadmin (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdeadmin (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining changes
    - kubuntu_08_kpackage_sudo.diff, sudo support
@@ -86,7 +86,7 @@ kdeadmin (4:3.5.8-1ubuntu1) hardy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:38 +0000
 
-kdeadmin (4:3.5.8-1) unstable; urgency=low
+tdeadmin (4:3.5.8-1) unstable; urgency=low
 
   * New upstream release.
   * Implement use of uploaders.mk and update control.
@@ -98,37 +98,37 @@ kdeadmin (4:3.5.8-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 11 Oct 2007 01:22:40 +0200
 
-kdeadmin (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdeadmin (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:22 +0100
 
-kdeadmin (4:3.5.7-1ubuntu2) gutsy; urgency=low
+tdeadmin (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
   * Fix build failure with g++-4.3. LP: #138590.
 
  -- Matthias Klose <doko@ubuntu.com>  Thu, 13 Sep 2007 00:08:50 +0000
 
-kdeadmin (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdeadmin (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * Merge with Debian for new upstream version
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 May 2007 15:38:29 +0100
 
-kdeadmin (4:3.5.7-1) unstable; urgency=low
+tdeadmin (4:3.5.7-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 15 May 2007 23:46:52 +0100
 
-kdeadmin (4:3.5.6-2ubuntu1) gutsy; urgency=low
+tdeadmin (4:3.5.6-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 15:08:30 +0100
 
-kdeadmin (4:3.5.6-2) unstable; urgency=low
+tdeadmin (4:3.5.6-2) unstable; urgency=low
 
   * Upload to unstable after Etch release.
   * Update Uploaders.
@@ -148,17 +148,17 @@ kdeadmin (4:3.5.6-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 19 Apr 2007 14:15:20 +0100
 
-kdeadmin (4:3.5.6-1) experimental; urgency=low
+tdeadmin (4:3.5.6-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 16 Jan 2007 23:59:27 +0100
 
-kdeadmin (4:3.5.5-3) unstable; urgency=medium
+tdeadmin (4:3.5.5-3) unstable; urgency=medium
 
   +++ Changes by Sune Vuorela:
   
-  * 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.
   * Really recognize sarge and etch stable versions (Closes: #405696, #387047).
   
@@ -168,7 +168,7 @@ kdeadmin (4:3.5.5-3) unstable; urgency=medium
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon,  8 Jan 2007 10:17:47 +0100
 
-kdeadmin (4:3.5.5-2) unstable; urgency=low
+tdeadmin (4:3.5.5-2) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
@@ -176,40 +176,40 @@ kdeadmin (4:3.5.5-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 21 Nov 2006 00:00:56 +0100
 
-kdeadmin (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdeadmin (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
   * Remove kubuntu_12_knetworkconf_feisty.diff, applied upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:29 +0000
 
-kdeadmin (4:3.5.5-1ubuntu4) feisty; urgency=low
+tdeadmin (4:3.5.5-1ubuntu4) feisty; urgency=low
 
   * Re-write kubuntu_12_kubuntu_feisty.diff since it didn't apply
     on previous build
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 19 Jan 2006 01:07:23 +0100
 
-kdeadmin (4:3.5.5-1ubuntu3) feisty; urgency=low
+tdeadmin (4:3.5.5-1ubuntu3) feisty; urgency=low
 
   * Added kubuntu_12_knetworkconf_feisty.diff to properly autodetect
     feisty as knetworkconf backend.
 
  -- Luka Renko <lure@ubuntu.com>  Sun, 10 Dec 2006 16:16:12 +0100
 
-kdeadmin (4:3.5.5-1ubuntu2) feisty; urgency=low
+tdeadmin (4:3.5.5-1ubuntu2) feisty; urgency=low
 
   * rebuild with --enable-gcc-hidden-visibility
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 19:39:16 +0000
 
-kdeadmin (4:3.5.5-1ubuntu1) feisty; urgency=low
+tdeadmin (4:3.5.5-1ubuntu1) feisty; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Nov 2006 22:22:50 +0000
 
-kdeadmin (4:3.5.5-1) unstable; urgency=low
+tdeadmin (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -225,7 +225,7 @@ kdeadmin (4:3.5.5-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  4 Oct 2006 20:13:07 -0400
 
-kdeadmin (4:3.5.4-1) unstable; urgency=low
+tdeadmin (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -233,7 +233,7 @@ kdeadmin (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 29 Jul 2006 20:46:53 -0400
 
-kdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low
+tdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low
 
   * kubuntu_10_knetworkconf_localhost.diff added, hostname should not 
     be appended as alias to localhost in /etc/hosts
@@ -241,52 +241,52 @@ kdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low
 
  -- Luka Renko <lure@ubuntu.com>  Thu, 19 Oct 2006 23:06:57 +0200
 
-kdeadmin (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdeadmin (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
   * kubuntu_09_networkconf_edgy.diff removed, merged upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:07 +0000
 
-kdeadmin (4:3.5.4-0ubuntu3) edgy; urgency=low
+tdeadmin (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 <jriddell@ubuntu.com>  Tue,  5 Sep 2006 22:53:10 +0000
 
-kdeadmin (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdeadmin (4:3.5.4-0ubuntu2) edgy; urgency=low
 
   * Add kubuntu_09_networkconf_edgy.diff to support Edgy in knetworkconf
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  7 Aug 2006 09:08:39 -0400
 
-kdeadmin (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdeadmin (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:17 +0000
 
-kdeadmin (4:3.5.3-1ubuntu3) edgy; urgency=low
+tdeadmin (4:3.5.3-1ubuntu3) edgy; urgency=low
 
   * Add kubuntu_08_kpackage_sudo.diff, use sudo in kpackage,
     closes Malone #47741
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Jun 2006 17:40:42 +0000
 
-kdeadmin (4:3.5.3-1ubuntu2) edgy; urgency=low
+tdeadmin (4:3.5.3-1ubuntu2) edgy; urgency=low
 
-  * Rebuild with build-dep on latest kdelibs, fixes Qt binary compatibility break
+  * Rebuild with build-dep on latest tdelibs, fixes Qt binary compatibility break
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Jun 2006 16:11:40 +0000
 
-kdeadmin (4:3.5.3-1ubuntu1) edgy; urgency=low
+tdeadmin (4:3.5.3-1ubuntu1) edgy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 27 Jun 2006 16:22:44 +0000
 
-kdeadmin (4:3.5.3-1) unstable; urgency=low
+tdeadmin (4:3.5.3-1) unstable; urgency=low
 
   * New upstream release.
     + Fixes x-debian-package/x-deb inconsistency. (Closes: #362968)
@@ -301,17 +301,17 @@ kdeadmin (4:3.5.3-1) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Fix kdeadmin description typo. (Closes: #364036)
+  * Fix tdeadmin description typo. (Closes: #364036)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun,  4 Jun 2006 18:11:09 -0400
 
-kdeadmin (4:3.5.2-1) unstable; urgency=low
+tdeadmin (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 29 Mar 2006 13:13:03 -0500
 
-kdeadmin (4:3.5.1-2) unstable; urgency=low
+tdeadmin (4:3.5.1-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -320,7 +320,7 @@ kdeadmin (4:3.5.1-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 19 Feb 2006 14:30:28 -0500
 
-kdeadmin (4:3.5.1-1) unstable; urgency=low
+tdeadmin (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -330,7 +330,7 @@ kdeadmin (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 29 Jan 2006 10:10:44 -0500
 
-kdeadmin (4:3.5.0-4) unstable; urgency=low
+tdeadmin (4:3.5.0-4) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -340,7 +340,7 @@ kdeadmin (4:3.5.0-4) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  7 Jan 2006 17:21:53 -0500
 
-kdeadmin (4:3.5.0-3) experimental; urgency=low
+tdeadmin (4:3.5.0-3) experimental; urgency=low
 
   * Upload to experimental.
 
@@ -348,14 +348,14 @@ kdeadmin (4:3.5.0-3) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 16 Dec 2005 10:14:03 -0500
 
-kdeadmin (4:3.5.2-0ubuntu8) dapper; urgency=low
+tdeadmin (4:3.5.2-0ubuntu8) dapper; urgency=low
 
   * debian/cdbs/kde.mk:
     - added dh_iconcache.
 
  -- Daniel Holbach <daniel.holbach@ubuntu.com>  Thu, 18 May 2006 21:01:04 +0200
 
-kdeadmin (4:3.5.2-0ubuntu7) dapper; urgency=low
+tdeadmin (4:3.5.2-0ubuntu7) dapper; urgency=low
 
   * Add kubuntu_07_enabled_dhcp.patch to fix problem where interface 
     without IP address was considered as down/disabled and therefore 
@@ -363,7 +363,7 @@ kdeadmin (4:3.5.2-0ubuntu7) dapper; urgency=low
 
  -- Luka Renko <lure.net@gmail.com>  Sun, 30 Apr 2006 21:42:59 +0200
 
-kdeadmin (4:3.5.2-0ubuntu6) dapper; urgency=low
+tdeadmin (4:3.5.2-0ubuntu6) dapper; urgency=low
 
   * Add kubuntu_06_route_byte_order.patch to fix wrong gateway due to 
     byte order on PPC (Malone: #23750)   
@@ -372,7 +372,7 @@ kdeadmin (4:3.5.2-0ubuntu6) dapper; urgency=low
 
  -- Luka Renko <lure.net@gmail.com>  Fri, 28 Apr 2006 15:03:32 +0200
 
-kdeadmin (4:3.5.2-0ubuntu5) dapper; urgency=low
+tdeadmin (4:3.5.2-0ubuntu5) dapper; urgency=low
 
   * Add kubuntu_03_dns_alias.diff to fix wrong warning about missing 
     alias in DNS server add dialog (Malone #35507)
@@ -384,37 +384,37 @@ kdeadmin (4:3.5.2-0ubuntu5) dapper; urgency=low
 
  -- Luka Renko <lure.net@gmail.com>  Tue, 26 Apr 2006 00:07:20 +0200
 
-kdeadmin (4:3.5.2-0ubuntu4) dapper; urgency=low
+tdeadmin (4:3.5.2-0ubuntu4) dapper; urgency=low
 
   * Added kubuntu_02_wep_key.diff to fix WEP key (Malone #24516)
 
  -- Luka Renko <lure.net@gmail.com>  Mon, 24 Apr 2006 21:45:42 +0200
 
-kdeadmin (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdeadmin (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Edit debian/cdbs/kde.mk to mark .po files as UTF-8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Apr 2006 19:14:28 +0100
 
-kdeadmin (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdeadmin (4:3.5.2-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_01_ubuntu_version.diff change dapper version number
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 31 Mar 2006 00:50:12 +0100
 
-kdeadmin (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdeadmin (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:28 +0000
 
-kdeadmin (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdeadmin (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:06 +0000
 
-kdeadmin (4:3.5.0-0ubuntu2) dapper; urgency=low
+tdeadmin (4:3.5.0-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_01_knetworkconf_branch_fixes.diff fixes
     - http://bugzilla.ubuntu.com/9871 knetworkconf doesn't save gateway
@@ -424,26 +424,26 @@ kdeadmin (4:3.5.0-0ubuntu2) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 19 Dec 2005 15:19:17 +0000
 
-kdeadmin (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdeadmin (4:3.5.0-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Dec 2005 12:26:57 +0000
 
-kdeadmin (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdeadmin (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Generate .pot files
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 21:44:24 +0000
 
-kdeadmin (4:3.5-rc1-1ubuntu1) dapper; urgency=low
+tdeadmin (4:3.5-rc1-1ubuntu1) dapper; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 13 Nov 2005 16:22:21 +0000
 
-kdeadmin (4:3.5.0-2) alioth; urgency=low
+tdeadmin (4:3.5.0-2) alioth; urgency=low
 
   * New upstream release.
 
@@ -455,27 +455,27 @@ kdeadmin (4:3.5.0-2) alioth; urgency=low
 
   * Bump DH_COMPAT to 5. No changes.
 
-  * Add kdeadmin-dbg, to help track down problems.
+  * Add tdeadmin-dbg, to help track down problems.
 
   * Build lilo-config on amd64.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  1 Dec 2005 16:51:09 -0500
 
-kdeadmin (4:3.4.3-2) unstable; urgency=low
+tdeadmin (4:3.4.3-2) unstable; urgency=low
 
-  * Upload to unstable, rebuilding against kdelibs4c2a.
+  * Upload to unstable, rebuilding against tdelibs4c2a.
 
   * KDE_3_4_BRANCH update (up to r484392).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 30 Nov 2005 18:01:38 +0100
 
-kdeadmin (4:3.4.3-1) experimental; urgency=low
+tdeadmin (4:3.4.3-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 16 Oct 2005 14:26:58 -0400
 
-kdeadmin (4:3.4.2-1) unstable; urgency=low
+tdeadmin (4:3.4.2-1) unstable; urgency=low
 
   [ Debian Qt/KDE Maintainers ]
   * New upstream release.
@@ -486,39 +486,39 @@ kdeadmin (4:3.4.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 26 Aug 2005 17:18:42 +0200
 
-kdeadmin (4:3.4.1-1) experimental; urgency=low
+tdeadmin (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
 
-kdeadmin (4:3.4.3-0ubuntu1) breezy; urgency=low
+tdeadmin (4:3.4.3-0ubuntu1) breezy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun,  9 Oct 2005 02:21:28 +0000
 
-kdeadmin (4:3.4.2-0ubuntu1) breezy; urgency=low
+tdeadmin (4:3.4.2-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Build using unsermake
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 16:24:00 +0000
 
-kdeadmin (4:3.4.1-0ubuntu1) breezy; urgency=low
+tdeadmin (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number following KDE 3.4.1 release.
   * Add all packaged back to meta-package
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed,  1 Jun 2005 00:02:05 +0000
 
-kdeadmin (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+tdeadmin (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue, 24 May 2005 16:52:30 +0000
 
-kdeadmin (4:3.4.0-0pre2) alioth; urgency=low
+tdeadmin (4:3.4.0-0pre2) alioth; urgency=low
 
   * New upstream release.
 
@@ -531,8 +531,8 @@ kdeadmin (4:3.4.0-0pre2) alioth; urgency=low
 
   +++ Changes by Pierre Habouzit:
 
-  * Recommends kdebase-bin for lilo-config (kdesu in the menu command).
-  * Remove kcmlinuz from Depends for kdeadmin meta package.
+  * Recommends tdebase-bin for lilo-config (kdesu in the menu command).
+  * Remove kcmlinuz from Depends for tdeadmin meta package.
   * Wrote a man page for kdat.
 
   * [debian/control] :
@@ -546,13 +546,13 @@ kdeadmin (4:3.4.0-0pre2) alioth; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * New kdeadmin-doc-html package, containing doc-base registered HTML
+  * New tdeadmin-doc-html package, containing doc-base registered HTML
     versions of application handbooks, for users without Konqueror or
     KHelpCenter.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  7 Apr 2005 20:20:24 -0400
 
-kdeadmin (4:3.3.2-1) unstable; urgency=low
+tdeadmin (4:3.3.2-1) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -567,7 +567,7 @@ kdeadmin (4:3.3.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 23 Jan 2005 23:10:27 +0100
 
-kdeadmin (4:3.3.2-0pre1) experimental; urgency=low
+tdeadmin (4:3.3.2-0pre1) experimental; urgency=low
 
   * New upstream release.
   * KDE_3_3_BRANCH update.
@@ -575,32 +575,32 @@ kdeadmin (4:3.3.2-0pre1) experimental; urgency=low
 
  -- Christopher Martin <chrsmrtn@freeshell.org>  Thu, 16 Dec 2004 13:59:53 -0500
 
-kdeadmin (4:3.3.1-1) unstable; urgency=low
+tdeadmin (4:3.3.1-1) unstable; urgency=low
 
   * New upstream release.
   * KDE_3_3_BRANCH update.
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu,  4 Nov 2004 23:30:00 -0600
 
-kdeadmin (4:3.3.0-2) unstable; urgency=low
+tdeadmin (4:3.3.0-2) unstable; urgency=low
 
   * KDE_3_3_BRANCH update.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat, 25 Sep 2004 23:51:24 -0500
 
-kdeadmin (4:3.3.0-1) unstable; urgency=high
+tdeadmin (4:3.3.0-1) unstable; urgency=high
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri, 13 Aug 2004 23:30:00 -0500
 
-kdeadmin (4:3.2.3-1) unstable; urgency=high
+tdeadmin (4:3.2.3-1) unstable; urgency=high
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue,  3 Aug 2004 14:00:00 -0500
 
-kdeadmin (4:3.2.2-1) unstable; urgency=low
+tdeadmin (4:3.2.2-1) unstable; urgency=low
 
   * New upstream release.
   * debian/kpackage.mime: fix the entries to use a proper
@@ -609,38 +609,38 @@ kdeadmin (4:3.2.2-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon, 12 Apr 2004 01:00:00 -0500
 
-kdeadmin (4:3.2.1-1) unstable; urgency=low
+tdeadmin (4:3.2.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri,  5 Mar 2004 18:00:00 -0600
 
-kdeadmin (4:3.2.0-0pre1v1) experimental; urgency=low
+tdeadmin (4:3.2.0-0pre1v1) experimental; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed, 18 Feb 2004 19:00:00 -0600
 
-kdeadmin (4:3.1.95-1) unstable; urgency=low
+tdeadmin (4:3.1.95-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri, 23 Jan 2004 23:00:00 -0600
 
-kdeadmin (4:3.1.5-1) unstable; urgency=low
+tdeadmin (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
   * Added libtool arm patch.
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon, 12 Jan 2004 14:00:00 -0600
 
-kdeadmin (4:3.1.4-2) unstable; urgency=low
+tdeadmin (4:3.1.4-2) unstable; urgency=low
 
   * Changed Maintainer to Debian Qt/KDE Maintainers
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue,  6 Jan 2004 19:00:00 -0600
 
-kdeadmin (4:3.1.4-1) unstable; urgency=low
+tdeadmin (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
   * Added patch to update autotools files.
@@ -649,33 +649,33 @@ kdeadmin (4:3.1.4-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu, 16 Oct 2003 01:00:00 -0500
 
-kdeadmin (4:3.1.3-1) unstable; urgency=low
+tdeadmin (4:3.1.3-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri,  1 Aug 2003 14:00:00 -0500
 
-kdeadmin (4:3.1.2-1) unstable; urgency=low
+tdeadmin (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu, 22 May 2003 22:00:00 -0500
 
-kdeadmin (4:3.1.1-1) unstable; urgency=low
+tdeadmin (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release.
   * Add 'chmod +x configure' to rules. (Closes: #181357, #181563)
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed, 12 Mar 2003 01:00:00 -0600
 
-kdeadmin (4:3.1.0-1) unstable; urgency=low
+tdeadmin (4:3.1.0-1) unstable; urgency=low
 
   * New upstream release.
   * Rebuilt debian dir.
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon, 03 Feb 2003 22:00:00 -0600
 
-kdeadmin (4:2.2.2-7.2) stable-security; urgency=high
+tdeadmin (4:2.2.2-7.2) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Added special detection routine for big/little endianess on MIPS since
@@ -685,7 +685,7 @@ kdeadmin (4:2.2.2-7.2) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Wed,  8 Jan 2003 20:01:04 +0100
 
-kdeadmin (4:2.2.2-7.1) stable-security; urgency=high
+tdeadmin (4:2.2.2-7.1) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Applied upstream patches to fix several potential vulnerabilities.
@@ -693,20 +693,20 @@ kdeadmin (4:2.2.2-7.1) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Sun,  5 Jan 2003 21:09:43 +0100
 
-kdeadmin (4:2.2.2-7) unstable; urgency=high
+tdeadmin (4:2.2.2-7) unstable; urgency=high
 
   * Fixed lilo Build-Dep (added [i386])
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon,  4 Mar 2002 08:00:00 -0600
 
-kdeadmin (4:2.2.2-6) unstable; urgency=high
+tdeadmin (4:2.2.2-6) unstable; urgency=high
 
   * Changing Maintainer to Chris.
   * Fixing PowerPC breakage.
 
  -- Daniel Stone <daniel@sfarc.net>  Wed, 27 Feb 2002 21:28:09 +1100
 
-kdeadmin (4:2.2.2-5) unstable; urgency=low
+tdeadmin (4:2.2.2-5) unstable; urgency=low
 
   * debian/control, kpackage/Makefile.am:
     - Update kpackage for rpm 4.0.3, thanks Joey Hess. (Tighten [Build]Deps on
@@ -716,7 +716,7 @@ kdeadmin (4:2.2.2-5) unstable; urgency=low
 
  -- Daniel Stone <daniel@sfarc.net>  Tue,  1 Jan 2002 06:50:15 -0500
 
-kdeadmin (4:2.2.2-4) unstable; urgency=low
+tdeadmin (4:2.2.2-4) unstable; urgency=low
 
   * Crap! I lost the Build-Dep on docbook-to-man in the merge between my -2
     and RevKrusty's; reinstated. (closes: #122044)
@@ -724,19 +724,19 @@ kdeadmin (4:2.2.2-4) unstable; urgency=low
 
  -- Daniel Stone <daniel@sfarc.net>  Sun,  2 Dec 2001 11:23:19 +1100
 
-kdeadmin (4:2.2.2-3) unstable; urgency=low
+tdeadmin (4:2.2.2-3) unstable; urgency=low
 
   * New maintainer. (closes: #114101)
   * debian/{secpolicy,kwuftpd,kuser,ksysv,kpackage,kcron}.sgml:
     - New manpages.
   * secpolicy/main.cpp: fix this dodgyness, it now gives an actual description:
-    daniel@tsubasa:~/kde-2.2.2/kdeadmin-2.2.2/kdeadmin-2.2.2% ./secpolicy/secpolicy --help
+    daniel@tsubasa:~/kde-2.2.2/tdeadmin-2.2.2/tdeadmin-2.2.2% ./secpolicy/secpolicy --help
     Usage: secpolicy [Qt-options] [KDE-options]
     What does this do?
 
  -- Daniel Stone <daniel@sfarc.net>  Sat,  1 Dec 2001 23:59:40 +1100
 
-kdeadmin (4:2.2.2-2) unstable; urgency=low
+tdeadmin (4:2.2.2-2) unstable; urgency=low
 
   * Sync with upstream
   * Cleanup build process
@@ -745,7 +745,7 @@ kdeadmin (4:2.2.2-2) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 29 Nov 2001 04:15:00 -0700
 
-kdeadmin (4:2.2.2-1) unstable; urgency=low
+tdeadmin (4:2.2.2-1) unstable; urgency=low
 
   * New upstream version
   * use auto* again
@@ -753,25 +753,25 @@ kdeadmin (4:2.2.2-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Nov 2001 19:26:00 -0700
 
-kdeadmin (4:2.2.1-1.3) unstable; urgency=low
+tdeadmin (4:2.2.1-1.3) unstable; urgency=low
 
   * take out checks for auto* as it just hoses things
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 08 Oct 2001 19:26:00 -0700
 
-kdeadmin (4:2.2.1-1.2) unstable; urgency=low
+tdeadmin (4:2.2.1-1.2) unstable; urgency=low
 
   * fix configure
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 05 Oct 2001 09:28:00 -0700
 
-kdeadmin (4:2.2.1-1.1) unstable; urgency=low
+tdeadmin (4:2.2.1-1.1) unstable; urgency=low
 
   * Workaround for stupid automake 1.5 issues
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 03 Oct 2001 09:28:00 -0700
 
-kdeadmin (4:2.2.1-1) unstable; urgency=low
+tdeadmin (4:2.2.1-1) unstable; urgency=low
  
   * New upstream version
   * Change maintainer
@@ -779,19 +779,19 @@ kdeadmin (4:2.2.1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 25 Aug 2001 14:31:00 -0700
 
-kdeadmin (4:2.2.0-final-1) unstable; urgency=low
+tdeadmin (4:2.2.0-final-1) unstable; urgency=low
  
   * New upstream version 2.2
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 30 Jul 2001 00:01:00 -0700
 
-kdeadmin (4:2.2.0-0.1beta1-2) unstable; urgency=low
+tdeadmin (4:2.2.0-0.1beta1-2) unstable; urgency=low
  
   * Use apt by default and not rpm for kpackage (Closes: #106937)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 28 Jul 2001 18:33:00 -0700
 
-kdeadmin (4:2.2.0-0.1beta1-1) unstable; urgency=low
+tdeadmin (4:2.2.0-0.1beta1-1) unstable; urgency=low
  
   * sync with upstream
   * gcc3 build fixes
@@ -799,7 +799,7 @@ kdeadmin (4:2.2.0-0.1beta1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 26 Jul 2001 18:05:00 -0700
 
-kdeadmin (4:2.2.0-0beta1-3) unstable; urgency=low
+tdeadmin (4:2.2.0-0beta1-3) unstable; urgency=low
  
   * Depend on proper version of rpm so we don't crash (Closes: #103439)
   * Sync with upstream
@@ -807,21 +807,21 @@ kdeadmin (4:2.2.0-0beta1-3) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 07 Jul 2001 03:25:00 -0700
 
-kdeadmin (4:2.2.0-0beta1-2) unstable; urgency=low
+tdeadmin (4:2.2.0-0beta1-2) unstable; urgency=low
  
   * Sync with upstream
   * Autobuild for alpha now
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 03 Jul 2001 02:20:00 -0700
 
-kdeadmin (4:2.2.0-0beta1-1) unstable; urgency=low
+tdeadmin (4:2.2.0-0beta1-1) unstable; urgency=low
  
   * Sync with upstream
   * fix mips build
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 30 Jun 2001 20:30:00 -0700
 
-kdeadmin (4:2.2-cvs20010622-1) unstable; urgency=low
+tdeadmin (4:2.2-cvs20010622-1) unstable; urgency=low
  
   * New upstream version
   * 2.2 beta1
@@ -832,7 +832,7 @@ kdeadmin (4:2.2-cvs20010622-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
 
-kdeadmin (4:2.1.1-2) unstable; urgency=low
+tdeadmin (4:2.1.1-2) unstable; urgency=low
  
   * Update menu tags to include new kde menu removal tag
   * Update build-depends to recognize real | virtual
@@ -840,32 +840,32 @@ kdeadmin (4:2.1.1-2) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Apr 2001 17:28:00 -0700
 
-kdeadmin (4:2.1.1-1.0.1) unstable; urgency=low
+tdeadmin (4:2.1.1-1.0.1) unstable; urgency=low
  
   * Rebuild with older libc
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 26 Mar 2001 16:33:00 -0700
 
-kdeadmin (4:2.1.1-1) unstable; urgency=low
+tdeadmin (4:2.1.1-1) unstable; urgency=low
  
   * New upstream version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Mar 2001 10:29:00 -0700
 
-kdeadmin (4:2.1.0-3) unstable; urgency=low
+tdeadmin (4:2.1.0-3) unstable; urgency=low
  
   * Change Build-Depends and rebuild with new librpm packages (Closes: #89695)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 15 Mar 2001 10:29:00 -0700
 
-kdeadmin (4:2.1.0-2) unstable; urgency=low
+tdeadmin (4:2.1.0-2) unstable; urgency=low
  
   * Adding rpm to build-depends (Closes: #87412) 
   * Upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 11 Mar 2001 04:58:00 -0700
 
-kdeadmin (4:2.1.0-1) unstable; urgency=low
+tdeadmin (4:2.1.0-1) unstable; urgency=low
  
   * Fresh CVS sync with future 2.1.1 version
   * Fixing build process for non-i386 systems (Closes: #87412)
@@ -873,73 +873,73 @@ kdeadmin (4:2.1.0-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 04 Mar 2001 06:46:00 -0700
 
-kdeadmin (4:2.1-final-1) unstable; urgency=low
+tdeadmin (4:2.1-final-1) unstable; urgency=low
  
   * New upstream version
   * Updating standards version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
 
-kdeadmin (4:2.1-beta2-1) unstable; urgency=low
+tdeadmin (4:2.1-beta2-1) unstable; urgency=low
  
   * New upstream beta
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 22 Jan 2001 06:00:00 -0700
 
-kdeadmin (4:2.1-20010115-1) unstable; urgency=low
+tdeadmin (4:2.1-20010115-1) unstable; urgency=low
  
   * More upstream fixes
   * Fixes assertion problems (Closes: #75073)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
 
-kdeadmin (4:2.1-20010106-1) unstable; urgency=low
+tdeadmin (4:2.1-20010106-1) unstable; urgency=low
  
   * More upstream fixes
   * Fixing depends as well as updating them
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 06 Jan 2001 23:30:00 -0700
 
-kdeadmin (4:2.1-20010101-1) unstable; urgency=low
+tdeadmin (4:2.1-20010101-1) unstable; urgency=low
  
   * More upstream fixes
     
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Jan 2001 17:05:00 -0700
      
-kdeadmin (4:2.1-20001218-1) unstable; urgency=low
+tdeadmin (4:2.1-20001218-1) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Dec 2000 13:11:00 -0700
 
-kdeadmin (4:2.1-20001216-1) unstable; urgency=low
+tdeadmin (4:2.1-20001216-1) unstable; urgency=low
  
   * More upstream fixes
-  * Adding in conflicts for kdeadmin which I forgot to to along time ago
+  * Adding in conflicts for tdeadmin which I forgot to to along time ago
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 16 Dec 2000 23:50:00 -0700
 
-kdeadmin (4:2.1-20001213-1) unstable; urgency=low
+tdeadmin (4:2.1-20001213-1) unstable; urgency=low
  
   * New upstream beta version
   * Fix deb package indexing (Closes: #79060)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 13 Dec 2000 18:00:00 -0700
 
-kdeadmin (4:2.0-final-8) unstable; urgency=low
+tdeadmin (4:2.0-final-8) unstable; urgency=low
  
   * Fixing file conflicts (Closes: #77853)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 25 Nov 2000 06:45:00 -0700
 
-kdeadmin (4:2.0-final-7) unstable; urgency=low
+tdeadmin (4:2.0-final-7) unstable; urgency=low
  
   * More upstream fixes
   * build rules cleanup
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 21 Nov 2000 04:45:00 -0700
 
-kdeadmin (4:2.0-final-6) unstable; urgency=low
+tdeadmin (4:2.0-final-6) unstable; urgency=low
  
   * More upstream fixes
   * More dependency cleanup - xlib6g vs xlibs
@@ -947,79 +947,79 @@ kdeadmin (4:2.0-final-6) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 18 Nov 2000 00:45:00 -0700
 
-kdeadmin (4:2.0-final-5) unstable; urgency=low
+tdeadmin (4:2.0-final-5) unstable; urgency=low
  
   * More upstream fixes
   * More dependency cleanup
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 18 Nov 2000 00:45:00 -0700
 
-kdeadmin (4:2.0-final-4) unstable; urgency=low
+tdeadmin (4:2.0-final-4) unstable; urgency=low
  
   * More upstream fixes
   * adding menu hints
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
                                                                                 
-kdeadmin (4:2.0-final-3) unstable; urgency=low
+tdeadmin (4:2.0-final-3) unstable; urgency=low
  
   * More upstream fixes
   * build against new xlibs
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 04 Nov 2000 18:00:00 -0700
                                                                                 
-kdeadmin (4:2.0-final-2) unstable; urgency=low
+tdeadmin (4:2.0-final-2) unstable; urgency=low
  
   * More upstream fixes
   * kdat no longer provided
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
                                                                                 
-kdeadmin (4:2.0-final-0) unstable; urgency=low
+tdeadmin (4:2.0-final-0) unstable; urgency=low
 
   * KDE 2.0
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Oct 2000 00:00:00 -0700
 
-kdeadmin (4:2.0-20001013-0) unstable; urgency=low
+tdeadmin (4:2.0-20001013-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 13 Oct 2000 23:45:00 -0700
                                                                                 
-kdeadmin (4:2.0-20001011-0) unstable; urgency=low
+tdeadmin (4:2.0-20001011-0) unstable; urgency=low
  
   * KDE 2.0 RC2
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 11 Oct 2000 06:00:00 -0700
                                                                                 
-kdeadmin (4:2.0-20001006-0) unstable; urgency=low
+tdeadmin (4:2.0-20001006-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 06 Oct 2000 04:00:00 -0700
                                                                                 
-kdeadmin (4:2.0-20001005-0) unstable; urgency=low
+tdeadmin (4:2.0-20001005-0) unstable; urgency=low
  
   * More upstream fixes
-  * Compiling against non-versioned kdelibs once again
+  * Compiling against non-versioned tdelibs once again
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 05 Oct 2000 15:00:00 -0700
                                                                                 
-kdeadmin (4:2.0-20001002-0) unstable; urgency=low
+tdeadmin (4:2.0-20001002-0) unstable; urgency=low
  
   * KDE 2.0 RC1
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Oct 2000 01:30:00 -0700
                                                                                 
-kdeadmin (4:2.0-20000927-0) unstable; urgency=low
+tdeadmin (4:2.0-20000927-0) unstable; urgency=low
  
   * More upstream fixes
   * Building in RPM support to kpackage again.
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 28 Sep 2000 04:30:00 -0700
 
-kdeadmin (4:2.0-20000925-0) unstable; urgency=low
+tdeadmin (4:2.0-20000925-0) unstable; urgency=low
  
   * More upstream fixes
   * Updating build-depends
@@ -1027,99 +1027,99 @@ kdeadmin (4:2.0-20000925-0) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
 
-kdeadmin (4:2.0-20000920-0) unstable; urgency=low
+tdeadmin (4:2.0-20000920-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Sep 2000 22:00:00 -0700
 
-kdeadmin (4:2.0-20000918-0) unstable; urgency=low
+tdeadmin (4:2.0-20000918-0) unstable; urgency=low
  
   * More upstream fixes
-  * Breaking down kdeadmin into individual packages
+  * Breaking down tdeadmin into individual packages
   * Changing section from utils to admin (Closes: #71870)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Sep 2000 18:00:00 -0700
 
-kdeadmin (4:2.0-20000909-0) unstable; urgency=low
+tdeadmin (4:2.0-20000909-0) unstable; urgency=low
 
   * More upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 09 Sep 2000 22:00:00 -0700
 
-kdeadmin (4:2.0-20000907-0) unstable; urgency=low
+tdeadmin (4:2.0-20000907-0) unstable; urgency=low
 
   * More upstream fixes
   * Built against new QT 2.2
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 07 Sep 2000 04:00:00 -0700
 
-kdeadmin (4:2.0-20000901-0) unstable; urgency=low
+tdeadmin (4:2.0-20000901-0) unstable; urgency=low
  
   * More upstream fixes
   * Merging package changes into upstream CVS
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Sep 2000 17:00:00 -0700
                                                                                
-kdeadmin (4:2.0-20000825-1.0) experimental; urgency=low
+tdeadmin (4:2.0-20000825-1.0) experimental; urgency=low
  
   * KDE 2.0 beta 4
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 25 Aug 2000 22:30:00 -0700
 
-kdeadmin (4:2.0-20000820-1.0) experimental; urgency=low
+tdeadmin (4:2.0-20000820-1.0) experimental; urgency=low
  
   * New upstream beta version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 20 Aug 2000 09:30:00 -0700
 
-kdeadmin-cvs (4:2.0-20000521-1.0) experimental; urgency=low
+tdeadmin-cvs (4:2.0-20000521-1.0) experimental; urgency=low
  
   * New upstream CVS version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 21 May 2000 18:15:00 -0700
                                                                               
-kdeadmin-cvs (4:2.0-20000512-1.1) experimental; urgency=low
+tdeadmin-cvs (4:2.0-20000512-1.1) experimental; urgency=low
 
   * New upstream CVS version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 12 May 2000 22:30:00 -0700
 
-kdeadmin-cvs (4:2.0-20000308-1.0) experimental; urgency=low
+tdeadmin-cvs (4:2.0-20000308-1.0) experimental; urgency=low
  
   * New upstream CVS version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 08 Mar 2000 22:30:00 -0700
 
-kdeadmin-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+tdeadmin-cvs (4:2.0-20000302-1.0) experimental; urgency=low
  
   * New upstream CVS version
   * Adding in build options for pam
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Mar 2000 22:00:00 -0700
                                                              
-kdeadmin-cvs (4:2.0-20000229-1.0) experimental; urgency=low
+tdeadmin-cvs (4:2.0-20000229-1.0) experimental; urgency=low
 
   * New upstream CVS version 
   * Adding in build-depends
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 29 Feb 2000 22:00:00 -0700
 
-kdeadmin-cvs (4:2.0-19991001-1) unstable; urgency=low
+tdeadmin-cvs (4:2.0-19991001-1) unstable; urgency=low
 
   * Cleaning out old workaround in menu.in
   * Fixing up dependencies
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Oct 1999 14:22:41 -0400
 
-kdeadmin-cvs (4:2.0-19990820-1) unstable; urgency=low
+tdeadmin-cvs (4:2.0-19990820-1) unstable; urgency=low
 
   * new upstream CVS version
   * migrating back to /usr from /opt
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 20 Aug 1999 14:22:41 -0400
 
-kdeadmin-cvs (4:2.0-19990524-1) unstable; urgency=low
+tdeadmin-cvs (4:2.0-19990524-1) unstable; urgency=low
 
   * new upstream version
   * migrating back to / from /opt
@@ -1127,43 +1127,43 @@ kdeadmin-cvs (4:2.0-19990524-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 24 May 1999 07:00:41 -0400
 
-kdeadmin (4:1.1-19990217-1) unstable; urgency=low
+tdeadmin (4:1.1-19990217-1) unstable; urgency=low
 
   * new upstream version
 
  -- Patricia Jung <trish@freiburg.linux.de>  Wed, 17 Feb 1999 19:09:41 +0100
 
-kdeadmin (4:1.1-19990207-3) unstable; urgency=low
+tdeadmin (4:1.1-19990207-3) unstable; urgency=low
 
   * fixed ScriptPath and RunlevelPath for ksysv
 
  -- Patricia Jung <trish@freiburg.linux.de>  Thu, 11 Feb 1999 22:58:00 +0100 
 
-kdeadmin (4:1.1-19990207-2) unstable; urgency=low
+tdeadmin (4:1.1-19990207-2) unstable; urgency=low
 
   * fixed a bug with the wrong libjpeg version
 
  -- Stephan Kulow <coolo@kde.org>  Tue,  9 Feb 1999 10:43:42 +0100
 
-kdeadmin (4:1.1-19990207-1) unstable; urgency=low
+tdeadmin (4:1.1-19990207-1) unstable; urgency=low
 
   * new upstream version 1.1 and new epoche
 
  -- Stephan Kulow <coolo@kde.org>  Sun,  7 Feb 1999 12:12:58 +0100
 
-kdeadmin (2:980419-b4-1) unstable; urgency=low
+tdeadmin (2:980419-b4-1) unstable; urgency=low
 
   * new upstream version Beta4
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 19 Apr 1998 18:20:53 +0200
 
-kdeadmin (2:980402-1) frozen; urgency=low
+tdeadmin (2:980402-1) frozen; urgency=low
 
   * new upstream version with bugfixes
 
  -- Stephan Kulow <coolo@kde.org>  Thu,  2 Apr 1998 18:05:34 +0200
 
-kdeadmin (2:980309-1) unstable; urgency=low
+tdeadmin (2:980309-1) unstable; urgency=low
 
   * Initial Release.
 
diff --git a/ubuntu/maverick/tdeadmin/debian/control b/ubuntu/maverick/tdeadmin/debian/control
index 33e19eaf9..d3165c338 100644
--- a/ubuntu/maverick/tdeadmin/debian/control
+++ b/ubuntu/maverick/tdeadmin/debian/control
@@ -1,20 +1,20 @@
-Source: kdeadmin-trinity
+Source: tdeadmin-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kdeadmin-trinity
+Package: tdeadmin-trinity
 Section: kde
 Architecture: all
-Replaces: kdeadmin-kde3 (<< 4:3.5.13)
-Breaks: kdeadmin-kde3 (<< 4:3.5.13)
-Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), kdeadmin-kfile-plugins-trinity (>= ${Source-Version}), knetworkconf-trinity (>= ${Source-Version}), kpackage-trinity (>= ${Source-Version}), ksysv-trinity (>= ${Source-Version}), kuser-trinity (>= ${Source-Version})
+Replaces: tdeadmin-kde3 (<< 4:3.5.13)
+Breaks: tdeadmin-kde3 (<< 4:3.5.13)
+Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-kfile-plugins-trinity (>= ${Source-Version}), knetworkconf-trinity (>= ${Source-Version}), kpackage-trinity (>= ${Source-Version}), ksysv-trinity (>= ${Source-Version}), kuser-trinity (>= ${Source-Version})
 Recommends: lilo-config-trinity (>= ${Source-Version})
-Suggests: kdeadmin-trinity-doc-html (>= ${Source-Version})
+Suggests: tdeadmin-trinity-doc-html (>= ${Source-Version})
 Description: system administration tools 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,
@@ -24,12 +24,12 @@ Description: system administration tools from the official Trinity release
  This metapackage includes a collection of system administration tools
  provided with the official release of KDE.
 
-Package: kdeadmin-trinity-doc-html
+Package: tdeadmin-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: kdeadmin-kde3-doc-html (<< 4:3.5.13)
-Breaks: kdeadmin-kde3-doc-html (<< 4:3.5.13)
-Suggests: konqueror-trinity | www-browser, kdebase-trinity
+Replaces: tdeadmin-kde3-doc-html (<< 4:3.5.13)
+Breaks: tdeadmin-kde3-doc-html (<< 4:3.5.13)
+Suggests: konqueror-trinity | www-browser, tdebase-trinity
 Description: KDE administration 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.
@@ -42,7 +42,7 @@ Description: KDE administration documentation in HTML format
  KDE administration packages.
  .
  This package is part of Trinity, and a component of the KDE administration
- module. See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ module. See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: kcron-trinity
 Section: admin
@@ -56,7 +56,7 @@ Description: the Trinity crontab editor
  It is a graphical user interface to cron, the UNIX system scheduler.
  .
  This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: kdat-trinity
 Section: admin
@@ -77,19 +77,19 @@ Description: a Trinity tape backup tool
   * Backup profiles for frequently used backups.
  .
  This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
-Package: kdeadmin-kfile-plugins-trinity
+Package: tdeadmin-kfile-plugins-trinity
 Section: kde
 Architecture: any
-Replaces: kdeadmin-kfile-plugins-kde3 (<< 4:3.5.13)
-Breaks: kdeadmin-kfile-plugins-kde3 (<< 4:3.5.13)
+Replaces: tdeadmin-kfile-plugins-kde3 (<< 4:3.5.13)
+Breaks: tdeadmin-kfile-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Description: Trinity file metainfo plugins for deb and rpm files
  File metainfo plugins for deb and rpm package files.
  .
  This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: knetworkconf-trinity
 Section: kde
@@ -102,7 +102,7 @@ Description: Trinity network configuration tool
  can be used to manage network devices and settings for each device.
  .
  This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: kpackage-trinity
 Section: admin
@@ -118,7 +118,7 @@ Description: Trinity package management tool
  install/remove them.
  .
  This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: ksysv-trinity
 Section: admin
@@ -132,7 +132,7 @@ Description: Trinity SysV-style init configuration editor
  drag and drop GUI.
  .
  This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: kuser-trinity
 Section: admin
@@ -145,7 +145,7 @@ Description: Trinity user/group administration tool
  A user/group administration tool for KDE.
  .
  This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: lilo-config-trinity
 Section: kde
@@ -153,26 +153,26 @@ Architecture: none
 Replaces: lilo-config-kde3 (<< 4:3.5.13)
 Breaks: lilo-config-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, kcontrol-trinity
-Recommends: kdebase-trinity-bin
+Recommends: tdebase-trinity-bin
 Suggests: lilo
 Description: Trinity frontend for lilo configuration
  lilo-config is a KDE based frontend to the lilo boot manager configuration.
  It runs out of the KDE Control Center.
  .
  If you want to use the menu entry to launch lilo-config, you need to install
- kdebase-bin since it uses the kdesu command to gain root privileges.
+ tdebase-bin since it uses the kdesu command to gain root privileges.
  .
  This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
-Package: kdeadmin-trinity-dbg
+Package: tdeadmin-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: kdeadmin-kde3-dbg (<< 4:3.5.13)
-Breaks: kdeadmin-kde3-dbg (<< 4:3.5.13)
-Depends: kdelibs-trinity-dbg
+Replaces: tdeadmin-kde3-dbg (<< 4:3.5.13)
+Breaks: tdeadmin-kde3-dbg (<< 4:3.5.13)
+Depends: tdelibs-trinity-dbg
 Priority: extra
-Description: debugging symbols for kdeadmin-trinity
- This package contains the debugging symbols associated with kdeadmin-trinity.
- They will automatically be used by gdb for debugging kdeadmin-related
+Description: debugging symbols for tdeadmin-trinity
+ This package contains the debugging symbols associated with tdeadmin-trinity.
+ They will automatically be used by gdb for debugging tdeadmin-related
  issues.
diff --git a/ubuntu/maverick/tdeadmin/debian/control.in b/ubuntu/maverick/tdeadmin/debian/control.in
index 570400afa..8fd3732e5 100644
--- a/ubuntu/maverick/tdeadmin/debian/control.in
+++ b/ubuntu/maverick/tdeadmin/debian/control.in
@@ -1,18 +1,18 @@
-Source: kdeadmin
+Source: tdeadmin
 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), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, kdelibs4-dev (>= 4:3.5.7), libbz2-dev, libpam0g-dev, lilo [i386 amd64], sharutils, texinfo, rpm
+Build-Depends: cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, tdelibs4-dev (>= 4:3.5.7), libbz2-dev, libpam0g-dev, lilo [i386 amd64], sharutils, texinfo, rpm
 Standards-Version: 3.7.2
 
-Package: kdeadmin
+Package: tdeadmin
 Section: kde
 Architecture: all
-Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), kdeadmin-kfile-plugins (>= ${Source-Version}), knetworkconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version})
+Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), tdeadmin-kfile-plugins (>= ${Source-Version}), knetworkconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version})
 Recommends: lilo-config (>= ${Source-Version})
-Suggests: kdeadmin-doc-html (>= ${Source-Version})
+Suggests: tdeadmin-doc-html (>= ${Source-Version})
 Description: system administration tools 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,
@@ -22,10 +22,10 @@ Description: system administration tools from the official KDE release
  This metapackage includes a collection of system administration tools
  provided with the official release of KDE.
 
-Package: kdeadmin-doc-html
+Package: tdeadmin-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror | www-browser, kdebase
+Suggests: konqueror | www-browser, tdebase
 Description: KDE administration 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.
@@ -38,7 +38,7 @@ Description: KDE administration documentation in HTML format
  KDE administration packages.
  .
  This package is part of KDE, and a component of the KDE administration
- module. See the 'kde' and 'kdeadmin' packages for more information.
+ module. See the 'kde' and 'tdeadmin' packages for more information.
 
 Package: kcron
 Section: admin
@@ -50,7 +50,7 @@ Description: the KDE crontab editor
  It is a graphical user interface to cron, the UNIX system scheduler.
  .
  This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'kdeadmin' packages for more information.
+ See the 'kde' and 'tdeadmin' packages for more information.
 
 Package: kdat
 Section: admin
@@ -69,9 +69,9 @@ Description: a KDE tape backup tool
   * Backup profiles for frequently used backups.
  .
  This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'kdeadmin' packages for more information.
+ See the 'kde' and 'tdeadmin' packages for more information.
 
-Package: kdeadmin-kfile-plugins
+Package: tdeadmin-kfile-plugins
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -79,7 +79,7 @@ Description: KDE file metainfo plugins for deb and rpm files
  File metainfo plugins for deb and rpm package files.
  .
  This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'kdeadmin' packages for more information.
+ See the 'kde' and 'tdeadmin' packages for more information.
 
 Package: knetworkconf
 Section: kde
@@ -90,7 +90,7 @@ Description: KDE network configuration tool
  can be used to manage network devices and settings for each device.
  .
  This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'kdeadmin' packages for more information.
+ See the 'kde' and 'tdeadmin' packages for more information.
 
 Package: kpackage
 Section: admin
@@ -104,7 +104,7 @@ Description: KDE package management tool
  install/remove them.
  .
  This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'kdeadmin' packages for more information.
+ See the 'kde' and 'tdeadmin' packages for more information.
 
 Package: ksysv
 Section: admin
@@ -116,7 +116,7 @@ Description: KDE SysV-style init configuration editor
  drag and drop GUI.
  .
  This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'kdeadmin' packages for more information.
+ See the 'kde' and 'tdeadmin' packages for more information.
 
 Package: kuser
 Section: admin
@@ -127,30 +127,30 @@ Description: KDE user/group administration tool
  A user/group administration tool for KDE.
  .
  This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'kdeadmin' packages for more information.
+ See the 'kde' and 'tdeadmin' packages for more information.
 
 Package: lilo-config
 Section: kde
 Architecture: i386 amd64
 Depends: ${shlibs:Depends}, kcontrol
-Recommends: kdebase-bin
+Recommends: tdebase-bin
 Suggests: lilo
 Description: KDE frontend for lilo configuration
  lilo-config is a KDE based frontend to the lilo boot manager configuration.
  It runs out of the KDE Control Center.
  .
  If you want to use the menu entry to launch lilo-config, you need to install
- kdebase-bin since it uses the kdesu command to gain root privileges.
+ tdebase-bin since it uses the kdesu command to gain root privileges.
  .
  This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'kdeadmin' packages for more information.
+ See the 'kde' and 'tdeadmin' packages for more information.
 
-Package: kdeadmin-dbg
+Package: tdeadmin-dbg
 Section: libdevel
 Architecture: any
-Depends: kdelibs-dbg
+Depends: tdelibs-dbg
 Priority: extra
-Description: debugging symbols for kdeadmin
- This package contains the debugging symbols associated with kdeadmin.
- They will automatically be used by gdb for debugging kdeadmin-related
+Description: debugging symbols for tdeadmin
+ This package contains the debugging symbols associated with tdeadmin.
+ They will automatically be used by gdb for debugging tdeadmin-related
  issues.
diff --git a/ubuntu/maverick/tdeadmin/debian/rules b/ubuntu/maverick/tdeadmin/debian/rules
index dec35a720..19e9ac01b 100755
--- a/ubuntu/maverick/tdeadmin/debian/rules
+++ b/ubuntu/maverick/tdeadmin/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=kdeadmin-trinity-dbg
+DEB_DH_STRIP_ARGS  := --dbg-package=tdeadmin-trinity-dbg
 
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--without-rpm --with-pam=kde --with-shadow --with-nis \
diff --git a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.kcron b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kcron
index a209fd796..9c4a9007a 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.kcron
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kcron
@@ -1,4 +1,4 @@
-Document: kdeadmin-doc-html-kcron
+Document: tdeadmin-doc-html-kcron
 Title: Kcron Handbook
 Author: Morgan Sandquist, Gary Meyer, Lauri Watts
 Abstract: Kcron is an application that schedules programs to be run.
diff --git a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.kdat b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kdat
index 8b6cc0217..f6910c928 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.kdat
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kdat
@@ -1,4 +1,4 @@
-Document: kdeadmin-doc-html-kdat
+Document: tdeadmin-doc-html-kdat
 Title: Kdat Handbook
 Author: Sean Vyain
 Abstract: KDE tape management.
diff --git a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf
index aeb73ead3..4a8a2da69 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf
@@ -1,4 +1,4 @@
-Document: kdeadmin-doc-html-knetworkconf
+Document: tdeadmin-doc-html-knetworkconf
 Title: KNetworkConf Handbook
 Author: Sean Wheller, Christoph Eckert
 Abstract: KNetworkConf is a graphical manager for network devices and settings.
diff --git a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.kpackage b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kpackage
index 9b1257bd6..87046af71 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.kpackage
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kpackage
@@ -1,4 +1,4 @@
-Document: kdeadmin-doc-html-kpackage
+Document: tdeadmin-doc-html-kpackage
 Title: KPackage Handbook
 Author: Toivo Pedaste, Lauri Watts 
 Abstract: KPackage is a graphical interface to the RPM, Debian,
diff --git a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.ksysv b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.ksysv
index c3df6fcf6..97cdaae29 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.ksysv
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.ksysv
@@ -1,4 +1,4 @@
-Document: kdeadmin-doc-html-ksysv
+Document: tdeadmin-doc-html-ksysv
 Title: KSysV Handbook
 Author: Peter Putzer 
 Abstract: KSysV is a graphical editor for the SysV style init configuration.
diff --git a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.kuser b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kuser
index 3e4010703..c3c5e7728 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.kuser
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kuser
@@ -1,4 +1,4 @@
-Document: kdeadmin-doc-html-kuser
+Document: tdeadmin-doc-html-kuser
 Title: KUser Handbook
 Author: Matt Johnston, Lauri Watts, Jonathan Singer
 Abstract: KUser allows you to manage users and groups on your system. 
diff --git a/ubuntu/maverick/tdeadmin/debian/kdeadmin-kfile-plugins-trinity.install b/ubuntu/maverick/tdeadmin/debian/tdeadmin-kfile-plugins-trinity.install
index e3b00f7da..e3b00f7da 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdeadmin-kfile-plugins-trinity.install
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-kfile-plugins-trinity.install