Rename a bunch of kde names to tde

40 files changed, 536 insertions, 536 deletions

diff --git a/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
index a95d6a7aa..9a68eac1d 100644
--- a/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -10,7 +10,7 @@ various Replaces/Conflicts (search for ubuntu)
 split out services/kontact/*desktop from kontact to indiviual apps
 add kandy*xpm to debian/icons and install lines to kandy.install
 remove clean:: rule
-kdepim-dev does not depend on kitchensync
+tdepim-dev does not depend on kitchensync
 Control has networkstatus-dev package and networkstatus package includes
    libnetworkstatus.so* files
 build-dep on gpgsm
diff --git a/ubuntu/maverick/tdepim/debian/changelog b/ubuntu/maverick/tdepim/debian/changelog
index bb7a10821..4dac80686 100644
--- a/ubuntu/maverick/tdepim/debian/changelog
+++ b/ubuntu/maverick/tdepim/debian/changelog
@@ -1,62 +1,62 @@
-kdepim-trinity (4:3.5.10-0ubuntu4) karmic; urgency=low
+tdepim-trinity (4:3.5.10-0ubuntu4) karmic; urgency=low
 
   * Fix KMail crash on compose window destruct; reverting to gcc4.3 for now
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 03 Dec 2009 15:05:00 -0600
 
-kdepim-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
+tdepim-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdepim-trinity (4:3.5.10-0ubuntu2~intrepid1) intrepid; urgency=low
+tdepim-trinity (4:3.5.10-0ubuntu2~intrepid1) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 01 March 2009 20:46:00 -0600
 
-kdepim-trinity (4:3.5.10-0ubuntu1~intrepid7) intrepid; urgency=low
+tdepim-trinity (4:3.5.10-0ubuntu1~intrepid7) intrepid; urgency=low
 
   * Reactivated knode, korganizer, etc in the KDE menu
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 02 Jan 2009 19:23:00 -0600
 
-kdepim-trinity (4:3.5.10-0ubuntu1~intrepid6) intrepid; urgency=low
+tdepim-trinity (4:3.5.10-0ubuntu1~intrepid6) intrepid; urgency=low
 
   * Fixed conflicts for akregator
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 Nov 2008 11:58:00 -0600
 
-kdepim-trinity (4:3.5.10-0ubuntu1~intrepid5) intrepid; urgency=low
+tdepim-trinity (4:3.5.10-0ubuntu1~intrepid5) intrepid; urgency=low
 
   * Repaired AMD64 build of kmail; fixed dependencies for kaddressbook
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 28 Nov 2008 14:51:00 -0600
 
-kdepim-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
+tdepim-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
 
   * SVN import
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 27 Nov 2008 22:18:00 -0600
 
-kdepim (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdepim (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
-    - Bump version of build dep on kdelibs4-dev to 3.5.10
+    - Bump version of build dep on tdelibs4-dev to 3.5.10
     - Drop kubuntu_13_fix_seive_truncate.diff - incorporated upstream
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:48:22 -0400
 
-kdepim (4:3.5.9-0ubuntu3) hardy; urgency=low
+tdepim (4:3.5.9-0ubuntu3) hardy; urgency=low
 
   * Add kubuntu_13_fix_seive_truncate.diff from upstream, fixes 
     http://bugs.kde.org/155223 "sieve script is truncated"
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 10 Apr 2008 17:31:23 +0100
 
-kdepim (4:3.5.9-0ubuntu2) hardy; urgency=low
+tdepim (4:3.5.9-0ubuntu2) hardy; urgency=low
 
   * Add patches kubuntu_11_groupwarewizard_categories.diff and
     kubuntu_12_ktnef_categories.diff, stop showing groupwarewizard and
@@ -64,40 +64,40 @@ kdepim (4:3.5.9-0ubuntu2) hardy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Mar 2008 15:54:43 +0000
 
-kdepim (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdepim (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:07 +0000
 
-kdepim (4:3.5.7enterprise20080127-0ubuntu1) hardy; urgency=low
+tdepim (4:3.5.7enterprise20080127-0ubuntu1) hardy; urgency=low
 
   * New upstream SVN snapshot (SVN r763039)
     (closes LP: #185846) 
 
  -- Luka Renko <lure@ubuntu.com>  Sun, 27 Jan 2008 13:08:25 +0100
 
-kdepim (4:3.5.7enterprise20080118-0ubuntu2) hardy; urgency=low
+tdepim (4:3.5.7enterprise20080118-0ubuntu2) hardy; urgency=low
 
   * Rebuild against new Qt to fix kmail missing fstat64 symbol, still
     looking into what causes it
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 22 Jan 2008 17:27:45 +0000
 
-kdepim (4:3.5.7enterprise20080118-0ubuntu1) hardy; urgency=low
+tdepim (4:3.5.7enterprise20080118-0ubuntu1) hardy; urgency=low
 
   * New upstream SVN snapshot (SVN r763039)
 
  -- Luka Renko <lure@ubuntu.com>  Sat, 19 Jan 2008 09:40:27 +0100
 
-kdepim (4:3.5.7enterprise20071207-1ubuntu2) hardy; urgency=low
+tdepim (4:3.5.7enterprise20071207-1ubuntu2) hardy; urgency=low
 
   * debian/control: Added Conflict/Replaces on ksync for kitchensync.
     "ksync" gets shipped with kitchensync now. (LP: #133944)
 
  -- dAniel hAhler <ubuntu@thequod.de>  Sat, 29 Dec 2007 05:23:59 +0100
 
-kdepim (4:3.5.7enterprise20071207-1ubuntu1) hardy; urgency=low
+tdepim (4:3.5.7enterprise20071207-1ubuntu1) hardy; urgency=low
 
   * New upstream SVN snapshot (SVN r745814)
   * Drop patches that were from upstream SVN
@@ -106,7 +106,7 @@ kdepim (4:3.5.7enterprise20071207-1ubuntu1) hardy; urgency=low
 
  -- Luka Renko <lure@ubuntu.com>  Sat, 08 Dec 2007 20:42:32 +0100
 
-kdepim (4:3.5.7enterprise20070926-1ubuntu9) hardy; urgency=low
+tdepim (4:3.5.7enterprise20070926-1ubuntu9) hardy; urgency=low
 
   * Re-added networkstatus-dev package:
     - Fixed control and control.in files
@@ -118,56 +118,56 @@ kdepim (4:3.5.7enterprise20070926-1ubuntu9) hardy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 29 Nov 2007 19:33:03 +0100
 
-kdepim (4:3.5.7enterprise20070926-1ubuntu8) hardy; urgency=low
+tdepim (4:3.5.7enterprise20070926-1ubuntu8) hardy; urgency=low
 
-  * kdepim-dev does not depend on kitchensync
+  * tdepim-dev does not depend on kitchensync
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Nov 2007 12:55:39 +0000
 
-kdepim (4:3.5.7enterprise20070926-1ubuntu7) hardy; urgency=low
+tdepim (4:3.5.7enterprise20070926-1ubuntu7) hardy; urgency=low
 
   * Undo shlibs crack.  Installable packages are overrated, really -
     especially around CD times...
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 28 Nov 2007 19:22:00 +1100
 
-kdepim (4:3.5.7enterprise20070926-1ubuntu6) hardy; urgency=low
+tdepim (4:3.5.7enterprise20070926-1ubuntu6) hardy; urgency=low
 
-  * Fix kdepim-doc.install (again)
+  * Fix tdepim-doc.install (again)
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 27 Nov 2007 09:20:22 +0000
 
-kdepim (4:3.5.7enterprise20070926-1ubuntu5) hardy; urgency=low
+tdepim (4:3.5.7enterprise20070926-1ubuntu5) hardy; urgency=low
 
-  * Fix kdepim-doc.install for enterprise version
+  * Fix tdepim-doc.install for enterprise version
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 23 Nov 2007 17:31:25 +0000
 
-kdepim (4:3.5.7enterprise20070926-1ubuntu4) hardy; urgency=low
+tdepim (4:3.5.7enterprise20070926-1ubuntu4) hardy; urgency=low
 
-  * Lower kdepim-dev depends
+  * Lower tdepim-dev depends
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 23 Nov 2007 14:29:09 +0000
 
-kdepim (4:3.5.7enterprise20070926-1ubuntu3) hardy; urgency=low
+tdepim (4:3.5.7enterprise20070926-1ubuntu3) hardy; urgency=low
 
   * Compile against libgpg-error 1.4-2ubuntu7 to fix build.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 23:20:53 +0000
 
-kdepim (4:3.5.7enterprise20070926-1ubuntu2) hardy; urgency=low
+tdepim (4:3.5.7enterprise20070926-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 10:35:42 +0000
 
-kdepim (4:3.5.7enterprise20070926-1ubuntu1) hardy; urgency=low
+tdepim (4:3.5.7enterprise20070926-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining changes in KUBUNTU-DEBIAN-DIFFERENCES
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:42 +0000
 
-kdepim (4:3.5.8-1) unstable; urgency=low
+tdepim (4:3.5.8-1) unstable; urgency=low
 
   * New upstream release.
     * Resync patches:
@@ -183,21 +183,21 @@ kdepim (4:3.5.8-1) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 14 Oct 2007 15:51:08 +0200
 
-kdepim (4:3.5.7-4) unstable; urgency=low
+tdepim (4:3.5.7-4) unstable; urgency=low
 
   * Rebuild without --enable final on all archs now. It seems the only way
     to get it built in all the buildd network.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 23 Aug 2007 23:20:38 +0200
 
-kdepim (4:3.5.7-3) unstable; urgency=low
+tdepim (4:3.5.7-3) unstable; urgency=low
 
   * Rebuild without --enable-final on mipsel.
   * Update section in Debian menu files.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 22 Aug 2007 07:44:48 +0200
 
-kdepim (4:3.5.7-2) unstable; urgency=low
+tdepim (4:3.5.7-2) unstable; urgency=low
 
   * Rebuild with a fixed dpkg-dev (Closes: #427893, #425621, #425913, #431576).
     Add a versioned build dependency.
@@ -216,7 +216,7 @@ kdepim (4:3.5.7-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 24 Jul 2007 00:05:45 +0200
 
-kdepim (4:3.5.7enterprise20070926-0ubuntu2) gutsy; urgency=low
+tdepim (4:3.5.7enterprise20070926-0ubuntu2) gutsy; urgency=low
 
   * Change default folder view to "last selected" to reduce confusion 
     caused by new mails being missed by "jump to new" view
@@ -240,7 +240,7 @@ kdepim (4:3.5.7enterprise20070926-0ubuntu2) gutsy; urgency=low
 
  -- Luka Renko <lure@ubuntu.com>  Mon, 08 Oct 2007 18:41:23 +0200
 
-kdepim (4:3.5.7enterprise20070926-0ubuntu1) gutsy; urgency=low
+tdepim (4:3.5.7enterprise20070926-0ubuntu1) gutsy; urgency=low
 
   [ Sarah Hobbs ]
   * Added various conflicts/replaces on kontact, to stop the file overwrites
@@ -264,7 +264,7 @@ kdepim (4:3.5.7enterprise20070926-0ubuntu1) gutsy; urgency=low
 
  -- Luka Renko <lure@ubuntu.com>  Wed, 26 Sep 2007 18:10:10 +0200
 
-kdepim (4:3.5.7enterprise20070907-0ubuntu3) gutsy; urgency=low
+tdepim (4:3.5.7enterprise20070907-0ubuntu3) gutsy; urgency=low
 
   * Include some bug-fixes from upstream. Closes LP #140500.
     debian/patches/kubuntu_12_svn_r711165_kmkernel_null_check.diff
@@ -275,87 +275,87 @@ kdepim (4:3.5.7enterprise20070907-0ubuntu3) gutsy; urgency=low
 
  -- Luka Renko <lure@ubuntu.com>  Mon, 17 Sep 2007 21:19:08 +0200
 
-kdepim (4:3.5.7enterprise20070907-0ubuntu2) gutsy; urgency=low
+tdepim (4:3.5.7enterprise20070907-0ubuntu2) gutsy; urgency=low
 
   * Fix build failures with g++-4.3. LP: #138596.
 
  -- Matthias Klose <doko@ubuntu.com>  Thu, 13 Sep 2007 01:05:38 +0000
 
-kdepim (4:3.5.7enterprise20070907-0ubuntu1) gutsy; urgency=low
+tdepim (4:3.5.7enterprise20070907-0ubuntu1) gutsy; urgency=low
 
   * New upstream snapshot
   * Drop debian/patches/kubuntu_12_imap_unread_status_svn708706.diff
 
  -- Luka Renko <lure@ubuntu.com>  Sat, 08 Sep 2007 08:50:41 +0200
 
-kdepim (4:3.5.7enterprise20070904-0ubuntu2) gutsy; urgency=low
+tdepim (4:3.5.7enterprise20070904-0ubuntu2) gutsy; urgency=low
 
   * Fix unread status wrong on initial load of the folder (from SVN)
     debian/patches/kubuntu_12_imap_unread_status_svn708706.diff
 
  -- Luka Renko <lure@ubuntu.com>  Wed, 05 Sep 2007 22:23:33 +0200
 
-kdepim (4:3.5.7enterprise20070904-0ubuntu1) gutsy; urgency=low
+tdepim (4:3.5.7enterprise20070904-0ubuntu1) gutsy; urgency=low
 
   * New upstream snapshot
   * Fixes lots of crash bugs on pop3 accounts and on text paste
 
  -- Luka Renko <lure@ubuntu.com>  Tue, 04 Sep 2007 18:21:22 +0200
 
-kdepim (4:3.5.7enterprise20070828really20070825-0ubuntu3) gutsy; urgency=low
+tdepim (4:3.5.7enterprise20070828really20070825-0ubuntu3) gutsy; urgency=low
 
-  * Fix install path in kdepim-doc.install
+  * Fix install path in tdepim-doc.install
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 03 Sep 2007 12:27:31 +0100
 
-kdepim (4:3.5.7enterprise20070828really20070825-0ubuntu2) gutsy; urgency=low
+tdepim (4:3.5.7enterprise20070828really20070825-0ubuntu2) gutsy; urgency=low
 
   * Run buildprep before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 03 Sep 2007 10:09:40 +0100
 
-kdepim (4:3.5.7enterprise20070828really20070825-0ubuntu1) gutsy; urgency=low
+tdepim (4:3.5.7enterprise20070828really20070825-0ubuntu1) gutsy; urgency=low
 
   * Revert to 20070825 snapshot from Impilinux, should be more stable
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 03 Sep 2007 09:17:12 +0100
 
-kdepim (4:3.5.7enterprise20070828-0ubuntu1) gutsy; urgency=low
+tdepim (4:3.5.7enterprise20070828-0ubuntu1) gutsy; urgency=low
 
   * New upstream snapshot
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 27 Aug 2007 18:34:01 +0100
 
-kdepim (4:3.5.7enterprise20070810-0ubuntu2) gutsy; urgency=low
+tdepim (4:3.5.7enterprise20070810-0ubuntu2) gutsy; urgency=low
 
   * Add missing epoch to kepimlibs1a replace old korganiser,
-    https://bugs.launchpad.net/ubuntu/+source/kdepim/+bug/119664
+    https://bugs.launchpad.net/ubuntu/+source/tdepim/+bug/119664
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 21 Aug 2007 09:28:19 +0100
 
-kdepim (4:3.5.7enterprise20070810-0ubuntu1) gutsy; urgency=low
+tdepim (4:3.5.7enterprise20070810-0ubuntu1) gutsy; urgency=low
 
   * Package enterprise branch from
-    http://websvn.kde.org/branches/kdepim/enterprise/kdepim/
+    http://websvn.kde.org/branches/tdepim/enterprise/tdepim/
   * Build-dep on libopensync-dev now we have 0.19 in
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 08 Aug 2007 18:11:22 +0100
 
-kdepim (4:3.5.7-1ubuntu7) gutsy; urgency=low
+tdepim (4:3.5.7-1ubuntu7) gutsy; urgency=low
 
-  * Make kdepimlibs1a replace old korganiser, closes
-    https://bugs.launchpad.net/ubuntu/+source/kdepim/+bug/119664
+  * Make tdepimlibs1a replace old korganiser, closes
+    https://bugs.launchpad.net/ubuntu/+source/tdepim/+bug/119664
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 06 Aug 2007 17:02:10 +0100
 
-kdepim (4:3.5.7-1ubuntu6) gutsy; urgency=low
+tdepim (4:3.5.7-1ubuntu6) gutsy; urgency=low
 
   * Make akregator replaces kontact << 4:3.5.7-1ubuntu5, closes 
-    https://bugs.launchpad.net/ubuntu/+source/kdepim/+bug/124068
+    https://bugs.launchpad.net/ubuntu/+source/tdepim/+bug/124068
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 06 Aug 2007 10:35:48 +0100
 
-kdepim (4:3.5.7-1ubuntu5) gutsy; urgency=low
+tdepim (4:3.5.7-1ubuntu5) gutsy; urgency=low
  
    * Kmail S/MIME and GPG by default
      -  Add gpgsm to kmail depends
@@ -366,7 +366,7 @@ kdepim (4:3.5.7-1ubuntu5) gutsy; urgency=low
  
  -- Scott Kitterman <scott@kitterman.com>  Wed, 04 Jul 2007 16:12:44 -0400
 
-kdepim (4:3.5.7-1ubuntu4) gutsy; urgency=low
+tdepim (4:3.5.7-1ubuntu4) gutsy; urgency=low
 
   * Fixed /usr/share/services/kontact/*.desktop files 
     installation. They currently are all in the kontact package
@@ -381,7 +381,7 @@ kdepim (4:3.5.7-1ubuntu4) gutsy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 29 Jun 2007 15:43:22 +0200
 
-kdepim (4:3.5.7-1ubuntu3) gutsy; urgency=low
+tdepim (4:3.5.7-1ubuntu3) gutsy; urgency=low
 
   * Added networkstatus-dev back in - thanks Lure for pointing this out.
   * Removed /usr/share/services/kontact/knodeplugin.desktop from
@@ -389,7 +389,7 @@ kdepim (4:3.5.7-1ubuntu3) gutsy; urgency=low
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Fri, 25 May 2007 22:15:39 -0500
 
-kdepim (4:3.5.7-1ubuntu2) gutsy; urgency=low
+tdepim (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
   * Make kitchensync package empty: new kitchensync depends on opensync
     which is not in main yet. Will change this back when opensync gets 
@@ -397,7 +397,7 @@ kdepim (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
  -- Luka Renko <lure@ubuntu.com>  Thu, 24 May 2007 12:01:14 +0000
 
-kdepim (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdepim (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * Merge with Debian for new upstream version, remaining changes in
     KUBUNTU-DEBIAN-DIFFERENCES
@@ -409,7 +409,7 @@ kdepim (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Tue, 22 May 2007 22:12:28 +1000
 
-kdepim (4:3.5.7-1) unstable; urgency=low
+tdepim (4:3.5.7-1) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
   
@@ -430,20 +430,20 @@ kdepim (4:3.5.7-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 16 Apr 2007 21:37:29 +0200
 
-kdepim (4:3.5.6-2ubuntu2) gutsy; urgency=low
+tdepim (4:3.5.6-2ubuntu2) gutsy; urgency=low
 
   * Turn off DEB_KDE_CVS_MAKE in debian/rules
   * Remove 16_kde_modulename.diff, module name isn't changed in Ubuntu
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 02 May 2007 14:19:49 +0100
 
-kdepim (4:3.5.6-2ubuntu1) gutsy; urgency=low
+tdepim (4:3.5.6-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 20:32:54 +0100
 
-kdepim (4:3.5.6.dfsg.1-2) unstable; urgency=low
+tdepim (4:3.5.6.dfsg.1-2) unstable; urgency=low
 
   * Upload to unstable after Etch release.
   * The pilot-link-please-don't-break-your-api-release
@@ -468,7 +468,7 @@ kdepim (4:3.5.6.dfsg.1-2) unstable; urgency=low
 
  -- Sune Vuorela <debian@pusling.com>  Fri, 20 Apr 2007 14:52:42 +0100
 
-kdepim (4:3.5.6.dfsg.1-1) experimental; urgency=low
+tdepim (4:3.5.6.dfsg.1-1) experimental; urgency=low
 
   * New upstream release.
     - Old unused cruft that misbuilds on 64 bit archs, removed. (Closes: 347478)
@@ -502,7 +502,7 @@ kdepim (4:3.5.6.dfsg.1-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 18 Jan 2007 20:52:16 +0100
 
-kdepim (4:3.5.5.dfsg.1-5) unstable; urgency=high
+tdepim (4:3.5.5.dfsg.1-5) unstable; urgency=high
 
   +++ Changes by Sune Vuorela:
 
@@ -521,14 +521,14 @@ kdepim (4:3.5.5.dfsg.1-5) unstable; urgency=high
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon,  8 Jan 2007 12:02:18 +0100
 
-kdepim (4:3.5.5.dfsg.1-4) unstable; urgency=high
+tdepim (4:3.5.5.dfsg.1-4) unstable; urgency=high
 
   * Document workaround for kmail crashing on start after upgrade for users
     using IMAP with namespaces.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 15 Dec 2006 15:05:38 -0500
 
-kdepim (4:3.5.5.dfsg.1-3) unstable; urgency=low
+tdepim (4:3.5.5.dfsg.1-3) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -536,7 +536,7 @@ kdepim (4:3.5.5.dfsg.1-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 05 Dec 2006 12:39:47 +0100
 
-kdepim (4:3.5.5.dfsg.1-2) unstable; urgency=medium
+tdepim (4:3.5.5.dfsg.1-2) unstable; urgency=medium
 
   * This release is dedicated to Rembrandt van Rijn for his fast response
     fixing KPilot. Many thanks.
@@ -553,8 +553,8 @@ kdepim (4:3.5.5.dfsg.1-2) unstable; urgency=medium
   * Fixed manpage of akregator to not talk about korganizer. Thanks to Kenny
     Duffus.
   * Do not build against bluetooth on !linux. (Closes: #399061)
-  * Slowly starting dependency chain on -dbg packages. Adding kdelibs-dbg to
-    kdepim-dbg depends.
+  * Slowly starting dependency chain on -dbg packages. Adding tdelibs-dbg to
+    tdepim-dbg depends.
   * Fixed romanian debconf template. (Closes: #397827)
   * Do not chmod stuff in kpilot if it is not there (in case of udev).
     (Closes: #378696)
@@ -566,7 +566,7 @@ kdepim (4:3.5.5.dfsg.1-2) unstable; urgency=medium
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 21 Nov 2006 02:53:59 +0100
 
-kdepim (4:3.5.5.dfsg.1-1) unstable; urgency=medium
+tdepim (4:3.5.5.dfsg.1-1) unstable; urgency=medium
 
   * Improve KOrganizer's description, from Filipus Klutiero.
     (Closes: #392468)
@@ -582,13 +582,13 @@ kdepim (4:3.5.5.dfsg.1-1) unstable; urgency=medium
   * Update from SVN branch, revision 600288, except for the changes to
     libkmime, which break binary compatibility, and the changes to kalarm,
     which I deem to be too invasive this close to a release.
-    + Absorbs 15_kdepim_debug.diff.
+    + Absorbs 15_tdepim_debug.diff.
     + Fixes a problem with korganizer.desktop causing it not to start.
       Closes: #395940, #395286, #394309.
 
  -- Daniel Schepler <schepler@debian.org>  Mon, 30 Oct 2006 20:46:01 +0100
 
-kdepim (4:3.5.5-1) unstable; urgency=medium
+tdepim (4:3.5.5-1) unstable; urgency=medium
 
   * New upstream release.
     + Fixes korganizer: reminder daemon leaks memory. (Closes: #357043)
@@ -598,7 +598,7 @@ kdepim (4:3.5.5-1) unstable; urgency=medium
   * Disable asking questions in the kmail d-imap debugging patch, since
     MadCoder has not been able to trigger mail loss answering yes to
     all questions.
-  * Add new directory for icon files to libkdepim1a.install.
+  * Add new directory for icon files to libtdepim1a.install.
   * Urgency medium for the RC bug fixes.
 
   +++ Changes by Christopher Martin:
@@ -606,14 +606,14 @@ kdepim (4:3.5.5-1) unstable; urgency=medium
   * Improve konsolekalendar's description. (Closes: #384941)
 
   * Add alpha and ppc64 to the problematic arch list, thus disabling
-    --enable-final and allowing kdepim to build. (Closes: #387419, #388014)
+    --enable-final and allowing tdepim to build. (Closes: #387419, #388014)
 
   * Add Romanian debconf translation, thanks to Stan Ioan-Eugen.
     (Closes: #387589)
 
   +++ Changes by Pierre Habouzit:
 
-  * Modify the kdepim d-imap debugging patch to be less verbose and intrusive,
+  * Modify the tdepim d-imap debugging patch to be less verbose and intrusive,
     but keep the rest of the patch, with its slightly safer file handling. No
     reports of d-imap data loss have surfaced with the recent code, and
     testing suggests that the problem is fixed.
@@ -621,7 +621,7 @@ kdepim (4:3.5.5-1) unstable; urgency=medium
 
  -- Daniel Schepler <schepler@debian.org>  Sat,  7 Oct 2006 17:44:26 +0200
 
-kdepim (4:3.5.4-1) unstable; urgency=low
+tdepim (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -630,7 +630,7 @@ kdepim (4:3.5.4-1) unstable; urgency=low
   * Branch pull to revision 577416, minus the akregator feeddetector
     changes which don't build.
 
-  * Added kdepim extra debug information from KDE bug #104956. Users of
+  * Added tdepim extra debug information from KDE bug #104956. Users of
     d-imap will have to put up with extra dialogs, but this is hopefully
     only until the d-imap data loss issues are worked out (some work on
     that problem is in this upload, but it hasn't been confirmed to fix
@@ -649,17 +649,17 @@ kdepim (4:3.5.4-1) unstable; urgency=low
     it globally on m68k and arm. We'll see if the other architectures can
     truly cope.
 
-  * Change dependencies on kdepim-kio-plugins or kdebase-kio-plugins to
+  * Change dependencies on tdepim-kio-plugins or tdebase-kio-plugins to
     dependencies on both; simple, and should prevent user error.
     (Closes: #327821)
 
-  * Make kaddressbook suggest kdebase-kio-plugins for LDAP support.
+  * Make kaddressbook suggest tdebase-kio-plugins for LDAP support.
     (Closes: #337527)
 
   * Add Spanish debconf translation. (Closes: #383360)
 
-  * Move libemailfunctions/idmapper.h from kdepim-dev to libkcal2-dev.
-    kdepim-dev depends on libkcal2-dev, so this shouldn't cause any problems.
+  * Move libemailfunctions/idmapper.h from tdepim-dev to libkcal2-dev.
+    tdepim-dev depends on libkcal2-dev, so this shouldn't cause any problems.
     Replaces have been added. (Closes: #342452)
 
   * Fix small bug in kmail_clamav.sh script. (Closes: #354185)
@@ -668,7 +668,7 @@ kdepim (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 26 Aug 2006 13:08:00 -0400
 
-kdepim (4:3.5.3-3) unstable; urgency=high
+tdepim (4:3.5.3-3) unstable; urgency=high
 
   * Fix FTBFS due to naive autoconf check. Closes: #378163.
     (using patch from kubuntu, thanks to J. Riddell).
@@ -676,13 +676,13 @@ kdepim (4:3.5.3-3) unstable; urgency=high
 
  -- Pierre Habouzit <madcoder@debian.org>  Sun, 16 Jul 2006 16:03:06 +0200
 
-kdepim (4:3.5.6-0ubuntu6) feisty; urgency=low
+tdepim (4:3.5.6-0ubuntu6) feisty; urgency=low
 
   * Rebuild on qt 3.3.7
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 26 Mar 2007 22:24:59 +0100
 
-kdepim (4:3.5.6-0ubuntu5) feisty; urgency=low
+tdepim (4:3.5.6-0ubuntu5) feisty; urgency=low
 
   * Add kubuntu_12_mass_filter_crash.diff, closes
     Malone 86578
@@ -691,14 +691,14 @@ kdepim (4:3.5.6-0ubuntu5) feisty; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 22 Mar 2007 23:00:12 +0100
 
-kdepim (4:3.5.6-0ubuntu4) feisty; urgency=low
+tdepim (4:3.5.6-0ubuntu4) feisty; urgency=low
 
   * Added kubuntu_11_mail_exporter_patch.diff, closes
     KDE bug #77744
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 05 Feb 2007 18:19:31 +0100
 
-kdepim (4:3.5.6-0ubuntu3) feisty; urgency=low
+tdepim (4:3.5.6-0ubuntu3) feisty; urgency=low
 
   * kubuntu_09_install_networkstatus_headers.diff
     - Install headers files for networkstatus (patch from SuSE)
@@ -706,11 +706,11 @@ kdepim (4:3.5.6-0ubuntu3) feisty; urgency=low
     - Activates networkstatus support for kmail (patch from SuSE)
   * debian/control:
     - New package networkstatus-dev
-  * ./libkdepim1-dev.install: added /usr/include/kde/kpimprefs.h
+  * ./libtdepim1-dev.install: added /usr/include/kde/kpimprefs.h
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 02 Feb 2007 15:37:42 +0100
 
-kdepim (4:3.5.6-0ubuntu2) feisty; urgency=low
+tdepim (4:3.5.6-0ubuntu2) feisty; urgency=low
 
   * Add patches from KDE (via Debian)
    - 03_kmail-templates.patch fixes a bug in the new KMail 
@@ -720,7 +720,7 @@ kdepim (4:3.5.6-0ubuntu2) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 27 Jan 2007 23:22:37 +0000
 
-kdepim (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdepim (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
   * Sync patches with Debian
@@ -729,10 +729,10 @@ kdepim (4:3.5.6-0ubuntu1) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:30 +0000
 
-kdepim (4:3.5.5-0ubuntu5) feisty; urgency=low
+tdepim (4:3.5.5-0ubuntu5) feisty; urgency=low
 
   * Added 15_kalarm_default_console.diff.  Closes malone #20877
-  * Added ${shlibs:Depends} to kdepim Depends, so things like libgpgme11
+  * Added ${shlibs:Depends} to tdepim Depends, so things like libgpgme11
     actually get installed.  Closes Malone #51399.  Should start making
     encyption actually work in kmail too, which will close many other bugs.
   * Added build-deps libpth-dev, libgpg-error-dev, libgcrypt11-dev,
@@ -740,13 +740,13 @@ kdepim (4:3.5.5-0ubuntu5) feisty; urgency=low
   * Added 16_pretrinity.5.6_save_message_quickly_delete_crash_fix.diff and hoping
     it will stop most of my crashes!  Patch from kde SVN.
   * Added knode suggests: kcontrol. Closes Malone #52660
-  * Changed kmail depends from kdepim-kio-plugins | kdebase-kio-plugins to
-    kdepim-kio-plugins, kdebase-kio-plugins so that pop3 mail can be sent.
+  * Changed kmail depends from tdepim-kio-plugins | tdebase-kio-plugins to
+    tdepim-kio-plugins, tdebase-kio-plugins so that pop3 mail can be sent.
     Closes Malone #71101, #76836
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 27 Dec 2006 15:45:02 +1100
 
-kdepim (4:3.5.5-0ubuntu4) feisty; urgency=low
+tdepim (4:3.5.5-0ubuntu4) feisty; urgency=low
 
   * Copied 25_fix_kpilot_feature_pull_thx_vanrijn.diff from Debian. 
     Thanks to the Debian QT/KDE team. (Closes LP: #66313)
@@ -755,20 +755,20 @@ kdepim (4:3.5.5-0ubuntu4) feisty; urgency=low
 
  -- Frode M. Døving <frode@ubuntu.com>  Thu, 23 Nov 2006 23:37:43 +0100
 
-kdepim (4:3.5.5-0ubuntu3) feisty; urgency=low
+tdepim (4:3.5.5-0ubuntu3) feisty; urgency=low
 
   * Added kubuntu_09_launch_korganiser.diff, closes KDE No 135513
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 22 Nov 2006 09:33:50 +0000
 
-kdepim (4:3.5.5-0ubuntu2) feisty; urgency=low
+tdepim (4:3.5.5-0ubuntu2) feisty; urgency=low
 
   * Changed kontact.install and knode.install to put
     knodeplugin.desktop in knode instead of kontact
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue,  7 Nov 2006 16:54:06 -0800
 
-kdepim (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdepim (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
   * Removed kubuntu_10_imap4_loop.diff, merged upstream
@@ -776,77 +776,77 @@ kdepim (4:3.5.5-0ubuntu1) edgy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:06 +0000
 
-kdepim (4:3.5.4-0ubuntu7) edgy; urgency=low
+tdepim (4:3.5.4-0ubuntu7) edgy; urgency=low
 
   * Remove kubuntu_09_kmail_addressbook.diff.  No longer necessary and causes problems.
     Closes Malone #47919
 
  -- Rocco Stanzione <grasshopper@linuxkungfu.org>  Thu, 24 Aug 2006 23:01:01 -0500
 
-kdepim (4:3.5.4-0ubuntu6) edgy; urgency=low
+tdepim (4:3.5.4-0ubuntu6) edgy; urgency=low
 
   * Make kontact depend on kmail, korganizer, kaddressbook
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  2 Oct 2006 16:59:38 +0100
 
-kdepim (4:3.5.4-0ubuntu5) edgy; urgency=low
+tdepim (4:3.5.4-0ubuntu5) edgy; urgency=low
 
   * Add patch kubuntu_11_dimap_data_loss.diff from KDE branch to resolve 
     dimap data loss issues, should fix https://bugs.kde.org/134292
 
  -- Fathi Boudra <fboudra@free.fr>  Tue, 19 Sep 2006 13:53:34 +0200
 
-kdepim (4:3.5.4-0ubuntu4) edgy; urgency=low
+tdepim (4:3.5.4-0ubuntu4) edgy; urgency=low
 
   * Rebuilt with new libpisock. 
 
  -- Daniel Holbach <daniel.holbach@ubuntu.com>  Mon, 18 Sep 2006 12:13:56 +0200
 
-kdepim (4:3.5.4-0ubuntu3) edgy; urgency=low
+tdepim (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:13 +0000
 
-kdepim (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdepim (4:3.5.4-0ubuntu2) edgy; urgency=low
 
   * Rebuild now that gpgsm is in main
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  2 Aug 2006 10:01:13 +0000
 
-kdepim (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdepim (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:19 +0000
 
-kdepim (4:3.5.3-2ubuntu4) edgy; urgency=low
+tdepim (4:3.5.3-2ubuntu4) edgy; urgency=low
 
   * Add gpgsm as build-dep, all dependencies have passed main inclusion
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 20 Jul 2006 12:58:09 +0100
 
-kdepim (4:3.5.3-2ubuntu3) edgy; urgency=low
+tdepim (4:3.5.3-2ubuntu3) edgy; urgency=low
 
   * Rebuild to get rid of libfam.la usage, no changes
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Jul 2006 15:08:51 +0000
 
-kdepim (4:3.5.3-2ubuntu2) edgy; urgency=low
+tdepim (4:3.5.3-2ubuntu2) edgy; urgency=low
 
   * Remove build-dep on libgnokii3-dev, it failed main inclusion review.
   * Remove gpgsm build-dep until it's fully in main
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 11 Jul 2006 21:54:29 +0000
 
-kdepim (4:3.5.3-2ubuntu1) edgy; urgency=low
+tdepim (4:3.5.3-2ubuntu1) edgy; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Jul 2006 11:26:27 +0000
 
-kdepim (4:3.5.3-2) unstable; urgency=low
+tdepim (4:3.5.3-2) unstable; urgency=low
 
   * Rebuild against libgnokii3-dev and libbluetooth2-dev.
   * New patch 15_groupwise_alpha.diff: fix FTBFS on alpha (again).
@@ -854,7 +854,7 @@ kdepim (4:3.5.3-2) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sat,  1 Jul 2006 11:23:08 -0400
 
-kdepim (4:3.5.3-1) unstable; urgency=low
+tdepim (4:3.5.3-1) unstable; urgency=low
 
   * New upstream release.
   * Include fixes on branch up to svn revision 555847.
@@ -867,7 +867,7 @@ kdepim (4:3.5.3-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Wed, 28 Jun 2006 11:58:50 -0400
 
-kdepim (4:3.5.2-1) unstable; urgency=low
+tdepim (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
   * Remove package-specific DEB_DH_SHLIBDEPS_ARGS_pkg hack, now that
@@ -876,7 +876,7 @@ kdepim (4:3.5.2-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Wed, 29 Mar 2006 19:46:16 +0200
 
-kdepim (4:3.5.1-2) unstable; urgency=medium
+tdepim (4:3.5.1-2) unstable; urgency=medium
 
   * Update to SVN branches/KDE/3.5, up to revision 518856.
     + Fixes a FTBFS on alpha.  Closes: #353922.
@@ -889,20 +889,20 @@ kdepim (4:3.5.1-2) unstable; urgency=medium
 
  -- Daniel Schepler <schepler@debian.org>  Wed, 15 Mar 2006 21:26:09 +0100
 
-kdepim (4:3.5.1-1) unstable; urgency=low
+tdepim (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Daniel Schepler <schepler@debian.org>  Wed,  1 Feb 2006 10:17:03 +0100
 
-kdepim (4:3.5.0-5) unstable; urgency=low
+tdepim (4:3.5.0-5) unstable; urgency=low
 
-  * New package: kdepim-dbg, to make debugging symbols available.
+  * New package: tdepim-dbg, to make debugging symbols available.
   * Add Build-Depends on libboost-dev for indexlib.
 
  -- Daniel Schepler <schepler@debian.org>  Tue, 17 Jan 2006 13:15:38 +0100
 
-kdepim (4:3.5.0-4) unstable; urgency=low
+tdepim (4:3.5.0-4) unstable; urgency=low
 
   * Upload to unstable.
   * No longer build with g++-3.4 on any architecture, since g++-4.0
@@ -912,7 +912,7 @@ kdepim (4:3.5.0-4) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Mon,  9 Jan 2006 21:06:19 +0100
 
-kdepim (4:3.5.0-3) experimental; urgency=low
+tdepim (4:3.5.0-3) experimental; urgency=low
 
   * Upload to experimental.
   * New patch 14_kmail_filter_icons.diff: update user config files to
@@ -920,14 +920,14 @@ kdepim (4:3.5.0-3) experimental; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Mon, 19 Dec 2005 22:10:28 +0100
 
-kdepim (4:3.5.0-2) alioth; urgency=medium
+tdepim (4:3.5.0-2) alioth; urgency=medium
 
   * Update from SVN 3.5 branch.
     + Fixes a serious bug with filtering to IMAP folders.
 
  -- Daniel Schepler <schepler@debian.org>  Sun, 11 Dec 2005 20:24:08 +0100
 
-kdepim (4:3.5.0-1) alioth; urgency=low
+tdepim (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
   * Bump debian/compat to 5.  No changes necessary.
@@ -936,7 +936,7 @@ kdepim (4:3.5.0-1) alioth; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Tue,  6 Dec 2005 11:18:32 +0100
 
-kdepim (4:3.4.3-1) unstable; urgency=low
+tdepim (4:3.4.3-1) unstable; urgency=low
 
   * New upstream release.
   * Apply changes from SVN 3.4 branch.
@@ -944,37 +944,37 @@ kdepim (4:3.4.3-1) unstable; urgency=low
   * Rename libmimelib1c2 to libmimelib1c2a due to C++ allocator changes.
   * New patch 13_mimelib_self_contained.diff:
     + Link against libkdefakes_pic.a instead of -lkdefakes to
-      eliminate mimelib's dependency on kdelibs.
+      eliminate mimelib's dependency on tdelibs.
     + Fix mimelib/config.h not to require the KDE or QT headers again.
-      This allows dropping the libkdepim-dev dependency from
+      This allows dropping the libtdepim-dev dependency from
       libmimelib1-dev.
-  * Adjust Build-Depends to ensure a version of kdelibs with the
+  * Adjust Build-Depends to ensure a version of tdelibs with the
     allocator changes.
 
  -- Daniel Schepler <schepler@debian.org>  Thu,  1 Dec 2005 19:59:09 +0100
 
-kdepim (4:3.5.2-0ubuntu6) dapper; urgency=low
+tdepim (4:3.5.2-0ubuntu6) dapper; urgency=low
 
   * debian/cdbs/kde.mk:
     - added dh_iconcache.
 
  -- Daniel Holbach <daniel.holbach@ubuntu.com>  Sun, 21 May 2006 16:38:54 +0200
 
-kdepim (4:3.5.2-0ubuntu5) dapper; urgency=low
+tdepim (4:3.5.2-0ubuntu5) dapper; urgency=low
 
   * Add kubuntu_11_korganizer_event.diff to fix Korganizer crash when adding
     new event (Closes: Malone #39419)
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Fri,  5 May 2006 14:21:53 +0200
 
-kdepim (4:3.5.2-0ubuntu4) dapper; urgency=low
+tdepim (4:3.5.2-0ubuntu4) dapper; urgency=low
 
   * Update kubuntu_06_add_akregator_feed.diff, add Planet Ubuntu
     closes Malone #38719
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  5 May 2006 11:42:44 +0100
 
-kdepim (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdepim (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Add kubuntu_10_imap4_loop.diff from Dirk Mueller
     "When a message is sent to a kmail user with a > 71 characters long filename in
@@ -983,19 +983,19 @@ kdepim (4:3.5.2-0ubuntu3) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  4 May 2006 19:07:10 +0100
 
-kdepim (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdepim (4:3.5.2-0ubuntu2) 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:30 +0100
 
-kdepim (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdepim (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 23:43:38 +0000
 
-kdepim (4:3.5.1-0ubuntu4) dapper; urgency=low
+tdepim (4:3.5.1-0ubuntu4) dapper; urgency=low
 
   * Add kubuntu_08_kalarm_autostart_kdeonly to prevent kalarm from starting
     automatically on GNOME (Closes: Malone #31923). 
@@ -1004,21 +1004,21 @@ kdepim (4:3.5.1-0ubuntu4) dapper; urgency=low
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Sat,  4 Mar 2006 17:41:05 +0100
 
-kdepim (4:3.5.1-0ubuntu3) dapper; urgency=low
+tdepim (4:3.5.1-0ubuntu3) dapper; urgency=low
 
   * Fixed akregator manpage closes
-    https://launchpad.net/distros/ubuntu/+source/kdepim/+bug/30753
+    https://launchpad.net/distros/ubuntu/+source/tdepim/+bug/30753
   * Fix by Kenny Duffus <kenny@duffus.org>
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 17 Feb 2006 11:36:11 +0000
 
-kdepim (4:3.5.1-0ubuntu2) dapper; urgency=low
+tdepim (4:3.5.1-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_07_autostart_kdeonly.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  9 Feb 2006 13:01:11 +0000
 
-kdepim (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdepim (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Install /usr/share/services/kontact/ desktop files in their supporting
@@ -1026,40 +1026,40 @@ kdepim (4:3.5.1-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:07 +0000
 
-kdepim (4:3.5.0-0ubuntu4) dapper; urgency=low
+tdepim (4:3.5.0-0ubuntu4) dapper; urgency=low
 
   * Install multisynk.desktop in kitchensync not Kontact, 
     stop empty icon displaying.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 18 Jan 2006 14:53:52 +0000
 
-kdepim (4:3.5.0-0ubuntu3) dapper; urgency=low
+tdepim (4:3.5.0-0ubuntu3) dapper; urgency=low
 
-  * Increase version number on Replaces for kdepim-kresources
+  * Increase version number on Replaces for tdepim-kresources
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  6 Jan 2006 18:42:44 +0000
 
-kdepim (4:3.5.0-0ubuntu2) dapper; urgency=low
+tdepim (4:3.5.0-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_07_branch_fixes.diff from KMail developers
     fixes http://bugs.kde.org/show_bug.cgi?id=113730
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  9 Dec 2005 23:00:48 +0000
 
-kdepim (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdepim (4:3.5.0-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Remove GCC 3.4 on hppa
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Dec 2005 12:28:46 +0000
 
-kdepim (4:3.5-rc2-0ubuntu2) dapper; urgency=low
+tdepim (4:3.5-rc2-0ubuntu2) dapper; urgency=low
 
   * s/Depends/Build-Depends/ in control
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 26 Nov 2005 18:56:44 +0000
 
-kdepim (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdepim (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Generate .pot files
@@ -1067,7 +1067,7 @@ kdepim (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 21:38:28 +0000
 
-kdepim (4:3.5-rc1-0ubuntu1) dapper; urgency=low
+tdepim (4:3.5-rc1-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Sync with Debian
@@ -1078,81 +1078,81 @@ kdepim (4:3.5-rc1-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 13 Nov 2005 18:09:20 +0000
 
-kdepim (4:3.4.2-2) unstable; urgency=medium
+tdepim (4:3.4.2-2) unstable; urgency=medium
 
   +++ Changes by Adeodato Simó:
 
   * Build with g++-3.4 on arm, m68k and hppa. Closes: #327594
-  * Add kitchensync as a dependency of kdepim-dev. Closes: #327159
+  * Add kitchensync as a dependency of tdepim-dev. Closes: #327159
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 21 Sep 2005 17:45:43 +0200
 
-kdepim (4:3.4.2-1) unstable; urgency=low
+tdepim (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
   * Bugs fixed in past experimental versions but filed with BTS
     afterwards:
     + Compiles on amd64 with g++-4.0.  Closes: #293107.
-    + kdepim-wizards support libraries were mistakenly in kdepim-dev.
+    + tdepim-wizards support libraries were mistakenly in tdepim-dev.
       Closes: #315560.
     + *.sh manpages in kmail.  Closes: #319808.
   * Reenable gnokii support since the license issues have now been
     resolved.
   * Yet more ABI breakages:
-    + libkdepim1 -> libkdepim1a.  Closes: #312310.
+    + libtdepim1 -> libtdepim1a.  Closes: #312310.
     + libkcal2a -> libkcal2b.  Closes: #312318.
   * C++ transition:
-    + Tighten Build-Depends on kdelibs4-dev to new enough version.
+    + Tighten Build-Depends on tdelibs4-dev to new enough version.
     + Rename libmimelib1a -> libmimelib1c2 in order not to break
       lurker.  Also split out libkmime2 from this package while I'm
-      at it so that lurker users don't have to install kdelibs4 --
+      at it so that lurker users don't have to install tdelibs4 --
       at least, they won't have to once I can link libkdefakes statically
       into mimelib (see bug #326113).
   * Add Vietnamese debconf translation.  Closes: #312159.
   * Remove 10_korganizer_makefile.diff, which has been applied in
-    upstream SVN and thus is included in the kdepim_branch patch.
+    upstream SVN and thus is included in the tdepim_branch patch.
   * Remove obsolete Conflicts and Replaces on packages not in sarge.
   * Fix command synopsis in kabc2mutt manpage.  Closes: #324958.
 
  -- Daniel Schepler <schepler@debian.org>  Thu,  1 Sep 2005 15:17:12 -0700
 
-kdepim (4:3.4.1-2) UNRELEASED; urgency=low
+tdepim (4:3.4.1-2) UNRELEASED; urgency=low
 
-  * Move libraries for egroupware, kolab, slox wizards to kdepim-wizards
+  * Move libraries for egroupware, kolab, slox wizards to tdepim-wizards
     where they belong.  Thanks to Reinhold Kainhofer for reporting the
     issue.
 
  -- Daniel Schepler <schepler@debian.org>  Fri,  3 Jun 2005 08:57:02 -0700
 
-kdepim (4:3.4.1-1) experimental; urgency=low
+tdepim (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.
-  * Split kresources into new package kdepim-kresources.
-  * Split kdepimmacros.h into new package libkdepim1-dev, and make all
+  * Split kresources into new package tdepim-kresources.
+  * Split tdepimmacros.h into new package libtdepim1-dev, and make all
     the other -dev packages depend on it.
 
  -- Daniel Schepler <schepler@debian.org>  Thu,  2 Jun 2005 21:45:31 -0700
 
-kdepim (4:3.4.3-0ubuntu4) dapper; urgency=low
+tdepim (4:3.4.3-0ubuntu4) dapper; urgency=low
 
   * Actually build-depend on g++-3.4 on hppa.
 
  -- LaMont Jones <lamont@ubuntu.com>  Fri, 11 Nov 2005 09:57:38 -0700
 
-kdepim (4:3.4.3-0ubuntu3) breezy-updates; urgency=low
+tdepim (4:3.4.3-0ubuntu3) breezy-updates; urgency=low
 
   * Add back gpgme11-dev build-dep, http://bugzilla.ubuntu.com/17546
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Oct 2005 13:10:47 +0000
 
-kdepim (4:3.4.3-0ubuntu2) breezy; urgency=low
+tdepim (4:3.4.3-0ubuntu2) breezy; urgency=low
 
   * Add kubuntu_06_add_akregator_feed.diff add kubuntu.org and fridge
     feeds as default
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 10 Oct 2005 19:14:19 +0100
 
-kdepim (4:3.4.3-0ubuntu1) breezy; urgency=low
+tdepim (4:3.4.3-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Remove gpgme11-dev build-dep
@@ -1160,53 +1160,53 @@ kdepim (4:3.4.3-0ubuntu1) breezy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  7 Oct 2005 16:41:29 +0000
 
-kdepim (4:3.4.2-0ubuntu2) breezy; urgency=low
+tdepim (4:3.4.2-0ubuntu2) breezy; urgency=low
 
   * Add kubuntu_07_korganiser_libraries.diff fix compile order
   * Add kubuntu_08_kmail_attachments.diff fix empty attachments http://bugs.kde.org/109003
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  3 Aug 2005 11:51:41 +0000
 
-kdepim (4:3.4.2-0ubuntu1) breezy; urgency=low
+tdepim (4:3.4.2-0ubuntu1) breezy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 28 Jul 2005 11:35:01 +0000
 
-kdepim (4:3.4.1-0ubuntu4) breezy; urgency=low
+tdepim (4:3.4.1-0ubuntu4) breezy; urgency=low
 
-  * Rebuild for removed libXcursor.la and tighten kdelibs dependency
+  * Rebuild for removed libXcursor.la and tighten tdelibs dependency
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 24 Jul 2005 23:58:51 +0000
 
-kdepim (4:3.4.1-0ubuntu3) breezy; urgency=low
+tdepim (4:3.4.1-0ubuntu3) breezy; urgency=low
 
   * Add back flex build-dep which somehow went missing.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 21 Jul 2005 13:03:06 +0000
 
-kdepim (4:3.4.1-0ubuntu2) breezy; urgency=low
+tdepim (4:3.4.1-0ubuntu2) breezy; urgency=low
 
   * Rebuild for libXrender.la changes
   * Add build-dep on libxfixes-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 20 Jul 2005 23:11:42 +0000
 
-kdepim (4:3.4.1-0ubuntu1) breezy; urgency=low
+tdepim (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number following KDE 3.4.1 release
   * Add all dependencies back to meta package
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed,  1 Jun 2005 00:51:23 +0000
 
-kdepim (4:3.4.1-0ubuntu0pre2) breezy; urgency=low
+tdepim (4:3.4.1-0ubuntu0pre2) breezy; urgency=low
 
   * Add kubuntu_06_kpilot_tag_to_branch.diff, patch from upstream to
     prevent data loss.
 
  -- Jonathan Riddell <jr@jriddell.org>  Fri, 27 May 2005 15:28:51 +0000
 
-kdepim (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+tdepim (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
 
   * New upstream release
   * Sync with Debian
@@ -1214,40 +1214,40 @@ kdepim (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 25 May 2005 17:37:34 +0000
 
-kdepim (4:3.4.0-0ubuntu10) hoary; urgency=low
+tdepim (4:3.4.0-0ubuntu10) hoary; urgency=low
 
   * Add /usr/share/doc/kde/HTML/en/kcontrol/kalarmd/ to
-    kdepim-doc-html to prevent dhelp error
+    tdepim-doc-html to prevent dhelp error
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 30 Mar 2005 18:05:50 +0000
 
-kdepim (4:3.4.0-0ubuntu9) hoary; urgency=low
+tdepim (4:3.4.0-0ubuntu9) hoary; urgency=low
 
-  * Remove duplicate files from kdepim-dev for libkleopatra0-dev and libkgantt0.
+  * Remove duplicate files from tdepim-dev for libkleopatra0-dev and libkgantt0.
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 30 Mar 2005 04:45:07 +0000
 
-kdepim (4:3.4.0-0ubuntu8) hoary; urgency=low
+tdepim (4:3.4.0-0ubuntu8) hoary; urgency=low
 
-  * Move wizards from kdepim-dev to kdepim-wizards, removes conflicing files.
+  * Move wizards from tdepim-dev to tdepim-wizards, removes conflicing files.
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 30 Mar 2005 04:45:46 +0100
 
-kdepim (4:3.4.0-0ubuntu7) hoary; urgency=low
+tdepim (4:3.4.0-0ubuntu7) hoary; urgency=low
 
   * remoded double depends and a conflict on libkcal2-dev
 
  -- Andreas Mueller <amu@ubuntu.com>  Tue, 29 Mar 2005 23:53:25 +0000
 
-kdepim (4:3.4.0-0ubuntu6) hoary; urgency=low
+tdepim (4:3.4.0-0ubuntu6) hoary; urgency=low
 
-  * added kdepim-dev as dep of libkcal2-dev
+  * added tdepim-dev as dep of libkcal2-dev
   * fixed some typo's
   * added missing egroupware libs
 
  -- Andreas Mueller <amu@ubuntu.com>  Tue, 29 Mar 2005 13:53:12 +0000
 
-kdepim (4:3.4.0-0ubuntu5) hoary; urgency=low
+tdepim (4:3.4.0-0ubuntu5) hoary; urgency=low
 
   * Removed gpgsm from builddepens 
   * final sync with kde-branch / backporting cool stuff
@@ -1255,7 +1255,7 @@ kdepim (4:3.4.0-0ubuntu5) hoary; urgency=low
 
  -- Andreas Mueller <amu@ubuntu.com>  Thu, 24 Mar 2005 17:11:22 +0000
 
-kdepim (4:3.4.0-0ubuntu4) hoary; urgency=low
+tdepim (4:3.4.0-0ubuntu4) hoary; urgency=low
 
   * Readded cyrpto support for kmail
   * Readded kleopatra for kmail
@@ -1264,7 +1264,7 @@ kdepim (4:3.4.0-0ubuntu4) hoary; urgency=low
 
  -- Andreas Mueller <amu@ubuntu.com>  Tue, 22 Mar 2005 18:45:04 +0000
 
-kdepim (4:3.4.0-0ubuntu3) hoary; urgency=low
+tdepim (4:3.4.0-0ubuntu3) hoary; urgency=low
 
   * Removed crypto support for kmail.
   * Removed depends on Kleopatra for kmail.
@@ -1272,31 +1272,31 @@ kdepim (4:3.4.0-0ubuntu3) hoary; urgency=low
        
  -- Andreas Mueller <amu@ubuntu.com>  Thu, 17 Mar 2005 18:05:34 +0000
 
-kdepim (4:3.4.0-0ubuntu2) hoary; urgency=low
+tdepim (4:3.4.0-0ubuntu2) hoary; urgency=low
 
-  * Remove korn dependency from kdepim meta-package.
+  * Remove korn dependency from tdepim meta-package.
   * Fix kubuntu_01_kmenu_tidy.diff
   * Add further patches to tidy menu
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 17 Mar 2005 01:49:54 +0000
 
-kdepim (4:3.4.0-0ubuntu1) hoary; urgency=low
+tdepim (4:3.4.0-0ubuntu1) hoary; urgency=low
 
-  * Remove korn dependency from kdepim meta-package.
+  * Remove korn dependency from tdepim meta-package.
   * Add kubuntu_01_kmenu_tidy.diff to tidy up kmenu.
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 23:58:26 +0000
 
-kdepim (4:3.4.0-0pre1ubuntu4) hoary; urgency=low
+tdepim (4:3.4.0-0pre1ubuntu4) hoary; urgency=low
 
   * fixed  wrong depends in kmail for kleopatra.
   
  -- Andreas Mueller <amu@ubuntu.com>  Wed, 16 Mar 2005 21:19:16 +0000
 
-kdepim (4:3.4.0-0pre1ubuntu3) hoary; urgency=low
+tdepim (4:3.4.0-0pre1ubuntu3) hoary; urgency=low
 
   * Removed them again, cause it cant move to main. 
-  * Added kdepim-kio-pluging as installdepends for kmail
+  * Added tdepim-kio-pluging as installdepends for kmail
     in case someone run only kmail.
   * Changed suggest kleopatra to depends for gpg decrypt
     support.     
@@ -1304,13 +1304,13 @@ kdepim (4:3.4.0-0pre1ubuntu3) hoary; urgency=low
 
  -- Andreas Mueller <amu@ubuntu.com>  Wed, 16 Mar 2005 19:02:50 +0000
 
-kdepim (4:3.4.0-0pre1ubuntu2) hoary; urgency=low
+tdepim (4:3.4.0-0pre1ubuntu2) hoary; urgency=low
 
   * Added gpgsm build depends
 
  -- Andreas Mueller <amu@ubuntu.com>  Mon, 14 Mar 2005 01:35:50 +0100
 
-kdepim (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+tdepim (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
 
   * New packages: kode, networkstatus.
   * New groupware wizards added to menu
@@ -1319,25 +1319,25 @@ kdepim (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
 
  -- Andreas Mueller <amu@ubuntu.com>  Fri, 11 Mar 2005 00:20:53 -0800
 
-kdepim (4:3.4.0-0pre1) alioth; urgency=low
+tdepim (4:3.4.0-0pre1) alioth; urgency=low
 
   * New upstream release.
   * Change to using upstream tar.bz2.
   * New packages: kode, networkstatus.
   * Absorb akregator package.  Thanks to Pierre Habouzit for his fine work
     on this package up until now.
-  * libkdenetwork2 split upstream into libkmime, which is now in the
+  * libtdenetwork2 split upstream into libkmime, which is now in the
     libmimelib1a package, and libkpgp, which is now in the libkleopatra0a
     package.
   * Split off libktnef1 from the ktnef package since libkcal now depends
     on it.
-    + Also split libktnef1-dev from kdepim-dev.
+    + Also split libktnef1-dev from tdepim-dev.
   * Keep kmail's *.sh manpages from being installed in
     /usr/share/man/sh/man1.
 
  -- Daniel Schepler <schepler@debian.org>  Sat, 12 Mar 2005 21:41:20 -0800
 
-kdepim (4:3.3.2-3) unstable; urgency=medium
+tdepim (4:3.3.2-3) unstable; urgency=medium
 
   * KDE_3_3_BRANCH update.
   * Move kleopatra to main, now that gnupg2 is in the archive.
@@ -1347,14 +1347,14 @@ kdepim (4:3.3.2-3) unstable; urgency=medium
   * Add Recommends on procmail to kmail, which is needed for fetching
     mbox mail.
   * Tighten libtool build dependency.  This closes half of #285882,
-    while the other half is really a kdelibs issue.
+    while the other half is really a tdelibs issue.
   * Include the GFDL in debian/copyright, since the handbooks are
     licensed under it.
   * Update the list of licenses.
 
  -- Daniel Schepler <schepler@debian.org>  Sun,  3 Apr 2005 20:23:43 -0700
 
-kdepim (4:3.3.2-2) unstable; urgency=low
+tdepim (4:3.3.2-2) unstable; urgency=low
 
   * Disable gnokii support again until bug #266566 is resolved.
   * Update from KDE_3_3_BRANCH.
@@ -1368,7 +1368,7 @@ kdepim (4:3.3.2-2) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Tue,  1 Mar 2005 05:20:08 -0800
 
-kdepim (4:3.3.2-1) unstable; urgency=low
+tdepim (4:3.3.2-1) unstable; urgency=low
 
   * Uploading to unstable.
   * Include updates from KDE_3_3_BRANCH.
@@ -1376,17 +1376,17 @@ kdepim (4:3.3.2-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Wed, 19 Jan 2005 18:20:43 -0800
 
-kdepim (4:3.3.2-0pre1) experimental; urgency=low
+tdepim (4:3.3.2-0pre1) experimental; urgency=low
 
   * New upstream release.
   * They did it again... rename libkcal2 to libkcal2a because of removed
     symbols SloxAccounts::self(), SloxAccounts::setServer(QString const&),
     SloxAccounts::SloxAccounts() in libkslox.so.
-  * Bump shlibs version on libkdepim1.
+  * Bump shlibs version on libtdepim1.
 
  -- Daniel Schepler <schepler@debian.org>  Fri, 17 Dec 2004 20:45:39 -0800
 
-kdepim (4:3.3.1-3) unstable; urgency=medium
+tdepim (4:3.3.1-3) unstable; urgency=medium
 
   * Disable gnokii support to attempt getting trinity.3 into sarge.
     Closes: #284985.
@@ -1395,18 +1395,18 @@ kdepim (4:3.3.1-3) unstable; urgency=medium
 
  -- Daniel Schepler <schepler@debian.org>  Sat, 11 Dec 2004 15:50:44 -0800
 
-kdepim (4:3.3.1-2) unstable; urgency=medium
+tdepim (4:3.3.1-2) unstable; urgency=medium
 
   * Urgency medium due to fix for buildd issues.
   * Updates from KDE_3_3_BRANCH.
   * Stop building static libraries to make buildd's happy (or at least
     happier).  They were pretty useless anyway without static versions
-    of Qt or kdelibs.  Closes: #281955.
+    of Qt or tdelibs.  Closes: #281955.
   * Update kleopatra dependencies for current experimental gnupg2/gpgsm
     packages.  Closes: #274611, #280759.
   * Drop cryptplug from kmail's dependencies, since it's no longer used.
     Closes: #274612.
-  * Add blurb about kdepim-kio-plugins and kdebase-kio-plugins
+  * Add blurb about tdepim-kio-plugins and tdebase-kio-plugins
     dependencies to kmail's description, due to the number of people who
     somehow manage to install kmail without even noticing the Recommends
     on these packages, then complain that things don't work.
@@ -1414,11 +1414,11 @@ kdepim (4:3.3.1-2) unstable; urgency=medium
 
  -- Daniel Schepler <schepler@debian.org>  Sun, 21 Nov 2004 15:04:40 -0800
 
-kdepim (4:3.3.1-1) unstable; urgency=low
+tdepim (4:3.3.1-1) unstable; urgency=low
 
   * New upstream release.
-  * Rename 01_kdepim_branch.diff to 10_kdepim_branch.diff, and
-    other kdepim-specific patches to 2?_*.diff.
+  * Rename 01_tdepim_branch.diff to 10_tdepim_branch.diff, and
+    other tdepim-specific patches to 2?_*.diff.
   * New patch 04_disable_static_la_final.diff, to keep --enable-final
     from messing up the static libraries.
     + debian/rules: Reenable --enable-final.
@@ -1449,7 +1449,7 @@ kdepim (4:3.3.1-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sat,  6 Nov 2004 12:18:42 -0800
 
-kdepim (4:3.3.0-3) unstable; urgency=low
+tdepim (4:3.3.0-3) unstable; urgency=low
 
   * Updates from KDE_3_3_BRANCH.
     + Fixes konsolekalendar.  Closes: #269295.
@@ -1462,7 +1462,7 @@ kdepim (4:3.3.0-3) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sat, 25 Sep 2004 19:44:44 -0700
 
-kdepim (4:3.3.0-2) unstable; urgency=low
+tdepim (4:3.3.0-2) unstable; urgency=low
 
   * Using automake1.7 doesn't fix the korganizer install problems; go to
     automake1.9 and readd 03_automake1.8.diff and
@@ -1473,24 +1473,24 @@ kdepim (4:3.3.0-2) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Fri, 27 Aug 2004 07:25:15 -0700
 
-kdepim (4:3.3.0-1) unstable; urgency=low
+tdepim (4:3.3.0-1) unstable; urgency=low
 
   * New upstream release.
   * Add German debconf translations, thanks to Erik Schanze.
     Closes: #264825.
   * Correct typo in kpilot.install which caused file conflicts.
     Closes: #266311.
-  * Add Recommends: kdepim-kio-plugins to kmail for newimap, and also
-    move kdebase-kio-plugins there from Depends.  Closes: #266603.
+  * Add Recommends: tdepim-kio-plugins to kmail for newimap, and also
+    move tdebase-kio-plugins there from Depends.  Closes: #266603.
   * Use automake1.7 instead of 1.8 to work around problem in
     korganizer/Makefile.am.
 
  -- Daniel Schepler <schepler@debian.org>  Wed, 25 Aug 2004 00:09:09 -0400
 
-kdepim (4:3.2.92+3.3.0rc1-1) experimental; urgency=low
+tdepim (4:3.2.92+3.3.0rc1-1) experimental; urgency=low
 
   * New upstream release.
-    + New packages: kdepim-wizards, kitchensync, libkleopatra0[-dev],
+    + New packages: tdepim-wizards, kitchensync, libkleopatra0[-dev],
       libkpimidentities1.
     + Removed packages: libkdgantt0[-dev].
     + Renamed kgpgcertmanager to kleopatra.
@@ -1500,36 +1500,36 @@ kdepim (4:3.2.92+3.3.0rc1-1) experimental; urgency=low
   * Make the *.install files a bit more robust by listing directories
     clearly belonging to packages instead of listing each individual
     file.
-  * Add kdepim-doc-html package for the benefit of non-KDE users.
+  * Add tdepim-doc-html package for the benefit of non-KDE users.
   * Expand package descriptions.  Closes: #209672, #209689, #209862,
     #209997, #210088, #210094.
   * Add menu icons.
-  * Add doc-base files for kdepim-doc and kdepim-doc-html.
+  * Add doc-base files for tdepim-doc and tdepim-doc-html.
   * Write new manual pages for all binaries.
 
  -- Daniel Schepler <schepler@debian.org>  Sat,  7 Aug 2004 23:20:22 -0700
 
-kdepim (4:3.2.3-1) unstable; urgency=high
+tdepim (4:3.2.3-1) unstable; urgency=high
 
   * New upstream release.
   * kmail Suggests: cryptplug. (Closes: #231797)
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue,  3 Aug 2004 23:00:00 -0500
 
-kdepim (4:3.2.2-2) unstable; urgency=high
+tdepim (4:3.2.2-2) unstable; urgency=high
 
   * Build-Conflicts: gnokii - due to gnokii not being properly maintained.
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon, 26 Apr 2004 22:00:00 -0500
 
-kdepim (4:3.2.2-1) unstable; urgency=low
+tdepim (4:3.2.2-1) unstable; urgency=low
 
   * New upstream release.
   * debian/*.menu: remove the obsolete kderemove tag.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri, 16 Apr 2004 19:00:00 -0500
 
-kdepim (4:3.2.1-1) unstable; urgency=low
+tdepim (4:3.2.1-1) unstable; urgency=low
 
   * New upstream release.
   * Added Danish and Japanese po-debconf translations. (Closes: #233579)
@@ -1537,26 +1537,26 @@ kdepim (4:3.2.1-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat,  6 Mar 2004 17:00:00 -0600
 
-kdepim (4:3.2.0-0pre1v1) experimental; urgency=low
+tdepim (4:3.2.0-0pre1v1) experimental; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri, 20 Feb 2004 01:00:00 -0600
 
-kdepim (4:3.1.95-1) unstable; urgency=low
+tdepim (4:3.1.95-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu, 29 Jan 2004 04:00:00 -0600
 
-kdepim (4:3.1.5-1.1) unstable; urgency=low
+tdepim (4:3.1.5-1.1) unstable; urgency=low
 
   * NMU with Maintainers permission
   * New patch: 07_libmal1_support.diff from Ludovic Rousseau (Closes: #232500, #217013)
 
  -- Riku Voipio <riku.voipio@iki.fi>  Sun, 15 Feb 2004 11:06:49 +0000
 
-kdepim (4:3.1.5-1) unstable; urgency=low
+tdepim (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
   * Added libtool arm patch.
@@ -1564,7 +1564,7 @@ kdepim (4:3.1.5-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed, 14 Jan 2004 02:00:00 -0600
 
-kdepim (4:3.1.4-1) unstable; urgency=low
+tdepim (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
   * Added patch to update autotools files.
@@ -1573,26 +1573,26 @@ kdepim (4:3.1.4-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat, 18 Oct 2003 02:00:00 -0500
 
-kdepim (4:3.1.3-1) unstable; urgency=low
+tdepim (4:3.1.3-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sun,  3 Aug 2003 23:00:00 -0500
 
-kdepim (4:3.1.2-1) unstable; urgency=low
+tdepim (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon, 26 May 2003 22:00:00 -0500
 
-kdepim (4:3.1.1-1) unstable; urgency=low
+tdepim (4:3.1.1-1) unstable; urgency=low
 
   * New upstream.
   * Redo debian dir.
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed, 12 Mar 2003 17:00:00 -0600
 
-kdepim (4:2.2.2-5.2) stable-security; urgency=high
+tdepim (4:2.2.2-5.2) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Added special detection routine for big/little endianess on MIPS since
@@ -1602,7 +1602,7 @@ kdepim (4:2.2.2-5.2) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Wed,  8 Jan 2003 21:24:12 +0100
 
-kdepim (4:2.2.2-5.1) stable-security; urgency=high
+tdepim (4:2.2.2-5.1) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Applied upstream patches to fix several potential vulnerabilities.
@@ -1610,7 +1610,7 @@ kdepim (4:2.2.2-5.1) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Mon,  6 Jan 2003 09:16:08 +0100
 
-kdepim (4:2.2.2-5) unstable; urgency=HIGH
+tdepim (4:2.2.2-5) unstable; urgency=HIGH
 
   * Change Maintainer to Chris.
   * Change || in Build-Deps to |. (closes: #130183)
@@ -1620,7 +1620,7 @@ kdepim (4:2.2.2-5) unstable; urgency=HIGH
 
  -- Daniel Stone <daniel@sfarc.net>  Wed, 27 Feb 2002 17:18:47 +1100
 
-kdepim (4:2.2.2-4) unstable; urgency=low
+tdepim (4:2.2.2-4) unstable; urgency=low
 
   * libical/src/libical/icalyacc.y:
     - Fix bison errors; thanks, Andrew Suffield. (closes: #124383)
@@ -1638,7 +1638,7 @@ kdepim (4:2.2.2-4) unstable; urgency=low
 
  -- Daniel Stone <daniel@sfarc.net>  Tue, 18 Dec 2001 13:45:28 +1100
 
-kdepim (4:2.2.2-3) unstable; urgency=low
+tdepim (4:2.2.2-3) unstable; urgency=low
 
   * New maintainer. (closes: #114106) 
   * libdif/ldif.c:
@@ -1651,7 +1651,7 @@ kdepim (4:2.2.2-3) unstable; urgency=low
 
  -- Daniel Stone <daniel@sfarc.net>  Fri, 30 Nov 2001 21:53:31 +1100
 
-kdepim (4:2.2.2-2) unstable; urgency=low
+tdepim (4:2.2.2-2) unstable; urgency=low
 
   * Sync with upstream
   * Cleanup documentation for freeze
@@ -1660,43 +1660,43 @@ kdepim (4:2.2.2-2) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 29 Nov 2001 04:10:00 -0700
 
-kdepim (4:2.2.2-1) unstable; urgency=low
+tdepim (4:2.2.2-1) unstable; urgency=low
 
   * New upstream version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Nov 2001 19:38:00 -0700
 
-kdepim (4:2.2.1-1.5) unstable; urgency=low
+tdepim (4:2.2.1-1.5) unstable; urgency=low
 
   * Don't search for auto* as it hoses things
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 08 Oct 2001 19:38:00 -0700
 
-kdepim (4:2.2.1-1.4) unstable; urgency=low
+tdepim (4:2.2.1-1.4) unstable; urgency=low
 
   * fix configure
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 05 Oct 2001 01:11:00 -0700
 
-kdepim (4:2.2.1-1.3) unstable; urgency=low
+tdepim (4:2.2.1-1.3) unstable; urgency=low
 
   * Don't use automake since it's hosed
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 03 Oct 2001 01:11:00 -0700
 
-kdepim (4:2.2.1-1.2) unstable; urgency=low
+tdepim (4:2.2.1-1.2) unstable; urgency=low
 
   * Remove libical (Closes: #113668)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 27 Sep 2001 01:11:00 -0700
 
-kdepim (4:2.2.1-1.1) unstable; urgency=low
+tdepim (4:2.2.1-1.1) unstable; urgency=low
 
   * Fix overwrite (Closes: #112974)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 23 Sep 2001 18:18:00 -0700
 
-kdepim (4:2.2.1-1) unstable; urgency=low
+tdepim (4:2.2.1-1) unstable; urgency=low
  
   * new upstream version 2.2.1
   * Change maintainer
@@ -1706,42 +1706,42 @@ kdepim (4:2.2.1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 07 Sep 2001 12:07:00 -0700
 
-kdepim (4:2.2.0-final-1) unstable; urgency=low
+tdepim (4:2.2.0-final-1) unstable; urgency=low
  
   * new upstream version 2.2
   * Hack build for hppa (Closes: #108273)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 12 Aug 2001 01:55:00 -0700
 
-kdepim (4:2.2.0-0beta1-5) unstable; urgency=low
+tdepim (4:2.2.0-0beta1-5) unstable; urgency=low
  
   * Sync with upstream
   * gcc3 build fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 26 Jul 2001 20:28:00 -0700
 
-kdepim (4:2.2.0-0beta1-4) unstable; urgency=low
+tdepim (4:2.2.0-0beta1-4) unstable; urgency=low
  
   * Sync with upstream
   * More alpha build fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 07 Jul 2001 03:38:00 -0700
 
-kdepim (4:2.2.0-0beta1-3) unstable; urgency=low
+tdepim (4:2.2.0-0beta1-3) unstable; urgency=low
  
   * Sync with upstream
   * Recommend kghostview (Closes: #103585)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 05 Jul 2001 09:08:00 -0700
 
-kdepim (4:2.2.0-0beta1-2) unstable; urgency=low
+tdepim (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:35:00 -0700
 
-kdepim (4:2.2.0-0beta1-1) unstable; urgency=low
+tdepim (4:2.2.0-0beta1-1) unstable; urgency=low
  
   * Fix overwrites (Closes: #102855)
   * sync with upstream
@@ -1749,45 +1749,45 @@ kdepim (4:2.2.0-0beta1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 30 Jun 2001 20:48:00 -0700
 
-kdepim (4:2.2-cvs20010622-1) unstable; urgency=low
+tdepim (4:2.2-cvs20010622-1) unstable; urgency=low
  
   * New upstream cvs pull
   * 2.2 beta1
   * Adding in Enhances
-  * abbrowser moved to kdelibs
+  * abbrowser moved to tdelibs
   * New package: kandy
   * Fix typo (Closes: #101349)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
 
-kdepim (4:2.1.1-2) unstable; urgency=low
+tdepim (4:2.1.1-2) unstable; urgency=low
  
   * Update menu bits to include new kde menu removal tag
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Apr 2001 17:46:00 -0700
 
-kdepim (4:2.1.1-1.0.1) unstable; urgency=low
+tdepim (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 17:00:00 -0700
 
-kdepim (4:2.1.1-1) unstable; urgency=low
+tdepim (4:2.1.1-1) unstable; urgency=low
  
   * New upstream version
   * Upstream fixes (Closes: #77622, #77803)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Mar 2001 22:31:00 -0700
 
-kdepim (4:2.1.0-1) unstable; urgency=low
+tdepim (4:2.1.0-1) unstable; urgency=low
  
   * New upstream CVS pull
   * Update shlibs
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Mar 2001 22:31:00 -0700
 
-kdepim (4:2.1-final-1) unstable; urgency=low
+tdepim (4:2.1-final-1) unstable; urgency=low
  
   * New upstream version
   * Upping standards version
@@ -1795,34 +1795,34 @@ kdepim (4:2.1-final-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
 
-kdepim (4:2.1-beta2-1) unstable; urgency=low
+tdepim (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
 
-kdepim (4:2.1-20010118-1) unstable; urgency=low
+tdepim (4:2.1-20010118-1) unstable; urgency=low
  
   * New upstream cvs version
   * Fixing overwrite problem (Closes: #82965)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 21 Jan 2001 00:46:00 -0700
 
-kdepim (4:2.1-20010115-1) unstable; urgency=low
+tdepim (4:2.1-20010115-1) unstable; urgency=low
  
   * New upstream cvs version
   * no more libical package
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
 
-kdepim (4:2.1-20010106-1) unstable; urgency=low
+tdepim (4:2.1-20010106-1) unstable; urgency=low
  
   * New upstream cvs version
   * Updating build-depends
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 06 Jan 2001 23:30:00 -0700
 
-kdepim (4:2.1-20010101-1) unstable; urgency=low
+tdepim (4:2.1-20010101-1) unstable; urgency=low
  
   * New upstream cvs version
   * korganizer is now 2.1beta1 as well
@@ -1831,7 +1831,7 @@ kdepim (4:2.1-20010101-1) unstable; urgency=low
         
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Jan 2001 15:30:00 -0700
 
-kdepim (4:2.1-20001218-1) unstable; urgency=low
+tdepim (4:2.1-20001218-1) unstable; urgency=low
 
   * New upstream cvs version
   * Including kpilot, 2 years and 10 days after I did the ITP for it (Closes: #68255)
@@ -1839,85 +1839,85 @@ kdepim (4:2.1-20001218-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Dec 2000 23:00:00 -0700
 
-kdepim (2.0-20001011-0) unstable; urgency=low
+tdepim (2.0-20001011-0) unstable; urgency=low
  
   * KDE 2.0 RC2
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 12 Sep 2000 06:00:00 -0700
                                                                                 
-kdepim (2.0-20001006-0) unstable; urgency=low
+tdepim (2.0-20001006-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 06 Sep 2000 22:00:00 -0700
                                                                                 
-kdepim (2.0-20001005-0) unstable; urgency=low
+tdepim (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 Sep 2000 15:00:00 -0700
                                                                                 
-kdepim (2.0-20001002-0) unstable; urgency=low
+tdepim (2.0-20001002-0) unstable; urgency=low
  
   * KDE 2.0 RC1
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Sep 2000 01:30:00 -0700
                                                                                 
-kdepim (2.0-20000925-2) unstable; urgency=low
+tdepim (2.0-20000925-2) unstable; urgency=low
 
   * More upstream fixes
   * Clean build against new libc6
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 26 Sep 2000 22:30:00 -0700
 
-kdepim (2.0-20000925-0) unstable; urgency=low
+tdepim (2.0-20000925-0) unstable; urgency=low
  
   * More upstream fixes
   * Build-Depends work
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
 
-kdepim (2.0-20000920-2) unstable; urgency=low
+tdepim (2.0-20000920-2) unstable; urgency=low
  
   * Fixing some dependencies
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 21 Sep 2000 17:30:00 -0700
 
-kdepim (2.0-20000920-0) unstable; urgency=low
+tdepim (2.0-20000920-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Sep 2000 23:00:00 -0700
 
-kdepim (2.0-20000918-0) unstable; urgency=low
+tdepim (2.0-20000918-0) unstable; urgency=low
  
   * More upstream fixes
-  * Fixing task-kdepim description (Closes: #71984)
+  * Fixing task-tdepim description (Closes: #71984)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Sep 2000 22:00:00 -0700
 
-kdepim (2.0-20000912-0) unstable; urgency=low
+tdepim (2.0-20000912-0) unstable; urgency=low
  
   * More upstream fixes
-  * Fixing non-replacement of old kdepim package
+  * Fixing non-replacement of old tdepim package
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 12 Sep 2000 22:00:00 -0700
 
-kdepim (2.0-20000909-0) unstable; urgency=low
+tdepim (2.0-20000909-0) unstable; urgency=low
 
   * upstream fixes
   * More build cleanups
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 09 Sep 2000 22:00:00 -0700
 
-kdepim (2.0-20000905-0) unstable; urgency=low
+tdepim (2.0-20000905-0) unstable; urgency=low
 
   * upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 05 Sep 2000 17:00:02 -0700
 
-kdepim (2.0-20000901-0) unstable; urgency=low
+tdepim (2.0-20000901-0) unstable; urgency=low
  
   * Build fixes
   * upstream fixes 
@@ -1925,31 +1925,31 @@ kdepim (2.0-20000901-0) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Sep 2000 17:00:02 -0700
                                                                                
-kdepim (2.0-20000825-0) experimental; urgency=low
+tdepim (2.0-20000825-0) experimental; urgency=low
  
   * Build fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 25 Aug 2000 22:30:02 -0700
                                                                                 
-kdepim (2.0-20000823-1.0) experimental; urgency=low
+tdepim (2.0-20000823-1.0) experimental; urgency=low
  
   * KDE 2.0 beta 4
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 23 Aug 2000 16:30:02 -0700
                                                                                 
-kdepim (2.0-20000820-1.0) experimental; urgency=low
+tdepim (2.0-20000820-1.0) experimental; urgency=low
  
   * New upstream beta version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 20 Aug 2000 15:30:02 -0700
                                                                                 
-kdepim-cvs (2.0-20000521-1.0) experimental; urgency=low
+tdepim-cvs (2.0-20000521-1.0) experimental; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 21 May 2000 18:15:02 -0700
 
-kdepim-cvs (2.0-20000516-1.0) experimental; urgency=low
+tdepim-cvs (2.0-20000516-1.0) experimental; urgency=low
 
   * Initial Release.
 
diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control
index a9ac57109..30d7281d5 100644
--- a/ubuntu/maverick/tdepim/debian/control
+++ b/ubuntu/maverick/tdepim/debian/control
@@ -1,11 +1,11 @@
-Source: kdepim-trinity
+Source: tdepim-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>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
 Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31),
- cdparanoia, gawk, gettext, kdelibs4-trinity-dev, bison, byacc, bzip2,
+ cdparanoia, gawk, gettext, tdelibs4-trinity-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev, libogg-dev-la,
  libboost-dev (>= 1.33.1), libgpgme11-dev, liblockdev1-dev,
  libpisock-dev, libreadline5-dev | libreadline6-dev, libsasl2-dev, libssl-dev,
@@ -13,17 +13,17 @@ Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31),
  libgpg-error-dev (>= 1.4-2), gpgsm, libical-dev,
  libcaldav-dev (>= 0.6.5), libcarddav-dev (>= 0.6.2), libcurl4-gnutls-dev,
  cmake, libtool, libltdl-dev
-Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, kdelibs4-trinity-doc
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs4-trinity-doc
 Build-Conflicts: libkleopatra0-trinity-dev
 Standards-Version: 3.8.4
 
-Package: kdepim-trinity
+Package: tdepim-trinity
 Section: kde
 Architecture: all
-Replaces: kdepim-kde3 (<< 4:3.5.13)
-Breaks: kdepim-kde3 (<< 4:3.5.13)
-Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), kdepim-kfile-plugins-trinity (>= ${Source-Version}), kdepim-kio-plugins-trinity (>= ${Source-Version}), kdepim-kresources-trinity (>= ${Source-Version}), kdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libkdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version})
-Suggests: kdepim-trinity-doc-html
+Replaces: tdepim-kde3 (<< 4:3.5.13)
+Breaks: tdepim-kde3 (<< 4:3.5.13)
+Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-kfile-plugins-trinity (>= ${Source-Version}), tdepim-kio-plugins-trinity (>= ${Source-Version}), tdepim-kresources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version})
+Suggests: tdepim-trinity-doc-html
 Description: Personal Information Management apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -35,53 +35,53 @@ Description: Personal Information Management apps from the official Trinity rele
  .
   Homepage: http://pim.kde.org/
 
-Package: kdepim-trinity-dbg
+Package: tdepim-trinity-dbg
 Priority: extra
 Section: libdevel
-Replaces: kdepim-kde3-dbg (<< 4:3.5.13)
-Breaks: kdepim-kde3-dbg (<< 4:3.5.13)
-Depends: kdelibs-trinity-dbg
+Replaces: tdepim-kde3-dbg (<< 4:3.5.13)
+Breaks: tdepim-kde3-dbg (<< 4:3.5.13)
+Depends: tdelibs-trinity-dbg
 Architecture: any
-Description: debugging symbols for kdepim-trinity
- This package contains the debugging symbols associated with kdepim-trinity.
- They will automatically be used by gdb for debugging kdepim-related
+Description: debugging symbols for tdepim-trinity
+ This package contains the debugging symbols associated with tdepim-trinity.
+ They will automatically be used by gdb for debugging tdepim-related
  issues.
 
-Package: kdepim-trinity-dev
+Package: tdepim-trinity-dev
 Section: devel
 Architecture: any
-Replaces: kdepim-kde3-dev (<< 4:3.5.13)
-Breaks: kdepim-kde3-dev (<< 4:3.5.13)
-Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), kdepim-kresources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libkdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version})
+Replaces: tdepim-kde3-dev (<< 4:3.5.13)
+Breaks: tdepim-kde3-dev (<< 4:3.5.13)
+Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-kresources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version})
 Description: KDE Personal Information Management [development]
- This package contains development files needed to compile kdepim applications.
+ This package contains development files needed to compile tdepim applications.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
  . 
   Homepage: http://pim.kde.org/
   
-Package: kdepim-trinity-doc
+Package: tdepim-trinity-doc
 Section: doc
 Architecture: all
-Replaces: kdepim-kde3-doc (<< 4:3.5.13)
-Breaks: kdepim-kde3-doc (<< 4:3.5.13)
+Replaces: tdepim-kde3-doc (<< 4:3.5.13)
+Breaks: tdepim-kde3-doc (<< 4:3.5.13)
 Suggests: konqueror-trinity | www-browser, doc-base
 Description: KDE Personal Information Management library documentation
  KDE core library documentation. You need this documentation to develop KDE PIM
  applications.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
  . 
   Homepage: http://pim.kde.org/
   
-Package: kdepim-trinity-doc-html
+Package: tdepim-trinity-doc-html
 Section: doc
 Architecture: all
-Replaces: kdepim-kde3-doc-html (<< 4:3.5.13)
-Breaks: kdepim-kde3-doc-html (<< 4:3.5.13)
-Suggests: konqueror-trinity | www-browser, kdepim-trinity
+Replaces: tdepim-kde3-doc-html (<< 4:3.5.13)
+Breaks: tdepim-kde3-doc-html (<< 4:3.5.13)
+Suggests: konqueror-trinity | www-browser, tdepim-trinity
 Description: KDE PIM documentation in HTML format
  By default the Personal Information Management applications provided with
  KDE only provide their documentation in KDE docbook format, which can only
@@ -90,7 +90,7 @@ Description: KDE PIM documentation in HTML format
  web browser.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
  . 
   Homepage: http://pim.kde.org/
 
@@ -106,7 +106,7 @@ Description: RSS feed aggregator for KDE
  thousands of internet feeds in a quick, efficient, and familiar way.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
  .
   Homepage: http://akregator.kde.org/
 
@@ -117,7 +117,7 @@ Replaces: kaddressbook-kde3 (<< 4:3.5.13)
 Breaks: kaddressbook-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
-Suggests: kdepim-kresources-trinity, kdebase-kio-plugins-trinity
+Suggests: tdepim-kresources-trinity, tdebase-kio-plugins-trinity
 Description: KDE NG addressbook application
  KAddressBook is the main address book application for KDE; it enables you
  to manage your contacts efficiently and comfortably. It can load and save
@@ -125,7 +125,7 @@ Description: KDE NG addressbook application
  LDAP servers, and SQL databases.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: kalarm-trinity
 Section: kde
@@ -150,7 +150,7 @@ Description: Trinity alarm message, command and email scheduler
  KDE-based, but will also run on other desktops.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: kandy-trinity
 Section: utils
@@ -167,7 +167,7 @@ Description: Trinity mobile phone utility
  Kandy is aimed at mobile phones with integrated (GSM) modems.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: karm-trinity
 Section: utils
@@ -181,38 +181,38 @@ Description: Trinity time tracker tool
  time they spend on various tasks.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
-Package: kdepim-kfile-plugins-trinity
+Package: tdepim-kfile-plugins-trinity
 Section: kde
 Architecture: any
-Replaces: kdepim-kfile-plugins-kde3 (<< 4:3.5.13)
-Breaks: kdepim-kfile-plugins-kde3 (<< 4:3.5.13)
+Replaces: tdepim-kfile-plugins-kde3 (<< 4:3.5.13)
+Breaks: tdepim-kfile-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Description: KDE File dialog plugins for palm and vcf files
  File dialog plugins for palm and vcf files.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
-Package: kdepim-kio-plugins-trinity
+Package: tdepim-kio-plugins-trinity
 Section: kde
 Architecture: any
-Replaces: kdepim-kio-plugins-kde3 (<< 4:3.5.13)
-Breaks: kdepim-kio-plugins-kde3 (<< 4:3.5.13)
+Replaces: tdepim-kio-plugins-kde3 (<< 4:3.5.13)
+Breaks: tdepim-kio-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Description: Trinity pim I/O Slaves
  This package includes the pim kioslaves. This includes imap4, sieve,
  and mbox.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
-Package: kdepim-kresources-trinity
+Package: tdepim-kresources-trinity
 Section: kde
 Architecture: any
-Replaces: kdepim-kresources-kde3 (<< 4:3.5.13)
-Breaks: kdepim-kresources-kde3 (<< 4:3.5.13)
+Replaces: tdepim-kresources-kde3 (<< 4:3.5.13)
+Breaks: tdepim-kresources-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}, korganizer-trinity
 Suggests: knotes-trinity
@@ -222,13 +222,13 @@ Description: Trinity pim resource plugins
  tracking feature plans.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
-Package: kdepim-wizards-trinity
+Package: tdepim-wizards-trinity
 Section: kde
 Architecture: any
-Replaces: kdepim-wizards-kde3 (<< 4:3.5.13)
-Breaks: kdepim-wizards-kde3 (<< 4:3.5.13)
+Replaces: tdepim-wizards-kde3 (<< 4:3.5.13)
+Breaks: tdepim-wizards-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Suggests: egroupware
 Description: Trinity server configuration wizards
@@ -236,7 +236,7 @@ Description: Trinity server configuration wizards
  Kolab, and SUSE Linux Openexchange servers.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: kitchensync-trinity
 Section: kde
@@ -251,7 +251,7 @@ Description: Synchronization framework
  development (?).  Kitchensync uses opensync.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: kleopatra-trinity
 Section: net
@@ -264,14 +264,14 @@ Description: Trinity Certificate Manager
  keybox and for retrieving certificates from LDAP servers.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: kmail-trinity
 Section: mail
 Architecture: any
 Replaces: kmail-kde3 (<< 4:3.5.13)
 Breaks: kmail-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, ${perl:Depends}, kdepim-kio-plugins-trinity, kdebase-kio-plugins-trinity, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11
+Depends: ${shlibs:Depends}, ${perl:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11
 Recommends: procmail
 Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook-trinity, kleopatra-trinity, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer
 Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
@@ -281,11 +281,11 @@ Description: Trinity Email client
  desktop. It has features such as support for IMAP, POP3, multiple accounts,
  mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
  .
- You need to install kdepim-kio-plugins if you want to use IMAP or
- mbox files, and/or kdebase-kio-plugins if you want to use POP3.
+ You need to install tdepim-kio-plugins if you want to use IMAP or
+ mbox files, and/or tdebase-kio-plugins if you want to use POP3.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
  .
   Homepage: http://kmail.kde.org/
  
@@ -300,7 +300,7 @@ Description: Trinity KMail mail folder converter
  include Outlook Express, Evolution, and plain mbox.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: knode-trinity
 Section: news
@@ -316,7 +316,7 @@ Description: Trinity news reader
  signatures.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: knotes-trinity
 Section: kde
@@ -324,7 +324,7 @@ Architecture: any
 Replaces: knotes-kde3 (<< 4:3.5.13)
 Breaks: knotes-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
-Suggests: kdepim-kresources-trinity
+Suggests: tdepim-kresources-trinity
 Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Description: Trinity sticky notes
  KNotes is a program that lets you write sticky notes. The notes are saved
@@ -332,7 +332,7 @@ Description: Trinity sticky notes
  program.  The program supports printing and mailing your notes.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: kode-trinity
 Section: devel
@@ -346,7 +346,7 @@ Description: Helper library for programmatic generation of C++ code
  described by RelaxNG schemes.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: konsolekalendar-trinity
 Section: kde
@@ -360,7 +360,7 @@ Description: Trinity konsole personal organizer
  frontend to manage your calendars.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: kontact-trinity
 Section: kde
@@ -378,7 +378,7 @@ Description: Trinity pim application
  scheduling, address book and other PIM functionality.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
  .
   Homepage: http://kontact.kde.org/
 
@@ -403,14 +403,14 @@ Description: Trinity personal organizer
  installed.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: korn-trinity
 Section: kde
 Architecture: any
 Replaces: korn-kde3 (<< 4:3.5.13)
 Breaks: korn-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdepim-kio-plugins-trinity, kdebase-kio-plugins-trinity
+Depends: ${shlibs:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity
 Description: Trinity mail checker
  Korn is a KDE mail checker that can display a small summary in the Kicker
  tray.  It supports checking mbox, pop3, imap4, and nntp sources.
@@ -420,7 +420,7 @@ Description: Trinity mail checker
  Korn run a program once you click on the docked icon in Kicker.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: ktnef-trinity
 Section: kde
@@ -434,7 +434,7 @@ Description: Trinity TNEF viewer
  mail servers and embed the mail properties as well as the actual attachments.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libindex0-trinity
 Section: libs
@@ -449,7 +449,7 @@ Description: Trinity indexing library
  This is the runtime package for programs that use the libindex-trinity library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libindex0-trinity-dev
 Section: libdevel
@@ -465,7 +465,7 @@ Description: Trinity indexing library [development]
  library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkcal2b-trinity
 Section: libs
@@ -475,7 +475,7 @@ Breaks: libkcal2b-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}
 Conflicts: libkcal2-trinity, libkcal2a-trinity
-Suggests: kdepim-kresources-trinity
+Suggests: tdepim-kresources-trinity
 Description: Trinity calendaring library
  This library provides a C++ API for handling the vCalendar and iCalendar
  formats.
@@ -483,14 +483,14 @@ Description: Trinity calendaring library
  This is the runtime package for programs that use the libkcal-trinity library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkcal2-trinity-dev
 Section: libdevel
 Architecture: any
 Replaces: libkcal2-kde3-dev (<< 4:3.5.13)
 Breaks: libkcal2-kde3-dev (<< 4:3.5.13)
-Depends: libkcal2b-trinity (= ${Source-Version}), libkdepim1-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version})
+Depends: libkcal2b-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version})
 Description: Trinity calendaring library [development]
  This library provides a C++ API for handling the vCalendar and iCalendar
  formats.
@@ -499,32 +499,32 @@ Description: Trinity calendaring library [development]
  library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
-Package: libkdepim1a-trinity
+Package: libtdepim1a-trinity
 Section: libs
 Architecture: any
-Replaces: libkdepim1a-kde3 (<< 4:3.5.13)
-Breaks: libkdepim1a-kde3 (<< 4:3.5.13)
+Replaces: libtdepim1a-kde3 (<< 4:3.5.13)
+Breaks: libtdepim1a-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Description: Trinity PIM library
- This is the runtime package for programs that use the libkdepim-trinity library.
+ This is the runtime package for programs that use the libtdepim-trinity library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
-Package: libkdepim1-trinity-dev
+Package: libtdepim1-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: libkdepim1-kde3-dev (<< 4:3.5.13)
-Breaks: libkdepim1-kde3-dev (<< 4:3.5.13)
-Depends: libkdepim1a-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.7)
+Replaces: libtdepim1-kde3-dev (<< 4:3.5.13)
+Breaks: libtdepim1-kde3-dev (<< 4:3.5.13)
+Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.7)
 Description: Trinity PIM library [development]
- This is the development package which contains the headers for the libkdepim-trinity
+ This is the development package which contains the headers for the libtdepim-trinity
  library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkgantt0-trinity
 Section: libs
@@ -536,20 +536,20 @@ Description: Trinity gantt charting library
  This is the runtime package for programs that use the libkgantt-trinity library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkgantt0-trinity-dev
 Section: libdevel
 Architecture: any
 Replaces: libkgantt0-kde3-dev (<< 4:3.5.13)
 Breaks: libkgantt0-kde3-dev (<< 4:3.5.13)
-Depends: libkgantt0-trinity (= ${Source-Version}), libkdepim1-trinity-dev (= ${Source-Version})
+Depends: libkgantt0-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
 Description: Trinity gantt charting library [development]
  This is the development package which contains the headers for the libkgantt-trinity
  library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkleopatra1-trinity
 Section: libs
@@ -565,14 +565,14 @@ Description: KDE GnuPG interface libraries
  This is the runtime package for programs that use the libkleopatra-trinity library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkleopatra1-trinity-dev
 Section: libdevel
 Architecture: any
 Replaces: libkleopatra1-kde3-dev (<< 4:3.5.13)
 Breaks: libkleopatra1-kde3-dev (<< 4:3.5.13)
-Depends: libkleopatra1-trinity (= ${Source-Version}), libkdepim1-trinity-dev (= ${Source-Version})
+Depends: libkleopatra1-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
 Conflicts: libkleopatra0-trinity-dev
 Description: Trinity GnuPG interface libraries [development]
  This library is used by several KDE applications to interface to the
@@ -582,7 +582,7 @@ Description: Trinity GnuPG interface libraries [development]
  libkleopatra-trinity library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkmime2-trinity
 Section: libs
@@ -596,7 +596,7 @@ Description: Trinity MIME interface library
  an object tree.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkpimexchange1-trinity
 Section: libs
@@ -609,20 +609,20 @@ Description: Trinity PIM Exchange library
  library. 
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkpimexchange1-trinity-dev
 Section: libdevel
 Architecture: any
 Replaces: libkpimexchange1-kde3-dev (<< 4:3.5.13)
 Breaks: libkpimexchange1-kde3-dev (<< 4:3.5.13)
-Depends: libkpimexchange1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libkdepim1-trinity-dev (= ${Source-Version})
+Depends: libkpimexchange1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
 Description: Trinity PIM Exchange library [development]
  This is the development package which contains the headers for the
  libkpimexchange-trinity library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libkpimidentities1-trinity
 Section: libs
@@ -638,7 +638,7 @@ Description: Trinity PIM user identity information library
  library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libksieve0-trinity
 Section: libs
@@ -650,20 +650,20 @@ Description: Trinity mail/news message filtering library
  This is the runtime package for programs that use the libksieve-trinity library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libksieve0-trinity-dev
 Section: libdevel
 Architecture: any
 Replaces: libksieve0-kde3-dev (<< 4:3.5.13)
 Breaks: libksieve0-kde3-dev (<< 4:3.5.13)
-Depends: libksieve0-trinity (= ${Source-Version}), libkdepim1-trinity-dev (= ${Source-Version})
+Depends: libksieve0-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
 Description: Trinity mail/news message filtering library [development]
  This is the development package which contains the headers for the libksieve-trinity
  library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libktnef1-trinity
 Section: libs
@@ -680,14 +680,14 @@ Description: Library for handling KTNEF email attachments
  This is the runtime library for packages using the ktnef-trinity library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libktnef1-trinity-dev
 Section: libdevel
 Architecture: any
 Replaces: libktnef1-kde3-dev (<< 4:3.5.13)
 Breaks: libktnef1-kde3-dev (<< 4:3.5.13)
-Depends: libktnef1-trinity (= ${Source-Version}), libkdepim1-trinity-dev (= ${Source-Version})
+Depends: libktnef1-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
 Description: KTNEF handler library [development]
  This library handles mail attachments using the TNEF format. These
  attachments are usually found in mails coming from Microsoft mail
@@ -698,7 +698,7 @@ Description: KTNEF handler library [development]
  ktnef-trinity library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libmimelib1c2a-trinity
 Section: libs
@@ -713,7 +713,7 @@ Description: Trinity mime library
  This is the runtime package for programs that use the libmimelib-trinity library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: libmimelib1-trinity-dev
 Section: libdevel
@@ -728,4 +728,4 @@ Description: Trinity mime library [development]
  libmimelib library.
  .
  This package is part of Trinity, and a component of the KDE PIM module.
- See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
diff --git a/ubuntu/maverick/tdepim/debian/control.in b/ubuntu/maverick/tdepim/debian/control.in
index 11c39f8b1..a5bb4892a 100644
--- a/ubuntu/maverick/tdepim/debian/control.in
+++ b/ubuntu/maverick/tdepim/debian/control.in
@@ -1,26 +1,26 @@
-Source: kdepim
+Source: tdepim
 Section: kde
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), automake1.9,
- cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), bison, byacc, bzip2,
+ cdparanoia, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev,
  libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  libboost-dev (>= 1.33.1), libgnokii3-dev, libgpgme11-dev, liblockdev1-dev,
  libpisock-dev, libreadline5-dev, libsasl2-dev, libssl-dev,
  libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4),
  libgpg-error-dev (>= 1.4-2ubuntu7), gpgsm
-Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, kdelibs4-doc
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, tdelibs4-doc
 Build-Conflicts: libkleopatra0-dev, autoconf2.13
 Standards-Version: 3.7.2
 
-Package: kdepim
+Package: tdepim
 Section: kde
 Architecture: all
-Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), kdepim-kfile-plugins (>= ${Source-Version}), kdepim-kio-plugins (>= ${Source-Version}), kdepim-kresources (>= ${Source-Version}), kdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libkdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version})
-Suggests: kdepim-doc-html
+Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), tdepim-kfile-plugins (>= ${Source-Version}), tdepim-kio-plugins (>= ${Source-Version}), tdepim-kresources (>= ${Source-Version}), tdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libtdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version})
+Suggests: tdepim-doc-html
 Description: Personal Information Management apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -32,30 +32,30 @@ Description: Personal Information Management apps from the official KDE release
  .
   Homepage: http://pim.kde.org/
 
-Package: kdepim-dbg
+Package: tdepim-dbg
 Priority: extra
 Section: libdevel
-Depends: kdelibs-dbg
+Depends: tdelibs-dbg
 Architecture: any
-Description: debugging symbols for kdepim
- This package contains the debugging symbols associated with kdepim.
- They will automatically be used by gdb for debugging kdepim-related
+Description: debugging symbols for tdepim
+ This package contains the debugging symbols associated with tdepim.
+ They will automatically be used by gdb for debugging tdepim-related
  issues.
 
-Package: kdepim-dev
+Package: tdepim-dev
 Section: devel
 Architecture: any
-Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-kresources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version})
+Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), tdepim-kresources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libtdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version})
 Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2)
 Description: KDE Personal Information Management [development]
- This package contains development files needed to compile kdepim applications.
+ This package contains development files needed to compile tdepim applications.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
  . 
   Homepage: http://pim.kde.org/
   
-Package: kdepim-doc
+Package: tdepim-doc
 Section: doc
 Architecture: all
 Suggests: konqueror | www-browser, doc-base
@@ -64,14 +64,14 @@ Description: KDE Personal Information Management library documentation
  applications.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
  . 
   Homepage: http://pim.kde.org/
   
-Package: kdepim-doc-html
+Package: tdepim-doc-html
 Section: doc
 Architecture: all
-Suggests: konqueror | www-browser, kdepim
+Suggests: konqueror | www-browser, tdepim
 Description: KDE PIM documentation in HTML format
  By default the Personal Information Management applications provided with
  KDE only provide their documentation in KDE docbook format, which can only
@@ -80,7 +80,7 @@ Description: KDE PIM documentation in HTML format
  web browser.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
  . 
   Homepage: http://pim.kde.org/
 
@@ -94,7 +94,7 @@ Description: RSS feed aggregator for KDE
  thousands of internet feeds in a quick, efficient, and familiar way.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
  .
   Homepage: http://akregator.kde.org/
 
@@ -102,7 +102,7 @@ Package: kaddressbook
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: kdepim-kresources, kdebase-kio-plugins
+Suggests: tdepim-kresources, tdebase-kio-plugins
 Description: KDE NG addressbook application
  KAddressBook is the main address book application for KDE; it enables you
  to manage your contacts efficiently and comfortably. It can load and save
@@ -110,7 +110,7 @@ Description: KDE NG addressbook application
  LDAP servers, and SQL databases.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: kalarm
 Section: kde
@@ -133,7 +133,7 @@ Description: KDE alarm message, command and email scheduler
  KDE-based, but will also run on other desktops.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: kandy
 Section: utils
@@ -148,7 +148,7 @@ Description: KDE mobile phone utility
  Kandy is aimed at mobile phones with integrated (GSM) modems.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: karm
 Section: utils
@@ -159,9 +159,9 @@ Description: KDE time tracker tool
  time they spend on various tasks.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
-Package: kdepim-kfile-plugins
+Package: tdepim-kfile-plugins
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -169,21 +169,21 @@ Description: KDE File dialog plugins for palm and vcf files
  File dialog plugins for palm and vcf files.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
-Package: kdepim-kio-plugins
+Package: tdepim-kio-plugins
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kdebase-kio-plugins (<< 4:3.4.0)
+Replaces: tdebase-kio-plugins (<< 4:3.4.0)
 Description: KDE pim I/O Slaves
  This package includes the pim kioslaves. This includes imap4, sieve,
  and mbox.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
-Package: kdepim-kresources
+Package: tdepim-kresources
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -196,20 +196,20 @@ Description: KDE pim resource plugins
  tracking feature plans.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
-Package: kdepim-wizards
+Package: tdepim-wizards
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kdepim-dev (<< 4:3.4.1-2)
+Replaces: tdepim-dev (<< 4:3.4.1-2)
 Suggests: egroupware
 Description: KDE server configuration wizards
  This package contains KDE-based wizards for configuring eGroupware,
  Kolab, and SUSE Linux Openexchange servers.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: kitchensync
 Section: kde
@@ -222,7 +222,7 @@ Description: Synchronization framework
  development.  Kitchensync uses opensync.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: kleopatra
 Section: net
@@ -233,26 +233,26 @@ Description: KDE Certificate Manager
  keybox and for retrieving certificates from LDAP servers.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: kmail
 Section: mail
 Architecture: any
-Depends: ${shlibs:Depends}, ${perl:Depends}, kdepim-kio-plugins, kdebase-kio-plugins, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11
+Depends: ${shlibs:Depends}, ${perl:Depends}, tdepim-kio-plugins, tdebase-kio-plugins, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11
 Recommends: procmail
 Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook, kleopatra, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer
-Replaces: kdepim-dev (<< 4:3.4.0), kdebase-data (<< 4:3.4.0)
+Replaces: tdepim-dev (<< 4:3.4.0), tdebase-data (<< 4:3.4.0)
 Provides: imap-client, mail-reader
 Description: KDE Email client
  KMail is a fully-featured email client that fits nicely into the KDE
  desktop. It has features such as support for IMAP, POP3, multiple accounts,
  mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
  .
- You need to install kdepim-kio-plugins if you want to use IMAP or
- mbox files, and/or kdebase-kio-plugins if you want to use POP3.
+ You need to install tdepim-kio-plugins if you want to use IMAP or
+ mbox files, and/or tdebase-kio-plugins if you want to use POP3.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
  .
   Homepage: http://kmail.kde.org/
  
@@ -265,13 +265,13 @@ Description: KDE KMail mail folder converter
  include Outlook Express, Evolution, and plain mbox.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: knode
 Section: news
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kdepim-dev (<< 4:3.4.0)
+Replaces: tdepim-dev (<< 4:3.4.0)
 Provides: news-reader
 Description: KDE news reader
  KNode is an easy-to-use, convenient newsreader. It is intended to be usable
@@ -280,20 +280,20 @@ Description: KDE news reader
  signatures.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: knotes
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: kdepim-kresources
+Suggests: tdepim-kresources
 Description: KDE sticky notes
  KNotes is a program that lets you write sticky notes. The notes are saved
  automatically when you exit the program, and they display when you open the
  program.  The program supports printing and mailing your notes.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: kode
 Section: devel
@@ -305,7 +305,7 @@ Description: Helper library for programmatic generation of C++ code
  described by RelaxNG schemes.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: konsolekalendar
 Section: kde
@@ -317,7 +317,7 @@ Description: KDE konsole personal organizer
  frontend to manage your calendars.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: kontact
 Section: kde
@@ -334,7 +334,7 @@ Description: KDE pim application
  scheduling, address book and other PIM functionality.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
  .
   Homepage: http://kontact.kde.org/
 
@@ -356,12 +356,12 @@ Description: KDE personal organizer
  installed.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: korn
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}, kdepim-kio-plugins, kdebase-kio-plugins
+Depends: ${shlibs:Depends}, tdepim-kio-plugins, tdebase-kio-plugins
 Description: KDE mail checker
  Korn is a KDE mail checker that can display a small summary in the Kicker
  tray.  It supports checking mbox, pop3, imap4, and nntp sources.
@@ -371,7 +371,7 @@ Description: KDE mail checker
  Korn run a program once you click on the docked icon in Kicker.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: ktnef
 Section: kde
@@ -383,7 +383,7 @@ Description: KDE TNEF viewer
  mail servers and embed the mail properties as well as the actual attachments.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: networkstatus
 Section: kde
@@ -394,18 +394,18 @@ Description: KDE network status monitor
  notification to applications when this status changes.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: networkstatus-dev
 Section: kde
 Architecture: any
-Depends: networkstatus (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
+Depends: networkstatus (= ${Source-Version}), libtdepim1-dev (= ${Source-Version})
 Description: KDE network status monitor [development]
  This is the development package which contains the headers for the
  networkstatus library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libindex0
 Section: libs
@@ -418,7 +418,7 @@ Description: KDE indexing library
  This is the runtime package for programs that use the libindex library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libindex0-dev
 Section: libdevel
@@ -432,7 +432,7 @@ Description: KDE indexing library [development]
  library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libkcal2b
 Section: libs
@@ -441,7 +441,7 @@ Depends: ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}
 Conflicts: libkcal2, libkcal2a
 Replaces: libkcal2a
-Suggests: kdepim-kresources
+Suggests: tdepim-kresources
 Description: KDE calendaring library
  This library provides a C++ API for handling the vCalendar and iCalendar
  formats.
@@ -449,13 +449,13 @@ Description: KDE calendaring library
  This is the runtime package for programs that use the libkcal library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libkcal2-dev
 Section: libdevel
 Architecture: any
-Depends: libkcal2b (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version})
-Replaces: kdepim-dev (<= 4:3.5.4-1)
+Depends: libkcal2b (= ${Source-Version}), libtdepim1-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version})
+Replaces: tdepim-dev (<= 4:3.5.4-1)
 Description: KDE calendaring library [development]
  This library provides a C++ API for handling the vCalendar and iCalendar
  formats.
@@ -464,31 +464,31 @@ Description: KDE calendaring library [development]
  library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
-Package: libkdepim1a
+Package: libtdepim1a
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libkdepim1
-Replaces: akregator (<< 4:3.4.0), libkdepim1
+Conflicts: libtdepim1
+Replaces: akregator (<< 4:3.4.0), libtdepim1
 Description: KDE PIM library
- This is the runtime package for programs that use the libkdepim library.
+ This is the runtime package for programs that use the libtdepim library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
-Package: libkdepim1-dev
+Package: libtdepim1-dev
 Section: libdevel
 Architecture: any
-Depends: libkdepim1a (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8)
-Replaces: kdepim-dev (<< 4:3.4.1)
+Depends: libtdepim1a (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Replaces: tdepim-dev (<< 4:3.4.1)
 Description: KDE PIM library [development]
- This is the development package which contains the headers for the libkdepim
+ This is the development package which contains the headers for the libtdepim
  library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libkgantt0
 Section: libs
@@ -498,25 +498,25 @@ Description: KDE gantt charting library
  This is the runtime package for programs that use the libkgantt library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libkgantt0-dev
 Section: libdevel
 Architecture: any
-Depends: libkgantt0 (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
+Depends: libkgantt0 (= ${Source-Version}), libtdepim1-dev (= ${Source-Version})
 Description: KDE gantt charting library [development]
  This is the development package which contains the headers for the libkgantt
  library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libkleopatra1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}, gnupg
 Conflicts: libkleopatra0, libkleopatra0a
-Replaces: libkdenetwork2, libkleopatra0a
+Replaces: libtdenetwork2, libkleopatra0a
 Description: KDE GnuPG interface libraries
  This library is used by several KDE applications to interface to the
  GnuPG program.
@@ -524,12 +524,12 @@ Description: KDE GnuPG interface libraries
  This is the runtime package for programs that use the libkleopatra library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libkleopatra1-dev
 Section: libdevel
 Architecture: any
-Depends: libkleopatra1 (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
+Depends: libkleopatra1 (= ${Source-Version}), libtdepim1-dev (= ${Source-Version})
 Conflicts: libkleopatra0-dev
 Replaces: libkleopatra0-dev
 Description: KDE GnuPG interface libraries [development]
@@ -540,7 +540,7 @@ Description: KDE GnuPG interface libraries [development]
  libkleopatra library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libkmime2
 Section: libs
@@ -553,7 +553,7 @@ Description: KDE MIME interface library
  an object tree.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libkpimexchange1
 Section: libs
@@ -564,18 +564,18 @@ Description: KDE PIM Exchange library
  library. 
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libkpimexchange1-dev
 Section: libdevel
 Architecture: any
-Depends: libkpimexchange1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
+Depends: libkpimexchange1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libtdepim1-dev (= ${Source-Version})
 Description: KDE PIM Exchange library [development]
  This is the development package which contains the headers for the
  libkpimexchange library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libkpimidentities1
 Section: libs
@@ -589,7 +589,7 @@ Description: KDE PIM user identity information library
  library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libksieve0
 Section: libs
@@ -599,18 +599,18 @@ Description: KDE mail/news message filtering library
  This is the runtime package for programs that use the libksieve library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libksieve0-dev
 Section: libdevel
 Architecture: any
-Depends: libksieve0 (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
+Depends: libksieve0 (= ${Source-Version}), libtdepim1-dev (= ${Source-Version})
 Description: KDE mail/news message filtering library [development]
  This is the development package which contains the headers for the libksieve
  library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libktnef1
 Section: libs
@@ -626,13 +626,13 @@ Description: Library for handling KTNEF email attachments
  This is the runtime library for packages using the ktnef library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libktnef1-dev
 Section: libdevel
 Architecture: any
-Depends: libktnef1 (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
-Replaces: kdepim-dev (<< 4:3.4.0)
+Depends: libktnef1 (= ${Source-Version}), libtdepim1-dev (= ${Source-Version})
+Replaces: tdepim-dev (<< 4:3.4.0)
 Description: KTNEF handler library [development]
  This library handles mail attachments using the TNEF format. These
  attachments are usually found in mails coming from Microsoft mail
@@ -643,7 +643,7 @@ Description: KTNEF handler library [development]
  ktnef library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libmimelib1c2a
 Section: libs
@@ -657,7 +657,7 @@ Description: KDE mime library
  This is the runtime package for programs that use the libmimelib library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
 
 Package: libmimelib1-dev
 Section: libdevel
@@ -670,4 +670,4 @@ Description: KDE mime library [development]
  libmimelib library.
  .
  This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+ See the 'kde' and 'tdepim' packages for more information.
diff --git a/ubuntu/maverick/tdepim/debian/copyright b/ubuntu/maverick/tdepim/debian/copyright
index 708f6aa75..29a13fa2b 100644
--- a/ubuntu/maverick/tdepim/debian/copyright
+++ b/ubuntu/maverick/tdepim/debian/copyright
@@ -27,7 +27,7 @@ headings and other identifying marks.
 akregator, kaddressbook, kalarm, kalarmd, kandy, karm, kdgantt,
 kfile-plugins, kgantt, kioslaves, kitchensync, kleopatra, kmail,
 kmailcvt, knode, knotes, konsolekalendar, kontact, korganizer, kpilot,
-ksync, ktnef, libindex, libkdenetwork, libkdepim, libkleopatra,
+ksync, ktnef, libindex, libtdenetwork, libtdepim, libkleopatra,
 libkpimidentities, libksieve, mimelib, wizards
 ----------------------------------------------------------------------------
 GPL
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-trinity-doc.doc-base b/ubuntu/maverick/tdepim/debian/kdepim-trinity-doc.doc-base
deleted file mode 100644
index 347239f46..000000000
--- a/ubuntu/maverick/tdepim/debian/kdepim-trinity-doc.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: kdepim-trinity-doc
-Title: KDE PIM Library API Documentation
-Author: The KDE Developers
-Abstract: This is the developers' API documentation for kdepim.
-Section: Apps/Programming
-
-Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kdepim-apidocs/index.html
-Files: /usr/share/doc/kde/HTML/en/kdepim-apidocs/*.html
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-trinity-doc.install b/ubuntu/maverick/tdepim/debian/kdepim-trinity-doc.install
deleted file mode 100644
index c0d624018..000000000
--- a/ubuntu/maverick/tdepim/debian/kdepim-trinity-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/kde/HTML/en/kdepim-apidocs/*
diff --git a/ubuntu/maverick/tdepim/debian/kmail.NEWS b/ubuntu/maverick/tdepim/debian/kmail.NEWS
index af3b48cf6..ad08f446a 100644
--- a/ubuntu/maverick/tdepim/debian/kmail.NEWS
+++ b/ubuntu/maverick/tdepim/debian/kmail.NEWS
@@ -1,4 +1,4 @@
-kdepim (4:3.5.5.dfsg.1-4) unstable; urgency=high
+tdepim (4:3.5.5.dfsg.1-4) unstable; urgency=high
 
   * KMail's handling of IMAP namespaces changed in KDE 3.5.  You used to be
     able to set a prefix for your mailboxes (most commonly INBOX. for
diff --git a/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.docs b/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.docs
index aa30f8b2c..8db46472b 100644
--- a/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.docs
+++ b/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.docs
@@ -1,2 +1,2 @@
-build-tree/kdepim-*/indexlib/README
-build-tree/kdepim-*/indexlib/docs/report.pdf
+build-tree/tdepim-*/indexlib/README
+build-tree/tdepim-*/indexlib/docs/report.pdf
diff --git a/ubuntu/maverick/tdepim/debian/libkdepim1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libkdepim1-trinity-dev.install
deleted file mode 100644
index 7d4795918..000000000
--- a/ubuntu/maverick/tdepim/debian/libkdepim1-trinity-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-/opt/trinity/include/kde/kdepimmacros.h
-/opt/trinity/lib/libkdepim.la
-/opt/trinity/lib/libkdepim.so
diff --git a/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install
index 61d765134..8bf3b312e 100644
--- a/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install
+++ b/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install
@@ -1,4 +1,4 @@
-/opt/trinity/include/kde/kdepim/exchangeaccount.h
-/opt/trinity/include/kde/kdepim/exchangeclient.h
+/opt/trinity/include/kde/tdepim/exchangeaccount.h
+/opt/trinity/include/kde/tdepim/exchangeclient.h
 /opt/trinity/lib/libkpimexchange.la
 /opt/trinity/lib/libkpimexchange.so
diff --git a/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install
new file mode 100644
index 000000000..4f6d52f46
--- /dev/null
+++ b/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install
@@ -0,0 +1,3 @@
+/opt/trinity/include/kde/tdepimmacros.h
+/opt/trinity/lib/libtdepim.la
+/opt/trinity/lib/libtdepim.so
diff --git a/ubuntu/maverick/tdepim/debian/libkdepim1a-trinity.install b/ubuntu/maverick/tdepim/debian/libtdepim1a-trinity.install
index b7799470a..6a17101ae 100644
--- a/ubuntu/maverick/tdepim/debian/libkdepim1a-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/libtdepim1a-trinity.install
@@ -1,12 +1,12 @@
-/opt/trinity/lib/trinity/plugins/designer/kdepimwidgets.la
-/opt/trinity/lib/trinity/plugins/designer/kdepimwidgets.so
+/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.la
+/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.so
 /opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.la
 /opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.so
-/opt/trinity/lib/libkdepim.so.1
-/opt/trinity/lib/libkdepim.so.1.0.0
-/opt/trinity/share/apps/kdepimwidgets
-/opt/trinity/share/apps/libkdepim
-/opt/trinity/share/apps/kdepim
+/opt/trinity/lib/libtdepim.so.1
+/opt/trinity/lib/libtdepim.so.1.0.0
+/opt/trinity/share/apps/tdepimwidgets
+/opt/trinity/share/apps/libtdepim
+/opt/trinity/share/apps/tdepim
 /opt/trinity/share/config.kcfg/pimemoticons.kcfg
 /opt/trinity/share/icons/crystalsvg/22x22/actions/button_fewer.png
 /opt/trinity/share/icons/crystalsvg/22x22/actions/button_more.png
diff --git a/ubuntu/maverick/tdepim/debian/man/kdeopt.part b/ubuntu/maverick/tdepim/debian/man/kdeopt.part
index d258f0ad1..e8fd346a6 100644
--- a/ubuntu/maverick/tdepim/debian/man/kdeopt.part
+++ b/ubuntu/maverick/tdepim/debian/man/kdeopt.part
@@ -1,5 +1,5 @@
 .\" This portion of the manual page is from kdeopt.man, from the
-.\" kdepim Debian package.
+.\" tdepim Debian package.
 .SH GENERIC OPTIONS
 .TP
 .B \-\-help
diff --git a/ubuntu/maverick/tdepim/debian/rules b/ubuntu/maverick/tdepim/debian/rules
index 07237352d..a8848e345 100755
--- a/ubuntu/maverick/tdepim/debian/rules
+++ b/ubuntu/maverick/tdepim/debian/rules
@@ -34,8 +34,8 @@ DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if
 shlibs_ver=4:3.5.7
 DEB_DH_MAKESHLIBS_ARGS_libindex0-trinity := -V'libindex0-trinity (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkcal2b-trinity := -V'libkcal2b-trinity (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_libkdenetwork2-trinity := -V'libkdenetwork2-trinity (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_libkdepim1a-trinity := -V'libkdepim1a-trinity (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libtdenetwork2-trinity := -V'libtdenetwork2-trinity (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libtdepim1a-trinity := -V'libtdepim1a-trinity (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkgantt0-trinity := -V'libkgantt0-trinity (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkleopatra1-trinity := -V'libkleopatra1-trinity (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkmime2-trinity := -V'libkmime2-trinity (>= $(shlibs_ver))'
@@ -59,10 +59,10 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
 	-dDepends	# Since -u args go first in dpkg-shlibdeps call
 
 ## Move kaddressbook-trinity dependency (from libkabc_xmlrpc.so) to Recommends
-#DEB_DH_SHLIBDEPS_ARGS_kdepim-kresources-trinity := \
+#DEB_DH_SHLIBDEPS_ARGS_tdepim-kresources-trinity := \
 #	-Xopt/lib/trinity/libkabc_xmlrpc.so.1 \
 #	-- -dRecommends \
-#	debian/kdepim-kresources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \
+#	debian/tdepim-kresources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \
 #	-dDepends
 #
 ## Move kaddressbook dependency of libkcal2b-trinity to Recommends
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.kaddressbook b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
index 5c438e067..25ac7ac38 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.kaddressbook
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
@@ -1,4 +1,4 @@
-Document: kdepim-doc-html-kaddressbook
+Document: tdepim-doc-html-kaddressbook
 Title: The KAddressBook Handbook
 Author: Tobias Koenig, Steffen Hansen, Don Sanders
 Abstract: KAddressBook is the KDE address book.
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.kalarm b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kalarm
index ab396ce78..2fb0a45e1 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.kalarm
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kalarm
@@ -1,4 +1,4 @@
-Document: kdepim-doc-html-kalarm
+Document: tdepim-doc-html-kalarm
 Title: The KAlarm Handbook
 Author: David Jarvie
 Abstract: KAlarm is a personal alarm message, command and email
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.kandy b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kandy
index c761ae786..ec6ed3f59 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.kandy
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kandy
@@ -1,4 +1,4 @@
-Document: kdepim-doc-html-kandy
+Document: tdepim-doc-html-kandy
 Title: The Kandy Handbook
 Author: Cornelius Schumacher
 Abstract: Kandy is an application for synchronizing the data on a mobile
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.karm b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.karm
index ca3097bcf..33b26cac8 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.karm
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.karm
@@ -1,4 +1,4 @@
-Document: kdepim-doc-html-karm
+Document: tdepim-doc-html-karm
 Title: The KArm Handbook
 Author: Jonathan Singer, Mark Bucciarelli, Sirtaj Singh Kang
 Abstract: KArm tracks time spent on various tasks.
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.kleopatra b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
index bfd04fb2e..d4c59f7a5 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.kleopatra
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
@@ -1,4 +1,4 @@
-Document: kdepim-doc-html-kleopatra
+Document: tdepim-doc-html-kleopatra
 Title: The Kleopatra Handbook
 Author: Marc Mutz
 Abstract: Kleopatra is a tool for managing X.509 certificates.
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.kmail b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kmail
index 6e8aeb87f..b76d30f6b 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.kmail
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kmail
@@ -1,4 +1,4 @@
-Document: kdepim-doc-html-kmail
+Document: tdepim-doc-html-kmail
 Title: The KMail Handbook
 Author: Daniel Naber, David Rugge
 Abstract: KMail is KDE's powerful and user friendly email client.
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.knode b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knode
index 9d4eec285..74ddd8031 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.knode
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knode
@@ -1,4 +1,4 @@
-Document: kdepim-doc-html-knode
+Document: tdepim-doc-html-knode
 Title: The KNode manual
 Author: Stephan Johach, Thomas Schûtz
 Abstract: KNode is an easy-to-use newsreader.
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.knotes b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knotes
index 0d885bda6..88cd4e75f 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.knotes
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knotes
@@ -1,4 +1,4 @@
-Document: kdepim-doc-html-knotes
+Document: tdepim-doc-html-knotes
 Title: The KNotes Handbook
 Author: Fabian Dal Santo, Grep M. Holmes
 Abstract: KNotes is a sticky notes application for the desktop.
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.konsolekalendar b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
index c28491e23..52fdd1a6b 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.konsolekalendar
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
@@ -1,4 +1,4 @@
-Document: kdepim-doc-html-konsolekalendar
+Document: tdepim-doc-html-konsolekalendar
 Title: The KonsoleKalendar Handbook
 Author: Tuukka Pasanen, Allen Winter
 Abstract: KonsoleKalendar is a command line interface to KDE calendars.
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.kontact b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kontact
index 8b228670b..cfc6d4e0f 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.kontact
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kontact
@@ -1,4 +1,4 @@
-Document: kdepim-doc-html-kontact
+Document: tdepim-doc-html-kontact
 Title: The Kontact Handbook
 Author: Cornelius Schumacher
 Abstract: Kontact is a command line interface to KDE calendars.
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.korganizer b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korganizer
index 62b7019cb..ac05fc107 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.korganizer
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korganizer
@@ -1,4 +1,4 @@
-Document: kdepim-doc-html-korganizer
+Document: tdepim-doc-html-korganizer
 Title: The KOrganizer Handbook
 Author: Milos Prudek, Paul E. Ahlquist Jr., Jürgen Nagel
 Abstract: KOrganizer is an easy to use personal information manager.
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.korn b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korn
index 86feb366d..4d9e3ce8b 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.korn
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korn
@@ -1,4 +1,4 @@
-Document: kdepim-doc-html-korn
+Document: tdepim-doc-html-korn
 Title: The KOrn Handbook
 Author: Nick Betcher
 Abstract: KOrn is a mail monitor.
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.kpilot b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kpilot
index e453195db..d30a8cdf8 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.kpilot
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kpilot
@@ -1,4 +1,4 @@
-Document: kdepim-doc-html-kpilot
+Document: tdepim-doc-html-kpilot
 Title: The KPilot Handbook
 Author: Carlos Leonhard Woelz, Adriaan de Groot, Dan Pilone
 Abstract: KPilot is the KDE version of the Desktop HotSync software for
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.ktnef b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.ktnef
index 9b9a8ae6c..38a420e1f 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.ktnef
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.ktnef
@@ -1,4 +1,4 @@
-Document: kdepim-doc-html-ktnef
+Document: tdepim-doc-html-ktnef
 Title: The TNEF File Viewer Handbook
 Author: Michael Goffioul
 Abstract: The TNEF File Viewer is an application for TNEF mail attachments.
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.kwatchgnupg b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
index 7a72c93e0..8e268e8f0 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.kwatchgnupg
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
@@ -1,4 +1,4 @@
-Document: kdepim-doc-html-kwatchgnupg
+Document: tdepim-doc-html-kwatchgnupg
 Title: The KWatchGnuPG Handbook
 Author: Marc Mutz
 Abstract: KWatchGnuPG is a simple GnuPG log viewer.
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.multisynk b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.multisynk
index 1a1f995e4..255dcb112 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-doc-html.doc-base.multisynk
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.multisynk
@@ -1,4 +1,4 @@
-Document: kdepim-doc-html-multisynk
+Document: tdepim-doc-html-multisynk
 Title: The MultiSynk Handbook
 Author: Tobias Koenig
 Abstract: KDE synchronization application.
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-kfile-plugins-trinity.install b/ubuntu/maverick/tdepim/debian/tdepim-kfile-plugins-trinity.install
index 3f39aaf87..3f39aaf87 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-kfile-plugins-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/tdepim-kfile-plugins-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-kio-plugins-trinity.install b/ubuntu/maverick/tdepim/debian/tdepim-kio-plugins-trinity.install
index f9cc8ca27..f9cc8ca27 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-kio-plugins-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/tdepim-kio-plugins-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-kresources-trinity.install b/ubuntu/maverick/tdepim/debian/tdepim-kresources-trinity.install
index 588b690b1..588b690b1 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-kresources-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/tdepim-kresources-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-trinity-dev.install b/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install
index 848758727..848758727 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-trinity-dev.install
+++ b/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.doc-base b/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.doc-base
new file mode 100644
index 000000000..b57d47ef7
--- /dev/null
+++ b/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.doc-base
@@ -0,0 +1,9 @@
+Document: tdepim-trinity-doc
+Title: KDE PIM Library API Documentation
+Author: The KDE Developers
+Abstract: This is the developers' API documentation for tdepim.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/tdepim-apidocs/index.html
+Files: /usr/share/doc/kde/HTML/en/tdepim-apidocs/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.install b/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.install
new file mode 100644
index 000000000..a747d872b
--- /dev/null
+++ b/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.install
@@ -0,0 +1 @@
+/opt/trinity/share/doc/kde/HTML/en/tdepim-apidocs/*
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-wizards-trinity.install b/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.install
index 465782c25..465782c25 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-wizards-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-wizards-trinity.manpages b/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.manpages
index 04a5781f5..04a5781f5 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-wizards-trinity.manpages
+++ b/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/kdepim-wizards-trinity.menu b/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.menu
index c622368a5..b86640432 100644
--- a/ubuntu/maverick/tdepim/debian/kdepim-wizards-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.menu
@@ -1,39 +1,39 @@
-?package(kdepim-wizards):\
+?package(tdepim-wizards):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="KDE"\
 	title="EGroupware Setup Wizard"\
 	command="/opt/trinity/bin/egroupwarewizard"
 
-?package(kdepim-wizards):\
+?package(tdepim-wizards):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="KDE"\
 	title="MS Exchange Setup Wizard"\
 	command="/opt/trinity/bin/exchangewizard"
 
-?package(kdepim-wizards):\
+?package(tdepim-wizards):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="KDE"\
 	title="KDE Groupware Wizard"\
 	command="/opt/trinity/bin/groupwarewizard"
 
-?package(kdepim-wizards):\
+?package(tdepim-wizards):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="KDE"\
 	title="Novell GroupWise Setup Wizard"\
 	command="/opt/trinity/bin/groupwisewizard"
 
-?package(kdepim-wizards):\
+?package(tdepim-wizards):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="KDE"\
 	title="KOLab Setup Wizard"\
 	command="/opt/trinity/bin/kolabwizard"
 
-?package(kdepim-wizards):\
+?package(tdepim-wizards):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="KDE"\