Rename a bunch of kde names to tde

735 files changed, 7630 insertions, 7630 deletions

diff --git a/ubuntu/maverick/applications/abakus/debian/control b/ubuntu/maverick/applications/abakus/debian/control
index 52eaeeb6c..4f6f51257 100644
--- a/ubuntu/maverick/applications/abakus/debian/control
+++ b/ubuntu/maverick/applications/abakus/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Steffen Joeris <steffen.joeris@skolelinux.de>
-Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), scons (>= 0.96), imagemagick, kdelibs4-trinity-dev, chrpath, bison, flex
+Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), scons (>= 0.96), imagemagick, tdelibs4-trinity-dev, chrpath, bison, flex
 Standards-Version: 3.8.4
 
 Package: abakus-trinity
diff --git a/ubuntu/maverick/applications/adept/debian/changelog b/ubuntu/maverick/applications/adept/debian/changelog
index 58496db32..ec12c0119 100644
--- a/ubuntu/maverick/applications/adept/debian/changelog
+++ b/ubuntu/maverick/applications/adept/debian/changelog
@@ -613,7 +613,7 @@ ept (1.88.2) unstable; urgency=low
 
   * Remove kde_terminal_interface.h and update debian/copyright accordingly,
   * add icons licenses to debian/copyright,
-  * build-depend on kdelibs4-dev >= 3.5.0.
+  * build-depend on tdelibs4-dev >= 3.5.0.
 
  -- Peter Rockai <me@mornfall.net>  Tue, 24 Jan 2006 18:10:36 +0100
 
diff --git a/ubuntu/maverick/applications/adept/debian/control b/ubuntu/maverick/applications/adept/debian/control
index db582c421..f14bf6ffd 100644
--- a/ubuntu/maverick/applications/adept/debian/control
+++ b/ubuntu/maverick/applications/adept/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Peter Rockai <me@mornfall.net>
 Uploaders: Isaac Clerencia <isaac@debian.org>, Enrico Zini <enrico@debian.org>
-Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), kdelibs4-trinity-dev (>= 3.5.0), sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs4-trinity-dev (>= 3.5.0), sharutils, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: adept-trinity
diff --git a/ubuntu/maverick/applications/adept/debian/control.in b/ubuntu/maverick/applications/adept/debian/control.in
index 2c9a1ea70..a313fdbae 100644
--- a/ubuntu/maverick/applications/adept/debian/control.in
+++ b/ubuntu/maverick/applications/adept/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libept-dev (>= 0.5.7), libept-dev (<< 0.6), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), kdelibs4-trinity-dev (>= 3.5.0), sharutils, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libept-dev (>= 0.5.7), libept-dev (<< 0.6), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs4-trinity-dev (>= 3.5.0), sharutils, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: adept-trinity
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
index ca324be99..db5399106 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -9,6 +9,6 @@ remove amarok-common.lintian, amarok.lintian
 make watch file actually work
 
 #### due to removal of KDE 3 packages ####
-remove kdemultimedia-dev, kdebase-dev from Build-Depends
-remove amarok-konqsidebar, kdemultimedia-kio-plugins from Recommends
+remove tdemultimedia-dev, tdebase-dev from Build-Depends
+remove amarok-konqsidebar, tdemultimedia-kio-plugins from Recommends
 remove complete amarok-konqsidebar package
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/README.Debian b/ubuntu/maverick/applications/amarok.cmake/debian/README.Debian
index 7dc17fb17..d696b9696 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/README.Debian
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/README.Debian
@@ -10,7 +10,7 @@ Amarok packages for Debian
       script.
 
     - if you want amarok to be able to play CDs, you need to install the
-      kdemultimedia-kio-plugins package.
+      tdemultimedia-kio-plugins package.
 
     - the scripts available in the 'Scripts' menu need that you install
       some other packages for them to work. Those packages are listed in
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/changelog b/ubuntu/maverick/applications/amarok.cmake/debian/changelog
index 43671ac52..e72612a70 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/changelog
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/changelog
@@ -225,7 +225,7 @@ amarok (1.4.8-1) unstable; urgency=low
   * Resync patches:
     - proxy_lyrics.diff - removed, merged upstream.
     - fix_gcc4.3_ftbfs.diff - removed, resolved upstream.
-  * Drop kdemultimedia-dev from Build-Depends. It's no longer needed.
+  * Drop tdemultimedia-dev from Build-Depends. It's no longer needed.
   * debian/rules: use /usr/share/automake-1.10 instead of *-1.9
     because 'automake' package provides version 1.10.
 
@@ -233,7 +233,7 @@ amarok (1.4.8-1) unstable; urgency=low
 
 amarok (2:1.4.9.1-0ubuntu3) hardy; urgency=low
 
-  * Added kdebase-kio-plugins as a recommened package 
+  * Added tdebase-kio-plugins as a recommened package 
 
  -- Jonathan Aquilina <eagles051387@gmail.com>  Tue, 15 Apr 2008 14:24:23 +0200
 
@@ -266,7 +266,7 @@ amarok (2:1.4.9-0ubuntu1) hardy; urgency=low
 amarok (2:1.4.8-0ubuntu5) hardy; urgency=low
 
   * Added kubuntu_08_luks_device_detection.diff to ajust Amarok's
-    media device detection to properly work with kdebase's
+    media device detection to properly work with tdebase's
     LUKS patch kubuntu_9913_kiomedialuks.diff) (LP: #186384)
 
  -- Harald Sitter <apachelogger@ubuntu.com>  Tue, 18 Mar 2008 01:10:01 +0100
@@ -563,7 +563,7 @@ amarok (2:1.4.5-0ubuntu1) feisty; urgency=low
     - sparc-asm.patch
 
   [ Sarah Hobbs ]
-  * Added dependancy kdebase-kio-plugins.  Closes malone #66764
+  * Added dependancy tdebase-kio-plugins.  Closes malone #66764
   * Compiling without stack smashing protection.  Closes malone #81768
 
  -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Sun,  4 Feb 2007 00:46:12 -0600
@@ -659,7 +659,7 @@ amarok (2:1.4.3-0ubuntu9) edgy; urgency=low
 amarok (2:1.4.3-0ubuntu8) edgy; urgency=low
 
   * The DAAP client would crash Amarok under certain conditions when
-    kdelibs was compiled with asserts on. Thanks to  Ian Monroe 
+    tdelibs was compiled with asserts on. Thanks to  Ian Monroe 
   * Closes KDE: #132851
 
  -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Wed, 20 Sep 2006 21:10:11 -0500
@@ -920,7 +920,7 @@ amarok (1.3.8-1) unstable; urgency=low
   * Switch patch management to quilt, and make use of patchsys-quilt.mk.
 
   * Drop build-depends version constraints that are satisfied with stable.
-    Drop the ones for kdebase-dev and kdemultimedia-dev as well, which were
+    Drop the ones for tdebase-dev and tdemultimedia-dev as well, which were
     transient and all arches have the minimum required versions in sid now.
 
  -- Adeodato Simó <dato@net.com.org.es>  Wed, 18 Jan 2006 01:43:40 +0100
@@ -929,8 +929,8 @@ amarok (1.3.7-1) unstable; urgency=low
 
   * New upstream bugfix release.
 
-  * Built against kdelibs4c2a, so installable in sid again. (Closes: #341959)
-    Temporarily bump build-deps on kdebase-dev and kdemultimedia-dev.
+  * Built against tdelibs4c2a, so installable in sid again. (Closes: #341959)
+    Temporarily bump build-deps on tdebase-dev and tdemultimedia-dev.
 
   * Remove debian/patches/taglib-1.3.1-suffices.diff, since taglib 1.4 is in
     testing and unstable, and I'll be using a backport for sarge packages.
@@ -1191,7 +1191,7 @@ amarok (1.3.0-1) unstable; urgency=low
 
     + automake1.6 to automake1.9.
     + libmysqlclient12-dev to libmysqlclient14-dev.
-    + temporarily bump version constraint in kdemultimedia-dev and kdebase-dev
+    + temporarily bump version constraint in tdemultimedia-dev and tdebase-dev
       in order to allow an early upload in the middle of the KDE transition.
 
   * Adjustments to the build-system:
@@ -1337,7 +1337,7 @@ amarok (1.2.0-1) unstable; urgency=low
       - add files for the konqueror sidebar.
 
     + debian/control:
-      - added kdebase-dev as Build-Dependency.
+      - added tdebase-dev as Build-Dependency.
 
     + debian/rules:
       - exclude konqsidebar_universalamarok.so from dh_shlibdeps, so that
@@ -1397,7 +1397,7 @@ amarok (1.1.1-2) unstable; urgency=high
   
   * New package relationships:
 
-    + amarok now recommends kdemultimedia-kio-plugins, which is needed to play
+    + amarok now recommends tdemultimedia-kio-plugins, which is needed to play
       audio CDs.
 
     + amarok now suggests konqueror, since it's called in the MusicBrainz
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/control b/ubuntu/maverick/applications/amarok.cmake/debian/control
index 24c254a21..def456393 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/control
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/control
@@ -5,13 +5,13 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
 Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2,
- kdelibs4-trinity-dev,
+ tdelibs4-trinity-dev,
  libxine-dev, libdbus-tqt-1-dev,
  libtag1-dev, libsqlite3-dev, libtunepimp-dev,
  libmysqlclient15-dev | libmysqlclient16-dev, libpq-dev,
  libvisual-0.4-dev, libsdl1.2-dev,
  libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev,
- ruby, ruby1.8-dev, kdebase-trinity-dev,
+ ruby, ruby1.8-dev, tdebase-trinity-dev,
  libtool, libltdl-dev, cmake
 Standards-Version: 3.8.4
 Homepage: http://amarok.kde.org
@@ -102,7 +102,7 @@ Architecture: any
 Replaces: amarok-kde3-dbg (<< 4:3.5.13)
 Breaks: amarok-kde3-dbg (<< 4:3.5.13)
 Depends: amarok-trinity (= ${binary:Version})
-Recommends: kdelibs-trinity-dbg
+Recommends: tdelibs-trinity-dbg
 Description: debugging symbols for Amarok [Trinity]
  This package provides debugging symbols for all binary packages built from
  amarok source package. It's highly recommended to have this package installed
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/control.in b/ubuntu/maverick/applications/amarok.cmake/debian/control.in
index d57046d4c..52ef14266 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/control.in
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, automake, autoconf, libtool,
- kdelibs4-trinity-dev,
+ tdelibs4-trinity-dev,
  libxine-dev, libdbus-qt-1-dev,
  libtag1-dev, libsqlite3-dev, libtunepimp-dev,
  libmysqlclient15-dev, libpq-dev,
@@ -89,7 +89,7 @@ Package: amarok-trinity-dbg
 Priority: extra
 Architecture: any
 Depends: amarok-trinity (= ${binary:Version})
-Recommends: kdelibs-trinity-dbg
+Recommends: tdelibs-trinity-dbg
 Description: debugging symbols for Amarok [Trinity]
  This package provides debugging symbols for all binary packages built from
  amarok source package. It's highly recommended to have this package installed
diff --git a/ubuntu/maverick/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
index ca324be99..db5399106 100644
--- a/ubuntu/maverick/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/maverick/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -9,6 +9,6 @@ remove amarok-common.lintian, amarok.lintian
 make watch file actually work
 
 #### due to removal of KDE 3 packages ####
-remove kdemultimedia-dev, kdebase-dev from Build-Depends
-remove amarok-konqsidebar, kdemultimedia-kio-plugins from Recommends
+remove tdemultimedia-dev, tdebase-dev from Build-Depends
+remove amarok-konqsidebar, tdemultimedia-kio-plugins from Recommends
 remove complete amarok-konqsidebar package
diff --git a/ubuntu/maverick/applications/amarok/debian/README.Debian b/ubuntu/maverick/applications/amarok/debian/README.Debian
index 7dc17fb17..d696b9696 100644
--- a/ubuntu/maverick/applications/amarok/debian/README.Debian
+++ b/ubuntu/maverick/applications/amarok/debian/README.Debian
@@ -10,7 +10,7 @@ Amarok packages for Debian
       script.
 
     - if you want amarok to be able to play CDs, you need to install the
-      kdemultimedia-kio-plugins package.
+      tdemultimedia-kio-plugins package.
 
     - the scripts available in the 'Scripts' menu need that you install
       some other packages for them to work. Those packages are listed in
diff --git a/ubuntu/maverick/applications/amarok/debian/changelog b/ubuntu/maverick/applications/amarok/debian/changelog
index 43671ac52..e72612a70 100644
--- a/ubuntu/maverick/applications/amarok/debian/changelog
+++ b/ubuntu/maverick/applications/amarok/debian/changelog
@@ -225,7 +225,7 @@ amarok (1.4.8-1) unstable; urgency=low
   * Resync patches:
     - proxy_lyrics.diff - removed, merged upstream.
     - fix_gcc4.3_ftbfs.diff - removed, resolved upstream.
-  * Drop kdemultimedia-dev from Build-Depends. It's no longer needed.
+  * Drop tdemultimedia-dev from Build-Depends. It's no longer needed.
   * debian/rules: use /usr/share/automake-1.10 instead of *-1.9
     because 'automake' package provides version 1.10.
 
@@ -233,7 +233,7 @@ amarok (1.4.8-1) unstable; urgency=low
 
 amarok (2:1.4.9.1-0ubuntu3) hardy; urgency=low
 
-  * Added kdebase-kio-plugins as a recommened package 
+  * Added tdebase-kio-plugins as a recommened package 
 
  -- Jonathan Aquilina <eagles051387@gmail.com>  Tue, 15 Apr 2008 14:24:23 +0200
 
@@ -266,7 +266,7 @@ amarok (2:1.4.9-0ubuntu1) hardy; urgency=low
 amarok (2:1.4.8-0ubuntu5) hardy; urgency=low
 
   * Added kubuntu_08_luks_device_detection.diff to ajust Amarok's
-    media device detection to properly work with kdebase's
+    media device detection to properly work with tdebase's
     LUKS patch kubuntu_9913_kiomedialuks.diff) (LP: #186384)
 
  -- Harald Sitter <apachelogger@ubuntu.com>  Tue, 18 Mar 2008 01:10:01 +0100
@@ -563,7 +563,7 @@ amarok (2:1.4.5-0ubuntu1) feisty; urgency=low
     - sparc-asm.patch
 
   [ Sarah Hobbs ]
-  * Added dependancy kdebase-kio-plugins.  Closes malone #66764
+  * Added dependancy tdebase-kio-plugins.  Closes malone #66764
   * Compiling without stack smashing protection.  Closes malone #81768
 
  -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Sun,  4 Feb 2007 00:46:12 -0600
@@ -659,7 +659,7 @@ amarok (2:1.4.3-0ubuntu9) edgy; urgency=low
 amarok (2:1.4.3-0ubuntu8) edgy; urgency=low
 
   * The DAAP client would crash Amarok under certain conditions when
-    kdelibs was compiled with asserts on. Thanks to  Ian Monroe 
+    tdelibs was compiled with asserts on. Thanks to  Ian Monroe 
   * Closes KDE: #132851
 
  -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Wed, 20 Sep 2006 21:10:11 -0500
@@ -920,7 +920,7 @@ amarok (1.3.8-1) unstable; urgency=low
   * Switch patch management to quilt, and make use of patchsys-quilt.mk.
 
   * Drop build-depends version constraints that are satisfied with stable.
-    Drop the ones for kdebase-dev and kdemultimedia-dev as well, which were
+    Drop the ones for tdebase-dev and tdemultimedia-dev as well, which were
     transient and all arches have the minimum required versions in sid now.
 
  -- Adeodato Simó <dato@net.com.org.es>  Wed, 18 Jan 2006 01:43:40 +0100
@@ -929,8 +929,8 @@ amarok (1.3.7-1) unstable; urgency=low
 
   * New upstream bugfix release.
 
-  * Built against kdelibs4c2a, so installable in sid again. (Closes: #341959)
-    Temporarily bump build-deps on kdebase-dev and kdemultimedia-dev.
+  * Built against tdelibs4c2a, so installable in sid again. (Closes: #341959)
+    Temporarily bump build-deps on tdebase-dev and tdemultimedia-dev.
 
   * Remove debian/patches/taglib-1.3.1-suffices.diff, since taglib 1.4 is in
     testing and unstable, and I'll be using a backport for sarge packages.
@@ -1191,7 +1191,7 @@ amarok (1.3.0-1) unstable; urgency=low
 
     + automake1.6 to automake1.9.
     + libmysqlclient12-dev to libmysqlclient14-dev.
-    + temporarily bump version constraint in kdemultimedia-dev and kdebase-dev
+    + temporarily bump version constraint in tdemultimedia-dev and tdebase-dev
       in order to allow an early upload in the middle of the KDE transition.
 
   * Adjustments to the build-system:
@@ -1337,7 +1337,7 @@ amarok (1.2.0-1) unstable; urgency=low
       - add files for the konqueror sidebar.
 
     + debian/control:
-      - added kdebase-dev as Build-Dependency.
+      - added tdebase-dev as Build-Dependency.
 
     + debian/rules:
       - exclude konqsidebar_universalamarok.so from dh_shlibdeps, so that
@@ -1397,7 +1397,7 @@ amarok (1.1.1-2) unstable; urgency=high
   
   * New package relationships:
 
-    + amarok now recommends kdemultimedia-kio-plugins, which is needed to play
+    + amarok now recommends tdemultimedia-kio-plugins, which is needed to play
       audio CDs.
 
     + amarok now suggests konqueror, since it's called in the MusicBrainz
diff --git a/ubuntu/maverick/applications/amarok/debian/control b/ubuntu/maverick/applications/amarok/debian/control
index 073eae0ce..0b36962a8 100644
--- a/ubuntu/maverick/applications/amarok/debian/control
+++ b/ubuntu/maverick/applications/amarok/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
 Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2,
- kdelibs4-trinity-dev,
+ tdelibs4-trinity-dev,
  libxine-dev, libdbus-tqt-1-dev,
  libtag1-dev, libsqlite3-dev, libtunepimp-dev,
  libmysqlclient15-dev | libmysqlclient16-dev, libpq-dev,
@@ -102,7 +102,7 @@ Architecture: any
 Replaces: amarok-kde3-dbg (<< 4:3.5.13)
 Breaks: amarok-kde3-dbg (<< 4:3.5.13)
 Depends: amarok-trinity (= ${binary:Version})
-Recommends: kdelibs-trinity-dbg
+Recommends: tdelibs-trinity-dbg
 Description: debugging symbols for Amarok [Trinity]
  This package provides debugging symbols for all binary packages built from
  amarok source package. It's highly recommended to have this package installed
diff --git a/ubuntu/maverick/applications/amarok/debian/control.in b/ubuntu/maverick/applications/amarok/debian/control.in
index d57046d4c..52ef14266 100644
--- a/ubuntu/maverick/applications/amarok/debian/control.in
+++ b/ubuntu/maverick/applications/amarok/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, automake, autoconf, libtool,
- kdelibs4-trinity-dev,
+ tdelibs4-trinity-dev,
  libxine-dev, libdbus-qt-1-dev,
  libtag1-dev, libsqlite3-dev, libtunepimp-dev,
  libmysqlclient15-dev, libpq-dev,
@@ -89,7 +89,7 @@ Package: amarok-trinity-dbg
 Priority: extra
 Architecture: any
 Depends: amarok-trinity (= ${binary:Version})
-Recommends: kdelibs-trinity-dbg
+Recommends: tdelibs-trinity-dbg
 Description: debugging symbols for Amarok [Trinity]
  This package provides debugging symbols for all binary packages built from
  amarok source package. It's highly recommended to have this package installed
diff --git a/ubuntu/maverick/applications/basket/debian/changelog b/ubuntu/maverick/applications/basket/debian/changelog
index e50268cd0..03f2c0199 100644
--- a/ubuntu/maverick/applications/basket/debian/changelog
+++ b/ubuntu/maverick/applications/basket/debian/changelog
@@ -28,13 +28,13 @@ basket (1.0.2-2ubuntu1) hardy; urgency=low
 
 basket (1.0.2-2build2) gutsy; urgency=low
 
-  * Rebuilt with no source changes, for kdepim-enterprise again
+  * Rebuilt with no source changes, for tdepim-enterprise again
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 06 Oct 2007 22:23:24 +1000
 
 basket (1.0.2-2build1) gutsy; urgency=low
 
-  * Rebuilt with no source changes, for kdepim-enterprise, which has
+  * Rebuilt with no source changes, for tdepim-enterprise, which has
     temporarily broken Kontact ABI
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 28 Aug 2007 21:56:28 +0100
@@ -91,8 +91,8 @@ basket (1.0~beta3-1) experimental; urgency=low
   * Remove unnecessary file debian/Makefile.
   * Update compat to 5.
   * Bumped Standards-Version to 3.7.2, no changes required.
-  * Update dep on kdebase-dev to kdelibs4-dev.
-  * Add build-dep on kdepim-dev to get kontact integration.
+  * Update dep on tdebase-dev to tdelibs4-dev.
+  * Add build-dep on tdepim-dev to get kontact integration.
   * Add build-dep on libgpgme11-dev to support encryption.
   * Package description:
     - Change short description.
@@ -100,7 +100,7 @@ basket (1.0~beta3-1) experimental; urgency=low
   * Not install empty file NEWS.
   * Rewrite debian/rules file.
   * Improve debian/copyright file.
-  * Versioned build-deps in kdelibs4-dev and kdepim-dev to build against 3.5.6
+  * Versioned build-deps in tdelibs4-dev and tdepim-dev to build against 3.5.6
     (so Sune's changes will work).
   * Patched desktop file to include Categories and moved to right place.
 
@@ -110,7 +110,7 @@ basket (1.0~beta3-1) experimental; urgency=low
   * Add a 10_dont_spam_stderr patch to not be that verbose on stderr. It uses
     kdDebug() now to report those.
   * Add a 11_match_trinity.5.6_kontact patch to make the kontact plugin work with 
-    kontact 3.5.6 - kdepim people have bumped their internal versionings.
+    kontact 3.5.6 - tdepim people have bumped their internal versionings.
   * Write new and improved manpage (Derived from help2man). (Closes: #405569)
   * Improve copyright file.
   * Minor changes to rules file.
@@ -132,7 +132,7 @@ basket (0.5.0-5.1) unstable; urgency=low
   * Non-maintainer upload.
   * Added -Wl,--as-needed as ldflags (Closes: #349480)
   * Trimmed build-depends to not include stuff from
-    kdebase dependency line
+    tdebase dependency line
 
  -- Sune Vuorela <debian@pusling.com>  Fri, 21 Apr 2006 21:25:43 +0000
 
diff --git a/ubuntu/maverick/applications/basket/debian/control b/ubuntu/maverick/applications/basket/debian/control
index 901f4c9e3..45319008f 100644
--- a/ubuntu/maverick/applications/basket/debian/control
+++ b/ubuntu/maverick/applications/basket/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, debhelper (>= 5), kdelibs4-trinity-dev (>= 4:3.5.6), kdepim-trinity-dev (>= 4:3.5.6), libgpgme11-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, debhelper (>= 5), tdelibs4-trinity-dev (>= 4:3.5.6), tdepim-trinity-dev (>= 4:3.5.6), libgpgme11-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: basket-trinity
diff --git a/ubuntu/maverick/applications/bibletime/debian/changelog b/ubuntu/maverick/applications/bibletime/debian/changelog
index 8ee32cf7c..e660fbb85 100644
--- a/ubuntu/maverick/applications/bibletime/debian/changelog
+++ b/ubuntu/maverick/applications/bibletime/debian/changelog
@@ -159,7 +159,7 @@ bibletime (1.0.2-2) unstable; urgency=low
 
   * Remove debian/controly which shouldn't be there 
   * stop configure from being run twice to fix alpha build, Closes: #121674
-  * build-depend on kdelibs-dev >= 2.2.2-8 to catch libfam-dev dependency, see bug 124264
+  * build-depend on tdelibs-dev >= 2.2.2-8 to catch libfam-dev dependency, see bug 124264
   * Update description for bibletime 1.0.2
   * Update to policy version 3.5.6.0, no necessary changes noticed yet
   * modify clean target in debian/rules to use clean instead of distclean
@@ -201,7 +201,7 @@ bibletime (0.31-3.1) unstable; urgency=low
 
   * Non-maintainer upload (Ben Burton <benb@acm.org>).
   * Rebuilt with new Qt libs (closes: #89789).
-  * Build-Depends: Replaced kdebase-dev with kdelibs-dev; removed
+  * Build-Depends: Replaced tdebase-dev with tdelibs-dev; removed
     autoconf (redundant); added libtool.
   * Replaced admin/debianrules with a newer version and modified
     debian/rules to use admin/debianrules; this way everything gets
diff --git a/ubuntu/maverick/applications/bibletime/debian/control b/ubuntu/maverick/applications/bibletime/debian/control
index fac05bba1..74815a5f1 100644
--- a/ubuntu/maverick/applications/bibletime/debian/control
+++ b/ubuntu/maverick/applications/bibletime/debian/control
@@ -1,6 +1,6 @@
 Source: bibletime-trinity
 Section: kde
-Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 4.1.0), kdelibs4-trinity-dev, libsword-dev, libclucene-dev, poxml, libboost-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 4.1.0), tdelibs4-trinity-dev, libsword-dev, libclucene-dev, poxml, libboost-dev, automake, autoconf, libtool, libltdl-dev
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Standards-Version: 3.8.4
diff --git a/ubuntu/maverick/applications/bibletime/debian/control.in b/ubuntu/maverick/applications/bibletime/debian/control.in
index d1bcaa676..6bcc44da7 100644
--- a/ubuntu/maverick/applications/bibletime/debian/control.in
+++ b/ubuntu/maverick/applications/bibletime/debian/control.in
@@ -1,6 +1,6 @@
 Source: bibletime-trinity
 Section: kde
-Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 4.1.0), kdelibs4-trinity-dev, libsword-dev, libclucene-dev, poxml, libboost-dev
+Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 4.1.0), tdelibs4-trinity-dev, libsword-dev, libclucene-dev, poxml, libboost-dev
 Priority: optional
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/control b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/control
index 699c6fbf9..b473b03c8 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/control
+++ b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/control
@@ -2,7 +2,7 @@ Source: compizconfig-backend-kconfig-trinity
 Section: libs
 Priority: extra
 Maintainer: Timothy Pearosn <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs, debhelper (>= 5), compiz-trinity-dev, pkg-config, intltool, kdelibs4-trinity-dev, libcompizconfig0-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), compiz-trinity-dev, pkg-config, intltool, tdelibs4-trinity-dev, libcompizconfig0-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: compizconfig-backend-kconfig-trinity
diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/changelog b/ubuntu/maverick/applications/desktop-effects-tde/debian/changelog
index 6ec99959d..0db149393 100644
--- a/ubuntu/maverick/applications/desktop-effects-tde/debian/changelog
+++ b/ubuntu/maverick/applications/desktop-effects-tde/debian/changelog
@@ -1,29 +1,29 @@
-desktop-effects-kde-trinity (0.4-7.4) karmic; urgency=low
+desktop-effects-tde-trinity (0.4-7.4) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-desktop-effects-kde-trinity (0.4-5) intrepid; urgency=low
+desktop-effects-tde-trinity (0.4-5) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
 
-desktop-effects-kde-trinity (0.4-3) intrepid; urgency=low
+desktop-effects-tde-trinity (0.4-3) intrepid; urgency=low
 
   * Added -trinity prefix
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 01 Dec 2008 09:29:00 -0600
 
-desktop-effects-kde (0.4) hardy; urgency=low
+desktop-effects-tde (0.4) hardy; urgency=low
 
   * added translation support
 
  -- Michael Anderson <nosrednaekim@gmail.com>  Sun, 20 Apr 2008 21:04:40 -0400
 
-desktop-effects-kde (0.3) hardy; urgency=low
+desktop-effects-tde (0.3) hardy; urgency=low
 
   * Remove bashism in 25enable-compiz
   * Fixed LP: #207609 which installed the packages even when the user
@@ -31,13 +31,13 @@ desktop-effects-kde (0.3) hardy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 31 Mar 2008 14:05:01 +0100
 
-desktop-effects-kde (0.2) hardy; urgency=low
+desktop-effects-tde (0.2) hardy; urgency=low
 
   * Fix compile, image install paths and add .desktop file
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 12 Mar 2008 21:47:16 +0000
 
-desktop-effects-kde (0.1) hardy; urgency=low
+desktop-effects-tde (0.1) hardy; urgency=low
 
   * Initial package
 
diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/control b/ubuntu/maverick/applications/desktop-effects-tde/debian/control
index f6b97b9b8..00ddd4bd1 100644
--- a/ubuntu/maverick/applications/desktop-effects-tde/debian/control
+++ b/ubuntu/maverick/applications/desktop-effects-tde/debian/control
@@ -1,4 +1,4 @@
-Source: desktop-effects-kde-trinity
+Source: desktop-effects-tde-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@@ -6,11 +6,11 @@ Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), python-central (>=
 Standards-Version: 3.8.4
 XS-Python-Version: all
 
-Package: desktop-effects-kde-trinity
+Package: desktop-effects-tde-trinity
 Architecture: all
 Depends: ${python:Depends}, python-qt4
-Replaces: desktop-effects-kde-kde3 (<< 4:3.5.13)
-Breaks: desktop-effects-kde-kde3 (<< 4:3.5.13)
+Replaces: desktop-effects-tde-kde3 (<< 4:3.5.13)
+Breaks: desktop-effects-tde-kde3 (<< 4:3.5.13)
 XB-Python-Version: ${python:Versions}
 Description: compiz setup tool for Trinity
  A simple Compiz configuration tool for Trinity.  Installs and sets Compiz
diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/copyright b/ubuntu/maverick/applications/desktop-effects-tde/debian/copyright
index b2569f52f..b037bf1ac 100644
--- a/ubuntu/maverick/applications/desktop-effects-tde/debian/copyright
+++ b/ubuntu/maverick/applications/desktop-effects-tde/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianised by Jonathan Riddell <jriddell@ubuntu.com> on
 Tue, 29 Jan 2008 22:28:46 +0000.
 
-It was downloaded from https://code.launchpad.net/~kubuntu-users/guidance/desktop-effects-kde
+It was downloaded from https://code.launchpad.net/~kubuntu-users/guidance/desktop-effects-tde
 
 Copyright: Copyright 2007-2008 Martin Böhm <martin.bohm@kubuntu.org>
            Copyright 2007-2008 Michael Anderson <nosrednaekim@gmail.com>
diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/desktop-effects-kde-trinity.install b/ubuntu/maverick/applications/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
index e6d16e467..d5af8f5d9 100644
--- a/ubuntu/maverick/applications/desktop-effects-tde/debian/desktop-effects-kde-trinity.install
+++ b/ubuntu/maverick/applications/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
@@ -1,8 +1,8 @@
-desktop-effects-kde4 /opt/trinity/bin/
+desktop-effects-tde4 /opt/trinity/bin/
 25enable-compiz /etc/X11/Xsession.d/
 DesktopEffects/DesktopEffectsCommon.py /opt/trinity/share/pyshared/DesktopEffects/
 DesktopEffects/DesktopEffectsKDE4.py /opt/trinity/share/pyshared/DesktopEffects/
 DesktopEffects/DesktopEffectsQt4Dialog.py /opt/trinity/share/pyshared/DesktopEffects/
 DesktopEffects/__init__.py /opt/trinity/share/pyshared/DesktopEffects/
-data/* /opt/trinity/share/apps/desktop-effects-kde/
-desktop-effects-kde.desktop /opt/trinity/share/applications/
+data/* /opt/trinity/share/apps/desktop-effects-tde/
+desktop-effects-tde.desktop /opt/trinity/share/applications/
diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/rules b/ubuntu/maverick/applications/desktop-effects-tde/debian/rules
index 89b037f13..7bdd258a5 100755
--- a/ubuntu/maverick/applications/desktop-effects-tde/debian/rules
+++ b/ubuntu/maverick/applications/desktop-effects-tde/debian/rules
@@ -9,5 +9,5 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
 
 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
-binary-install/desktop-effects-kde-trinity::
-	dh_pycentral -pdesktop-effects-kde-trinity
+binary-install/desktop-effects-tde-trinity::
+	dh_pycentral -pdesktop-effects-tde-trinity
diff --git a/ubuntu/maverick/applications/digikam/debian/changelog b/ubuntu/maverick/applications/digikam/debian/changelog
index 89c1b4e52..86611e634 100644
--- a/ubuntu/maverick/applications/digikam/debian/changelog
+++ b/ubuntu/maverick/applications/digikam/debian/changelog
@@ -88,8 +88,8 @@ digikam (2:0.9.3-2) unstable; urgency=low
   [ Achim Bohnet]
 
   * Cherry pick fixes from KDEs SVN:
-      40_kdesvn783161_fix_wrong_file-exits_check.diff
-      40_kdesvn786622_honour_scrollbar.diff
+      40_tdesvn783161_fix_wrong_file-exits_check.diff
+      40_tdesvn786622_honour_scrollbar.diff
 
   * Remove build-deps:
     + automake1.9: We take care that no rebuilding is necessary.
@@ -161,7 +161,7 @@ digikam (2:0.9.3~beta3-1) experimental; urgency=low
 
   * New upstream release
 
-  * Remove Depends: libgphoto2-2-dev thnks to kdelibs patch from pusling
+  * Remove Depends: libgphoto2-2-dev thnks to tdelibs patch from pusling
      - dependency on dev package (libgphoto2-2-dev) (Closes: #416123)
   * Working debian/watch from Raphael
     - debian/watch fails to report upstream&#39;s version (Closes:
@@ -293,7 +293,7 @@ digikam (2:0.9.2~beta1-1) experimental; urgency=low
   * Patches deleted as encorporated upstream:
     - debian/patches/10-gcc43-fix.diff
     - debian/patches/11-add-service-menu-translations.diff
-    - debian/patches/12-kdesvn-r649833-fix-tile-cache.diff
+    - debian/patches/12-tdesvn-r649833-fix-tile-cache.diff
   * Conflicts:/Replaces: digikamimageplugins - upstream has merged
   * Ensure kipi-plugins et al are correct versions/ correct libraries
     - Conflicts: libkexiv2-0 
@@ -322,7 +322,7 @@ digikam (2:0.9.1-3) unstable; urgency=low
     version of the file which contains turkish translation too fix french
     translation. Thanks to Anthony Mercatante <tonio@ubuntu.com> for the
     patch.
-  * add debian/patches/12-kdesvn-r649833-fix-tile-cache.diff: Editor tile
+  * add debian/patches/12-tdesvn-r649833-fix-tile-cache.diff: Editor tile
     cache mechanism does not work, making rendering slow. Thanks to
     Luka Renko <lure@ubuntu.com> for the patch.
 
@@ -338,7 +338,7 @@ digikam (2:0.9.1-3) unstable; urgency=low
 digikam (2:0.9.1-2) unstable; urgency=low
 
   [ Achim Bohnet ]
-  * Depend on kdebase-kio-plugins.  The pkg contains kio_trash and makes
+  * Depend on tdebase-kio-plugins.  The pkg contains kio_trash and makes
    'Move to Trash' working for e.g. Gnome sessions. Fixes report on
    digikam-user mailing list and closes malone #75435.
 
@@ -426,8 +426,8 @@ digikam (2:0.9.0-1) experimental; urgency=low
 
   [ Achim Bohnet ]
   * remove patches, now included in upstream tarball:
-    + 10_kdesvn_606804_dcraw-return-code.diff
-    + 11_kdesvn_606805_file-extention-parsing.diff
+    + 10_tdesvn_606804_dcraw-return-code.diff
+    + 11_tdesvn_606805_file-extention-parsing.diff
     + 12_kde_606923_fix_huge_memory_leak.diff
   * bump build-dep on exiv2 to >=0.12
   * debian/control: bump conflict with digikamimageplugins to << 0.9.0~rc2
@@ -453,9 +453,9 @@ digikam (1:0.9.0~rc1-1) unstable; urgency=low
   * removed patches/11_only_-lqt-mt.diff: autoconf 2.60 uses a totally
     different method to substitute vars.
   * Pick fixes from svn:
-    + 10_kdesvn_606804_dcraw-return-code.diff : fix file-extention parsing
+    + 10_tdesvn_606804_dcraw-return-code.diff : fix file-extention parsing
       when it's a null string KDEBUG: 137495
-    + 11_kdesvn_606805_file-extention-parsing.diff: dcraw fail to decode a
+    + 11_tdesvn_606805_file-extention-parsing.diff: dcraw fail to decode a
        RAW file. KDEBUG: 137495
     + patches/12_kde_606923_fix_huge_memory_leak.diff: fix huge memory
       corruption relevant of a wrong deletion of data shared between preview
@@ -563,7 +563,7 @@ digikam (0.8.2-1) unstable; urgency=low
     - remove applnk/ workaround: digikam.desktop is now properly
       installed in applications/kde/
     - remove x-raw.desktop removal. No longer delivered by upstream
-  * debian/control: x-raw.desktop is in kdelibs >= 4:3.5.1-3 so add
+  * debian/control: x-raw.desktop is in tdelibs >= 4:3.5.1-3 so add
     a versioned depend on it.
 
   [ Mark Purcell ]
@@ -600,9 +600,9 @@ digikam (0.8.1+0.8.2-rc1-1) unstable; urgency=low
     http://bugs.kde.org/show_bug.cgi?id=126326 and
     https://launchpad.net/distros/ubuntu/+source/digikam/+bug/34462
   * Removed patches now included upstream:
-     o 20_kdesvn_r531782_fix_16bit_tiff_thumbnails.diff
-     o 21_kdesvn_r532147_fix_16bit_tiff_umscamera.diff
-     o 22_kdesvn_r532959_fix_16bit_tiff_imageeditor.diff
+     o 20_tdesvn_r531782_fix_16bit_tiff_thumbnails.diff
+     o 21_tdesvn_r532147_fix_16bit_tiff_umscamera.diff
+     o 22_tdesvn_r532959_fix_16bit_tiff_imageeditor.diff
   * Add patch debian/patches/11_only_-lqt-mt.diff:
     By default configure sets LIB_QT to 
     LIB_QT = -lqt-mt  $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread
@@ -615,9 +615,9 @@ digikam (0.8.1+0.8.2-beta1-2) unstable; urgency=low
 
   [ Achim Bohnet ]
   * Pull some fixes from upstream svn:
-    + 20_kdesvn_r531782_fix_16bit_tiff_thumbnails.diff
-    + 21_kdesvn_r532147_fix_16bit_tiff_umscamera.diff
-    + 22_kdesvn_r532959_fix_16bit_tiff_imageeditor.diff
+    + 20_tdesvn_r531782_fix_16bit_tiff_thumbnails.diff
+    + 21_tdesvn_r532147_fix_16bit_tiff_umscamera.diff
+    + 22_tdesvn_r532959_fix_16bit_tiff_imageeditor.diff
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Mon, 24 Apr 2006 23:29:16 +0200
 
@@ -631,9 +631,9 @@ digikam (0.8.1+0.8.2-beta1-1) unstable; urgency=low
      o digikam now fail to display pictures, and needlessly invoke dcraw
         too (Closes: #364215)
   * Removed the patches that are in new upstream release:
-     o 10_kdesvn_r507591_fix_jpeg_on_ppc.diff
-     o 11_kdesvn_r508791_add_more_options_to_albumproperties.diff
-     o 12_kdesvn_r505430_fix_search.diff
+     o 10_tdesvn_r507591_fix_jpeg_on_ppc.diff
+     o 11_tdesvn_r508791_add_more_options_to_albumproperties.diff
+     o 12_tdesvn_r505430_fix_search.diff
   * debian rules: replace deletion of empty api-docs dir tree with one
     simple rm -rf
   * fix typo in long description. (Closes: #363256)
@@ -654,8 +654,8 @@ digikam (0.8.1-4) unstable; urgency=low
 
   [ Achim Bohnet ]
   * recommend dcraw
-  * patches/10_kdesvn_r507545_fix_jpeg_on_ppc.diff removed: breaks AMD64.
-  * patches/10_kdesvn_r507591_fix_jpeg_on_ppc.diff 2nd try.  Works on
+  * patches/10_tdesvn_r507545_fix_jpeg_on_ppc.diff removed: breaks AMD64.
+  * patches/10_tdesvn_r507591_fix_jpeg_on_ppc.diff 2nd try.  Works on
     PPC without breaking AMD64 (Closes: #354173).  Thanks to Rodney Gordon
     II and Fabrice Flore-Thebault for testing.
 
@@ -667,13 +667,13 @@ digikam (0.8.1-3) unstable; urgency=low
   * Remove version from build-dep on libkexif and libkipi.  Lastest
     libkexif and libkipi don't refer to libXft.la anymore.
   * remove image/x-raw.desktop. It is now in upstream's stable branch
-    of kdelibs (see http://bugs.kde.org/show_bug.cgi?id=121242).
-    Debian's kdelibs >= 4:3.5.1-3 contains this file already.
-  * patches/10_kdesvn_r507545_fix_jpeg_on_ppc.diff: fix endiness problem
+    of tdelibs (see http://bugs.kde.org/show_bug.cgi?id=121242).
+    Debian's tdelibs >= 4:3.5.1-3 contains this file already.
+  * patches/10_tdesvn_r507545_fix_jpeg_on_ppc.diff: fix endiness problem
     with jpeg. Fix:  (Closes: #351931)
 
   [ Tom Albers ]
-  * patches/11_kdesvn_r508791_add_more_options_to_albumproperties.diff
+  * patches/11_tdesvn_r508791_add_more_options_to_albumproperties.diff
     adds two buttons to album properties to set the date picker to oldest
     or newest image in the album.
 
@@ -757,7 +757,7 @@ digikam (0.7.4-5) unstable; urgency=low
 
   [ Achim Bohnet ]
   * Now that the pkgs are build on all archs, fix build dependencies
-     + kdelibs4-dev: remove version
+     + tdelibs4-dev: remove version
      + libkexif1-dev (>= 0.2-1), libkipi0-dev (>= 0.1-1): (re)set
        versions to last API change. (Helps backporting.)
   * remove debian/dirs, not needed because dh_install creates the
@@ -783,7 +783,7 @@ digikam (0.7.4-4) unstable; urgency=low
     - Libraries should be split in a lib and -dev package. (Closes:
     #324592)
   * fix lintian old-fsf-address-in-copyright-file
-  * Add Recommends: kdebase
+  * Add Recommends: tdebase
 
  -- Mark Purcell <msp@debian.org>  Thu,  1 Sep 2005 07:49:32 +0100
 
@@ -829,7 +829,7 @@ digikam (0.7.4-1) unstable; urgency=low
   * C++ transition package
   * Add debian/watch
   * Build-Depends: libkexif1-dev (>= 0.2.1-5)
-  *  libkipi0-dev (>= 0.1.1-3), kdelibs4-dev (>= 4:3.4.2-1)
+  *  libkipi0-dev (>= 0.1.1-3), tdelibs4-dev (>= 4:3.4.2-1)
   * Disable KDE_ENABLE_HIDDEN_VISIBILITY --
               debian/patches/visibility.diff
   * Build-Depends: automake1.9
@@ -1020,7 +1020,7 @@ digikam (0.6.2-4) unstable; urgency=low
 
 digikam (0.6.2-2sarge1) testing-proposed-updates; urgency=medium
 
-  * Rebuild to get back into Sarge due to kdelibs/libtiff dependencies (Closes: #268774)
+  * Rebuild to get back into Sarge due to tdelibs/libtiff dependencies (Closes: #268774)
 
  -- Paul Telford <pxt@debian.org>  Mon, 30 Aug 2004 15:35:52 +0000
 
diff --git a/ubuntu/maverick/applications/digikam/debian/control b/ubuntu/maverick/applications/digikam/debian/control
index 5422aa5f5..a6e1f9889 100644
--- a/ubuntu/maverick/applications/digikam/debian/control
+++ b/ubuntu/maverick/applications/digikam/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev,
  libtiff4-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
  libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev,
@@ -56,7 +56,7 @@ Architecture: any
 Section: devel
 Replaces: digikam-kde3-dbg (<< 4:3.5.13)
 Breaks: digikam-kde3-dbg (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, digikam-trinity (= ${binary:Version}), showfoto-trinity (= ${binary:Version}), kdelibs-trinity-dbg
+Depends: ${shlibs:Depends}, digikam-trinity (= ${binary:Version}), showfoto-trinity (= ${binary:Version}), tdelibs-trinity-dbg
 Priority: extra
 Description: debugging symbols for digikam [Trinity]
  The debugging symbols associated with digikam and showfoto. They will
diff --git a/ubuntu/maverick/applications/digikam/debian/control.in b/ubuntu/maverick/applications/digikam/debian/control.in
index dd5bda9e2..f0c7fd2cb 100644
--- a/ubuntu/maverick/applications/digikam/debian/control.in
+++ b/ubuntu/maverick/applications/digikam/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev,
  libtiff4-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
  libjasper-dev, libpng12-dev | libpng-dev, libexiv2-trinity-dev (>= 0.16),
@@ -50,7 +50,7 @@ Description: image viewer/editor for KDE [Trinity]
 Package: digikam-trinity-dbg
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, digikam-trinity (= ${binary:Version}), showfoto-trinity (= ${binary:Version}), kdelibs-trinity-dbg
+Depends: ${shlibs:Depends}, digikam-trinity (= ${binary:Version}), showfoto-trinity (= ${binary:Version}), tdelibs-trinity-dbg
 Priority: extra
 Description: debugging symbols for digikam [Trinity]
  The debugging symbols associated with digikam and showfoto. They will
diff --git a/ubuntu/maverick/applications/digikam/debian/copyright b/ubuntu/maverick/applications/digikam/debian/copyright
index c4c44e441..637b1fa8d 100644
--- a/ubuntu/maverick/applications/digikam/debian/copyright
+++ b/ubuntu/maverick/applications/digikam/debian/copyright
@@ -136,10 +136,10 @@ digikam/
 
 	o digikam/digikam_export.h
             © 2005 Laurent Montel <montel@kde.org>
-	o from kfiletip source copies (kdebase, konqueror)
+	o from kfiletip source copies (tdebase, konqueror)
 	    © 1998, 1999 Torben Weis <weis@kde.org>
 	    © 2000, 2001, 2002 David Faure <david@mandrakesoft.com>
-	o Concept copied from kdelibs/kio/kio/netaccess.h/cpp
+	o Concept copied from tdelibs/kio/kio/netaccess.h/cpp
 	    © 1997 Torben Weis (weis@kde.org)
 	    © 1998 Matthias Ettrich (ettrich@kde.org)
 	    © 1999 David Faure (faure@kde.org)
diff --git a/ubuntu/maverick/applications/dolphin/debian/changelog b/ubuntu/maverick/applications/dolphin/debian/changelog
index 0c80abc8d..409e81b52 100644
--- a/ubuntu/maverick/applications/dolphin/debian/changelog
+++ b/ubuntu/maverick/applications/dolphin/debian/changelog
@@ -40,7 +40,7 @@ dolphin (0.9.2-0ubuntu5) hardy; urgency=low
 
 dolphin (0.9.2-0ubuntu4) hardy; urgency=low
 
-  * Rebuild with kdesdk-script 4:3.5.8-1ubuntu6 to ensure .desktop
+  * Rebuild with tdesdk-script 4:3.5.8-1ubuntu6 to ensure .desktop
     file translations are used
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Dec 2007 16:58:36 +0000
diff --git a/ubuntu/maverick/applications/dolphin/debian/control b/ubuntu/maverick/applications/dolphin/debian/control
index cf4ee4824..70a5a26dc 100644
--- a/ubuntu/maverick/applications/dolphin/debian/control
+++ b/ubuntu/maverick/applications/dolphin/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, kdebase-trinity-dev, docbook2x, docbook-xml, libtool, libltdl-dev, cmake
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev, docbook2x, docbook-xml, libtool, libltdl-dev, cmake
 Standards-Version: 3.8.4
 
 Package: dolphin-trinity
diff --git a/ubuntu/maverick/applications/dolphin/debian/control.in b/ubuntu/maverick/applications/dolphin/debian/control.in
index e678c91e0..9926c47b0 100644
--- a/ubuntu/maverick/applications/dolphin/debian/control.in
+++ b/ubuntu/maverick/applications/dolphin/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, autotools-dev, docbook2x, docbook-xml, kdesdk-scripts-trinity, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libkonq4-trinity-dev, autotools-dev, docbook2x, docbook-xml, tdesdk-scripts-trinity, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: dolphin-trinity
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/control b/ubuntu/maverick/applications/filelight-l10n/debian/control
index 920f19f0c..091af9d3e 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/control
+++ b/ubuntu/maverick/applications/filelight-l10n/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Ral Snchez Siles <rasasi78@gmail.com>
-Build-Depends: kdelibs4-trinity-dev (>= 4:3.4.3), cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), automake, autoconf, libtool, libltdl-dev
+Build-Depends: tdelibs4-trinity-dev (>= 4:3.4.3), cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.methylblue.com/filelight/
 
diff --git a/ubuntu/maverick/applications/filelight/debian/control b/ubuntu/maverick/applications/filelight/debian/control
index 9d26d8bfc..47b3e6eaf 100644
--- a/ubuntu/maverick/applications/filelight/debian/control
+++ b/ubuntu/maverick/applications/filelight/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Ral Snchez Siles <rasasi78@gmail.com>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 5.0), cdbs, kdelibs4-trinity-dev, xutils, chrpath, gettext, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), cdbs, tdelibs4-trinity-dev, xutils, chrpath, gettext, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
 Homepage: http://www.methylblue.com/filelight/
 
 Package: filelight-trinity
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/changelog b/ubuntu/maverick/applications/gtk-qt-engine/debian/changelog
index 7bbe149b1..477da1594 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/changelog
+++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/changelog
@@ -434,7 +434,7 @@ gtk-qt-engine (0.60-1.1ubuntu1) dapper; urgency=low
 gtk-qt-engine (0.60-1.1) unstable; urgency=low
 
   * NMU at maintainer's request.
-  * Rebuild against C++ transitioned kdelibs; no source changes needed.
+  * Rebuild against C++ transitioned tdelibs; no source changes needed.
 
  -- Adeodato Simó <asp16@alu.ua.es>  Wed, 07 Sep 2005 16:45:32 +0200
 
@@ -473,7 +473,7 @@ gtk-qt-engine (0.60-1ubuntu1) hoary; urgency=low
 gtk-qt-engine (0.60-1.1) unstable; urgency=low
 
   * NMU at maintainer's request.
-  * Rebuild against C++ transitioned kdelibs; no source changes needed.
+  * Rebuild against C++ transitioned tdelibs; no source changes needed.
 
  -- Adeodato Simó <asp16@alu.ua.es>  Wed, 07 Sep 2005 16:45:32 +0200
 
@@ -528,7 +528,7 @@ gtk-qt-engine (0.41-3) unstable; urgency=low
 gtk-qt-engine (0.41-2) unstable; urgency=low
 
   * Rebuilt for unstable. Excuse me.
-  * Added kdelibs4-dev to Build-Depends.
+  * Added tdelibs4-dev to Build-Depends.
 
  -- Christoffer Sawicki <qerub@home.se>  Wed, 16 Jun 2004 20:51:15 +0200
 
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/control b/ubuntu/maverick/applications/gtk-qt-engine/debian/control
index ce550ea2d..84b2b015d 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/control
+++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org>
-Build-Depends: debhelper (>= 5.0), cdbs, kdelibs4-trinity-dev, libgtk2.0-dev, cmake, libgtk2.0-dev (>= 2.10.1)
+Build-Depends: debhelper (>= 5.0), cdbs, tdelibs4-trinity-dev, libgtk2.0-dev, cmake, libgtk2.0-dev (>= 2.10.1)
 Standards-Version: 3.8.4
 
 Package: gtk-qt-engine-trinity
diff --git a/ubuntu/maverick/applications/gwenview/debian/changelog b/ubuntu/maverick/applications/gwenview/debian/changelog
index fde66b4ad..0ebf36378 100644
--- a/ubuntu/maverick/applications/gwenview/debian/changelog
+++ b/ubuntu/maverick/applications/gwenview/debian/changelog
@@ -95,7 +95,7 @@ gwenview (1.4.0~debian.1-1) unstable; urgency=low
 gwenview (1.3.1-3) unstable; urgency=low
 
   * Clarify the package description, as merely editing EXIF comments doesn't
-    strictly require kdegraphics-kfile-plugins. (Closes: #368809)
+    strictly require tdegraphics-kfile-plugins. (Closes: #368809)
 
  -- Christopher Martin <chrsmrtn@debian.org>  Sun, 28 May 2006 11:37:27 -0400
 
@@ -109,7 +109,7 @@ gwenview (1.3.1-2) unstable; urgency=low
 gwenview (1.3.1-1) unstable; urgency=low
 
   * Minor upstream update.
-  * Rebuild against kdelibs4c2a.
+  * Rebuild against tdelibs4c2a.
   * Bump DH_COMPAT to 5. No changes required.
 
  -- Christopher Martin <chrsmrtn@debian.org>  Mon,  5 Dec 2005 07:46:53 -0500
@@ -198,7 +198,7 @@ gwenview (1.1.4-1) unstable; urgency=low
   * New upstream release.
   * Rebuild against Qt 3.3, fixing the failure to exit properly from
     fullscreen mode.
-  * Added a recommends on kdegraphics-kfile-plugins, which enables the use of
+  * Added a recommends on tdegraphics-kfile-plugins, which enables the use of
     EXIF comments.
 
  -- Christopher Martin <chrsmrtn@freeshell.org>  Tue, 10 Aug 2004 18:37:33 -0400
diff --git a/ubuntu/maverick/applications/gwenview/debian/control b/ubuntu/maverick/applications/gwenview/debian/control
index e33398e2c..33ab3069d 100644
--- a/ubuntu/maverick/applications/gwenview/debian/control
+++ b/ubuntu/maverick/applications/gwenview/debian/control
@@ -2,7 +2,7 @@ Source: gwenview-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6.0.0), kdelibs4-trinity-dev (>= 4:3.4.3), libkipi0-trinity-dev (>= 0.1.2-2), libexiv2-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6.0.0), tdelibs4-trinity-dev (>= 4:3.4.3), libkipi0-trinity-dev (>= 0.1.2-2), libexiv2-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://gwenview.sourceforge.net
 
@@ -11,7 +11,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: gwenview-kde3 (<< 4:3.5.13)
 Breaks: gwenview-kde3 (<< 4:3.5.13)
-Recommends: kdegraphics-kfile-plugins-trinity, kipi-plugins-trinity
+Recommends: tdegraphics-kfile-plugins-trinity, kipi-plugins-trinity
 Suggests: gwenview-i18n
 Description: image viewer for TDE
  Gwenview is an image viewer for the K Desktop Environment. It features a
@@ -23,7 +23,7 @@ Description: image viewer for TDE
  Image loading is handled by the Qt library, so Gwenview supports all image
  formats your Qt installation supports. Gwenview correctly displays images
  with an alpha channel. Gwenview supports the displaying and editing of EXIF
- comments, and, if the kdegraphics-kfile-plugins package is installed, other
+ comments, and, if the tdegraphics-kfile-plugins package is installed, other
  image meta-information as well. Also supported is KIPI, the KDE Image Plugin
  Interface, a collection of helpful tools provided by the kipi-plugins
  package. The ability to perform lossless JPEG transforms is built in.
diff --git a/ubuntu/maverick/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 0cf0bd0a6..58d2a725a 100644
--- a/ubuntu/maverick/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/maverick/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -3,6 +3,6 @@ remove build-dep on libdvdread-dev
 libk3b3-extracodecs conflicts libk3b2-extracodecs
 transitional libk3b2-extracodecs package
 
-Do not recommend on kdebase-kio-plugins, kcontrol, 
+Do not recommend on tdebase-kio-plugins, kcontrol, 
 Change recommend to suggest for vcdimager
 
diff --git a/ubuntu/maverick/applications/k3b/debian/changelog b/ubuntu/maverick/applications/k3b/debian/changelog
index 37b58f616..dccced4b4 100644
--- a/ubuntu/maverick/applications/k3b/debian/changelog
+++ b/ubuntu/maverick/applications/k3b/debian/changelog
@@ -59,7 +59,7 @@ k3b (1.0.5-3ubuntu1) jaunty; urgency=low
    - remove build-dep on libdvdread-dev
    - libk3b3-extracodecs conflicts libk3b2-extracodecs
    - transitional libk3b2-extracodecs package
-   - Do not recommend on kdebase-kio-plugins, kcontrol
+   - Do not recommend on tdebase-kio-plugins, kcontrol
    - Change recommend to suggest for vcdimager
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 19 Nov 2008 14:54:23 +0000
@@ -206,7 +206,7 @@ k3b (1.0.4-5) unstable; urgency=medium
 k3b (1.0.4-4) unstable; urgency=low
 
   * Create a new k3b-data package to hold the arch-independent data files
-  * Remove dependency on kdebase-bin (closes: #460481).  It's not needed
+  * Remove dependency on tdebase-bin (closes: #460481).  It's not needed
     since we don't build k3bsetup anymore.
   * Remove Entry key from k3b.desktop (fixes lintian info)
 
@@ -302,7 +302,7 @@ k3b (1.0.3-4) unstable; urgency=low
 k3b (1.0.3-3) unstable; urgency=low
 
   * Rebuild with new flac libraries (closes: #446775)
-  * Make libk3b-dev depend on kdelibs4-dev (closes: #443374)
+  * Make libk3b-dev depend on tdelibs4-dev (closes: #443374)
   * Add homepage field to debian/control
 
  -- Francois Marier <francois@debian.org>  Fri, 19 Oct 2007 15:23:32 +1300
@@ -586,7 +586,7 @@ k3b (0.12.17-1ubuntu3) edgy; urgency=low
 
 k3b (0.12.17-1ubuntu2) edgy; urgency=low
 
-  * removed versioning of kdelibs4-dev depend (malone 57602)
+  * removed versioning of tdelibs4-dev depend (malone 57602)
   * added kubuntu_08_dont_complain_about_non_suid_cdrecord.diff (malone 57105)
 
  -- Kenny Duffus <kenny@duffus.org>  Fri, 25 Aug 2006 17:25:34 +0100
@@ -640,7 +640,7 @@ k3b (0.12.16-1) unstable; urgency=low
 
 k3b (0.12.16-0ubuntu2) edgy; urgency=low
 
-  * Reupload with build-dep on latest kdelibs, fix Qt binary compatibility break
+  * Reupload with build-dep on latest tdelibs, fix Qt binary compatibility break
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Jun 2006 16:07:54 +0000
 
@@ -761,7 +761,7 @@ k3b (0.12.14-0ubuntu4) dapper; urgency=low
   * Reverting to first kubuntu_06_hide_k3bsetup.diff patch:
      - Changing the Category field prevents from using k3bsetup again.
      - k3bsetup will be deactivated in SystemSettings from the
-       kde-systemsettings package.
+       tde-systemsettings package.
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Fri, 17 Mar 2006 14:55:09 +0100
 
@@ -900,7 +900,7 @@ k3b (0.12.6-1) unstable; urgency=low
 k3b (0.12.5-1) unstable; urgency=low
 
   * New upstream release
-  * Add kdebase-kio-plugins to the recommended packages to enable features
+  * Add tdebase-kio-plugins to the recommended packages to enable features
     like file deletion in the built-in browser (thanks to Nikita Youshchenko
     for the suggestion)
   * Update the version dependency on k3b-i18n
@@ -1188,7 +1188,7 @@ k3b (0.11.10-1) unstable; urgency=low
 
 k3b (0.11.9-2) unstable; urgency=low
 
-  * Depends now on kdebase-bin.
+  * Depends now on tdebase-bin.
   (closes: #245566)
   * Suggests normalize and toolame.
   (closes: #240770)
@@ -1225,7 +1225,7 @@ k3b (0.11.6-1) unstable; urgency=low
 
 k3b (0.10.3-5) unstable; urgency=low
 
-  * Add kdebase-bin to Suggests in debian/control
+  * Add tdebase-bin to Suggests in debian/control
   (closes: #227254)
   * Apply a patch to let cdrdao working with ATAPI drives on kernel 2.6
   (closes: #227336)
@@ -1268,7 +1268,7 @@ k3b (0.9-4) unstable; urgency=low
     k3bsetup when k3b detect that cdrecord isn't setuid.
   * Add kcontrol to Recommands.
   (closes: #206753)
-  * Add kdelibs-data to Depends since
+  * Add tdelibs-data to Depends since
     usr/share/mimelnk/application/x-iso.desktop and
     usr/share/mimelnk/application/x-cue.desktop which where conflicting with
     arson package are now included in it. 
@@ -1285,7 +1285,7 @@ k3b (0.9-3.1) unstable; urgency=low
 
   * NMU
   * Removed x-cue.desktop and x-iso.desktop since they are now a part of
-    kdelibs-data.
+    tdelibs-data.
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon,  6 Oct 2003 22:00:00 -0500
 
@@ -1319,7 +1319,7 @@ k3b (0.9-1) unstable; urgency=low
 k3b (0.8.1-3) unstable; urgency=low
 
   * Made some changes in the dependancies.
-  * Compile against kdelibs4-dev (>= 3.1.1) in order to depend on the new
+  * Compile against tdelibs4-dev (>= 3.1.1) in order to depend on the new
     libvorbis.
 
  -- Jean-Michel Kelbert <kelbert@debian.org>  Sat, 15 Mar 2003 00:57:14 -0500
diff --git a/ubuntu/maverick/applications/k3b/debian/control b/ubuntu/maverick/applications/k3b/debian/control
index 0029d1c47..4dda755d0 100644
--- a/ubuntu/maverick/applications/k3b/debian/control
+++ b/ubuntu/maverick/applications/k3b/debian/control
@@ -4,13 +4,13 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), cdbs (>= 0.4.52ubuntu18), kdelibs4-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmusicbrainz4-dev (>= 2.1.1-4.1), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), cdbs (>= 0.4.52ubuntu18), tdelibs4-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmusicbrainz4-dev (>= 2.1.1-4.1), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.k3b.org
 
 Package: k3b-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, wodim | cdrskin, cdparanoia (>= 3a9.8), genisoimage, kdelibs-data-trinity (>= 4:3.1.4-2), cdrdao (>= 1.1.7-5), k3b-data-trinity (= ${source:Version}), libk3b3-trinity (= ${binary:Version})
+Depends: ${shlibs:Depends}, wodim | cdrskin, cdparanoia (>= 3a9.8), genisoimage, tdelibs-data-trinity (>= 4:3.1.4-2), cdrdao (>= 1.1.7-5), k3b-data-trinity (= ${source:Version}), libk3b3-trinity (= ${binary:Version})
 Replaces: k3b-kde3 (<< 4:3.5.13)
 Breaks: k3b-kde3 (<< 4:3.5.13)
 Recommends: dvd+rw-tools, libk3b3-extracodecs-trinity
diff --git a/ubuntu/maverick/applications/k9copy/debian/control b/ubuntu/maverick/applications/k9copy/debian/control
index 134053ae3..d35e678ee 100644
--- a/ubuntu/maverick/applications/k9copy/debian/control
+++ b/ubuntu/maverick/applications/k9copy/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, docbook2x, libdvdread-dev, libdbus-1-dev, libhal-dev, libhal-storage-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, libdvdread-dev, libdbus-1-dev, libhal-dev, libhal-storage-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://k9copy.sourceforge.net/
 
diff --git a/ubuntu/maverick/applications/kaffeine/debian/changelog b/ubuntu/maverick/applications/kaffeine/debian/changelog
index 856250282..be405ad6c 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/changelog
+++ b/ubuntu/maverick/applications/kaffeine/debian/changelog
@@ -130,7 +130,7 @@ kaffeine (0.8.4-5) unstable; urgency=low
 
   [ Mark Purcell ]
   * Update kaffeine-dbg Depends: kaffeine (= ${binary:Version}),
-    kdelibs-dbg
+    tdelibs-dbg
 
  -- Mark Purcell <msp@debian.org>  Fri, 06 Jul 2007 10:22:19 +0100
 
@@ -214,7 +214,7 @@ kaffeine (0.8.1-3) unstable; urgency=low
   * Added hdparm to kaffeine Depends (Closes: #289895)
   * Added informations about css and region setting in README.Debian
   * Added install-css script taken from libdvdread3 package
-  * Removed x-mplayer2.desktop shipped by kdelibs (Closes: #372514)
+  * Removed x-mplayer2.desktop shipped by tdelibs (Closes: #372514)
 
  -- Fathi Boudra <fboudra@free.fr>  Sat, 10 Jun 2006 00:25:04 +0200
 
@@ -540,7 +540,7 @@ kaffeine (0.7.1-1.1) unstable; urgency=low
 kaffeine (0.7.1-1) unstable; urgency=low
 
   * New upstream release. Closes: #326491
-  * Built against kdelibs4c2. Closes: #325074
+  * Built against tdelibs4c2. Closes: #325074
   * Removed kubuntu_03_gstreamer_stop.diff, which was included upstream.
   * Updated kubuntu_04_locate_wizard_stamp.diff.
 
@@ -707,7 +707,7 @@ kaffeine (0.5-1) unstable; urgency=low
 kaffeine (0.4.92+0.5rc2-3) unstable; urgency=low
 
   * Add suggests for libdvdread3 and libdvdnav4.
-  * Tightened build-depends for kdelibs4-dev.
+  * Tightened build-depends for tdelibs4-dev.
 
  -- Zack Cerza <zcerza@coe.neu.edu>  Mon, 13 Dec 2004 12:04:36 -0500
 
diff --git a/ubuntu/maverick/applications/kaffeine/debian/control b/ubuntu/maverick/applications/kaffeine/debian/control
index 6fdae9e9e..660e771c3 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/control
+++ b/ubuntu/maverick/applications/kaffeine/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Riku Voipio <riku.voipio@iki.fi>, Fathi Boudra <fboudra@free.fr>,
  Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev,
  libcdparanoia0-dev, libogg-dev, libxine-dev (>= 1.1.7), libxcb1-dev,
  libxtst-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev,
  libcdio-cdda-dev, libcdio-paranoia-dev,
@@ -17,7 +17,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, hdparm
 Replaces: kaffeine-kde3 (<< 4:3.5.13)
 Breaks: kaffeine-kde3 (<< 4:3.5.13)
-Recommends: kdesudo-trinity, kpackage-trinity
+Recommends: tdesudo-trinity, kpackage-trinity
 Description: versatile media player for TDE
  Kaffeine is a media player for KDE. While it supports multiple player
  engines, its default engine is Xine, giving Kaffeine a wide variety of
@@ -35,8 +35,8 @@ Architecture: any
 Replaces: kaffeine-kde3-dbg (<< 4:3.5.13)
 Breaks: kaffeine-kde3-dbg (<< 4:3.5.13)
 Priority: extra
-Depends: kaffeine-trinity (= ${binary:Version}), kdelibs-trinity-dbg
-Recommends: kdesudo-trinity, kpackage-trinity
+Depends: kaffeine-trinity (= ${binary:Version}), tdelibs-trinity-dbg
+Recommends: tdesudo-trinity, kpackage-trinity
 Description: debugging symbols for kaffeine [Trinity]
  This package contains the debugging symbols associated with kaffeine.
  They will automatically be used by gdb for debugging kaffeine-related
diff --git a/ubuntu/maverick/applications/kaffeine/debian/rules b/ubuntu/maverick/applications/kaffeine/debian/rules
index 5af03107b..efff35a86 100755
--- a/ubuntu/maverick/applications/kaffeine/debian/rules
+++ b/ubuntu/maverick/applications/kaffeine/debian/rules
@@ -41,7 +41,7 @@ install/kaffeine-trinity::
 	install -D -p -m0644 debian/kaffeine_xine-install-ffmpeg.desktop debian/kaffeine/opt/trinity/share/services/kaffeine_xine-install-ffmpeg.desktop
 	install -D -p -m0644 debian/kaffeine_codecinstall.desktop debian/kaffeine/opt/trinity/share/servicetypes/kaffeine_codecinstall.desktop
 
-	# file shipped by kdelibs
+	# file shipped by tdelibs
 	rm -f debian/kaffeine/opt/trinity/share/mimelnk/application/x-mplayer2.desktop
 	# Bogus, shouldn't be shipped..
 	rm -f debian/kaffeine/opt/trinity/share/doc/kde/HTML/en/doc/CMakeLists.txt
diff --git a/ubuntu/maverick/applications/katapult/debian/control b/ubuntu/maverick/applications/katapult/debian/control
index 833e4bdc0..4d7a1b588 100644
--- a/ubuntu/maverick/applications/katapult/debian/control
+++ b/ubuntu/maverick/applications/katapult/debian/control
@@ -2,7 +2,7 @@ Source: katapult-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 5.0.0), kdelibs4-trinity-dev, docbook2x, libxi-dev, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 5.0.0), tdelibs4-trinity-dev, docbook2x, libxi-dev, sharutils, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: katapult-trinity
diff --git a/ubuntu/maverick/applications/kbarcode/debian/control b/ubuntu/maverick/applications/kbarcode/debian/control
index ffc46eb98..e9fc1c3bd 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/control
+++ b/ubuntu/maverick/applications/kbarcode/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kbarcode-trinity
diff --git a/ubuntu/maverick/applications/kbfx/debian/control b/ubuntu/maverick/applications/kbfx/debian/control
index 9ea60548b..2f0099a65 100644
--- a/ubuntu/maverick/applications/kbfx/debian/control
+++ b/ubuntu/maverick/applications/kbfx/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), cmake, kdelibs4-trinity-dev
+Build-Depends: cdbs, debhelper (>= 5), cmake, tdelibs4-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kbfx-trinity
diff --git a/ubuntu/maverick/applications/kbookreader/debian/control b/ubuntu/maverick/applications/kbookreader/debian/control
index 8d1c855ca..cbea39b39 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/control
+++ b/ubuntu/maverick/applications/kbookreader/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://k9copy.sourceforge.net/
 
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/control b/ubuntu/maverick/applications/kchmviewer/debian/control
index ff16d4903..3a8e5bf73 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/control
+++ b/ubuntu/maverick/applications/kchmviewer/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: debhelper (>= 5.0.0), kdelibs4-trinity-dev, libchm-dev, dpatch, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), tdelibs4-trinity-dev, libchm-dev, dpatch, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kchmviewer.net/
 
diff --git a/ubuntu/maverick/applications/kcpuload/debian/changelog b/ubuntu/maverick/applications/kcpuload/debian/changelog
index 574b5d91e..a5b5f833f 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/changelog
+++ b/ubuntu/maverick/applications/kcpuload/debian/changelog
@@ -40,7 +40,7 @@ kcpuload (1.99-13) unstable; urgency=low
 
   * New maintainer.  Thankyou to Ben for looking after this for much longer 
     than he expected to.
-  * Removed versioned depends on kdelibs4-dev, since kdelibs4-dev_4:3.4.2* is 
+  * Removed versioned depends on tdelibs4-dev, since tdelibs4-dev_4:3.4.2* is 
     the current version in unstable now, and to make backports easier.  
 
  -- Helen Faulkner <helen@debian.org>  Sat, 10 Sep 2005 10:38:49 +1000
diff --git a/ubuntu/maverick/applications/kcpuload/debian/control b/ubuntu/maverick/applications/kcpuload/debian/control
index 637198e25..ee0499761 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/control
+++ b/ubuntu/maverick/applications/kcpuload/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Helen Faulkner <helen@debian.org>
-Build-Depends: debhelper (>> 4.0.0), kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>> 4.0.0), tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kcpuload-trinity
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/control b/ubuntu/maverick/applications/kdbusnotification/debian/control
index dfd6737bd..b08146fc3 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/control
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/control
@@ -2,7 +2,7 @@ Source: kdbusnotification-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>> 4.0.0), kdelibs4-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>> 4.0.0), tdelibs4-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kdbusnotification-trinity
diff --git a/ubuntu/maverick/applications/kdiff3/debian/control b/ubuntu/maverick/applications/kdiff3/debian/control
index 794382279..9caa5fa2e 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/control
+++ b/ubuntu/maverick/applications/kdiff3/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Eike Sauer <eike@debian.org>
-Build-Depends: debhelper (>= 4.0.0), kdelibs4-trinity-dev, libkonq4-trinity-dev, docbook-to-man, libacl1-dev, libattr1-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 4.0.0), tdelibs4-trinity-dev, libkonq4-trinity-dev, docbook-to-man, libacl1-dev, libattr1-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kdiff3-trinity
diff --git a/ubuntu/maverick/applications/kdirstat/debian/control b/ubuntu/maverick/applications/kdirstat/debian/control
index 1b6b4f398..e8946bff5 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/control
+++ b/ubuntu/maverick/applications/kdirstat/debian/control
@@ -2,7 +2,7 @@ Source: kdirstat-trinity
 Section: misc
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5), kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5), tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://kdirstat.sourceforge.net/
 
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/changelog b/ubuntu/maverick/applications/kdmtheme/debian/changelog
index ef78ad6fb..120d16cf8 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/changelog
+++ b/ubuntu/maverick/applications/kdmtheme/debian/changelog
@@ -99,7 +99,7 @@ kdmtheme (1.2-0ubuntu1) gutsy; urgency=low
 
 kdmtheme (1.1.2-2ubuntu1) feisty; urgency=low
 
-  * Added kubuntu_01_kcm_systemsettings.diff for kde-systemsettings
+  * Added kubuntu_01_kcm_systemsettings.diff for tde-systemsettings
     inclusion in the Appearance section
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 13 Feb 2007 06:18:32 +0100
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/control b/ubuntu/maverick/applications/kdmtheme/debian/control
index df3a7646f..ff09f4750 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/control
+++ b/ubuntu/maverick/applications/kdmtheme/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Kel Modderman <kel@otaku42.de>, Fathi Boudra <fabo@debian.org>,
  Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://beta.smileaf.org/projects
 
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/kdmtheme.lintian-overrides b/ubuntu/maverick/applications/kdmtheme/debian/kdmtheme.lintian-overrides
index d033183c7..4932c5f8a 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/kdmtheme.lintian-overrides
+++ b/ubuntu/maverick/applications/kdmtheme/debian/kdmtheme.lintian-overrides
@@ -1,4 +1,4 @@
-# provided by kdelibs
+# provided by tdelibs
 kdmtheme: desktop-command-not-in-package ./usr/share/applications/kde/kdmtheme.desktop kcmshell
 # kcontrol module
 kdmtheme: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/applications/kde/kdmtheme.desktop
diff --git a/ubuntu/maverick/applications/kdpkg/debian/control b/ubuntu/maverick/applications/kdpkg/debian/control
index 8708df9e2..5bf5bb345 100644
--- a/ubuntu/maverick/applications/kdpkg/debian/control
+++ b/ubuntu/maverick/applications/kdpkg/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Alexander Kopf <kopf-alexander@gmx.de>
-Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev, gettext, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, gettext, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kdpkg-trinity
diff --git a/ubuntu/maverick/applications/kdpkg/debian/copyright b/ubuntu/maverick/applications/kdpkg/debian/copyright
index 6ca73edad..a0a9c1d0d 100644
--- a/ubuntu/maverick/applications/kdpkg/debian/copyright
+++ b/ubuntu/maverick/applications/kdpkg/debian/copyright
@@ -23,7 +23,7 @@ Copyright:
 	                             in klamp-install/installdialog.ui
 	info.png                     in klamp/kdpkgdialog.ui
 
-	The following icons are from kdelibs-data
+	The following icons are from tdelibs-data
 	(c) 2002 Kalle Dalheimer <kalle@kde.org> and many others
 	wizard.png                   in klamp/kdpkgdialog.ui
 	                             in klamp-install/installdialog.ui
diff --git a/ubuntu/maverick/applications/keep/debian/control b/ubuntu/maverick/applications/keep/debian/control
index 5f5c6c631..98d816db0 100644
--- a/ubuntu/maverick/applications/keep/debian/control
+++ b/ubuntu/maverick/applications/keep/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: keep-trinity
diff --git a/ubuntu/maverick/applications/kerry/debian/control b/ubuntu/maverick/applications/kerry/debian/control
index 76f3c5184..1775ae6ad 100644
--- a/ubuntu/maverick/applications/kerry/debian/control
+++ b/ubuntu/maverick/applications/kerry/debian/control
@@ -2,7 +2,7 @@ Source: kerry-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5.0.0), cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, tdelibs4-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev
 Homepage: http://en.opensuse.org/Kerry
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/maverick/applications/kerry/debian/control.in b/ubuntu/maverick/applications/kerry/debian/control.in
index 38fbd9e47..b8b098bdd 100644
--- a/ubuntu/maverick/applications/kerry/debian/control.in
+++ b/ubuntu/maverick/applications/kerry/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5.0.0), cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, libqt3-mt-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, tdelibs4-trinity-dev, libkonq4-trinity-dev, libqt3-mt-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Homepage: http://en.opensuse.org/Kerry
 Standards-Version: 3.8.3
 
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/control b/ubuntu/maverick/applications/kgtk-qt3/debian/control
index a85b9392f..8152e92eb 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/control
+++ b/ubuntu/maverick/applications/kgtk-qt3/debian/control
@@ -2,7 +2,7 @@ Source: kgtk-qt3-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 7), cdbs, kdelibs4-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
+Build-Depends: debhelper (>= 7), cdbs, tdelibs4-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
 Standards-Version: 3.8.4
 Homepage: http://trinity.pearsoncomputing.net
 
diff --git a/ubuntu/maverick/applications/kile/debian/README.Debian b/ubuntu/maverick/applications/kile/debian/README.Debian
index 8e55c77bc..5339affff 100644
--- a/ubuntu/maverick/applications/kile/debian/README.Debian
+++ b/ubuntu/maverick/applications/kile/debian/README.Debian
@@ -5,6 +5,6 @@ Kile no longer comes with a Gnuplot front end. The Gnuplot front end that used
 to be part of Kile is now a separate application named Qgfe maintained by
 Pascal Brachet at http://www.xm1math.net/qgfe/ .
 
-Syntax files bibtex.xml and latex.xml are provided by kdelibs-data package.
+Syntax files bibtex.xml and latex.xml are provided by tdelibs-data package.
 
  -- Ben Burton <bab@debian.org>, Sat, 23 Oct 2004 12:56:57 +1000
diff --git a/ubuntu/maverick/applications/kile/debian/TODO.Debian b/ubuntu/maverick/applications/kile/debian/TODO.Debian
index bbfc0d8dd..7fe556fd4 100644
--- a/ubuntu/maverick/applications/kile/debian/TODO.Debian
+++ b/ubuntu/maverick/applications/kile/debian/TODO.Debian
@@ -1,5 +1,5 @@
 * confirm #319409 resolution.
-* Add script to keep bibtex.xml and latex.xml up-to-date in kdelibs-data
+* Add script to keep bibtex.xml and latex.xml up-to-date in tdelibs-data
   (Closes: #358863).
-  Updated issue: highlighters will be shipped with kdelibs and users could
+  Updated issue: highlighters will be shipped with tdelibs and users could
   use "load new highlightings" button in the configuration dialog.
diff --git a/ubuntu/maverick/applications/kile/debian/changelog b/ubuntu/maverick/applications/kile/debian/changelog
index f47c5878b..855ceef5e 100644
--- a/ubuntu/maverick/applications/kile/debian/changelog
+++ b/ubuntu/maverick/applications/kile/debian/changelog
@@ -197,7 +197,7 @@ kile (1:1.8.1-2) unstable; urgency=low
   * First g++-4 upload to sid.
   * Adjusted build-dependencies for the C++ ABI transition.  Removed the
     versioned build-dependency on libqt3-mt-dev, since the new versioned
-    kdelibs4-dev build-dependency makes it redundant.
+    tdelibs4-dev build-dependency makes it redundant.
   * Updated FSF address in the copyright file.
   * Bumped standards-version to 3.6.2.1 (no changes required).
 
diff --git a/ubuntu/maverick/applications/kile/debian/control b/ubuntu/maverick/applications/kile/debian/control
index 3775cdbd6..18bfb1feb 100644
--- a/ubuntu/maverick/applications/kile/debian/control
+++ b/ubuntu/maverick/applications/kile/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 6), quilt, kdelibs4-trinity-dev, pkg-config, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 6), quilt, tdelibs4-trinity-dev, pkg-config, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://kile.sourceforge.net
 
diff --git a/ubuntu/maverick/applications/kima/debian/control b/ubuntu/maverick/applications/kima/debian/control
index 4c2cd186c..59fc2c85b 100644
--- a/ubuntu/maverick/applications/kima/debian/control
+++ b/ubuntu/maverick/applications/kima/debian/control
@@ -2,7 +2,7 @@ Source: kima-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev, libhal-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, libhal-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kima-trinity
diff --git a/ubuntu/maverick/applications/kio-apt/debian/control b/ubuntu/maverick/applications/kio-apt/debian/control
index a007c2af3..ca97e58b9 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/control
+++ b/ubuntu/maverick/applications/kio-apt/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Emmanuel Bouthenot <kolter@openics.org>
-Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kio-apt-trinity
diff --git a/ubuntu/maverick/applications/kio-locate/debian/control b/ubuntu/maverick/applications/kio-locate/debian/control
index ff4d1bdff..a66f03f96 100644
--- a/ubuntu/maverick/applications/kio-locate/debian/control
+++ b/ubuntu/maverick/applications/kio-locate/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Tobi Vollebregt <tobivollebregt@gmail.com>
-Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev, bzip2, python (>= 2.3), scons
+Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, bzip2, python (>= 2.3), scons
 Standards-Version: 3.8.4
 
 Package: kio-locate-trinity
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/control b/ubuntu/maverick/applications/kio-umountwrapper/debian/control
index f3bf03c11..ac759122d 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/control
+++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/control
@@ -2,7 +2,7 @@ Source: kio-umountwrapper-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>> 5), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>> 5), cdbs, tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kio-umountwrapper-trinity
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/media_safelyremove.desktop b/ubuntu/maverick/applications/kio-umountwrapper/debian/media_safelyremove.desktop
index 970caf8a5..7f73117a9 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/media_safelyremove.desktop
+++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/media_safelyremove.desktop
@@ -71,4 +71,4 @@ Name[zh_CN]=安全删除
 Name[zh_TW]=安全的移除
 Exec=kio_umountwrapper %u
 
-X-Ubuntu-Gettext-Domain=desktop_kdebase
+X-Ubuntu-Gettext-Domain=desktop_tdebase
diff --git a/ubuntu/maverick/applications/kiosktool/debian/changelog b/ubuntu/maverick/applications/kiosktool/debian/changelog
index a81e4659e..05237119a 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/changelog
+++ b/ubuntu/maverick/applications/kiosktool/debian/changelog
@@ -13,7 +13,7 @@ kiosktool (1.0-1.1ubuntu6) hardy; urgency=low
 kiosktool (1.0-1.1ubuntu5) gutsy; urgency=low
 
   * Add kubuntu_03_sudo_support.diff to support sudo
-  * Add depend on kdesudo
+  * Add depend on tdesudo
   * Move maintainer to XSBC-Original-Maintainer: 
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 20 Jul 2007 16:57:11 +0100
diff --git a/ubuntu/maverick/applications/kiosktool/debian/control b/ubuntu/maverick/applications/kiosktool/debian/control
index bbf9a457f..68d0b7404 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/control
+++ b/ubuntu/maverick/applications/kiosktool/debian/control
@@ -3,12 +3,12 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 4.1.0), cdbs, tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kiosktool-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, kdesudo-trinity
+Depends: ${shlibs:Depends}, tdesudo-trinity
 Description: tool to configure the TDE kiosk framework
  A Point&Click tool for system administrators to enable 
  TDE's KIOSK features or otherwise preconfigure TDE for 
diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
index d850db3da..5488388ad 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
+++ b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
@@ -54,7 +54,7 @@
 +{
 +  if (url.protocol() == "fish" && url.host() == "localhost") {
 +    TQProcess proc;
-+    proc.addArgument("kdesudo");
++    proc.addArgument("tdesudo");
 +    proc.addArgument("mkdir " + url.path());
 +    TQByteArray buffer;
 +    proc.launch(buffer);
@@ -83,7 +83,7 @@
 +{
 +  if (dest.protocol() == "fish" && dest.host() == "localhost") {
 +    TQProcess proc;
-+    proc.addArgument("kdesudo");
++    proc.addArgument("tdesudo");
 +    proc.addArgument("cp " + src.path() + " " + dest.path());
 +    TQByteArray buffer;
 +    proc.launch(buffer);
@@ -92,7 +92,7 @@
 +    }
 +
 +    TQProcess proc2;
-+    proc2.addArgument("kdesudo");
++    proc2.addArgument("tdesudo");
 +    proc2.addArgument("chmod 0644 " + dest.path());
 +    proc2.launch(buffer);
 +    while (!proc2.normalExit()) {
@@ -111,7 +111,7 @@
 +{
 +  if (url.protocol() == "fish" && url.host() == "localhost") {
 +    TQProcess proc;
-+    proc.addArgument("kdesudo");
++    proc.addArgument("tdesudo");
 +    proc.addArgument("rm " + url.path());
 +    TQByteArray buffer;
 +    proc.launch(buffer);
@@ -130,7 +130,7 @@
 +{
 +  if (target.protocol() == "fish" && target.host() == "localhost") {
 +    TQProcess proc;
-+    proc.addArgument("kdesudo");
++    proc.addArgument("tdesudo");
 +    proc.addArgument("mv " + src.path() + " " + target.path());
 +    TQByteArray buffer;
 +    proc.launch(buffer);
diff --git a/ubuntu/maverick/applications/kmplayer/debian/control b/ubuntu/maverick/applications/kmplayer/debian/control
index f40216ac6..0af2ebb6d 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/control
+++ b/ubuntu/maverick/applications/kmplayer/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev,
  libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-tqt-1-dev,
  libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, libxine-dev, libxv-dev, docbook2x,
  automake, autoconf, libtool, libltdl-dev
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/control b/ubuntu/maverick/applications/kmyfirewall/debian/control
index 0043f1a17..234dbbc8e 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/control
+++ b/ubuntu/maverick/applications/kmyfirewall/debian/control
@@ -2,7 +2,7 @@ Source: kmyfirewall-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5.0.51), kdelibs4-trinity-dev (>= 3.3.0), chrpath, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.51), tdelibs4-trinity-dev (>= 3.3.0), chrpath, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://kmyfirewall.sourceforge.net/
 
diff --git a/ubuntu/maverick/applications/kmymoney/debian/changelog b/ubuntu/maverick/applications/kmymoney/debian/changelog
index 9907ea10b..36986fd74 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/changelog
+++ b/ubuntu/maverick/applications/kmymoney/debian/changelog
@@ -386,7 +386,7 @@ kmymoney2 (0.8-3) unstable; urgency=low
 kmymoney2 (0.8-2) experimental; urgency=low
 
   * C++ migration
-  * Build-Depends: kdelibs4-dev (>= 4:3.4.2-1)
+  * Build-Depends: tdelibs4-dev (>= 4:3.4.2-1)
 
  -- Mark Purcell <msp@debian.org>  Fri, 19 Aug 2005 07:22:23 +0100
 
diff --git a/ubuntu/maverick/applications/kmymoney/debian/control b/ubuntu/maverick/applications/kmymoney/debian/control
index c0dbe5b9b..edca3a474 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/control
+++ b/ubuntu/maverick/applications/kmymoney/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), cdbs, chrpath, automake, libtool, kdelibs4-trinity-dev, libofx-dev, libsqlite3-dev
+Build-Depends: debhelper (>= 7.0.50~), cdbs, chrpath, automake, libtool, tdelibs4-trinity-dev, libofx-dev, libsqlite3-dev
 Standards-Version: 3.8.4
 
 Package: kmymoney2-trinity
diff --git a/ubuntu/maverick/applications/knemo/debian/changelog b/ubuntu/maverick/applications/knemo/debian/changelog
index 31b53d817..884cc039e 100644
--- a/ubuntu/maverick/applications/knemo/debian/changelog
+++ b/ubuntu/maverick/applications/knemo/debian/changelog
@@ -49,7 +49,7 @@ knemo (0.4.5-1) unstable; urgency=low
 
   [ Mark Purcell ]
   * New upstream release
-  * Remove 12_kdesvn572745.diff as applied upstream
+  * Remove 12_tdesvn572745.diff as applied upstream
   * Remove 13_fix_essid_regexp_for_not_quoted_strings.diff as applied
     upstream
 
@@ -58,8 +58,8 @@ knemo (0.4.5-1) unstable; urgency=low
 knemo (0.4.4-2) unstable; urgency=low
 
   [ Achim Bohnet ]
-  * control: remove Depends: kdelibs-bin.  kdelibs-bin was merged into
-    kdelibs4c2a (4:3.5.3-1). kdelibs4c2a is added via ${shlibs:Depends}.
+  * control: remove Depends: tdelibs-bin.  tdelibs-bin was merged into
+    tdelibs4c2a (4:3.5.3-1). tdelibs4c2a is added via ${shlibs:Depends}.
     Thx Hobbsee for reminding me (again and again :).
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Tue, 22 Aug 2006 17:11:42 +0200
@@ -69,7 +69,7 @@ knemo (0.4.4-1) unstable; urgency=low
   * new upstream release
 
   [ Achim Bohnet ]
-  * added debian/patches/12_kdesvn572745.diff: Pull from KDE SVN:
+  * added debian/patches/12_tdesvn572745.diff: Pull from KDE SVN:
     Fixed counting of transmitted data
   * added debian/patches/11_revert_load_on_demand.diff:
     With load on demand, knemo does not start on login.
@@ -137,7 +137,7 @@ knemo (0.3.1-5) unstable; urgency=low
   [ Achim Bohnet ]
   * short description: replace "KDEs systray" with "KDE's systray"
     (Closes: 341298)
-  * patches/11_kdesvn_505129_add_kcm_desktop_keywords.diff:  added
+  * patches/11_tdesvn_505129_add_kcm_desktop_keywords.diff:  added
     keywords to knemo's kcontrol desktop file.  Knemo configuration
     can now be found via 'Search:' (suggested by gbrinkmann on kde-apps)
     This also fixes, well removes, the non UTF-8 encoding in comment[de],
@@ -239,7 +239,7 @@ knemo (0.1.9-1) unstable; urgency=low
   * add net-tools, wireless-tools to build-dep. Configure now checks
     for i[fw]config (instead of hardcoded path in *.cpp files)
   * added home page on kde-apps to control
-  * Add to depends: kdelibs-bin (contains kded), kicker
+  * Add to depends: tdelibs-bin (contains kded), kicker
   * Add to recommends: kcontrol  (contains kcmshell, kcontrol)
   * fixed version in VERSION file s/0.1.8/0.1.9/
   * README: s/&lt;/</
diff --git a/ubuntu/maverick/applications/knemo/debian/control b/ubuntu/maverick/applications/knemo/debian/control
index f256999b7..c6c92cded 100644
--- a/ubuntu/maverick/applications/knemo/debian/control
+++ b/ubuntu/maverick/applications/knemo/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: debhelper (>> 4.1), cdbs, kdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>> 4.1), cdbs, tdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: knemo-trinity
diff --git a/ubuntu/maverick/applications/knetload/debian/changelog b/ubuntu/maverick/applications/knetload/debian/changelog
index be58cc89a..d8577dc0d 100644
--- a/ubuntu/maverick/applications/knetload/debian/changelog
+++ b/ubuntu/maverick/applications/knetload/debian/changelog
@@ -46,7 +46,7 @@ knetload (2.3-3.1) unstable; urgency=low
 
 knetload (2.3-3) unstable; urgency=low
 
-  * Built with gcc-4.0 and against kdelibs 4:3.4.2.
+  * Built with gcc-4.0 and against tdelibs 4:3.4.2.
   * New maintainer email address.
   * Complies with new standards version (3.6.2).
   * Updated Free Software Foundation address in debian/copyright to new 
diff --git a/ubuntu/maverick/applications/knetload/debian/control b/ubuntu/maverick/applications/knetload/debian/control
index 294fc1aa8..de847a599 100644
--- a/ubuntu/maverick/applications/knetload/debian/control
+++ b/ubuntu/maverick/applications/knetload/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Helen Faulkner <helen@debian.org>
-Build-Depends: debhelper (>> 4.0.0), kdelibs4-trinity-dev (>= 4:3.4.2), automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>> 4.0.0), tdelibs4-trinity-dev (>= 4:3.4.2), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: knetload-trinity
diff --git a/ubuntu/maverick/applications/knetstats/debian/control b/ubuntu/maverick/applications/knetstats/debian/control
index eea239a54..5b8d1d972 100644
--- a/ubuntu/maverick/applications/knetstats/debian/control
+++ b/ubuntu/maverick/applications/knetstats/debian/control
@@ -2,7 +2,7 @@ Source: knetstats-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5.0), cdbs, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), cdbs, tdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://knetstats.sourceforge.net/
 
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control
index f8466b606..4a5c6e077 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control
+++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Build-Depends: cdbs,
  debhelper (>= 7),
  pkg-config,
- kdelibs4-trinity-dev,
+ tdelibs4-trinity-dev,
  libnm-util-dev (>= 0.7.0),
  libnm-glib-dev (>= 0.7.0),
  network-manager-dev (>= 0.7.0),
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control.in b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control.in
index 43adf3e33..9d0819bca 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control.in
+++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control.in
@@ -7,7 +7,7 @@ Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs,
  debhelper (>= 7),
  pkg-config,
- kdelibs4-trinity-dev,
+ tdelibs4-trinity-dev,
  libnm-util-dev (>= 0.7.0),
  libnm-glib-dev (>= 0.7.0),
  network-manager-dev (>= 0.7.0),
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/control b/ubuntu/maverick/applications/knetworkmanager8/debian/control
index 41a91963b..bae087017 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/control
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Build-Depends: cdbs,
  debhelper (>= 7),
  pkg-config,
- kdelibs4-trinity-dev,
+ tdelibs4-trinity-dev,
  libnm-util-dev (>= 0.7.0),
  libnm-glib-dev (>= 0.7.0),
  network-manager-dev (>= 0.7.0),
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/control.in b/ubuntu/maverick/applications/knetworkmanager8/debian/control.in
index 43adf3e33..9d0819bca 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/control.in
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/control.in
@@ -7,7 +7,7 @@ Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs,
  debhelper (>= 7),
  pkg-config,
- kdelibs4-trinity-dev,
+ tdelibs4-trinity-dev,
  libnm-util-dev (>= 0.7.0),
  libnm-glib-dev (>= 0.7.0),
  network-manager-dev (>= 0.7.0),
diff --git a/ubuntu/maverick/applications/knights/debian/changelog b/ubuntu/maverick/applications/knights/debian/changelog
index cf45a8316..05bfb3450 100644
--- a/ubuntu/maverick/applications/knights/debian/changelog
+++ b/ubuntu/maverick/applications/knights/debian/changelog
@@ -103,7 +103,7 @@ knights (0.6-7.1) unstable; urgency=medium
 
 knights (0.6-7) unstable; urgency=low
 
-  * debian/control: added kdebase-kio-plugins to Depends field.
+  * debian/control: added tdebase-kio-plugins to Depends field.
     This allow users without kde installations to be able to load knights
     themes. (Closes: #361451)
   * Added a dpatch (courtesy of Claudio Moratti) to prevent knights from asking
@@ -114,7 +114,7 @@ knights (0.6-7) unstable; urgency=low
 
 knights (0.6-6) unstable; urgency=low
 
-  * Rebuild against kdelibs4c2a. (Closes: #338269)
+  * Rebuild against tdelibs4c2a. (Closes: #338269)
   * debian/control: build-depends on specific libraries instead of xlibs-dev.
 
  -- Tommaso Moroni <moronito@debian.org>  Sun,  4 Dec 2005 11:55:42 +0100
diff --git a/ubuntu/maverick/applications/knights/debian/control b/ubuntu/maverick/applications/knights/debian/control
index 8c7cc33a4..0e9ef19ce 100644
--- a/ubuntu/maverick/applications/knights/debian/control
+++ b/ubuntu/maverick/applications/knights/debian/control
@@ -4,13 +4,13 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jose Carlos Medeiros <debian@psabs.com.br>
 Uploaders: Ola Lundqvist <opal@debian.org>
-Build-Depends: debhelper (>= 5.0.0), kdelibs4-trinity-dev, poxml, dpatch, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), tdelibs4-trinity-dev, poxml, dpatch, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://knights.sourceforge.net/
 
 Package: knights-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, kdebase-kio-plugins-trinity
+Depends: ${shlibs:Depends}, tdebase-kio-plugins-trinity
 Replaces: knights-kde3 (<< 4:3.5.13)
 Breaks: knights-kde3 (<< 4:3.5.13)
 Suggests: gnuchess | crafty | sjeng, knights-themepack-trinity
diff --git a/ubuntu/maverick/applications/knowit/debian/control b/ubuntu/maverick/applications/knowit/debian/control
index 39806f6fd..735520a53 100644
--- a/ubuntu/maverick/applications/knowit/debian/control
+++ b/ubuntu/maverick/applications/knowit/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Lorenzo Villani <arbiter@arbiterlab.net>
-Build-Depends: debhelper (>= 5), kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://knowit.sourceforge.net/
 
diff --git a/ubuntu/maverick/applications/knutclient/debian/control b/ubuntu/maverick/applications/knutclient/debian/control
index d9cbe6a1c..5661d50df 100644
--- a/ubuntu/maverick/applications/knutclient/debian/control
+++ b/ubuntu/maverick/applications/knutclient/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Arnaud Quette <aquette@debian.org>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 5.0.51), kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.51), tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Homepage: http://www.knut.noveradsl.cz/knutclient/
 
 Package: knutclient-trinity
diff --git a/ubuntu/maverick/applications/koffice/debian/changelog b/ubuntu/maverick/applications/koffice/debian/changelog
index 8ce61b75e..fa9c8a04f 100644
--- a/ubuntu/maverick/applications/koffice/debian/changelog
+++ b/ubuntu/maverick/applications/koffice/debian/changelog
@@ -21,9 +21,9 @@ koffice (1:1.6.3-7ubuntu5) jaunty; urgency=low
 
 koffice (1:1.6.3-7ubuntu4) jaunty; urgency=low
 
-  * Stop building KDE 3 API documentation (kdelibs4-doc is history)
+  * Stop building KDE 3 API documentation (tdelibs4-doc is history)
     - In debian/rules: Set DEB_KDE_APIDOX := no
-    - In debian/control: Drop Build-Depends-Indep for doxygen and kdelibs4-doc
+    - In debian/control: Drop Build-Depends-Indep for doxygen and tdelibs4-doc
 
  -- Scott Kitterman <scott@kitterman.com>  Mon, 23 Feb 2009 11:59:16 -0500
 
@@ -641,7 +641,7 @@ koffice (1:1.4.2-3) unstable; urgency=low
   * Fix Chalk description in debian/control
   * Update copyright (new maintainers, new Chalk developer)
   * Build against libwv2 built against the new libgsf, closes: #338832
-  * Rebuild against kdelibs4c2a
+  * Rebuild against tdelibs4c2a
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 11 Nov 2005 11:22:00 +0100
 
@@ -1131,7 +1131,7 @@ koffice (1:1.1-rc1-1) unstable; urgency=low
   * Renamed package killustrator to kontour.
   * Removed package krayon.
   * Rebuilt with newer admin files (closes: Bug#105209).
-  * Added kdebase-dev to build-depends.
+  * Added tdebase-dev to build-depends.
   * Builds on alpha.
 
  -- Ben Burton <benb@acm.org>  Tue, 31 Jul 2001 12:23:44 +1000
@@ -1350,7 +1350,7 @@ koffice (2.0-20001006-0) unstable; urgency=low
 koffice (2.0-20001005-0) unstable; urgency=low
  
   * More upstream fixes
-  * Compiling against non-versioned kdelibs once again
+  * Compiling against non-versioned tdelibs once again
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 05 Oct 2000 15:30:00 -0700
 
diff --git a/ubuntu/maverick/applications/koffice/debian/control b/ubuntu/maverick/applications/koffice/debian/control
index 5600dcbc0..57911e8ba 100644
--- a/ubuntu/maverick/applications/koffice/debian/control
+++ b/ubuntu/maverick/applications/koffice/debian/control
@@ -4,7 +4,7 @@ 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>, Ral Snchez Siles <rasasi78@gmail.com>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.4
 Homepage: http://www.koffice.org
@@ -328,7 +328,7 @@ Architecture: any
 Section: libdevel
 Replaces: koffice-kde3-dev (<< 4:3.5.13)
 Breaks: koffice-kde3-dev (<< 4:3.5.13)
-Depends: koffice-libs-trinity (= ${binary:Version}), karbon-trinity (= ${binary:Version}), kchart-trinity (= ${binary:Version}), kexi-trinity (= ${binary:Version}), kformula-trinity (= ${binary:Version}), kivio-trinity (= ${binary:Version}), koshell-trinity (= ${binary:Version}), kplato-trinity (= ${binary:Version}), kpresenter-trinity (= ${binary:Version}), chalk-trinity (= ${binary:Version}), kspread-trinity (= ${binary:Version}), kthesaurus-trinity (= ${binary:Version}), kugar-trinity (= ${binary:Version}), kword-trinity (= ${binary:Version}), kdelibs4-trinity-dev
+Depends: koffice-libs-trinity (= ${binary:Version}), karbon-trinity (= ${binary:Version}), kchart-trinity (= ${binary:Version}), kexi-trinity (= ${binary:Version}), kformula-trinity (= ${binary:Version}), kivio-trinity (= ${binary:Version}), koshell-trinity (= ${binary:Version}), kplato-trinity (= ${binary:Version}), kpresenter-trinity (= ${binary:Version}), chalk-trinity (= ${binary:Version}), kspread-trinity (= ${binary:Version}), kthesaurus-trinity (= ${binary:Version}), kugar-trinity (= ${binary:Version}), kword-trinity (= ${binary:Version}), tdelibs4-trinity-dev
 Description: common libraries for KOffice (development files) [Trinity]
  This package provides the development files for the libraries that are
  shared amongst the various components of KOffice.
diff --git a/ubuntu/maverick/applications/koffice/debian/control.in b/ubuntu/maverick/applications/koffice/debian/control.in
index faee83eb7..6977987da 100644
--- a/ubuntu/maverick/applications/koffice/debian/control.in
+++ b/ubuntu/maverick/applications/koffice/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient16-dev, sharutils, bzip2, libpoppler-qt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, flex, tdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient16-dev, sharutils, bzip2, libpoppler-qt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Build-Depends-Indep: qt3-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
 Homepage: http://www.koffice.org
@@ -282,7 +282,7 @@ Description: common shared data for the KDE Office Suite [Trinity]
 Package: koffice-trinity-dev
 Architecture: any
 Section: libdevel
-Depends: koffice-libs-trinity (= ${binary:Version}), karbon-trinity (= ${binary:Version}), kchart-trinity (= ${binary:Version}), kexi-trinity (= ${binary:Version}), kformula-trinity (= ${binary:Version}), kivio-trinity (= ${binary:Version}), koshell-trinity (= ${binary:Version}), kplato-trinity (= ${binary:Version}), kpresenter-trinity (= ${binary:Version}), chalk-trinity (= ${binary:Version}), kspread-trinity (= ${binary:Version}), kthesaurus-trinity (= ${binary:Version}), kugar-trinity (= ${binary:Version}), kword-trinity (= ${binary:Version}), kdelibs4-trinity-dev
+Depends: koffice-libs-trinity (= ${binary:Version}), karbon-trinity (= ${binary:Version}), kchart-trinity (= ${binary:Version}), kexi-trinity (= ${binary:Version}), kformula-trinity (= ${binary:Version}), kivio-trinity (= ${binary:Version}), koshell-trinity (= ${binary:Version}), kplato-trinity (= ${binary:Version}), kpresenter-trinity (= ${binary:Version}), chalk-trinity (= ${binary:Version}), kspread-trinity (= ${binary:Version}), kthesaurus-trinity (= ${binary:Version}), kugar-trinity (= ${binary:Version}), kword-trinity (= ${binary:Version}), tdelibs4-trinity-dev
 Description: common libraries for KOffice (development files) [Trinity]
  This package provides the development files for the libraries that are
  shared amongst the various components of KOffice.
diff --git a/ubuntu/maverick/applications/konversation/debian/changelog b/ubuntu/maverick/applications/konversation/debian/changelog
index 5d44efa2e..69aa8c22f 100644
--- a/ubuntu/maverick/applications/konversation/debian/changelog
+++ b/ubuntu/maverick/applications/konversation/debian/changelog
@@ -171,7 +171,7 @@ konversation (1.0.1-3) unstable; urgency=low
       nicknames were not affected) (Closes: #412894).
     - 14_dbug412803_assert_crash.diff - avoid a possible crash on DCOP info.
       Remove a bogus assert (Closes: #412803).
-  * Add kdelibs-dbg to konversation-dbg Recommends.
+  * Add tdelibs-dbg to konversation-dbg Recommends.
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Tue, 24 Jul 2007 01:15:48 +0300
 
@@ -389,7 +389,7 @@ konversation (0.18-4) unstable; urgency=low
 
 konversation (0.18-3ubuntu2) dapper; urgency=low
 
-  * Rebuild against the latest kdelibs4-dev to make us installable.
+  * Rebuild against the latest tdelibs4-dev to make us installable.
 
  -- Adam Conrad <adconrad@ubuntu.com>  Mon, 12 Dec 2005 21:35:14 +1100
 
@@ -410,7 +410,7 @@ konversation (0.18-3) unstable; urgency=low
 
 konversation (0.18-2) unstable; urgency=low
 
-  * Upload to Debian unstable, now that a C++ transitioned version of kdelibs
+  * Upload to Debian unstable, now that a C++ transitioned version of tdelibs
     has been built on all architectures.
 
   * Use a more descriptive title in the Debian menu entry.
@@ -764,7 +764,7 @@ konversation (0.14cvs20040427-2) unstable; urgency=low
 konversation (0.14cvs20040427-1) unstable; urgency=low
 
   * New CVS snapshot.
-  * Prepare the upstream snapshot tarball using cvs2dist from kdesdk-scripts
+  * Prepare the upstream snapshot tarball using cvs2dist from tdesdk-scripts
     instead of my own homebrewed script.  This has a number of advantages:
     - debian/rules and debian/control are simplified a bit.
     - Documentation is now included in the package.
diff --git a/ubuntu/maverick/applications/konversation/debian/control b/ubuntu/maverick/applications/konversation/debian/control
index 0d1b4ff4f..37a646f93 100644
--- a/ubuntu/maverick/applications/konversation/debian/control
+++ b/ubuntu/maverick/applications/konversation/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Modestas Vainius <modestas@vainius.eu>
-Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), kdelibs4-trinity-dev, xsltproc, docbook-xsl, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs4-trinity-dev, xsltproc, docbook-xsl, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 DM-Upload-Allowed: yes
 Homepage: http://konversation.kde.org/
@@ -40,7 +40,7 @@ Priority: extra
 Replaces: konversation-kde3-dbg (<< 4:3.5.13)
 Breaks: konversation-kde3-dbg (<< 4:3.5.13)
 Depends: konversation-trinity (= ${binary:Version})
-Recommends: kdelibs-trinity-dbg
+Recommends: tdelibs-trinity-dbg
 Description: debugging symbols for konversation
  This package contains the debugging symbols associated with konversation.
  They will automatically be used by gdb for debugging konversation-related
diff --git a/ubuntu/maverick/applications/konversation/debian/copyright b/ubuntu/maverick/applications/konversation/debian/copyright
index cb5c85c8e..337154e3c 100644
--- a/ubuntu/maverick/applications/konversation/debian/copyright
+++ b/ubuntu/maverick/applications/konversation/debian/copyright
@@ -13,7 +13,7 @@ Konversation is copyright as follows:
   © 2003 by Alex Zepeda <garbanzo@hooked.net>
   © 2003, 2005 by Stanislav Karchebny <stanislav.karchenny@kdemail.net>
   © 2003 by Mickael Marchand <marchand@kde.org>
-  © 2003 by Benjamin C Meyer <ben+kdelibs@meyerhome.net>
+  © 2003 by Benjamin C Meyer <ben+tdelibs@meyerhome.net>
   © 2003 by Waldo Bastian <bastian@kde.org>
   © 2003, 2004, 2005, 2006 by Peter Simonsson <psn@linux.se>
   © 2003, 2004 by Christian Mühlhäuser <chris@chris.de>
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/control b/ubuntu/maverick/applications/kopete-otr/debian/control
index e37f102bb..a6fd2d0c7 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/control
+++ b/ubuntu/maverick/applications/kopete-otr/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 5), kdenetwork-trinity-dev, libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), tdenetwork-trinity-dev, libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://kopete-otr.follefuder.org/
 
diff --git a/ubuntu/maverick/applications/kpicosim/debian/control b/ubuntu/maverick/applications/kpicosim/debian/control
index f495266bf..329129a04 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/control
+++ b/ubuntu/maverick/applications/kpicosim/debian/control
@@ -2,7 +2,7 @@ Source: kpicosim-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 
-Build-Depends: debhelper (>= 4.0.0), kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 4.0.0), tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kpicosim-trinity
diff --git a/ubuntu/maverick/applications/kpilot/debian/control b/ubuntu/maverick/applications/kpilot/debian/control
index eb519d870..44ba65f05 100644
--- a/ubuntu/maverick/applications/kpilot/debian/control
+++ b/ubuntu/maverick/applications/kpilot/debian/control
@@ -2,7 +2,7 @@ Source: kpilot-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 4.0.0), kdelibs4-trinity-dev, kdepim-trinity-dev,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 4.0.0), tdelibs4-trinity-dev, tdepim-trinity-dev,
                libopensync0-dev, libpisock-dev,
                bison, byacc, bzip2, flex, groff-base,
                libboost-dev (>= 1.33.1), libgpgme11-dev, liblockdev1-dev,
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/control b/ubuntu/maverick/applications/kpowersave.cmake/debian/control
index c30049699..2cab05a96 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/control
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, libtool, libltdl-dev, cmake
+Build-Depends: cdbs, debhelper (>= 5.0.0), tdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, libtool, libltdl-dev, cmake
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/control.in b/ubuntu/maverick/applications/kpowersave.cmake/debian/control.in
index 8fb5ca51f..f8d6ca2fe 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/control.in
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5.0.0), kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-qt-1-dev (>= 0.6), libtool, libltdl-dev, cmake
+Build-Depends: cdbs, debhelper (>= 5.0.0), tdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-qt-1-dev (>= 0.6), libtool, libltdl-dev, cmake
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
diff --git a/ubuntu/maverick/applications/kpowersave/debian/control b/ubuntu/maverick/applications/kpowersave/debian/control
index dbe08b9d3..886aab9b3 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/control
+++ b/ubuntu/maverick/applications/kpowersave/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5.0.0), tdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
diff --git a/ubuntu/maverick/applications/kradio/debian/control b/ubuntu/maverick/applications/kradio/debian/control
index d1b61edbd..cc803208e 100644
--- a/ubuntu/maverick/applications/kradio/debian/control
+++ b/ubuntu/maverick/applications/kradio/debian/control
@@ -2,7 +2,7 @@ Source: kradio-trinity
 Section: sound
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), kdelibs4-trinity-dev, liblircclient-dev, libsndfile1-dev, imagemagick, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), tdelibs4-trinity-dev, liblircclient-dev, libsndfile1-dev, imagemagick, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://kradio.sourceforge.net/
 
diff --git a/ubuntu/maverick/applications/krename/debian/control b/ubuntu/maverick/applications/krename/debian/control
index 0cb7f68fe..42389bc1a 100644
--- a/ubuntu/maverick/applications/krename/debian/control
+++ b/ubuntu/maverick/applications/krename/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Richard A. Johnson <nixternal@ubuntu.com> 
-Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, patchutils, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, patchutils, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: krename-trinity
diff --git a/ubuntu/maverick/applications/krusader/debian/changelog b/ubuntu/maverick/applications/krusader/debian/changelog
index 609286530..a4c38c63d 100644
--- a/ubuntu/maverick/applications/krusader/debian/changelog
+++ b/ubuntu/maverick/applications/krusader/debian/changelog
@@ -32,7 +32,7 @@ krusader (1.90.0-1) unstable; urgency=low
   * Update my e-mail address.
   * Remove Angel Ramos from Uploaders field.
   * Bump Standard-Version to 3.7.3.
-  * Add kdebase-bin versioned dependency.
+  * Add tdebase-bin versioned dependency.
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Sun, 23 Mar 2008 15:10:45 +0100
 
@@ -119,7 +119,7 @@ krusader (1.60.0-3) unstable; urgency=low
   * Fixed gcc-4.0 compiling problem (Closes: #326789).
   * Fixed autoconf m68k and mipsel problem (Closes: #310669).
   * de.po corrected (Closes: #313785).
-  * Added kdebase-kio-plugins as suggest header (Closes: #322764).
+  * Added tdebase-kio-plugins as suggest header (Closes: #322764).
   * The problem with ps/pdf files is a kghostview problem, not
     krusader (Closes: #325130)
   * No segfault on closing the viewer with krusader 1.60 (Closes: #325170).
@@ -176,7 +176,7 @@ krusader (1.30-1.2) unstable; urgency=low
 krusader (1.30-1.1) unstable; urgency=low
 
   * NMU during BSP
-  * remove x-ace.desktop, which is also in kdelibs-data. Closes: #238052
+  * remove x-ace.desktop, which is also in tdelibs-data. Closes: #238052
  
  -- Andreas Barth <aba@not.so.argh.org>  Sun, 18 Apr 2004 11:39:32 +0200
 
@@ -283,7 +283,7 @@ krusader (0.75-2) unstable; urgency=low
 krusader (0.75-1.2) unstable; urgency=low
  
   * NMU
-  * Build against new qt/kdelibs
+  * Build against new qt/tdelibs
   * update build-depends
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 27 Feb 2001 13:35:16 -0700
diff --git a/ubuntu/maverick/applications/krusader/debian/control b/ubuntu/maverick/applications/krusader/debian/control
index 4e9f7e5f3..cf8f42e14 100644
--- a/ubuntu/maverick/applications/krusader/debian/control
+++ b/ubuntu/maverick/applications/krusader/debian/control
@@ -14,8 +14,8 @@ Replaces: krusader-kde3 (<< 4:3.5.13)
 Breaks: krusader-kde3 (<< 4:3.5.13)
 Suggests: md5deep | cfv, kedit-trinity, khexedit-trinity, konsole-trinity, kmail-trinity,
  krename-trinity, kdiff3-trinity | kompare-trinity | xxdiff, ark-trinity, arj, bzip2, cpio, lha,
- unrar | unrar-free | rar, rpm, unace, unzip, zip, p7zip, kdebase-trinity-bin,
- kdebase-kio-plugins-trinity
+ unrar | unrar-free | rar, rpm, unace, unzip, zip, p7zip, tdebase-trinity-bin,
+ tdebase-kio-plugins-trinity
 Description: twin-panel (commander-style) file manager for KDE (and other desktops)
  Krusader is a simple, easy, powerful, twin-panel (commander-style) file
  manager for KDE and other desktops, similar to Midnight Commander (C) or Total
diff --git a/ubuntu/maverick/applications/krusader/debian/copyright b/ubuntu/maverick/applications/krusader/debian/copyright
index 127bd8f63..4f0e31c89 100644
--- a/ubuntu/maverick/applications/krusader/debian/copyright
+++ b/ubuntu/maverick/applications/krusader/debian/copyright
@@ -14,27 +14,27 @@ Upstream Authors:
    Jonas Bähr <jonas.baehr@web.de>
    Matej Urbancic <matej@amis.net>
 
-iso is based on tar from kdebase:
+iso is based on tar from tdebase:
    (C) David Faure <faure@kde.org>
 
-kiso is based on ktar from kdelibs:
+kiso is based on ktar from tdelibs:
    (C) Torben Weis <weis@kde.org>
    (C) David Faure <faure@kde.org>
 
-krremoteencodingmenu is based on KRemoteEncodingPlugin from kdebase:
+krremoteencodingmenu is based on KRemoteEncodingPlugin from tdebase:
    (C) Dawit Alemayehu <adawit@kde.org>
 
 paneltabbar is based on code from k3b:
    (C) Sebastian Trueg <trueg@k3b.org>
 
-kimagefilepreview is based on code from kdelibs:
+kimagefilepreview is based on code from tdelibs:
    (C) 2001 Martin R. Jones <mjones@kde.org>
    (C) 2001 Carsten Pfeiffer <pfeiffer@kde.org>
 
-kdiskfreesp is based on code from kdelibs:
+kdiskfreesp is based on code from tdelibs:
    (C) 1999 Michael Kropfberger <michael.kropfberger@gmx.net>
 
-krprogress code is bases on code from kdelibs:
+krprogress code is bases on code from tdelibs:
    (C) 2000 Matej Koss <koss@miesto.sk>
 
 Copyright for libisofs, licensed under the GPL:
diff --git a/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides b/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides
index ab5986658..74c03c669 100644
--- a/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides
+++ b/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides
@@ -1,2 +1,2 @@
-# package depends on kdebase-bin, which provides kdesu
+# package depends on tdebase-bin, which provides kdesu
 krusader-trinity: menu-command-not-in-package /usr/share/menu/krusader:17 kdesu
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control
index b8afd7a01..c4a15afc4 100644
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control
+++ b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: debhelper (>= 5.0.24), autotools-dev, kdebase-trinity-dev, ksplash-trinity, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.24), autotools-dev, tdebase-trinity-dev, ksplash-trinity, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: ksplash-engine-moodin-trinity
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/README.debian b/ubuntu/maverick/applications/ksquirrel/debian/README.debian
index 7c478322f..c580229d7 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/README.debian
+++ b/ubuntu/maverick/applications/ksquirrel/debian/README.debian
@@ -1,10 +1,10 @@
 This program was initialy writen for Trinity. To compile it for KDE4 the
-exif support is disabled. That library depends on kdelibs3.
+exif support is disabled. That library depends on tdelibs3.
 
 MT is enabled because configure seems not smart enough.
 
 Qt version coded in configure.in.in
-Hard-coded dependency on libkio.la (in kdelibs4-dev)
+Hard-coded dependency on libkio.la (in tdelibs4-dev)
 Hard-coded dependency on dcopidl
 
  -- Paul Gevers <paul@climbing.nl>  Sun, 14 Sep 2008 10:17:50 -0500
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/control b/ubuntu/maverick/applications/kstreamripper/debian/control
index 665ed62f2..47563dcb8 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/control
+++ b/ubuntu/maverick/applications/kstreamripper/debian/control
@@ -2,7 +2,7 @@ Source: kstreamripper-trinity
 Section: sound 
 Priority: optional
 Maintainer: Michael Ablassmeier <abi@debian.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs, libxmu-dev, libjpeg62-dev (>= 6b-9), kdelibs4-trinity-dev, scons
+Build-Depends: debhelper (>= 4.1.0), cdbs, libxmu-dev, libjpeg62-dev (>= 6b-9), tdelibs4-trinity-dev, scons
 Standards-Version: 3.8.4
 
 Package: kstreamripper-trinity
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/control b/ubuntu/maverick/applications/ksystemlog/debian/control
index 70cf90768..abeeea972 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/control
+++ b/ubuntu/maverick/applications/ksystemlog/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: ksystemlog-trinity
diff --git a/ubuntu/maverick/applications/ktechlab/debian/changelog b/ubuntu/maverick/applications/ktechlab/debian/changelog
index eb84eb89e..d20521745 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/changelog
+++ b/ubuntu/maverick/applications/ktechlab/debian/changelog
@@ -32,7 +32,7 @@ ktechlab (0.3-9) unstable; urgency=low
   * added a French translation, modified po/Makefile.in to deal with
     translations.
   * Raised the DH_COMPAT level to 6.
-  * Added kdesdk-scripts to build-depends to get the extractrc command
+  * Added tdesdk-scripts to build-depends to get the extractrc command
 
  -- Georges Khaznadar <georgesk@ofset.org>  Sat, 07 Jun 2008 05:38:09 +0200
 
diff --git a/ubuntu/maverick/applications/ktechlab/debian/control b/ubuntu/maverick/applications/ktechlab/debian/control
index 34da31b35..a7a59162a 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/control
+++ b/ubuntu/maverick/applications/ktechlab/debian/control
@@ -2,7 +2,7 @@ Source: ktechlab-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 6.0.0), imagemagick, kdelibs4-trinity-dev, dpatch, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, kdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 6.0.0), imagemagick, tdelibs4-trinity-dev, dpatch, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: ktechlab-trinity
diff --git a/ubuntu/maverick/applications/ktechlab/debian/debiandirs b/ubuntu/maverick/applications/ktechlab/debian/debiandirs
index 57c2b82b6..d35ab77aa 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/debiandirs
+++ b/ubuntu/maverick/applications/ktechlab/debian/debiandirs
@@ -28,5 +28,5 @@ export MCOPIDL=/opt/trinity/bin/mcopidl
 export ARTSCCONFIG=/opt/trinity/bin/artsc-config
 export INSTALL_DATA=install -p -c -m 644
 configkde=--disable-debug  --disable-rpath --prefix=$(kde_prefix) --libexecdir=$(kde_bindir) --sysconfdir=$(sysconfdir) --libdir=$(kde_libdir) --includedir=$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=$(mandir) --infodir=$(infodir) --with-xinerama
-configkdevelop=--disable-debug  --disable-rpath --enable-docbase --enable-kdoc2 --libdir=$(kde_libdir) --includedir=$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=$(mandir) --with-kdelibsdoc-dir=/opt/trinity/share/doc/kdelibs3-doc/html --with-xinerama
-configkdepim=--disable-debug  --disable-rpath --with-extra-includes=/usr/include/libpisock --enable-shared --prefix=$(kde_prefix) --libexecdir=$(kde_bindir) --with-qt-includes=/usr/include/qt3 --mandir=$(mandir) --infodir=$(infodir) --with-xinerama
+configtdevelop=--disable-debug  --disable-rpath --enable-docbase --enable-kdoc2 --libdir=$(kde_libdir) --includedir=$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=$(mandir) --with-tdelibsdoc-dir=/opt/trinity/share/doc/tdelibs3-doc/html --with-xinerama
+configtdepim=--disable-debug  --disable-rpath --with-extra-includes=/usr/include/libpisock --enable-shared --prefix=$(kde_prefix) --libexecdir=$(kde_bindir) --with-qt-includes=/usr/include/qt3 --mandir=$(mandir) --infodir=$(infodir) --with-xinerama
diff --git a/ubuntu/maverick/applications/ktorrent/debian/changelog b/ubuntu/maverick/applications/ktorrent/debian/changelog
index 7d19f0f25..96eb17815 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/changelog
+++ b/ubuntu/maverick/applications/ktorrent/debian/changelog
@@ -51,7 +51,7 @@ ktorrent (2.2.3-0ubuntu1) hardy; urgency=low
 
   * New upstream release
   * kubuntu_03_remove_nasty_search_engines.patch: rebase against 2.2.3
-  * Add kdebase-kio-plugins to Recommends, needed for IP Filters plugin
+  * Add tdebase-kio-plugins to Recommends, needed for IP Filters plugin
     (LP: #150062)
 
  -- John Dong <jdong@ubuntu.com>  Fri, 16 Nov 2007 02:11:41 -0500
@@ -250,7 +250,7 @@ ktorrent (2.0.1-0ubuntu1) edgy; urgency=low
 ktorrent (2.0-0ubuntu2) edgy; urgency=low
 
   * Fixed install issue by removing debian/ktorrent/usr/share/applnk and 
-    debian/ktorrent/usr/share/mimelnk in debian/rules already provided by kdelibs-data
+    debian/ktorrent/usr/share/mimelnk in debian/rules already provided by tdelibs-data
   * Closes Malone Bug #55969
 
  -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Wed, 09 Aug 2006 09:51:44 -0500
diff --git a/ubuntu/maverick/applications/ktorrent/debian/control b/ubuntu/maverick/applications/ktorrent/debian/control
index 770273cc4..ada1f4cb0 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/control
+++ b/ubuntu/maverick/applications/ktorrent/debian/control
@@ -2,7 +2,7 @@ Source: ktorrent-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, kdelibs4-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs4-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: ktorrent-trinity
@@ -11,7 +11,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: ktorrent-kde3 (<< 4:3.5.13)
 Breaks: ktorrent-kde3 (<< 4:3.5.13)
 Suggests: php5-cli
-Recommends: kdebase-kio-plugins-trinity
+Recommends: tdebase-kio-plugins-trinity
 Description: BitTorrent client for Trinity
  KTorrent is a BitTorrent program for Trinity. Its features include speed capping
  (both down and up), integrated searching, UDP tracker support, preview of
diff --git a/ubuntu/maverick/applications/ktorrent/debian/control.in b/ubuntu/maverick/applications/ktorrent/debian/control.in
index f688d0c53..93b55e4ff 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/control.in
+++ b/ubuntu/maverick/applications/ktorrent/debian/control.in
@@ -4,14 +4,14 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, kdelibs4-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs4-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: ktorrent-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: php5-cli
-Recommends: kdebase-kio-plugins-trinity
+Recommends: tdebase-kio-plugins-trinity
 Description: BitTorrent client for Trinity
  KTorrent is a BitTorrent program for Trinity. Its features include speed capping
  (both down and up), integrated searching, UDP tracker support, preview of
diff --git a/ubuntu/maverick/applications/kuickshow/debian/changelog b/ubuntu/maverick/applications/kuickshow/debian/changelog
index 6d94f0d4b..9683f6e2d 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/changelog
+++ b/ubuntu/maverick/applications/kuickshow/debian/changelog
@@ -25,18 +25,18 @@ kuickshow (4:3.5.8-0ubuntu2) hardy; urgency=low
 
 kuickshow (4:3.5.8-0ubuntu1) hardy; urgency=low
 
-  * New upstream release, extracted from kdegraphics 3.5.8
+  * New upstream release, extracted from tdegraphics 3.5.8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:59:49 +0000
 
 kuickshow (4:3.5.7-0ubuntu1) gutsy; urgency=low
 
-  * New upstream release, extracted from kdegraphics 3.5.7
+  * New upstream release, extracted from tdegraphics 3.5.7
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 03 Jun 2007 14:45:49 +0100
 
 kuickshow (4:3.5.6-0ubuntu1) feisty; urgency=low
 
-  * Initial package, separate from kdegraphics due to imlib11 not being in main
+  * Initial package, separate from tdegraphics due to imlib11 not being in main
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Feb 2007 16:29:08 +0000
diff --git a/ubuntu/maverick/applications/kuickshow/debian/control b/ubuntu/maverick/applications/kuickshow/debian/control
index 6f27aa78e..49b582716 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/control
+++ b/ubuntu/maverick/applications/kuickshow/debian/control
@@ -2,7 +2,7 @@ Source: kuickshow-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, kdelibs4-trinity-dev (>= 4:3.5.6), imlib11-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, tdelibs4-trinity-dev (>= 4:3.5.6), imlib11-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kuickshow-trinity
@@ -21,6 +21,6 @@ Description: KDE image/slideshow viewer [Trinity]
  large to display). KuickShow also has a slideshow mode.
  .
  This package is part of KDE, as a component of the KDE graphics
- module. See the 'kde' and 'kdegraphics' packages for more information.
+ module. See the 'kde' and 'tdegraphics' packages for more information.
  .
  Homepage: http://kuickshow.sourceforge.net
diff --git a/ubuntu/maverick/applications/kuickshow/debian/control.in b/ubuntu/maverick/applications/kuickshow/debian/control.in
index 1d61299fe..ed8445afa 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/control.in
+++ b/ubuntu/maverick/applications/kuickshow/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, kdelibs4-trinity-dev (>= 4:3.5.6), imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, tdelibs4-trinity-dev (>= 4:3.5.6), imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: kuickshow-trinity
@@ -21,6 +21,6 @@ Description: KDE image/slideshow viewer [Trinity]
  large to display). KuickShow also has a slideshow mode.
  .
  This package is part of KDE, as a component of the KDE graphics
- module. See the 'kde' and 'kdegraphics' packages for more information.
+ module. See the 'kde' and 'tdegraphics' packages for more information.
  .
  Homepage: http://kuickshow.sourceforge.net
diff --git a/ubuntu/maverick/applications/kvirc/debian/changelog b/ubuntu/maverick/applications/kvirc/debian/changelog
index 802811b21..28535f296 100644
--- a/ubuntu/maverick/applications/kvirc/debian/changelog
+++ b/ubuntu/maverick/applications/kvirc/debian/changelog
@@ -342,7 +342,7 @@ kvirc (2:2.1.2.99pre2-2) unstable; urgency=low
   * Change debian/rules file to use cdbs.
   * Overhaul kvirc autoconf macros.
   * Enable AM_MAINTAINER_MODE to avoid failed autobuilds.
-  * Remove build dependencies on libtool, automake, devscripts, kdebase-dev.
+  * Remove build dependencies on libtool, automake, devscripts, tdebase-dev.
   * Remove obsolete configure options.
 
  -- Robin Verduijn <robin@debian.org>  Fri, 10 Oct 2003 23:03:18 -0500
@@ -399,7 +399,7 @@ kvirc (2:2.1.2.99pre1-0) unstable; urgency=low
 
 kvirc (2:2.1.2-24) unstable; urgency=low
 
-  * With kdelibs built successfully on all architectures, try to get KVIrc
+  * With tdelibs built successfully on all architectures, try to get KVIrc
     into testing again.
 
  -- Robin Verduijn <robin@debian.org>  Tue,  9 Sep 2003 21:38:34 -0100
@@ -767,7 +767,7 @@ kvirc (2.1.2-pre5) unstable; urgency=low
   * Add Depends: kvirc to kvirc-dev and kvirc-doc.
   * Make the configure target change the literal $PREFIX in the man page
     to the prefix we're installing in, i.e. /usr.
-  * Add a versioned dependancy on libqt2 (>= 2.3) and kdelibs3 (>= 2.2)
+  * Add a versioned dependancy on libqt2 (>= 2.3) and tdelibs3 (>= 2.2)
     since I think only specifying libqt2 was creating problems for
     people on older systems.
   * Supply rfc2810.txt, rfc2811.txt, rfc2812.txt and rfc2813.txt with
diff --git a/ubuntu/maverick/applications/kvirc/debian/control b/ubuntu/maverick/applications/kvirc/debian/control
index 97da3b516..01e7eb13a 100644
--- a/ubuntu/maverick/applications/kvirc/debian/control
+++ b/ubuntu/maverick/applications/kvirc/debian/control
@@ -1,5 +1,5 @@
 Source: kvirc-trinity
-Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), kdelibs4-trinity-dev (>= 4:3.1.3), libesd0-dev, libperl-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), tdelibs4-trinity-dev (>= 4:3.1.3), libesd0-dev, libperl-dev, automake, autoconf, libtool, libltdl-dev
 Section: net
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
diff --git a/ubuntu/maverick/applications/kvkbd/debian/control b/ubuntu/maverick/applications/kvkbd/debian/control
index 9daf3579d..f4a40a1e8 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/control
+++ b/ubuntu/maverick/applications/kvkbd/debian/control
@@ -2,7 +2,7 @@ Source: kvkbd-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), cdbs, libxtst-dev, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, libxtst-dev, tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://pan4os.info/main/index.php
 
diff --git a/ubuntu/maverick/applications/piklab/debian/control b/ubuntu/maverick/applications/piklab/debian/control
index e2a7e9628..1bfd9448a 100644
--- a/ubuntu/maverick/applications/piklab/debian/control
+++ b/ubuntu/maverick/applications/piklab/debian/control
@@ -3,7 +3,7 @@ Section: electronics
 Priority: extra
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Build-Depends: debhelper (>= 5), autotools-dev, quilt, chrpath,
- libusb-dev, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, automake, autoconf, libtool, libltdl-dev
+ libusb-dev, tdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://piklab.sourceforge.net/
 
diff --git a/ubuntu/maverick/applications/potracegui/debian/control b/ubuntu/maverick/applications/potracegui/debian/control
index 9a4644f5e..c4c1925dc 100644
--- a/ubuntu/maverick/applications/potracegui/debian/control
+++ b/ubuntu/maverick/applications/potracegui/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Christoph Wegscheider <christoph.wegscheider@wegi.net>
 Uploaders: Bartosz Fenski <fenio@debian.org>
-Build-Depends: debhelper (>= 5.0.51), kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.51), tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: potracegui-trinity
diff --git a/ubuntu/maverick/applications/rosegarden/debian/changelog b/ubuntu/maverick/applications/rosegarden/debian/changelog
index 1733e9ec5..da6daabcb 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/changelog
+++ b/ubuntu/maverick/applications/rosegarden/debian/changelog
@@ -155,7 +155,7 @@ rosegarden (1:1.5.1-1) unstable; urgency=low
 
 rosegarden (1:1.5.0-3) unstable; urgency=low
 
-  * Depend on kdebase-bin, as rosegarden-project-manager needs kdialog
+  * Depend on tdebase-bin, as rosegarden-project-manager needs kdialog
 
  -- Free Ekanayaka <freee@debian.org>  Thu,  1 Mar 2007 11:58:23 +0100
 
@@ -427,7 +427,7 @@ rosegarden4 (0.8.5-2) unstable; urgency=low
 rosegarden4 (0.8.5-1) unstable; urgency=low
 
   * New upstream version.
-  * Moved to Trinity: Now using kdelibs4-dev, closes: #180365.
+  * Moved to Trinity: Now using tdelibs4-dev, closes: #180365.
   * Using automake1.6, which seems to be necessary for trinity build scripts.
   * Added build dependency on ladspa-sdk package (debian/control).
   * Updated package description and README.Debian. Latest releases are not
diff --git a/ubuntu/maverick/applications/rosegarden/debian/control b/ubuntu/maverick/applications/rosegarden/debian/control
index c074275db..639d9bd43 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/control
+++ b/ubuntu/maverick/applications/rosegarden/debian/control
@@ -4,13 +4,13 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Multimedia Team <debian-multimedia@lists.debian.org>
 Uploaders: Mike O'Connor <stew@debian.org>, Free Ekanayaka <freee@debian.org>
-Build-Depends: debhelper (>> 5.0.0), cmake, kdelibs4-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev
+Build-Depends: debhelper (>> 5.0.0), cmake, tdelibs4-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev
 Standards-Version: 3.8.4
 Homepage: http://www.rosegardenmusic.com/
 
 Package: rosegarden-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, khelpcenter-trinity, rosegarden-data-trinity (= ${source:Version}), libxml-twig-perl, sndfile-programs, xterm, kdebase-trinity-bin, konqueror-trinity | www-browser, flac
+Depends: ${shlibs:Depends}, khelpcenter-trinity, rosegarden-data-trinity (= ${source:Version}), libxml-twig-perl, sndfile-programs, xterm, tdebase-trinity-bin, konqueror-trinity | www-browser, flac
 Replaces: rosegarden-kde3 (<< 4:3.5.13)
 Breaks: rosegarden-kde3 (<< 4:3.5.13)
 Recommends: jackd, lilypond, swh-plugins | ladspa-plugin
diff --git a/ubuntu/maverick/applications/smb4k/debian/changelog b/ubuntu/maverick/applications/smb4k/debian/changelog
index 4bbfd4f98..aee60a650 100644
--- a/ubuntu/maverick/applications/smb4k/debian/changelog
+++ b/ubuntu/maverick/applications/smb4k/debian/changelog
@@ -167,7 +167,7 @@ smb4k (0.6.1-1) unstable; urgency=low
 smb4k (0.6.0-1) unstable; urgency=low
 
   * New upstream release
-  * Added missing kdebase-dev build-dep
+  * Added missing tdebase-dev build-dep
   * Policy bumped to 3.6.2
 
  -- Francesco Paolo Lovergine <frankie@debian.org>  Tue, 23 Aug 2005 23:29:26 +0200
diff --git a/ubuntu/maverick/applications/smb4k/debian/control b/ubuntu/maverick/applications/smb4k/debian/control
index b53e862ab..c684c3fd1 100644
--- a/ubuntu/maverick/applications/smb4k/debian/control
+++ b/ubuntu/maverick/applications/smb4k/debian/control
@@ -2,7 +2,7 @@ Source: smb4k-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: kdebase-trinity-dev, kdelibs4-trinity-dev, libart-2.0-dev, libpng3-dev, zlib1g-dev, debhelper (>= 4.1.0), cdbs, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: tdebase-trinity-dev, tdelibs4-trinity-dev, libart-2.0-dev, libpng3-dev, zlib1g-dev, debhelper (>= 4.1.0), cdbs, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://smb4k.berlios.de/
 
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/control b/ubuntu/maverick/applications/soundkonverter/debian/control
index 822cd2878..77c4c1dd7 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/control
+++ b/ubuntu/maverick/applications/soundkonverter/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>, Michael Meskes <meskes@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev, libcdparanoia0-dev, libtag1-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs4-trinity-dev, libcdparanoia0-dev, libtag1-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kde-apps.org/content/show.php?content=29024
 
@@ -12,7 +12,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: soundkonverter-kde3 (<< 4:3.5.13)
 Breaks: soundkonverter-kde3 (<< 4:3.5.13)
-Recommends: cdda2wav, cdparanoia, faad, ffmpeg, flac, kdemultimedia-kio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack
+Recommends: cdda2wav, cdparanoia, faad, ffmpeg, flac, tdemultimedia-kio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack
 Suggests: soundkonverter-amarok-trinity
 Description: audio converter frontend for Trinity
  soundKonverter is a frontend to various audio converters.
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/changelog b/ubuntu/maverick/applications/tde-guidance/debian/changelog
index fbd50fb8f..f73cc1d80 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/changelog
+++ b/ubuntu/maverick/applications/tde-guidance/debian/changelog
@@ -1,34 +1,34 @@
-kde-guidance-trinity (0.8.0svn20080103-0ubuntu17.15) karmic; urgency=low
+tde-guidance-trinity (0.8.0svn20080103-0ubuntu17.15) karmic; urgency=low
 
   * Repaired displayconfig scripting and paths
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 25 Oct 2009 21:47:00 -0600
 
-kde-guidance-trinity (0.8.0svn20080103-0ubuntu17.5) karmic; urgency=low
+tde-guidance-trinity (0.8.0svn20080103-0ubuntu17.5) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 26 Jul 2009 17:59:00 -0600
 
-kde-guidance-trinity (0.8.0svn20080103-0ubuntu17.4) jaunty; urgency=low
+tde-guidance-trinity (0.8.0svn20080103-0ubuntu17.4) jaunty; urgency=low
 
   * Rebuild against Python 2.6
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 22 Apr 2009 22:44:00 -0600
 
-kde-guidance-trinity (0.8.0svn20080103-0ubuntu16.5) intrepid; urgency=low
+tde-guidance-trinity (0.8.0svn20080103-0ubuntu16.5) intrepid; urgency=low
 
   * Fixed broken links (closes bug #58)
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 03 Apr 2009 11:18:00 -0600
 
-kde-guidance-trinity (0.8.0svn20080103-0ubuntu16.4) intrepid; urgency=low
+tde-guidance-trinity (0.8.0svn20080103-0ubuntu16.4) intrepid; urgency=low
 
   * Added -trinity suffix, altered paths
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 08 Mar 2009 16:31:00 -0600
 
-kde-guidance (0.8.0svn20080103-0ubuntu16.2) hardy-proposed; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu16.2) hardy-proposed; urgency=low
 
   * kubuntu_35_displayconfig_detect_nvidia_driver.patch:
     - Detect proprietary driver 'nvidia' again as some of the nvidia
@@ -36,7 +36,7 @@ kde-guidance (0.8.0svn20080103-0ubuntu16.2) hardy-proposed; urgency=low
 
  -- Andreas Wenning <awen@awen.dk>  Thu, 18 Sep 2008 14:24:31 +0200
 
-kde-guidance (0.8.0svn20080103-0ubuntu16.1) hardy-proposed; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu16.1) hardy-proposed; urgency=low
 
   [ Anthony Fok ]
   * kubuntu_32_displayconfig_update_refresh_rate.patch:
@@ -56,7 +56,7 @@ kde-guidance (0.8.0svn20080103-0ubuntu16.1) hardy-proposed; urgency=low
 
  -- Andreas Wenning <awen@awen.dk>  Thu, 05 Jun 2008 16:24:38 +0200
 
-kde-guidance (0.8.0svn20080103-0ubuntu16) hardy; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu16) hardy; urgency=low
 
   * kubuntu_26_kde-powermanager_handle_hal_dbus_restarts.patch:
     - don't try to restart HAL if it is not running, let gpm displays
@@ -67,7 +67,7 @@ kde-guidance (0.8.0svn20080103-0ubuntu16) hardy; urgency=low
 
  -- Guillaume Martres <smarter@ubuntu.com>  Thu, 17 Apr 2008 14:18:43 +0200
 
-kde-guidance (0.8.0svn20080103-0ubuntu15) hardy; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu15) hardy; urgency=low
 
   [ Andreas Wenning ]
   * Added kubuntu_29_kde-powermanager_display_consumption_rate.patch to
@@ -84,7 +84,7 @@ kde-guidance (0.8.0svn20080103-0ubuntu15) hardy; urgency=low
 
  -- Yuriy Kozlov <yuriy-kozlov@kubuntu.org>  Sun, 13 Apr 2008 12:49:35 -0400
 
-kde-guidance (0.8.0svn20080103-0ubuntu14) hardy; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu14) hardy; urgency=low
 
   * Disable kubuntu_30_displayconfig_no_xorg_correct_detection.patch. It
     breaks the API, and the previous change did not even state a bug number.
@@ -94,7 +94,7 @@ kde-guidance (0.8.0svn20080103-0ubuntu14) hardy; urgency=low
 
  -- Martin Pitt <martin.pitt@ubuntu.com>  Sat, 12 Apr 2008 18:17:24 +0200
 
-kde-guidance (0.8.0svn20080103-0ubuntu13) hardy; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu13) hardy; urgency=low
 
   * Added kubuntu_30_displayconfig_no_xorg_correct_detection.patch
     so we will detect the hardware automatically and write a xorg.conf
@@ -102,14 +102,14 @@ kde-guidance (0.8.0svn20080103-0ubuntu13) hardy; urgency=low
 
  -- Andreas Wenning <awen@awen.dk>  Thu, 10 Apr 2008 00:59:19 +0200
 
-kde-guidance (0.8.0svn20080103-0ubuntu12) hardy; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu12) hardy; urgency=low
 
   * Patch kubuntu_28_kde-powermanager_i18n_strings.patch adds missing
     translatable string.
 
  -- Andreas Wenning <awen@awen.dk>  Wed, 09 Apr 2008 00:13:18 +0200
 
-kde-guidance (0.8.0svn20080103-0ubuntu11) hardy; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu11) hardy; urgency=low
 
   [ Andreas Wenning ]
   * Added kubuntu_24_displayconfig_no_gamma.patch: As we cannot check if
@@ -131,7 +131,7 @@ kde-guidance (0.8.0svn20080103-0ubuntu11) hardy; urgency=low
 
  -- Scott Kitterman <scott@kitterman.com>  Sat, 05 Apr 2008 20:06:50 -0400
 
-kde-guidance (0.8.0svn20080103-0ubuntu10) hardy; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu10) hardy; urgency=low
 
   [ Andreas Wenning ]
   * Added kubuntu_21_kde-powermanager_unique-check.patch:
@@ -141,9 +141,9 @@ kde-guidance (0.8.0svn20080103-0ubuntu10) hardy; urgency=low
       dcop calls to guidance-power-manager.
     - guidance-power-manager will now start gpmhelper.py.
     - Patched setup.py to build/install gpmhelper.py
-  * Changed debian/rules and debian/kde-guidance-powermanager.install
+  * Changed debian/rules and debian/tde-guidance-powermanager.install
     to install gpmhelper.py
-  * Added depends for kde-guidance-powermanager to python-gobject as
+  * Added depends for tde-guidance-powermanager to python-gobject as
     this is the only mainloop to work with DBusGMainLoop.
 
   [ Scott Kitterman ]
@@ -154,7 +154,7 @@ kde-guidance (0.8.0svn20080103-0ubuntu10) hardy; urgency=low
 
  -- Scott Kitterman <scott@kitterman.com>  Sun, 30 Mar 2008 19:11:55 -0400
 
-kde-guidance (0.8.0svn20080103-0ubuntu9) hardy; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu9) hardy; urgency=low
 
   [ Andreas Wenning ]
   * Added kubuntu_22_userconfig_utf8.patch which fixes unicode problems present
@@ -167,7 +167,7 @@ kde-guidance (0.8.0svn20080103-0ubuntu9) hardy; urgency=low
 
  -- Scott Kitterman <scott@kitterman.com>  Sat, 29 Mar 2008 23:10:20 -0400
 
-kde-guidance (0.8.0svn20080103-0ubuntu8) hardy; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu8) hardy; urgency=low
 
   * Update kubuntu_12_powermanager_survive_no_brightness.patch so it correctly
     catches the error (LP: #183656)
@@ -180,7 +180,7 @@ kde-guidance (0.8.0svn20080103-0ubuntu8) hardy; urgency=low
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 25 Mar 2008 11:48:16 -0400
 
-kde-guidance (0.8.0svn20080103-0ubuntu7) hardy; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu7) hardy; urgency=low
 
   * Added debian/patches/kubuntu_17_kde-powermanager_brightness.patch
     which fixes the brightness slider when number of brightness levels
@@ -188,7 +188,7 @@ kde-guidance (0.8.0svn20080103-0ubuntu7) hardy; urgency=low
 
  -- Andreas Wenning <awen@awen.dk>  Mon, 17 Mar 2008 23:02:36 +0100
 
-kde-guidance (0.8.0svn20080103-0ubuntu6) hardy; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu6) hardy; urgency=low
 
   * Bump standards version to 3.7.3 without further change
   * Rename kubuntu_14_displayconfig_survive_no_serverlayout.patch to be
@@ -209,14 +209,14 @@ kde-guidance (0.8.0svn20080103-0ubuntu6) hardy; urgency=low
 
  -- Scott Kitterman <scott@kitterman.com>  Mon, 17 Mar 2008 15:23:49 -0400
 
-kde-guidance (0.8.0svn20080103-0ubuntu5) hardy; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu5) hardy; urgency=low
 
   * debian/patches/kubuntu_15_powermanager_suspend.patch so we can
     suspend.
 
  -- Andreas Wenning <awen@awen.dk>  Thu, 13 Mar 2008 11:33:46 +0100
 
-kde-guidance (0.8.0svn20080103-0ubuntu4) hardy; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu4) hardy; urgency=low
 
   * Add kubuntu_14_displayconfig_survive_no_serverlayout.patch so 
     displaymanager doesn't crash if xorg.conf has no ServerLayout section 
@@ -226,7 +226,7 @@ kde-guidance (0.8.0svn20080103-0ubuntu4) hardy; urgency=low
 
  -- Scott Kitterman <scott@kitterman.com>  Wed, 12 Mar 2008 10:19:57 -0400
 
-kde-guidance (0.8.0svn20080103-0ubuntu3) hardy; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu3) hardy; urgency=low
 
   * Add Add kubuntu_09_mountconfig_no_extensions.patch to remove uneeded call
     to pykdeextensions in mountconfig so that pyqt3 no longer needs to be
@@ -245,13 +245,13 @@ kde-guidance (0.8.0svn20080103-0ubuntu3) hardy; urgency=low
 
  -- Scott Kitterman <scott@kitterman.com>  Sun, 09 Mar 2008 19:53:42 -0400
 
-kde-guidance (0.8.0svn20080103-0ubuntu2) hardy; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu2) hardy; urgency=low
 
   * Revert inadvertent upload meant for PPA
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 04 Mar 2008 16:52:29 -0500
 
-kde-guidance (0.8.0svn20080103-0ubuntu1) hardy; urgency=low
+tde-guidance (0.8.0svn20080103-0ubuntu1) hardy; urgency=low
 
   * New svn snapshot, includes fixes for .pot file
   * Add kubuntu_07_powermanager_i18n.patch:
@@ -266,14 +266,14 @@ kde-guidance (0.8.0svn20080103-0ubuntu1) hardy; urgency=low
 
  -- Anthony Mercatante <tonio@kubuntu>  Thu, 03 Jan 2008 22:37:28 +0100
 
-kde-guidance (0.8.0svn20070928-0ubuntu7) gutsy; urgency=low
+tde-guidance (0.8.0svn20070928-0ubuntu7) gutsy; urgency=low
 
   * Add workaround to displayconfig-restore.py for 151311
     kubuntu_06_displayconfig_fix_intel_dpi.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 15 Oct 2007 15:53:45 +0100
 
-kde-guidance (0.8.0svn20070928-0ubuntu6) gutsy; urgency=low
+tde-guidance (0.8.0svn20070928-0ubuntu6) gutsy; urgency=low
 
   [ Jonathan Riddell ] * Add kubuntu_05_displayconfig_fix.diff with
   fix from Sebastian Heinline for bug which resulted in falsely
@@ -284,24 +284,24 @@ kde-guidance (0.8.0svn20070928-0ubuntu6) gutsy; urgency=low
     Patch provided by Liam Keene. (LP: #141023)
     debian/patches/kubuntu_04_disk_unicode.diff
   * Install Xsession startup script (displayconfig-restore) in 
-    kde-guidance package as it is KDE specific. (LP: #146730)
+    tde-guidance package as it is KDE specific. (LP: #146730)
 
  -- Luka Renko <lure@ubuntu.com>  Tue, 09 Oct 2007 19:57:37 +0200
 
-kde-guidance (0.8.0svn20070928-0ubuntu5) gutsy; urgency=low
+tde-guidance (0.8.0svn20070928-0ubuntu5) gutsy; urgency=low
 
-  * Make guidance-backends replace/conflicts old kde-guidance
+  * Make guidance-backends replace/conflicts old tde-guidance
     Closes LP: #133810
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 08 Oct 2007 12:44:15 +0100
 
-kde-guidance (0.8.0svn20070928-0ubuntu4) gutsy; urgency=low
+tde-guidance (0.8.0svn20070928-0ubuntu4) gutsy; urgency=low
 
   * Remove kubuntu_04_no_ati_dualhead.diff, it conflicts with patch 03
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 05 Oct 2007 12:22:27 +0100
 
-kde-guidance (0.8.0svn20070928-0ubuntu3) gutsy; urgency=low
+tde-guidance (0.8.0svn20070928-0ubuntu3) gutsy; urgency=low
 
   * Add kubuntu_04_no_ati_dualhead.diff from Sebastian Heinlein, 
     the latest free ATI drivers do no longer support the classic xinerama
@@ -309,7 +309,7 @@ kde-guidance (0.8.0svn20070928-0ubuntu3) gutsy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 04 Oct 2007 21:47:47 +0100
 
-kde-guidance (0.8.0svn20070928-0ubuntu2) gutsy; urgency=low
+tde-guidance (0.8.0svn20070928-0ubuntu2) gutsy; urgency=low
 
   * Add kubuntu_03_displayconfig_updates.diff with updates from SVN by glatzor
    - Disable dual head support for intel and ati driver
@@ -321,36 +321,36 @@ kde-guidance (0.8.0svn20070928-0ubuntu2) gutsy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 01 Oct 2007 23:25:16 +0100
 
-kde-guidance (0.8.0svn20070928-0ubuntu1) gutsy; urgency=low
+tde-guidance (0.8.0svn20070928-0ubuntu1) gutsy; urgency=low
 
   * New snapshot, includes
    - Update monitor definitions - fixes LP: #113520 #113514
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 28 Sep 2007 11:47:59 +0100
 
-kde-guidance (0.8.0svn20070727-0ubuntu6) gutsy; urgency=low
+tde-guidance (0.8.0svn20070727-0ubuntu6) gutsy; urgency=low
 
   * Fix for crash when loading xorg.conf's using the "Disable" keyword
 
  -- Bryce Harrington <bryce@ubuntu.com>  Thu,  6 Sep 2007 10:56:03 -0700
 
-kde-guidance (0.8.0svn20070727-0ubuntu5) gutsy; urgency=low
+tde-guidance (0.8.0svn20070727-0ubuntu5) gutsy; urgency=low
 
-  * Update kde-guidance replaces/conflicts guidance-backends
-    closes https://bugs.launchpad.net/ubuntu/+source/kde-guidance/+bug/133810
+  * Update tde-guidance replaces/conflicts guidance-backends
+    closes https://bugs.launchpad.net/ubuntu/+source/tde-guidance/+bug/133810
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 05 Sep 2007 18:59:44 +0100
 
-kde-guidance (0.8.0svn20070727-0ubuntu4) gutsy; urgency=low
+tde-guidance (0.8.0svn20070727-0ubuntu4) gutsy; urgency=low
 
   * Fixed an issue where you cannot not select the primary group for a user
     in the secondary ListPickerDialog()
-   - Closes https://bugs.launchpad.net/ubuntu/+source/kde-guidance/+bug/47412
+   - Closes https://bugs.launchpad.net/ubuntu/+source/tde-guidance/+bug/47412
    - Added kubuntu_02_primary_group_change.diff
 
  -- Stefan Skotte <sfs@enhance-it.dk>  Mon, 03 Sep 2007 22:17:07 +0200
 
-kde-guidance (0.8.0svn20070727-0ubuntu3) gutsy; urgency=low
+tde-guidance (0.8.0svn20070727-0ubuntu3) gutsy; urgency=low
 
   * Update from Uwe Koziolek <uwe.koziolek@gmx.net>
     The attached files includes updates for pcitables. The data are
@@ -359,22 +359,22 @@ kde-guidance (0.8.0svn20070727-0ubuntu3) gutsy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 30 Aug 2007 15:34:26 +0100
 
-kde-guidance (0.8.0svn20070727-0ubuntu2) gutsy; urgency=low
+tde-guidance (0.8.0svn20070727-0ubuntu2) gutsy; urgency=low
 
   * Build-dep on python-qt-dev
   * Add kubuntu_01_infimport.diff to install infiimport.py file, closes
-    https://bugs.launchpad.net/ubuntu/+source/kde-guidance/+bug/131669
+    https://bugs.launchpad.net/ubuntu/+source/tde-guidance/+bug/131669
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 14 Aug 2007 10:53:06 +0100
 
-kde-guidance (0.8.0svn20070727-0ubuntu1) gutsy; urgency=low
+tde-guidance (0.8.0svn20070727-0ubuntu1) gutsy; urgency=low
 
   * New upstream snapshot
   * Remove all patches, applied upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 27 Jul 2007 18:00:13 +0100
 
-kde-guidance (0.8.0-1ubuntu9) gutsy; urgency=low
+tde-guidance (0.8.0-1ubuntu9) gutsy; urgency=low
 
   * Add debian/patches/xorgconfig_dexconf_style.patch: Change xorgconfig.py's
     style of written xorg.conf files to closely match dexconf's: Capitalize
@@ -383,51 +383,51 @@ kde-guidance (0.8.0-1ubuntu9) gutsy; urgency=low
 
  -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 19 Jun 2007 19:10:11 +0200
 
-kde-guidance (0.8.0-1ubuntu8) gutsy; urgency=low
+tde-guidance (0.8.0-1ubuntu8) gutsy; urgency=low
 
   * Fix symlink to displayconfig-restore
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 07 Jun 2007 13:16:25 +0100
 
-kde-guidance (0.8.0-1ubuntu7) gutsy; urgency=low
+tde-guidance (0.8.0-1ubuntu7) gutsy; urgency=low
 
-  * Fix kde-guidance's replaces to allow installation
+  * Fix tde-guidance's replaces to allow installation
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 06 Jun 2007 09:42:36 +0000
 
-kde-guidance (0.8.0-1ubuntu6) gutsy; urgency=low
+tde-guidance (0.8.0-1ubuntu6) gutsy; urgency=low
 
   * Fix path in /usr/bin/guidance-power-manager
-  * Add replaces to old package on kde-guidance
+  * Add replaces to old package on tde-guidance
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 05 Jun 2007 21:35:55 +0000
 
-kde-guidance (0.8.0-1ubuntu5) gutsy; urgency=low
+tde-guidance (0.8.0-1ubuntu5) gutsy; urgency=low
 
   * Remove excessive dependencies from guidance-backends
   * Split up python-central directories to avoid overlapping files
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 05 Jun 2007 14:47:30 +0000
 
-kde-guidance (0.8.0-1ubuntu4) gutsy; urgency=low
+tde-guidance (0.8.0-1ubuntu4) gutsy; urgency=low
 
   * Move pyversion to correctly named pyversions, to build with python 2.5
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 04 Jun 2007 16:00:50 +0000
 
-kde-guidance (0.8.0-1ubuntu3) gutsy; urgency=low
+tde-guidance (0.8.0-1ubuntu3) gutsy; urgency=low
 
   * Fix versioned build depends to python-qt3 not python-trinity
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 04 Jun 2007 13:23:18 +0100
 
-kde-guidance (0.8.0-1ubuntu2) gutsy; urgency=low
+tde-guidance (0.8.0-1ubuntu2) gutsy; urgency=low
 
   * Build-dep on python-qt3 >= 3.17.2-1ubuntu2 for compile fix
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 31 May 2007 11:59:26 +0100
 
-kde-guidance (0.8.0-1ubuntu1) gutsy; urgency=low
+tde-guidance (0.8.0-1ubuntu1) gutsy; urgency=low
 
   * Merge with Debian, remaining change:
    - kubuntu_01_enable_wineconfig.diff
@@ -443,18 +443,18 @@ kde-guidance (0.8.0-1ubuntu1) gutsy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 30 May 2007 15:54:26 +0100
 
-kde-guidance (0.8.0-1) unstable; urgency=low
+tde-guidance (0.8.0-1) unstable; urgency=low
 
   * New upstream release.
 
   [ Fathi Boudra ]
   * Add x11proto-scrnsaver-dev build dependency.
-  * Update kde-guidance.install:
+  * Update tde-guidance.install:
     * Add wineconfig icons.
     * Remove bytecompiled modules (pyc).
     * Remove fuser_ui.ui file.
-  * Remove old displayconfig-hwprobe.py init links in kde-guidance.postinst.
-  * Update kde-guidance-powermanager.install. Add powermanager_ui.py.
+  * Remove old displayconfig-hwprobe.py init links in tde-guidance.postinst.
+  * Update tde-guidance-powermanager.install. Add powermanager_ui.py.
   * Remove pycompat file. Deprecated.
   * Update rules:
     * Use DEB_DH_INSTALL_ARGS.
@@ -475,7 +475,7 @@ kde-guidance (0.8.0-1) unstable; urgency=low
 
  -- Fathi Boudra <fboudra@free.fr>  Fri, 18 May 2007 19:45:51 +0200
 
-kde-guidance (0.8.0-0ubuntu5) feisty; urgency=low
+tde-guidance (0.8.0-0ubuntu5) feisty; urgency=low
 
   * Update kubuntu_06_powermanager_fixes.diff with fix from
     https://launchpad.net/bugs/104794 comment 7
@@ -483,52 +483,52 @@ kde-guidance (0.8.0-0ubuntu5) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 13 Apr 2007 10:50:55 +0100
 
-kde-guidance (0.8.0-0ubuntu4) feisty; urgency=low
+tde-guidance (0.8.0-0ubuntu4) feisty; urgency=low
 
   * Add kubuntu_05_nvidia_typo.diff fix crash with nvidia non-free driver
   * Add kubuntu_06_powermanager_fixes.diff with fixes from trunk
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  9 Apr 2007 23:47:13 +0100
 
-kde-guidance (0.8.0-0ubuntu3) feisty; urgency=low
+tde-guidance (0.8.0-0ubuntu3) feisty; urgency=low
 
-  * Remove old displayconfig-hwprobe.py init links in kde-guidance.postinst
-    closes https://bugs.launchpad.net/ubuntu/+source/kde-guidance/+bug/99203
+  * Remove old displayconfig-hwprobe.py init links in tde-guidance.postinst
+    closes https://bugs.launchpad.net/ubuntu/+source/tde-guidance/+bug/99203
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  6 Apr 2007 16:29:18 +0100
 
-kde-guidance (0.8.0-0ubuntu2) feisty; urgency=low
+tde-guidance (0.8.0-0ubuntu2) feisty; urgency=low
 
   * Add kubuntu_03_no_cpu_freq.diff, fix https://launchpad.net/bugs/99198
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 31 Mar 2007 11:33:39 +0100
 
-kde-guidance (0.8.0-0ubuntu1) feisty; urgency=low
+tde-guidance (0.8.0-0ubuntu1) feisty; urgency=low
 
   * Non-snapshot release for feisty
   * Add kubuntu_02_wineconfig_icon.diff fix icon name in .desktop file
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 30 Mar 2007 12:17:30 +0100
 
-kde-guidance (0.7.1~svn20070205-0ubuntu1) feisty; urgency=low
+tde-guidance (0.7.1~svn20070205-0ubuntu1) feisty; urgency=low
 
   * New upstream snapshot
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 05 Feb 2007 11:52:27 +0100
 
-kde-guidance (0.7.1~svn20070204-1) experimental; urgency=low
+tde-guidance (0.7.1~svn20070204-1) experimental; urgency=low
 
   [ Fathi Boudra ]
   * New release from svn r630094. (Closes: #397508, #405880)
   * Remove useless patch typos_setup and force_python2.4_script.
   * control:
     * Add libxss-dev to build-depends.
-    * Remove python-dbus depends on kde-guidance.
-    * Add Conflicts: python2.4-iconvcodec on kde-guidance.
-    * Add kde-guidance depends on kde-guidance-powermanager.
-    * Remove Conflicts: klaptopdaemon, kpowersave on kde-guidance-powermanager
-  * kde-guidance.install: replace versioned python by wildcard on ixf86misc.so.
-  * kde-guidance-powermanager.install: use wildcard for battery pics.
+    * Remove python-dbus depends on tde-guidance.
+    * Add Conflicts: python2.4-iconvcodec on tde-guidance.
+    * Add tde-guidance depends on tde-guidance-powermanager.
+    * Remove Conflicts: klaptopdaemon, kpowersave on tde-guidance-powermanager
+  * tde-guidance.install: replace versioned python by wildcard on ixf86misc.so.
+  * tde-guidance-powermanager.install: use wildcard for battery pics.
   * rules:
     * Replace hardcoded python version by wildcard.
     * Enable wineconfig.
@@ -539,7 +539,7 @@ kde-guidance (0.7.1~svn20070204-1) experimental; urgency=low
 
  -- Fathi Boudra <fboudra@free.fr>  Sun,  4 Feb 2007 12:27:42 +0100
 
-kde-guidance (0.7.1~svn20070129-0ubuntu1) feisty; urgency=low
+tde-guidance (0.7.1~svn20070129-0ubuntu1) feisty; urgency=low
 
   * New upstream snapshot
   * Add kubuntu_01_enable_wineconfig.diff to enable wineconfig in
@@ -547,67 +547,67 @@ kde-guidance (0.7.1~svn20070129-0ubuntu1) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 29 Jan 2007 18:03:53 +0000
 
-kde-guidance (0.7.1~svn20070111-0ubuntu7) feisty; urgency=low
+tde-guidance (0.7.1~svn20070111-0ubuntu7) feisty; urgency=low
 
   * Add kubuntu_02_powermanage.diff from trunk, stop it breaking
     when cpufreq is disabled
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 18 Jan 2007 15:44:26 +0000
 
-kde-guidance (0.7.1~svn20070111-0ubuntu6) feisty; urgency=low
+tde-guidance (0.7.1~svn20070111-0ubuntu6) feisty; urgency=low
 
   * Remove debian/patches/12_force_python2.4_script.diff.
 
  -- Matthias Klose <doko@ubuntu.com>  Tue, 16 Jan 2007 12:44:50 +0100
 
-kde-guidance (0.7.1~svn20070111-0ubuntu5) feisty; urgency=low
+tde-guidance (0.7.1~svn20070111-0ubuntu5) feisty; urgency=low
 
   * Use the unversioned interpreter name for the scripts.
 
  -- Matthias Klose <doko@ubuntu.com>  Mon, 15 Jan 2007 15:47:46 +0000
 
-kde-guidance (0.7.1~svn20070111-0ubuntu4) feisty; urgency=low
+tde-guidance (0.7.1~svn20070111-0ubuntu4) feisty; urgency=low
 
   * debian/pyversions: Nice file to hardcode the python version.
   * debian/rules: Don't hardcode the python version.
 
  -- Matthias Klose <doko@ubuntu.com>  Mon, 15 Jan 2007 09:22:54 +0000
 
-kde-guidance (0.7.1~svn20070111-0ubuntu3) feisty; urgency=low
+tde-guidance (0.7.1~svn20070111-0ubuntu3) feisty; urgency=low
 
   * Rebuild for python2.5 as the default python version.
 
  -- Matthias Klose <doko@ubuntu.com>  Fri, 12 Jan 2007 13:18:02 +0000
 
-kde-guidance (0.7.1~svn20070111-0ubuntu2) feisty; urgency=low
+tde-guidance (0.7.1~svn20070111-0ubuntu2) feisty; urgency=low
 
-  * Drop some duplicate icons from kde-guidance-powermanager
-    (already in kde-guidance package)
+  * Drop some duplicate icons from tde-guidance-powermanager
+    (already in tde-guidance package)
 
  -- Luka Renko <lure@ubuntu.com>  Tue,  9 Jan 2007 20:15:54 +0100
 
-kde-guidance (0.7.1~svn20070111-0ubuntu1) feisty; urgency=low
+tde-guidance (0.7.1~svn20070111-0ubuntu1) feisty; urgency=low
 
   * New SVN snapshot. Fixes powermanager icons.
-  * Fixed debian/control, kde-guidance doesn't depend on
-    python-dbus and kde-guidance-powermanager depends on
-    kde-guidance.
+  * Fixed debian/control, tde-guidance doesn't depend on
+    python-dbus and tde-guidance-powermanager depends on
+    tde-guidance.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 09 Jan 2007 17:07:35 +0100
 
-kde-guidance (0.7.1~svn20070110-0ubuntu1) feisty; urgency=low
+tde-guidance (0.7.1~svn20070110-0ubuntu1) feisty; urgency=low
 
   * New SVN snapshot. Fixes critical crash on startup.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 09 Jan 2007 13:45:32 +0100
 
-kde-guidance (0.7.1~svn20070109-0ubuntu1) feisty; urgency=low
+tde-guidance (0.7.1~svn20070109-0ubuntu1) feisty; urgency=low
 
   * New SVN snapshot.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 09 Jan 2007 01:55:47 +0100
 
-kde-guidance (0.7.1~svn20061215-0ubuntu1) feisty; urgency=low
+tde-guidance (0.7.1~svn20061215-0ubuntu1) feisty; urgency=low
 
   * New SVN snapshot.
   * Clean powermanager/icon content
@@ -616,20 +616,20 @@ kde-guidance (0.7.1~svn20061215-0ubuntu1) feisty; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 15 Dec 2006 03:51:54 +0100
 
-kde-guidance (0.7.1~svn20061124-0ubuntu2) feisty; urgency=low
+tde-guidance (0.7.1~svn20061124-0ubuntu2) feisty; urgency=low
 
   * Rebuilt against new pykde.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 06 Dec 2006 23:40:32 +0100
 
-kde-guidance (0.7.1~svn20061124-0ubuntu1) feisty; urgency=low
+tde-guidance (0.7.1~svn20061124-0ubuntu1) feisty; urgency=low
 
   * New SVN snapshot.
   * Removed obsolete kubuntu_10_critical_threshold.diff
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri,  24 Nov 2006 01:00:28 +0200
 
-kde-guidance (0.7.0-1) unstable; urgency=low
+tde-guidance (0.7.0-1) unstable; urgency=low
 
   * New upstream release (Closes: #386636)
   * Update maintainers
@@ -644,34 +644,34 @@ kde-guidance (0.7.0-1) unstable; urgency=low
     * control:
       * add python-trinity-dev to build-depends
       * add python-dbus and sysv-rc to depends
-      * add kde-guidance-powermanager package
+      * add tde-guidance-powermanager package
     * pyversions: replace "2.4-" by "2.4", since build fails using python 2.5,
       problem to import kdedistutils
     * rules:
       * Don't add extra /usr prefix when creating symlinks for
         {display,mount,service,user}config and displayconfig-restore
-      * add kde-guidance-powermanager install
+      * add tde-guidance-powermanager install
       * create a script to launch guidance-power-manager instead of a link
 
  -- Fathi Boudra <fboudra@free.fr>  Mon, 21 Aug 2006 10:34:01 +0200
 
-kde-guidance (0.7.0-0ubuntu4) edgy; urgency=low
+tde-guidance (0.7.0-0ubuntu4) edgy; urgency=low
 
   * Edit debian/rules to generate .pot file
     Closes Malone No 67614
-  * Remove Conflicts: klaptopdaemon, kpowersave from kde-guidance-powermanager
+  * Remove Conflicts: klaptopdaemon, kpowersave from tde-guidance-powermanager
     allows people to do apt-get install kde
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 22 Oct 2006 20:05:01 +0000
 
-kde-guidance (0.7.0-0ubuntu3) edgy; urgency=low
+tde-guidance (0.7.0-0ubuntu3) edgy; urgency=low
 
-  * Make kde-guidance conflict on python2.4-iconvcodec
+  * Make tde-guidance conflict on python2.4-iconvcodec
     Closes Malone No 62223
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 22 Oct 2006 14:34:54 +0100
 
-kde-guidance (0.7.0-0ubuntu2) edgy; urgency=low
+tde-guidance (0.7.0-0ubuntu2) edgy; urgency=low
 
   * kubuntu_10_critical_threshold.diff added, reduce safety threshold
     for percentage charged to 10% in order to prevent automatic critical
@@ -686,20 +686,20 @@ kde-guidance (0.7.0-0ubuntu2) edgy; urgency=low
 
  -- Luka Renko <lure@ubuntu.com>  Sat, 21 Oct 2006 15:10:50 +0200
 
-kde-guidance (0.7.0-0ubuntu1) edgy; urgency=low
+tde-guidance (0.7.0-0ubuntu1) edgy; urgency=low
 
   * Bump version number for an Edgy release
   * Fixes bugs 64053 and 64978
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Oct 2006 20:05:22 +0100
 
-kde-guidance (0.6.7svn20061006-0ubuntu1) edgy; urgency=low
+tde-guidance (0.6.7svn20061006-0ubuntu1) edgy; urgency=low
 
   * New SVN snapshot
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri,  10 Oct 2006 16:04:28 +0200
 
-kde-guidance (0.6.7svn20060919-0ubuntu1) edgy; urgency=low
+tde-guidance (0.6.7svn20060919-0ubuntu1) edgy; urgency=low
 
   * New SVN snapshot
   * Split out power manager applet into new package so it can be removed 
@@ -707,19 +707,19 @@ kde-guidance (0.6.7svn20060919-0ubuntu1) edgy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 19 Sep 2006 14:52:11 +0100
 
-kde-guidance (0.6.7svn20060914-0ubuntu2) edgy; urgency=low
+tde-guidance (0.6.7svn20060914-0ubuntu2) edgy; urgency=low
 
   * Remove stop script symlinks from rc0 and rc6.
 
  -- Scott James Remnant <scott@ubuntu.com>  Mon, 18 Sep 2006 17:26:27 +0100
 
-kde-guidance (0.6.7svn20060914-0ubuntu1) edgy; urgency=low
+tde-guidance (0.6.7svn20060914-0ubuntu1) edgy; urgency=low
 
   * New SVN snapshot, includes power-manager improvement
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu,  14 Sep 2006 20:54:28 +0200
 
-kde-guidance (0.6.7svn20060906-0ubuntu2) edgy; urgency=low
+tde-guidance (0.6.7svn20060906-0ubuntu2) edgy; urgency=low
 
   * Changed debian/rules to create a script to launch
     guidance-power-manager instead of a link. Fixes the logout issue
@@ -730,20 +730,20 @@ kde-guidance (0.6.7svn20060906-0ubuntu2) edgy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Sun,  10 Sep 2006 13:45:28 +0200
 
-kde-guidance (0.6.7svn20060906-0ubuntu1) edgy; urgency=low
+tde-guidance (0.6.7svn20060906-0ubuntu1) edgy; urgency=low
 
   * New SVN snapshot, includes displayconfig usability fixes, 
     powerconfig fixes and new powerconfig icons
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  6 Sep 2006 13:22:28 +0100
 
-kde-guidance (0.6.7svn20060829-0ubuntu1) edgy; urgency=low
+tde-guidance (0.6.7svn20060829-0ubuntu1) edgy; urgency=low
 
   * New SVN snapshot
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 29 Aug 2006 14:35:20 +0100
 
-kde-guidance (0.6.7svn20060810-0ubuntu1) edgy; urgency=low
+tde-guidance (0.6.7svn20060810-0ubuntu1) edgy; urgency=low
 
   * New SVN snapshot
   * Adds power manager applet for 
@@ -751,7 +751,7 @@ kde-guidance (0.6.7svn20060810-0ubuntu1) edgy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 10 Aug 2006 08:56:24 -0400
 
-kde-guidance (0.6.7-3ubuntu2) edgy; urgency=low
+tde-guidance (0.6.7-3ubuntu2) edgy; urgency=low
 
   * debian/rules: Don't add extra /usr prefix when creating symlinks
     for {display,mount,service,user}config & displayconfig-restore
@@ -759,19 +759,19 @@ kde-guidance (0.6.7-3ubuntu2) edgy; urgency=low
 
  -- Daniel T Chen <crimsun@ubuntu.com>  Mon, 31 Jul 2006 21:55:39 -0400
 
-kde-guidance (0.6.7-3ubuntu1) edgy; urgency=low
+tde-guidance (0.6.7-3ubuntu1) edgy; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 26 Jul 2006 18:39:47 +0100
 
-kde-guidance (0.6.7-3) experimental; urgency=low
+tde-guidance (0.6.7-3) experimental; urgency=low
 
-  * Fixed displayconfig-hwprobe.py in kde-guidance.init (Closes: #376779)
+  * Fixed displayconfig-hwprobe.py in tde-guidance.init (Closes: #376779)
 
  -- Fathi Boudra <fboudra@free.fr>  Wed,  5 Jul 2006 08:35:08 +0200
 
-kde-guidance (0.6.7-2) experimental; urgency=low
+tde-guidance (0.6.7-2) experimental; urgency=low
 
   * Converted package to python-support
   * Added pycompat and pyversions
@@ -783,7 +783,7 @@ kde-guidance (0.6.7-2) experimental; urgency=low
 
  -- Fathi Boudra <fboudra@free.fr>  Fri, 30 Jun 2006 14:44:46 +0200
 
-kde-guidance (0.6.7-1) experimental; urgency=low
+tde-guidance (0.6.7-1) experimental; urgency=low
 
   * Initial Debian release (Closes: #340144)
   * Merged with Ubuntu
@@ -794,7 +794,7 @@ kde-guidance (0.6.7-1) experimental; urgency=low
 
  -- Fathi Boudra <fboudra@free.fr>  Thu,  8 Jun 2006 17:08:06 +0200
 
-kde-guidance (0.6.7-0ubuntu4) dapper; urgency=low
+tde-guidance (0.6.7-0ubuntu4) dapper; urgency=low
 
   * Add kubuntu_02_passwordexpire.diff from branch,
     set local passexpirewarn (not global variable of same name) 
@@ -802,14 +802,14 @@ kde-guidance (0.6.7-0ubuntu4) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 28 May 2006 14:34:10 +0100
 
-kde-guidance (0.6.7-0ubuntu3) dapper; urgency=low
+tde-guidance (0.6.7-0ubuntu3) dapper; urgency=low
 
   * Change init number of displayconfig-hwprobe.py to 60, 
     in line with Ubuntu policy
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 26 May 2006 14:18:42 +0100
 
-kde-guidance (0.6.7-0ubuntu2) dapper; urgency=low
+tde-guidance (0.6.7-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_01_branch.diff
     - Adds Dutch Translations to .desktop files
@@ -818,7 +818,7 @@ kde-guidance (0.6.7-0ubuntu2) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 19 May 2006 02:09:48 +0300
 
-kde-guidance (0.6.7-0ubuntu1) dapper; urgency=low
+tde-guidance (0.6.7-0ubuntu1) dapper; urgency=low
 
   [ Simon Edwards ]
   * Dutch translation added (Rinse de Vries)
@@ -830,7 +830,7 @@ kde-guidance (0.6.7-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 14 May 2006 01:38:55 +0300
 
-kde-guidance (0.6.6-0ubuntu1) dapper; urgency=low
+tde-guidance (0.6.6-0ubuntu1) dapper; urgency=low
 
   [ Simon Edwards ]
   * BUG: Serviceconfig didn't correctly remove links in runlevel directories.
@@ -850,14 +850,14 @@ kde-guidance (0.6.6-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 28 Apr 2006 14:18:26 +0100
 
-kde-guidance (0.6.5-0ubuntu2) dapper; urgency=low
+tde-guidance (0.6.5-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_01_broken_script.diff comment out invalid python in
     displayconfig script
  
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 26 Apr 2006 00:38:46 +0100
 
-kde-guidance (0.6.5-0ubuntu1) dapper; urgency=low
+tde-guidance (0.6.5-0ubuntu1) dapper; urgency=low
 
   [ Simon Edwards ]
   * BUG: services that have not been installed via apt would cause long loops
@@ -897,7 +897,7 @@ kde-guidance (0.6.5-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 20 Apr 2006 18:35:40 +0100
 
-kde-guidance (0.6.4-0ubuntu1) dapper; urgency=low
+tde-guidance (0.6.4-0ubuntu1) dapper; urgency=low
 
   [ Simon Edwards ]
   * BUG: All of the tools no longer write out config files under ~/.kde when
@@ -934,7 +934,7 @@ kde-guidance (0.6.4-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun,  2 Apr 2006 21:46:15 +0100
 
-kde-guidance (0.6.3-0ubuntu1) dapper; urgency=low
+tde-guidance (0.6.3-0ubuntu1) dapper; urgency=low
 
   [ Fathi Boudra ]
   * Sync with Debian package (not yet in archives)
@@ -982,7 +982,7 @@ kde-guidance (0.6.3-0ubuntu1) dapper; urgency=low
 
  -- Fathi Boudra <fboudra@free.fr>  Sun, 19 Mar 2006 17:39:48 +0100
 
-kde-guidance (0.6.3-1) unstable; urgency=low
+tde-guidance (0.6.3-1) unstable; urgency=low
 
   * Merge with Ubuntu
   * New upstream version
@@ -993,7 +993,7 @@ kde-guidance (0.6.3-1) unstable; urgency=low
 
  -- Fathi Boudra <fboudra@free.fr>  Sun, 19 Mar 2006 15:46:17 +0100
 
-kde-guidance (0.6.2-0ubuntu1) dapper; urgency=low
+tde-guidance (0.6.2-0ubuntu1) dapper; urgency=low
 
   [ Simon Edwards ]
   * BUG: Small bug in displayconfig that caused it to bug out around the 
@@ -1026,7 +1026,7 @@ kde-guidance (0.6.2-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun,  5 Mar 2006 21:51:47 +0000
 
-kde-guidance (0.6.1-0ubuntu0) dapper; urgency=low
+tde-guidance (0.6.1-0ubuntu0) dapper; urgency=low
 
   * New release, sets a fixed DPI for Xft
   * Add run time dependency on pykdeextensions
@@ -1035,7 +1035,7 @@ kde-guidance (0.6.1-0ubuntu0) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Feb 2006 22:22:25 +0000
 
-kde-guidance (0.6.0-0ubuntu1) dapper; urgency=low
+tde-guidance (0.6.0-0ubuntu1) dapper; urgency=low
 
   * New release
   * Implements Guidance sections of https://wiki.ubuntu.com/DebianSystemTools
@@ -1044,19 +1044,19 @@ kde-guidance (0.6.0-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 18 Jan 2006 20:44:05 +0100
 
-kde-guidance (0.4.0+svn20060102-0ubuntu1) dapper; urgency=low
+tde-guidance (0.4.0+svn20060102-0ubuntu1) dapper; urgency=low
 
   * New snapshot, displayconfig added
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  2 Jan 2006 22:53:34 +0000
 
-kde-guidance (0.4.0-0ubuntu5) dapper; urgency=low
+tde-guidance (0.4.0-0ubuntu5) dapper; urgency=low
 
   * Rebuild for libstdc++ transition
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 13 Dec 2005 00:25:05 +0000
 
-kde-guidance (0.4.0-0ubuntu4) breezy; urgency=low
+tde-guidance (0.4.0-0ubuntu4) breezy; urgency=low
 
   * Copy necessary icons to global icon directory
   * Add GenericNames to .desktop files
@@ -1064,31 +1064,31 @@ kde-guidance (0.4.0-0ubuntu4) breezy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 21 Sep 2005 02:44:22 +0100
 
-kde-guidance (0.4.0-0ubuntu3) breezy; urgency=low
+tde-guidance (0.4.0-0ubuntu3) breezy; urgency=low
 
   * Move files from /usr/lib/python2.4/site-packages/guidance 
     to just /usr/lib/python2.4/site-packages
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 17 Sep 2005 21:31:21 +0100
 
-kde-guidance (0.4.0-0ubuntu2) breezy; urgency=low
+tde-guidance (0.4.0-0ubuntu2) breezy; urgency=low
 
   * Can't remove debian/docs, it's in the .orig
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Sep 2005 02:01:07 +0100
 
-kde-guidance (0.4.0-0ubuntu1) breezy; urgency=low
+tde-guidance (0.4.0-0ubuntu1) breezy; urgency=low
 
   * New upstream version
-  * Fix debian/rules for rename to kde-guidance
+  * Fix debian/rules for rename to tde-guidance
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Sep 2005 01:07:38 +0100
 
-kde-guidance (0.3.0+svn20050911-0ubuntu1) breezy; urgency=low
+tde-guidance (0.3.0+svn20050911-0ubuntu1) breezy; urgency=low
 
   * Initial Ubuntu upload
   * Install .py files into /usr/lib/python2.4/site-packages/guidance
-  * Change source and package name to kde-guidance to 
+  * Change source and package name to tde-guidance to 
     reduce namespace polution
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 11 Sep 2005 23:51:52 +0100
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/maverick/applications/tde-guidance/debian/control
index 76e2fc6bf..8446115c3 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/control
+++ b/ubuntu/maverick/applications/tde-guidance/debian/control
@@ -1,21 +1,21 @@
-Source: kde-guidance-trinity
+Source: tde-guidance-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), chrpath, kdelibs4-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), chrpath, tdelibs4-trinity-dev,
  libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
  pykdeextensions-trinity, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
  python-support (>= 0.6), python2.6 (>= 2.5), python2.6-dev (>= 2.5), x11proto-scrnsaver-dev, python-qt-dev, hwdata
 Standards-Version: 3.8.4
 
-Package: kde-guidance-trinity
+Package: tde-guidance-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pykdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
-Replaces: kde-guidance-kde3 (<< 4:3.5.13)
-Breaks: kde-guidance-kde3 (<< 4:3.5.13)
-Conflicts: guidance-power-manager, kde-guidance-powermanager
+Replaces: tde-guidance-kde3 (<< 4:3.5.13)
+Breaks: tde-guidance-kde3 (<< 4:3.5.13)
+Conflicts: guidance-power-manager, tde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of KDE system administration tools for GNU/Linux [Trinity]
  Guidance currently consists of four programs designed to help you
@@ -36,7 +36,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Replaces: guidance-backends-kde3 (<< 4:3.5.13)
 Breaks: guidance-backends-kde3 (<< 4:3.5.13)
-Conflicts: guidance-power-manager, kde-guidance-powermanager
+Conflicts: guidance-power-manager, tde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of system administration tools for GNU/Linux [Trinity]
  This package contains the platform neutral backends used in the
@@ -44,12 +44,12 @@ Description: collection of system administration tools for GNU/Linux [Trinity]
  .
   Homepage: http://www.simonzone.com/software/guidance
 
-Package: kde-guidance-powermanager-trinity
+Package: tde-guidance-powermanager-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, kde-guidance-trinity, python-trinity-trinity, python-dbus, hal, python-gobject, python (>= 2.5), python-dev (>= 2.5)
-Replaces: kde-guidance-powermanager-kde3 (<< 4:3.5.13)
-Breaks: kde-guidance-powermanager-kde3 (<< 4:3.5.13)
-Conflicts: guidance-power-manager, kde-guidance-powermanager
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, tde-guidance-trinity, python-trinity-trinity, python-dbus, hal, python-gobject, python (>= 2.5), python-dev (>= 2.5)
+Replaces: tde-guidance-powermanager-kde3 (<< 4:3.5.13)
+Breaks: tde-guidance-powermanager-kde3 (<< 4:3.5.13)
+Conflicts: guidance-power-manager, tde-guidance-powermanager
 Provides: ${python:Provides}
 Description: HAL based power manager applet [Trinity]
  A power management applet to indicate battery levels and perform hibernate or
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/copyright b/ubuntu/maverick/applications/tde-guidance/debian/copyright
index 38c1d30e8..d50783096 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/copyright
+++ b/ubuntu/maverick/applications/tde-guidance/debian/copyright
@@ -26,7 +26,7 @@ License:
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
-The documentations provided with kde-guidance is distributed under
+The documentations provided with tde-guidance is distributed under
 the GNU Free Documentation License (GFDL). They are considered free with
 regards to the Debian Free Software Guidelines (DFSG) because they don't
 contain any unmodifiable parts (invariant sections). The complete text of
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/kde-guidance-trinity.lintian-overrides b/ubuntu/maverick/applications/tde-guidance/debian/kde-guidance-trinity.lintian-overrides
deleted file mode 100644
index 6131946c2..000000000
--- a/ubuntu/maverick/applications/tde-guidance/debian/kde-guidance-trinity.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# false positive warnings from lintian
-kde-guidance-trinity: postinst-has-useless-call-to-ldconfig
-kde-guidance-trinity: postrm-has-useless-call-to-ldconfig
-kde-guidance-trinity: package-has-a-duplicate-relation depends
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules
index 54634ed38..2bb582451 100755
--- a/ubuntu/maverick/applications/tde-guidance/debian/rules
+++ b/ubuntu/maverick/applications/tde-guidance/debian/rules
@@ -10,12 +10,12 @@ include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
 DEB_UPDATE_RCD_PARAMS := multiuser
-DEB_INSTALL_MANPAGES_kde-guidance-trinity := debian/displayconfig-trinity.1  debian/mountconfig-trinity.1  debian/serviceconfig-trinity.1  debian/userconfig-trinity.1
+DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/displayconfig-trinity.1  debian/mountconfig-trinity.1  debian/serviceconfig-trinity.1  debian/userconfig-trinity.1
 PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
 LDFLAGS_APPEND := -L/opt/trinity/lib
 
-install/kde-guidance-trinity::
+install/tde-guidance-trinity::
 	# install icons to right place
 	install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png \
 		$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
@@ -31,8 +31,8 @@ install/kde-guidance-trinity::
 		$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/wineconfig.png
 
 	# install lintian overrides
-	install -D -p -m0644 debian/kde-guidance-trinity.lintian-overrides \
-		$(DEB_DESTDIR)/usr/share/lintian/overrides/kde-guidance-trinity
+	install -D -p -m0644 debian/tde-guidance-trinity.lintian-overrides \
+		$(DEB_DESTDIR)/usr/share/lintian/overrides/tde-guidance-trinity
 
 	# fix binary-or-shlib-defines-rpath
 	chrpath -d $(DEB_DESTDIR)/opt/trinity/lib/trinity/kcm_*.so.*
@@ -41,42 +41,42 @@ install/kde-guidance-trinity::
 	chmod 0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/kdewinewizard.png
 
 	# fix the link properly
-	mkdir -p debian/kde-guidance-trinity/opt/trinity/bin
-	(cd debian/kde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/kde-guidance-trinity/displayconfig.py displayconfig)
-	(cd debian/kde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/kde-guidance-trinity/mountconfig.py mountconfig)
-	(cd debian/kde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/kde-guidance-trinity/serviceconfig.py serviceconfig)
-	(cd debian/kde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/kde-guidance-trinity/userconfig.py userconfig)
-	(cd debian/kde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/kde-guidance-trinity/wineconfig.py wineconfig)
-#	(cd debian/kde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/kde-guidance-trinity/grubconfig.py grubconfig)
+	mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
+	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/displayconfig.py displayconfig)
+	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
+	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
+	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
+	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
+#	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
 
 	# put this here since gnome people probably don't want it by default
-	(cd debian/kde-guidance-trinity/opt/trinity/bin; ln -sf ../share/python-support/guidance-backends-trinity/displayconfig-restore.py displayconfig-restore)
+	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf ../share/python-support/guidance-backends-trinity/displayconfig-restore.py displayconfig-restore)
 
 	# move python modules in PYSUPPORT_PATH
-	mkdir -p $(PYSUPPORT_PATH)/kde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/SMBShareSelectDialog.py $(PYSUPPORT_PATH)/kde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/SimpleCommandRunner.py $(PYSUPPORT_PATH)/kde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/displayconfig.py $(PYSUPPORT_PATH)/kde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/displayconfigwidgets.py $(PYSUPPORT_PATH)/kde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/fuser.py $(PYSUPPORT_PATH)/kde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/fuser_ui.py $(PYSUPPORT_PATH)/kde-guidance-trinity
-#	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/grubconfig.py $(PYSUPPORT_PATH)/kde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/ktimerdialog.py $(PYSUPPORT_PATH)/kde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/mountconfig.py $(PYSUPPORT_PATH)/kde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/servertestdialog.py $(PYSUPPORT_PATH)/kde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/serviceconfig.py $(PYSUPPORT_PATH)/kde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/sizeview.py $(PYSUPPORT_PATH)/kde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/unixauthdb.py $(PYSUPPORT_PATH)/kde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/userconfig.py $(PYSUPPORT_PATH)/kde-guidance-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineconfig.py $(PYSUPPORT_PATH)/kde-guidance-trinity
+	mkdir -p $(PYSUPPORT_PATH)/tde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/SMBShareSelectDialog.py $(PYSUPPORT_PATH)/tde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/SimpleCommandRunner.py $(PYSUPPORT_PATH)/tde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/displayconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/displayconfigwidgets.py $(PYSUPPORT_PATH)/tde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/fuser.py $(PYSUPPORT_PATH)/tde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/fuser_ui.py $(PYSUPPORT_PATH)/tde-guidance-trinity
+#	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/grubconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/ktimerdialog.py $(PYSUPPORT_PATH)/tde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/mountconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/servertestdialog.py $(PYSUPPORT_PATH)/tde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/serviceconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/sizeview.py $(PYSUPPORT_PATH)/tde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/unixauthdb.py $(PYSUPPORT_PATH)/tde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/userconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity
 
         # fix script-not-executable
-	chmod 0755 $(PYSUPPORT_PATH)/kde-guidance-trinity/fuser.py
-#	chmod 0755 $(PYSUPPORT_PATH)/kde-guidance-trinity/grubconfig.py
+	chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-trinity/fuser.py
+#	chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-trinity/grubconfig.py
 
 	: # Replace all '#!' calls to python with /usr/bin/python
 	: # and make them executable
-	for i in `find debian/kde-guidance-trinity -type f`; do \
+	for i in `find debian/tde-guidance-trinity -type f`; do \
 		sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
 			$$i > $$i.temp; \
 		if cmp --quiet $$i $$i.temp; then \
@@ -108,7 +108,7 @@ install/guidance-backends-trinity::
 	rm -f $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MonitorsDB
 	ln -s /usr/share/hwdata/MonitorsDB $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MonitorsDB
 
-install/kde-guidance-powermanager-trinity::
+install/tde-guidance-powermanager-trinity::
 	# install icon to right place
 	install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
 		$(DEB_DESTDIR)/opt/trinity/share/icons/hicolor/22x22/apps/power-manager.png
@@ -120,28 +120,28 @@ install/kde-guidance-powermanager-trinity::
 		$(DEB_DESTDIR)/opt/trinity/share/autostart/guidance-power-manager.desktop
 
 	# copy python modules in PYSUPPORT_PATH
-	mkdir -p $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity
+	mkdir -p $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
 	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/guidance-power-manager.py $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanage.py $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/gpmhelper.py $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanager_ui.py $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity
-	cp powermanager/guidance_power_manager_ui.py $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity
-	cp powermanager/notify.py $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity
-	cp powermanager/tooltip.py $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/guidance-power-manager.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanage.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/gpmhelper.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanager_ui.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
+	cp powermanager/guidance_power_manager_ui.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
+	cp powermanager/notify.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
+	cp powermanager/tooltip.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
 
 	# generate guidance-power-manager script
 	echo "#!/bin/sh" > $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
-	echo "/usr/share/python-support/kde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
+	echo "/usr/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
 	chmod +x $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
 
 	# fix script-not-executable
-	chmod 0755 $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity/powermanage.py
-	chmod 0755 $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity/gpmhelper.py
+	chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity/powermanage.py
+	chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity/gpmhelper.py
 
 	: # Replace all '#!' calls to python with /usr/bin/python
 	: # and make them executable
-	for i in `find debian/kde-guidance-powermanager-trinity -type f`; do \
+	for i in `find debian/tde-guidance-powermanager-trinity -type f`; do \
 		sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
 			$$i > $$i.temp; \
 		if cmp --quiet $$i $$i.temp; then \
@@ -210,8 +210,8 @@ common-install-prehook-impl::
 		rm -f LIST; \
 	fi
 
-	rm -f kde-guidance-trinity/usr/share/python-support/kde-guidance-trinity/.version
-	rm -f kde-guidance-trinity/usr/share/python-support/kde-guidance-powermanager-trinity/.version
+	rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-trinity/.version
+	rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-powermanager-trinity/.version
 
 get-orig-source:
 	@@dh_testdir
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/kde-guidance-powermanager-trinity.install b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-powermanager-trinity.install
index 8c707520e..396df988c 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/kde-guidance-powermanager-trinity.install
+++ b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-powermanager-trinity.install
@@ -4,10 +4,10 @@ opt/trinity/share/apps/guidance/pics/ac-adapter.png
 opt/trinity/share/apps/guidance/pics/battery*.png
 opt/trinity/share/apps/guidance/pics/processor.png
 opt/trinity/share/autostart/guidance-power-manager.desktop
-opt/trinity/share/python-support/kde-guidance-powermanager-trinity/guidance-power-manager.py
-opt/trinity/share/python-support/kde-guidance-powermanager-trinity/guidance_power_manager_ui.py
-opt/trinity/share/python-support/kde-guidance-powermanager-trinity/notify.py
-opt/trinity/share/python-support/kde-guidance-powermanager-trinity/powermanage.py
-opt/trinity/share/python-support/kde-guidance-powermanager-trinity/gpmhelper.py
-opt/trinity/share/python-support/kde-guidance-powermanager-trinity/powermanager_ui.py
-opt/trinity/share/python-support/kde-guidance-powermanager-trinity/tooltip.py
+opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py
+opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance_power_manager_ui.py
+opt/trinity/share/python-support/tde-guidance-powermanager-trinity/notify.py
+opt/trinity/share/python-support/tde-guidance-powermanager-trinity/powermanage.py
+opt/trinity/share/python-support/tde-guidance-powermanager-trinity/gpmhelper.py
+opt/trinity/share/python-support/tde-guidance-powermanager-trinity/powermanager_ui.py
+opt/trinity/share/python-support/tde-guidance-powermanager-trinity/tooltip.py
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/kde-guidance-trinity.init b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.init
index 30a3854d1..734e51725 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/kde-guidance-trinity.init
+++ b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.init
@@ -1,6 +1,6 @@
 #!/bin/sh
 ### BEGIN INIT INFO
-# Provides:          kde-guidance
+# Provides:          tde-guidance
 # Required-Start:    $local_fs $remote_fs
 # Required-Stop:     $local_fs $remote_fs
 # Default-Start:     2 3 4 5
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/kde-guidance-trinity.install b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install
index 5a92a6472..de46528da 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/kde-guidance-trinity.install
+++ b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install
@@ -68,19 +68,19 @@ opt/trinity/share/apps/guidance/pics/hi32-gfxcard.png
 opt/trinity/share/apps/guidance/pics/hi32-display.png
 opt/trinity/share/apps/guidance/pics/32-wine.png
 opt/trinity/share/apps/guidance/pics/kdewinewizard.png
-opt/trinity/share/python-support/kde-guidance-trinity/SMBShareSelectDialog.py
-opt/trinity/share/python-support/kde-guidance-trinity/SimpleCommandRunner.py
-opt/trinity/share/python-support/kde-guidance-trinity/fuser.py
-opt/trinity/share/python-support/kde-guidance-trinity/fuser_ui.py
-#opt/trinity/share/python-support/kde-guidance-trinity/grubconfig.py
-opt/trinity/share/python-support/kde-guidance-trinity/ktimerdialog.py
-opt/trinity/share/python-support/kde-guidance-trinity/mountconfig.py
-opt/trinity/share/python-support/kde-guidance-trinity/servertestdialog.py
-opt/trinity/share/python-support/kde-guidance-trinity/serviceconfig.py
-opt/trinity/share/python-support/kde-guidance-trinity/sizeview.py
-opt/trinity/share/python-support/kde-guidance-trinity/unixauthdb.py
-opt/trinity/share/python-support/kde-guidance-trinity/userconfig.py
-opt/trinity/share/python-support/kde-guidance-trinity/wineconfig.py
+opt/trinity/share/python-support/tde-guidance-trinity/SMBShareSelectDialog.py
+opt/trinity/share/python-support/tde-guidance-trinity/SimpleCommandRunner.py
+opt/trinity/share/python-support/tde-guidance-trinity/fuser.py
+opt/trinity/share/python-support/tde-guidance-trinity/fuser_ui.py
+#opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py
+opt/trinity/share/python-support/tde-guidance-trinity/ktimerdialog.py
+opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py
+opt/trinity/share/python-support/tde-guidance-trinity/servertestdialog.py
+opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py
+opt/trinity/share/python-support/tde-guidance-trinity/sizeview.py
+opt/trinity/share/python-support/tde-guidance-trinity/unixauthdb.py
+opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py
+opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py
 opt/trinity/lib/trinity/kcm_serviceconfig.so.0 opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_serviceconfig.so opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_userconfig.so.0 opt/trinity/lib/
@@ -89,4 +89,4 @@ opt/trinity/lib/trinity/kcm_mountconfig.so.0 opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_mountconfig.so opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_wineconfig.so.0 opt/trinity/lib/
 opt/trinity/lib/trinity/kcm_wineconfig.so opt/trinity/lib/
-usr/share/lintian/overrides/kde-guidance-trinity
+usr/share/lintian/overrides/tde-guidance-trinity
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.lintian-overrides b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
new file mode 100644
index 000000000..f151ee69f
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
@@ -0,0 +1,4 @@
+# false positive warnings from lintian
+tde-guidance-trinity: postinst-has-useless-call-to-ldconfig
+tde-guidance-trinity: postrm-has-useless-call-to-ldconfig
+tde-guidance-trinity: package-has-a-duplicate-relation depends
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/kde-guidance-trinity.postinst b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.postinst
index de2804fc4..af8e365b5 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/kde-guidance-trinity.postinst
+++ b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.postinst
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Remove shutdown and reboot links; this init script does not need them.
-rm -f /etc/rc0.d/K20kde-guidance /etc/rc6.d/K20kde-guidance
+rm -f /etc/rc0.d/K20tde-guidance /etc/rc6.d/K20tde-guidance
 
 #remove script from older times
 update-rc.d -f displayconfig-hwprobe.py remove
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/changelog b/ubuntu/maverick/applications/tde-style-lipstik/debian/changelog
index 4e603d7ed..2010b4b10 100644
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/changelog
+++ b/ubuntu/maverick/applications/tde-style-lipstik/debian/changelog
@@ -1,30 +1,30 @@
-kde-style-lipstik-trinity (2.2.3-4) karmic; urgency=low
+tde-style-lipstik-trinity (2.2.3-4) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kde-style-lipstik-trinity (2.2.3-3) intrepid; urgency=low
+tde-style-lipstik-trinity (2.2.3-3) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 02 March 2009 01:07:00 -0600
 
-kde-style-lipstik-trinity (2.2.3-1) intrepid; urgency=low
+tde-style-lipstik-trinity (2.2.3-1) intrepid; urgency=low
 
   * Added -trinity suffix
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 05 Dec 2008 09:38:00 -0600
 
-kde-style-lipstik (2.2.3-1) unstable; urgency=low
+tde-style-lipstik (2.2.3-1) unstable; urgency=low
 
   * New Upstream release
     - Added a configurable active tab highlight color
 
  -- Bastian Venthur <venthur@debian.org>  Tue, 30 Oct 2007 20:45:14 +0100
 
-kde-style-lipstik (2.2.2-1) unstable; urgency=low
+tde-style-lipstik (2.2.2-1) unstable; urgency=low
 
   * New upstream version
     - Added new automake1.9 dependency
@@ -32,14 +32,14 @@ kde-style-lipstik (2.2.2-1) unstable; urgency=low
 
  -- Bastian Venthur <venthur@debian.org>  Thu, 24 May 2007 23:32:09 +0200
 
-kde-style-lipstik (2.2.1-2) unstable; urgency=low
+tde-style-lipstik (2.2.1-2) unstable; urgency=low
 
   * Bumped standards version (no changes)
   * Updated address in maintainer field
 
  -- Bastian Venthur <venthur@debian.org>  Wed, 18 Oct 2006 18:32:15 +0200
 
-kde-style-lipstik (2.2.1-1) unstable; urgency=low
+tde-style-lipstik (2.2.1-1) unstable; urgency=low
 
   * New upstream release
     + Some changes to get lipstik build with GCC 4.1
@@ -51,7 +51,7 @@ kde-style-lipstik (2.2.1-1) unstable; urgency=low
 
  -- Bastian Venthur <mail@venthur.de>  Tue, 28 Feb 2006 16:42:22 +0100
 
-kde-style-lipstik (2.2-1) unstable; urgency=low
+tde-style-lipstik (2.2-1) unstable; urgency=low
 
   * New upstream release
     + Added possibility to configure the spacing for menus
@@ -64,13 +64,13 @@ kde-style-lipstik (2.2-1) unstable; urgency=low
 
  -- Bastian Venthur <mail@venthur.de>  Tue, 14 Feb 2006 10:11:35 +0100
 
-kde-style-lipstik (2.1-2) unstable; urgency=low
+tde-style-lipstik (2.1-2) unstable; urgency=low
 
   * updated libtool scripts (see #343963 for details)
 
  -- Bastian Venthur <mail@venthur.de>  Sun, 22 Jan 2006 15:48:17 +0100
 
-kde-style-lipstik (2.1-1) unstable; urgency=low
+tde-style-lipstik (2.1-1) unstable; urgency=low
 
   * New upstream release
     + Fix for the toolbar seperator net being the right color
@@ -80,7 +80,7 @@ kde-style-lipstik (2.1-1) unstable; urgency=low
 
  -- Bastian Venthur <mail@venthur.de>  Sat, 10 Dec 2005 14:13:45 +0100
 
-kde-style-lipstik (2.0-1) unstable; urgency=low
+tde-style-lipstik (2.0-1) unstable; urgency=low
 
   * New upstream release, exerpt from the changelog:
     + Many bugfixes
@@ -90,7 +90,7 @@ kde-style-lipstik (2.0-1) unstable; urgency=low
 
  -- Bastian Venthur <mail@venthur.de>  Fri,  9 Dec 2005 12:09:00 +0100
 
-kde-style-lipstik (1.3-1) unstable; urgency=low
+tde-style-lipstik (1.3-1) unstable; urgency=low
 
   * Initial release Closes: #322356
 
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/control b/ubuntu/maverick/applications/tde-style-lipstik/debian/control
index 9067e5a15..157fb6c46 100644
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/control
+++ b/ubuntu/maverick/applications/tde-style-lipstik/debian/control
@@ -1,15 +1,15 @@
-Source: kde-style-lipstik-trinity
+Source: tde-style-lipstik-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 4.0.0), kdelibs4-trinity-dev (>= 4:3.2), dpatch, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 4.0.0), tdelibs4-trinity-dev (>= 4:3.2), dpatch, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kde-style-lipstik-trinity
+Package: tde-style-lipstik-trinity
 Section: kde
 Architecture: any
-Replaces: kde-style-lipstik-kde3 (<< 4:3.5.13)
-Breaks: kde-style-lipstik-kde3 (<< 4:3.5.13)
+Replaces: tde-style-lipstik-kde3 (<< 4:3.5.13)
+Breaks: tde-style-lipstik-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Lipstik style for TDE
  Based on the plastik style, Lipstik is a purified style with many options to
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/rules b/ubuntu/maverick/applications/tde-style-lipstik/debian/rules
index 0f4c518e5..c25c8d5bd 100755
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/rules
+++ b/ubuntu/maverick/applications/tde-style-lipstik/debian/rules
@@ -47,7 +47,7 @@ build-stamp:  config.status
 
 	# Add here commands to compile the package.
 	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib $(MAKE)
-	#docbook-to-man debian/kde-style-lipstik.sgml > kde-style-lipstik.1
+	#docbook-to-man debian/tde-style-lipstik.sgml > tde-style-lipstik.1
 
 	touch build-stamp
 
@@ -93,8 +93,8 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 
-	# Add here commands to install the package into debian/kde-style-lipstik.
-	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib $(MAKE) install DESTDIR=$(CURDIR)/debian/kde-style-lipstik-trinity
+	# Add here commands to install the package into debian/tde-style-lipstik.
+	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib $(MAKE) install DESTDIR=$(CURDIR)/debian/tde-style-lipstik-trinity
 
 
 # Build architecture-independent files here.
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/changelog b/ubuntu/maverick/applications/tde-style-qtcurve/debian/changelog
index b89b8bc90..3ff72d99c 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/changelog
+++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/changelog
@@ -1,36 +1,36 @@
-kde-style-qtcurve-trinity (0.55.2-1ubuntu8) karmic; urgency=low
+tde-style-qtcurve-trinity (0.55.2-1ubuntu8) karmic; urgency=low
 
-  * Now provides kde-style-qtcurve for backward compatibility
+  * Now provides tde-style-qtcurve for backward compatibility
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 17 Sep 2009 16:05:00 -0600
 
-kde-style-qtcurve-trinity (0.55.2-1ubuntu7) karmic; urgency=low
+tde-style-qtcurve-trinity (0.55.2-1ubuntu7) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kde-style-qtcurve-trinity (0.55.2-1ubuntu6) intrepid; urgency=low
+tde-style-qtcurve-trinity (0.55.2-1ubuntu6) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 21:15:00 -0600
 
-kde-style-qtcurve-trinity (0.55.2-1ubuntu5) intrepid; urgency=low
+tde-style-qtcurve-trinity (0.55.2-1ubuntu5) intrepid; urgency=low
 
   * Added -trinity suffix
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 Dec 2008 18:37:00 -0600
 
-kde-style-qtcurve (0.55.2-1ubuntu3) hardy; urgency=low
+tde-style-qtcurve (0.55.2-1ubuntu3) hardy; urgency=low
 
   * Set toolbar handles to sunken lines by default in
     kubuntu_01_default_settings.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 31 Mar 2008 13:04:55 +0100
 
-kde-style-qtcurve (0.55.2-1ubuntu2) hardy; urgency=low
+tde-style-qtcurve (0.55.2-1ubuntu2) hardy; urgency=low
 
   * Add kubuntu_01_default_settings.diff for nicer defaults.  Flat
     toolbars and don't darken menubars.
@@ -38,7 +38,7 @@ kde-style-qtcurve (0.55.2-1ubuntu2) hardy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 17 Mar 2008 14:54:33 +0000
 
-kde-style-qtcurve (0.55.2-1ubuntu1) hardy; urgency=low
+tde-style-qtcurve (0.55.2-1ubuntu1) hardy; urgency=low
 
   * Merge from debian unstable, remaining changes:
     - debian/scan-version: Script to scan and download new upstream releases
@@ -54,13 +54,13 @@ kde-style-qtcurve (0.55.2-1ubuntu1) hardy; urgency=low
 
  -- Stephan Hermann <sh@sourcecode.de>  Mon, 21 Jan 2008 19:23:02 +0100
 
-kde-style-qtcurve (0.55.2-1) unstable; urgency=low
+tde-style-qtcurve (0.55.2-1) unstable; urgency=low
 
   * New upstream version (Closes: #449309)
 
  -- Bastian Venthur <venthur@debian.org>  Sun, 20 Jan 2008 17:17:49 +0100
 
-kde-style-qtcurve (0.55.1-0ubuntu1) hardy; urgency=low
+tde-style-qtcurve (0.55.1-0ubuntu1) hardy; urgency=low
 
   * New upstream release. (LP: #179655)
   * debian/scan-version: Script to scan and download new upstream releases
@@ -79,7 +79,7 @@ kde-style-qtcurve (0.55.1-0ubuntu1) hardy; urgency=low
 
  -- Matvey Kozhev <sikon@lucidfox.org>  Tue, 01 Jan 2008 17:08:56 +0600
 
-kde-style-qtcurve (0.52.3-1) unstable; urgency=low
+tde-style-qtcurve (0.52.3-1) unstable; urgency=low
 
   * Don't lighten border of disabled check/radio buttons.
   * Lighten trough of disabled slider.
@@ -90,7 +90,7 @@ kde-style-qtcurve (0.52.3-1) unstable; urgency=low
 
  -- Bastian Venthur <venthur@debian.org>  Fri, 10 Aug 2007 10:10:55 +0200
 
-kde-style-qtcurve (0.52.2-1) unstable; urgency=low
+tde-style-qtcurve (0.52.2-1) unstable; urgency=low
 
   New upstream version
 
@@ -108,7 +108,7 @@ kde-style-qtcurve (0.52.2-1) unstable; urgency=low
 
  -- Bastian Venthur <venthur@debian.org>  Sun, 24 Jun 2007 13:13:10 +0200
 
-kde-style-qtcurve (0.52-1) unstable; urgency=low
+tde-style-qtcurve (0.52-1) unstable; urgency=low
 
   * New upstream version
 
@@ -132,13 +132,13 @@ kde-style-qtcurve (0.52-1) unstable; urgency=low
 
  -- Bastian Venthur <venthur@debian.org>  Tue, 19 Jun 2007 17:35:33 +0200
 
-kde-style-qtcurve (0.51-2) unstable; urgency=low
+tde-style-qtcurve (0.51-2) unstable; urgency=low
 
   * Changed priority from extra to optional 
 
  -- Bastian Venthur <venthur@debian.org>  Mon, 11 Jun 2007 11:21:00 +0200
 
-kde-style-qtcurve (0.51-1)  unstable; urgency=low
+tde-style-qtcurve (0.51-1)  unstable; urgency=low
 
   * New upstream version (Closes: #427043)
 
@@ -163,7 +163,7 @@ kde-style-qtcurve (0.51-1)  unstable; urgency=low
 
  -- Bastian Venthur <venthur@debian.org>  Mon, 11 Jun 2007 10:42:01 +0200
 
-kde-style-qtcurve (0.50-1) unstable; urgency=low
+tde-style-qtcurve (0.50-1) unstable; urgency=low
 
   * Initial release
 
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/control b/ubuntu/maverick/applications/tde-style-qtcurve/debian/control
index 8d5a658e1..6c7103211 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/control
+++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/control
@@ -1,18 +1,18 @@
-Source: kde-style-qtcurve-trinity
+Source: tde-style-qtcurve-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org>
-Build-Depends: debhelper (>= 5), kdelibs4-trinity-dev, cmake
+Build-Depends: debhelper (>= 5), tdelibs4-trinity-dev, cmake
 Standards-Version: 3.8.4
 
-Package: kde-style-qtcurve-trinity
+Package: tde-style-qtcurve-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kde-style-qtcurve-kde3 (<< 4:3.5.13)
-Breaks: kde-style-qtcurve-kde3 (<< 4:3.5.13)
+Replaces: tde-style-qtcurve-kde3 (<< 4:3.5.13)
+Breaks: tde-style-qtcurve-kde3 (<< 4:3.5.13)
 Recommends: gtk2-engines-qtcurve
-Provides: kde-style-qtcurve
+Provides: tde-style-qtcurve
 Description: This is a set of widget styles for Trinity based apps
  This package together with gtk2-engines-qtcurve aim to provide a unified look
  and feel on the desktop when using KDE and Gnome applications.
@@ -22,10 +22,10 @@ Description: This is a set of widget styles for Trinity based apps
 
 Package: qtcurve-trinity
 Architecture: any
-Depends: kde-style-qtcurve-trinity, gtk2-engines-qtcurve
+Depends: tde-style-qtcurve-trinity, gtk2-engines-qtcurve
 Replaces: qtcurve-kde3 (<< 4:3.5.13)
 Breaks: qtcurve-kde3 (<< 4:3.5.13)
 Description: This is a set of widget styles for Trinity and Gtk2 based apps
  This is an empty dummy package which will drag the packages 
- kde-style-qtcurve and gtk2-engines-qtcurve in your system.
+ tde-style-qtcurve and gtk2-engines-qtcurve in your system.
 
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules b/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules
index 7e7cc1d9e..3d090390b 100755
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules
+++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules
@@ -51,7 +51,7 @@ build-stamp:  config.status
 
 	# Add here commands to compile the package.
 	cd build; env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE)
-	#docbook-to-man debian/kde-style-qtcurve.sgml > kde-style-qtcurve.1
+	#docbook-to-man debian/tde-style-qtcurve.sgml > tde-style-qtcurve.1
 
 	touch $@
 
@@ -73,8 +73,8 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 
-	# Add here commands to install the package into debian/kde-style-qtcurve-trinity.
-	cd build; env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) DESTDIR=$(CURDIR)/debian/kde-style-qtcurve-trinity install
+	# Add here commands to install the package into debian/tde-style-qtcurve-trinity.
+	cd build; env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) DESTDIR=$(CURDIR)/debian/tde-style-qtcurve-trinity install
 
 
 # Build architecture-independent files here.
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/changelog b/ubuntu/maverick/applications/tde-systemsettings/debian/changelog
index 7e97530ed..49bc830e9 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/changelog
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/changelog
@@ -1,29 +1,29 @@
-kde-systemsettings-trinity (0.0svn20070312-0ubuntu5) karmic; urgency=low
+tde-systemsettings-trinity (0.0svn20070312-0ubuntu5) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kde-systemsettings-trinity (0.0svn20070312-0ubuntu4) intrepid; urgency=low
+tde-systemsettings-trinity (0.0svn20070312-0ubuntu4) intrepid; urgency=low
 
   * Removed long-broken Bluetooth configuration icon
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 22 April 2009 20:44:00 -0600
 
-kde-systemsettings-trinity (0.0svn20070312-0ubuntu3) intrepid; urgency=low
+tde-systemsettings-trinity (0.0svn20070312-0ubuntu3) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
 
-kde-systemsettings-trinity (0.0svn20070312-0ubuntu2) intrepid; urgency=low
+tde-systemsettings-trinity (0.0svn20070312-0ubuntu2) intrepid; urgency=low
 
   * Added -trinity suffix
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 Dec 2008 18:44:00 -0600
 
-kde-systemsettings (0.0svn20070312-0ubuntu5) hardy; urgency=low
+tde-systemsettings (0.0svn20070312-0ubuntu5) hardy; urgency=low
 
   * Cleanup previous installed
     /etc/xdg/menus/kde-applications-merged/system-settings-merge.menu
@@ -40,14 +40,14 @@ kde-systemsettings (0.0svn20070312-0ubuntu5) hardy; urgency=low
 
  -- dAniel hAhler <ubuntu@thequod.de>  Sat, 29 Dec 2007 12:23:42 +0100
 
-kde-systemsettings (0.0svn20070312-0ubuntu4) gutsy; urgency=low
+tde-systemsettings (0.0svn20070312-0ubuntu4) gutsy; urgency=low
 
   * Added kubuntu_04_fix_share_submenu.diff, adds missing 'Desktop
     Share' entry
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 15 Oct 2007 11:59:04 +0200
 
-kde-systemsettings (0.0svn20070312-0ubuntu3) gutsy; urgency=low
+tde-systemsettings (0.0svn20070312-0ubuntu3) gutsy; urgency=low
 
   * Added kubuntu_02_checkadmin_fix.diff, fixes the way systemsettings
     checks if kcm module requires admin privileges, to make it to work
@@ -55,95 +55,95 @@ kde-systemsettings (0.0svn20070312-0ubuntu3) gutsy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 22 Aug 2007 13:02:07 +0200
 
-kde-systemsettings (0.0svn20070312-0ubuntu2) gutsy; urgency=low
+tde-systemsettings (0.0svn20070312-0ubuntu2) gutsy; urgency=low
 
   * Use applications-merged not kde-applications-merged, XDG prefix
     not used for merge directories, closes 
-    https://bugs.launchpad.net/ubuntu/gutsy/+source/kde-systemsettings/+bug/114286
+    https://bugs.launchpad.net/ubuntu/gutsy/+source/tde-systemsettings/+bug/114286
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 05 Jun 2007 01:57:42 +0100
 
-kde-systemsettings (0.0svn20070312-0ubuntu1) feisty; urgency=low
+tde-systemsettings (0.0svn20070312-0ubuntu1) feisty; urgency=low
 
   * New snapshot
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 12 Mar 2007 23:25:11 +0000
 
-kde-systemsettings (0.0svn20070104-0ubuntu3) feisty; urgency=low
+tde-systemsettings (0.0svn20070104-0ubuntu3) feisty; urgency=low
 
   * Added kubuntu_05_more_categories.diff to allow universe
     apps with kcm to go in the right section
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 22 Jan 2007 18:56:37 +0100
 
-kde-systemsettings (0.0svn20070104-0ubuntu2) feisty; urgency=low
+tde-systemsettings (0.0svn20070104-0ubuntu2) feisty; urgency=low
 
   * Added kubuntu_04_kcmgtk to get gtk-qt-engines in the
     Appearance section
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 19 Jan 2007 05:42:21 +0100
 
-kde-systemsettings (0.0svn20070104-0ubuntu1) feisty; urgency=low
+tde-systemsettings (0.0svn20070104-0ubuntu1) feisty; urgency=low
 
   * New SVN snapshot
   * Don't build with unsermake
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  4 Jan 2007 19:51:18 +0000
 
-kde-systemsettings (0.0svn20060929-0ubuntu1) edgy; urgency=low
+tde-systemsettings (0.0svn20060929-0ubuntu1) edgy; urgency=low
 
   * New SVN snapshot
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri,  29 Sep 2006 00:02:55 +0200
 
-kde-systemsettings (0.0svn20060908-0ubuntu1) edgy; urgency=low
+tde-systemsettings (0.0svn20060908-0ubuntu1) edgy; urgency=low
 
   * New SVN snapshot
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri,  8 Sep 2006 20:41:55 +0200
 
-kde-systemsettings (0.0svn20060906-0ubuntu1) edgy; urgency=low
+tde-systemsettings (0.0svn20060906-0ubuntu1) edgy; urgency=low
 
   * New SVN snapshot
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  6 Sep 2006 20:51:55 +0000
 
-kde-systemsettings (0.0svn20060830-0ubuntu3) edgy; urgency=low
+tde-systemsettings (0.0svn20060830-0ubuntu3) edgy; urgency=low
 
   * Changed debian/rules to remove laptoppowermanagement.desktop
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue,  5 Sep 2006 21:17:25 +0200
 
-kde-systemsettings (0.0svn20060830-0ubuntu2) edgy; urgency=low
+tde-systemsettings (0.0svn20060830-0ubuntu2) edgy; urgency=low
 
   * Changed debian/rules to install kde-settings-accessibility_ss.directory
     correctly
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue,  5 Sep 2006 21:03:25 +0200
 
-kde-systemsettings (0.0svn20060830-0ubuntu1) edgy; urgency=low
+tde-systemsettings (0.0svn20060830-0ubuntu1) edgy; urgency=low
 
   * New SVN snapshot, includes changes for 
     kubuntu-system-settings-usability by Simon Edwards
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Wed,  30 Aug 2006 16:03:25 +0200
 
-kde-systemsettings (0.0svn20060803-0ubuntu2) edgy; urgency=low
+tde-systemsettings (0.0svn20060803-0ubuntu2) edgy; urgency=low
 
-  * Stopped kde-systemsettings installing
-    kde-settings-accessibility.directory (also in kdebase-data).
+  * Stopped tde-systemsettings installing
+    kde-settings-accessibility.directory (also in tdebase-data).
     Closes bug #55135
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Fri,  4 Aug 2006 13:01:09 +1000
 
-kde-systemsettings (0.0svn20060803-0ubuntu1) edgy; urgency=low
+tde-systemsettings (0.0svn20060803-0ubuntu1) edgy; urgency=low
 
   * New SVN snapshot, includes changes for 
     kubuntu-system-settings-usability by Simon Edwards
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  3 Aug 2006 16:44:25 +0100
 
-kde-systemsettings (0.0svn20060512-0ubuntu1) dapper; urgency=low
+tde-systemsettings (0.0svn20060512-0ubuntu1) dapper; urgency=low
 
   [ Jonathan Riddell ]
   * New SVN snapshot, includes our Debian patches now 
@@ -157,7 +157,7 @@ kde-systemsettings (0.0svn20060512-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 12 May 2006 16:10:16 +0300
 
-kde-systemsettings (0.0svn20060502-0ubuntu1) dapper; urgency=low
+tde-systemsettings (0.0svn20060502-0ubuntu1) dapper; urgency=low
 
   [ Jonathan Riddell ]
   * New SVN snapshot
@@ -171,32 +171,32 @@ kde-systemsettings (0.0svn20060502-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  2 May 2006 02:14:19 +0100
 
-kde-systemsettings (0.0svn20060413-0ubuntu1) dapper; urgency=low
+tde-systemsettings (0.0svn20060413-0ubuntu1) dapper; urgency=low
 
   * New SVN snapshot, no code changes only new translations 
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Apr 2006 17:31:56 +0100
 
-kde-systemsettings (0.0svn20060314-0ubuntu4) dapper; urgency=low
+tde-systemsettings (0.0svn20060314-0ubuntu4) dapper; urgency=low
 
   * Fix format in kubuntu_02_update_menus.diff.
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Fri, 17 Mar 2006 16:48:12 +0100
 
-kde-systemsettings (0.0svn20060314-0ubuntu3) dapper; urgency=low
+tde-systemsettings (0.0svn20060314-0ubuntu3) dapper; urgency=low
 
   * Modify kubuntu_02_update_menus.diff to prevent k3bsetup from showing up.
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Fri, 17 Mar 2006 15:02:49 +0100
 
-kde-systemsettings (0.0svn20060314-0ubuntu2) dapper; urgency=low
+tde-systemsettings (0.0svn20060314-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_03_no_kbuildsycoca.diff, stop it running kbuildsycocoa 
     during 'make install'
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Mar 2006 01:12:43 +0000
 
-kde-systemsettings (0.0svn20060314-0ubuntu1) dapper; urgency=low
+tde-systemsettings (0.0svn20060314-0ubuntu1) dapper; urgency=low
 
   * New upstream snapshot, adds various bugfixes by Simon Edwards
     - Remove text for the "reset" button and put the icon text 
@@ -209,25 +209,25 @@ kde-systemsettings (0.0svn20060314-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 14 Mar 2006 00:44:10 +0000
 
-kde-systemsettings (0.0svn20051207-0ubuntu4) dapper; urgency=low
+tde-systemsettings (0.0svn20051207-0ubuntu4) dapper; urgency=low
 
   * Don't use DEB_AUTO_UPDATE_DEBIAN_CONTROL
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  8 Dec 2005 18:52:52 +0000
 
-kde-systemsettings (0.0svn20051207-0ubuntu3) dapper; urgency=low
+tde-systemsettings (0.0svn20051207-0ubuntu3) dapper; urgency=low
 
   * Add build-dep on automake1.9
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  8 Dec 2005 03:55:12 +0000
 
-kde-systemsettings (0.0svn20051207-0ubuntu2) dapper; urgency=low
+tde-systemsettings (0.0svn20051207-0ubuntu2) dapper; urgency=low
 
   * Add build-dep on autoconf
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  7 Dec 2005 18:26:47 +0000
 
-kde-systemsettings (0.0svn20051207-0ubuntu1) dapper; urgency=low
+tde-systemsettings (0.0svn20051207-0ubuntu1) dapper; urgency=low
 
   * New snapshot
   * Rebuild for libstdc++ transition
@@ -235,20 +235,20 @@ kde-systemsettings (0.0svn20051207-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  7 Dec 2005 16:20:32 +0000
 
-kde-systemsettings (0.0svn20050613-0ubuntu3) breezy; urgency=low
+tde-systemsettings (0.0svn20050613-0ubuntu3) breezy; urgency=low
 
   * Add kubuntu_02_update_menus.diff, kde-settings-bluetooth.directory
     and kde-settings-laptops.directory to tidy up menus
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 24 Sep 2005 18:11:08 +0100
 
-kde-systemsettings (0.0svn20050613-0ubuntu2) breezy; urgency=low
+tde-systemsettings (0.0svn20050613-0ubuntu2) breezy; urgency=low
 
   * Add kubuntu_01_only_show_in_kde.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Jun 2005 17:10:56 +0000
 
-kde-systemsettings (0.0svn20050613-0ubuntu1) breezy; urgency=low
+tde-systemsettings (0.0svn20050613-0ubuntu1) breezy; urgency=low
 
   * Initial Release.
   * Added manpage (from docbook source).
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/control b/ubuntu/maverick/applications/tde-systemsettings/debian/control
index 3b163f83f..d0ddb0d48 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/control
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/control
@@ -1,15 +1,15 @@
-Source: kde-systemsettings-trinity
+Source: tde-systemsettings-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0), patchutils (>= 0.2.25), kdelibs4-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0), patchutils (>= 0.2.25), tdelibs4-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kde-systemsettings-trinity
+Package: tde-systemsettings-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, kcontrol-trinity
-Replaces: kde-systemsettings-kde3 (<< 4:3.5.13)
-Breaks: kde-systemsettings-kde3 (<< 4:3.5.13)
+Replaces: tde-systemsettings-kde3 (<< 4:3.5.13)
+Breaks: tde-systemsettings-kde3 (<< 4:3.5.13)
 Description: easy to use control centre for TDE
  System preferences is a replacement for the TDE
  Control Centre with an improved user interface.
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/rules b/ubuntu/maverick/applications/tde-systemsettings/debian/rules
index f6bd275e1..82d5c2429 100755
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/rules
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/rules
@@ -27,18 +27,18 @@ debian/stamp-bootstrap:
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
-cleanbuilddir/kde-systemsettings-trinity::
+cleanbuilddir/tde-systemsettings-trinity::
 	rm -f systemsettings.1
 
-build/kde-systemsettings-trinity::
+build/tde-systemsettings-trinity::
 	docbook2x-man debian/systemsettings.1.docbook
 
-install/kde-systemsettings-trinity::
+install/tde-systemsettings-trinity::
 	# Don't clash files, just Use the ones from kcontrol
-	rm debian/kde-systemsettings-trinity/opt/trinity/share/desktop-directories/kde-settings-power.directory
-	rm debian/kde-systemsettings-trinity/opt/trinity/share/desktop-directories/kde-settings-system.directory
-	rm debian/kde-systemsettings-trinity/opt/trinity/share/applications/kde/kcmfontinst.desktop
-	rm debian/kde-systemsettings-trinity/opt/trinity/share/applications/kde/laptoppowermanagement.desktop
-	cp debian/kde-settings-laptops.directory debian/kde-systemsettings-trinity/opt/trinity/share/desktop-directories/
+	rm debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/kde-settings-power.directory
+	rm debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/kde-settings-system.directory
+	rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/kde/kcmfontinst.desktop
+	rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/kde/laptoppowermanagement.desktop
+	cp debian/kde-settings-laptops.directory debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/
 
-DEB_INSTALL_MANPAGES_kde-systemsettings-trinity = systemsettings.1
+DEB_INSTALL_MANPAGES_tde-systemsettings-trinity = systemsettings.1
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/kde-systemsettings-trinity.preinst b/ubuntu/maverick/applications/tde-systemsettings/debian/tde-systemsettings-trinity.preinst
index f7b840ea2..f7b840ea2 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/kde-systemsettings-trinity.preinst
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/tde-systemsettings-trinity.preinst
diff --git a/ubuntu/maverick/applications/tdesudo/debian/changelog b/ubuntu/maverick/applications/tdesudo/debian/changelog
index 3e01f5533..c0e354a0f 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/changelog
+++ b/ubuntu/maverick/applications/tdesudo/debian/changelog
@@ -1,23 +1,23 @@
-kdesudo-trinity (4:2.5.1-4ubuntu0) karmic; urgency=low
+tdesudo-trinity (4:2.5.1-4ubuntu0) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdesudo-trinity (4:2.5.1-3ubuntu8) intrepid; urgency=low
+tdesudo-trinity (4:2.5.1-3ubuntu8) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 01 March 2009 23:25:00 -0600
 
-kdesudo-trinity (4:2.5.1-3ubuntu6) intrepid; urgency=low
+tdesudo-trinity (4:2.5.1-3ubuntu6) intrepid; urgency=low
 
   * Added -trinity suffix
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 04 Nov 2008 08:49:00 -0600
 
-kdesudo (2.5.1-0ubuntu3) hardy; urgency=low
+tdesudo (2.5.1-0ubuntu3) hardy; urgency=low
 
   * Improved kubuntu_02_spaced_args.patch:
     - Now deals with -c command option too
@@ -26,7 +26,7 @@ kdesudo (2.5.1-0ubuntu3) hardy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 21 Apr 2008 09:20:30 +0200
 
-kdesudo (2.5.1-0ubuntu2) hardy; urgency=low
+tdesudo (2.5.1-0ubuntu2) hardy; urgency=low
 
   * Added kubuntu_02_spaced_args.patch:
     - Closes LP: #209831
@@ -35,43 +35,43 @@ kdesudo (2.5.1-0ubuntu2) hardy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 17 Apr 2008 23:47:16 +0200
 
-kdesudo (2.5.1-0ubuntu1) hardy; urgency=low
+tdesudo (2.5.1-0ubuntu1) hardy; urgency=low
 
   * New upstream release. Fixes issue building towards gcc 4.3.0
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 28 Mar 2008 15:27:57 +0100
 
-kdesudo (2.5-0ubuntu1) hardy; urgency=low
+tdesudo (2.5-0ubuntu1) hardy; urgency=low
 
   * New upstream release. Closes LP: #203690
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 18 Mar 2008 23:49:19 +0100
 
-kdesudo (2.4-0ubuntu1) hardy; urgency=low
+tdesudo (2.4-0ubuntu1) hardy; urgency=low
 
   * New upstream release. Closes LP: #187053
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 18 Feb 2008 13:43:57 +0100
 
-kdesudo (2.3-0ubuntu1) hardy; urgency=low
+tdesudo (2.3-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Sun, 17 Feb 2008 02:34:43 +0100
 
-kdesudo (2.2-0ubuntu1) hardy; urgency=low
+tdesudo (2.2-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 04 Feb 2008 20:07:55 +0100
 
-kdesudo (2.1-0ubuntu1) hardy; urgency=low
+tdesudo (2.1-0ubuntu1) hardy; urgency=low
 
   * New upstream release.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 24 Jan 2008 13:44:16 +0100
 
-kdesudo (2.0-0ubuntu1) hardy; urgency=low
+tdesudo (2.0-0ubuntu1) hardy; urgency=low
 
   * New upstream release :
     - Closes LP: #157043, #162823, #144970, #148255,#172749, #173319
@@ -79,32 +79,32 @@ kdesudo (2.0-0ubuntu1) hardy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 04 Dec 2007 16:41:58 +0100
 
-kdesudo (1.4-0ubuntu1) hardy; urgency=low
+tdesudo (1.4-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 20 Nov 2007 12:46:56 +0100
 
-kdesudo (1.3-0ubuntu1) hardy; urgency=low
+tdesudo (1.3-0ubuntu1) hardy; urgency=low
 
   * New upstream release. Closes LP: #163417
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 19 Nov 2007 20:36:49 +0100
 
-kdesudo (1.2-0ubuntu2) hardy; urgency=low
+tdesudo (1.2-0ubuntu2) hardy; urgency=low
 
   * Reupload as the build farm should now be fixed
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 12 Nov 2007 12:22:07 +0100
 
-kdesudo (1.2-0ubuntu1) hardy; urgency=low
+tdesudo (1.2-0ubuntu1) hardy; urgency=low
 
   * New upstream release, fixes the user's $HOME usage
     potential corrupting files issue
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 10 Nov 2007 12:58:57 +0100
 
-kdesudo (1.1-0ubuntu1) gutsy; urgency=low
+tdesudo (1.1-0ubuntu1) gutsy; urgency=low
 
   * Initial release
 
diff --git a/ubuntu/maverick/applications/tdesudo/debian/control b/ubuntu/maverick/applications/tdesudo/debian/control
index 889b111ed..c541b6b90 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/control
+++ b/ubuntu/maverick/applications/tdesudo/debian/control
@@ -1,15 +1,15 @@
-Source: kdesudo-trinity
+Source: tdesudo-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>> 5), cdbs, kdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>> 5), cdbs, tdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kdesudo-trinity
+Package: tdesudo-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, sudo
-Replaces: kdesudo-kde3 (<< 4:3.5.13)
-Breaks: kdesudo-kde3 (<< 4:3.5.13)
+Replaces: tdesudo-kde3 (<< 4:3.5.13)
+Breaks: tdesudo-kde3 (<< 4:3.5.13)
 Description: sudo frontend for Trinity
  KdeSudo is a graphical frontend for the sudo utility.
  It allows you to run programs as another user by entering your password.
diff --git a/ubuntu/maverick/applications/tdesudo/debian/copyright b/ubuntu/maverick/applications/tdesudo/debian/copyright
index 9cd32407b..ee75c3d6d 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/copyright
+++ b/ubuntu/maverick/applications/tdesudo/debian/copyright
@@ -2,10 +2,10 @@ This package was debianized by Anthony Mercatante <tonio@ubuntu.com>
 on Fri, 01 Jun 2007 01:07:10 +0200
 
 It was downloaded from
-    https://code.launchpad.net/kdesudo
+    https://code.launchpad.net/tdesudo
 
-This version is a fork of the original kdesudo from
-    http://ksudo.sourceforge.net/kdesudo/
+This version is a fork of the original tdesudo from
+    http://ksudo.sourceforge.net/tdesudo/
 
 Upstream authors:
     Robert Gruber
diff --git a/ubuntu/maverick/applications/tdesudo/debian/links b/ubuntu/maverick/applications/tdesudo/debian/links
index c30adf9c1..0482e1e4f 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/links
+++ b/ubuntu/maverick/applications/tdesudo/debian/links
@@ -1 +1 @@
-opt/trinity/bin/kdesudo opt/trinity/bin/kdesu 
+opt/trinity/bin/tdesudo opt/trinity/bin/kdesu 
diff --git a/ubuntu/maverick/applications/tdesudo/debian/postinst b/ubuntu/maverick/applications/tdesudo/debian/postinst
index d452abce3..b0100d96c 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/postinst
+++ b/ubuntu/maverick/applications/tdesudo/debian/postinst
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kdesudo-trinity
+package_name=tdesudo-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/ubuntu/maverick/applications/tdesudo/debian/postrm b/ubuntu/maverick/applications/tdesudo/debian/postrm
index 526a8c60a..a5b54ebf1 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/postrm
+++ b/ubuntu/maverick/applications/tdesudo/debian/postrm
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kdesudo-trinity
+package_name=tdesudo-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/ubuntu/maverick/applications/tdesudo/debian/preinst b/ubuntu/maverick/applications/tdesudo/debian/preinst
index d711fde5b..fe6a85b58 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/preinst
+++ b/ubuntu/maverick/applications/tdesudo/debian/preinst
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kdesudo-trinity
+package_name=tdesudo-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/ubuntu/maverick/applications/tdesudo/debian/rules b/ubuntu/maverick/applications/tdesudo/debian/rules
index 25290a923..f3b2afb13 100755
--- a/ubuntu/maverick/applications/tdesudo/debian/rules
+++ b/ubuntu/maverick/applications/tdesudo/debian/rules
@@ -13,14 +13,14 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
 
-DEB_INSTALL_MANPAGES_kdesudo-trinity = kdesudo-trinity.1
+DEB_INSTALL_MANPAGES_tdesudo-trinity = tdesudo-trinity.1
 
-build/kdesudo-trinity::
-	docbook2x-man debian/kdesudo-trinity.1.docbook
-	mv kdesudo.1 kdesudo-trinity.1
+build/tdesudo-trinity::
+	docbook2x-man debian/tdesudo-trinity.1.docbook
+	mv tdesudo.1 tdesudo-trinity.1
 
 clean::
-	rm -f kdesudo-trinity.1
+	rm -f tdesudo-trinity.1
 
 post-patches:: debian/stamp-bootstrap
 
diff --git a/ubuntu/maverick/applications/tdesudo/debian/kdesudo-trinity.1.docbook b/ubuntu/maverick/applications/tdesudo/debian/tdesudo-trinity.1.docbook
index 0e1ba2b60..ab5db3a96 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/kdesudo-trinity.1.docbook
+++ b/ubuntu/maverick/applications/tdesudo/debian/tdesudo-trinity.1.docbook
@@ -19,28 +19,28 @@
     <!--  ^^^^^^^^^^ -->
   </refentryinfo>
   <refmeta>
-    <refentrytitle>kdesudo</refentrytitle>
+    <refentrytitle>tdesudo</refentrytitle>
     <manvolnum>1</manvolnum>
   </refmeta>
   <refnamediv>
-    <refname>kdesudo</refname>
+    <refname>tdesudo</refname>
     <refpurpose>a sudo frontend for KDE</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>kdesudo</command>
+      <command>tdesudo</command>
       <arg choice="opt">
         <option><replaceable>Generic-options</replaceable></option>
       </arg>
       <arg choice="opt">
-        <option><replaceable>kdesudo-options</replaceable></option>
+        <option><replaceable>tdesudo-options</replaceable></option>
       </arg>
     </cmdsynopsis>
   </refsynopsisdiv>
   <refsect1>
     <title>DESCRIPTION</title>
     <para>
-      kdesudo is a frontend for sudo for the <productname>KDE</productname> desktop.
+      tdesudo is a frontend for sudo for the <productname>KDE</productname> desktop.
     </para>
   </refsect1>
   <refsect1>
diff --git a/ubuntu/maverick/applications/tdesvn/debian/changelog b/ubuntu/maverick/applications/tdesvn/debian/changelog
index 55c73dd3c..07180f154 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/changelog
+++ b/ubuntu/maverick/applications/tdesvn/debian/changelog
@@ -1,23 +1,23 @@
-kdesvn-trinity (1.0.4-2~2ubuntu4) karmic; urgency=low
+tdesvn-trinity (1.0.4-2~2ubuntu4) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdesvn-trinity (1.0.4-2~0ubuntu4) intrepid; urgency=low
+tdesvn-trinity (1.0.4-2~0ubuntu4) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 10 March 2009 12:31:00 -0600
 
-kdesvn-trinity (1.0.4-2~0ubuntu3) intrepid; urgency=low
+tdesvn-trinity (1.0.4-2~0ubuntu3) intrepid; urgency=low
 
   * Added -trinity suffix
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 31 Dec 2008 17:59:00 -0600
 
-kdesvn (1.0.4-2~hardy1) hardy-backports; urgency=low
+tdesvn (1.0.4-2~hardy1) hardy-backports; urgency=low
 
   * Upload fixed Trinity package from sid for compatibility with svn 1.5
     (LP: #283468)
@@ -26,7 +26,7 @@ kdesvn (1.0.4-2~hardy1) hardy-backports; urgency=low
 
  -- Scott Kitterman <scott@kitterman.com>  Wed, 15 Oct 2008 01:14:20 -0400
 
-kdesvn (1.0.4-2) unstable; urgency=low
+tdesvn (1.0.4-2) unstable; urgency=low
 
   * debian/control
     - Add Vcs-* fields.
@@ -35,23 +35,23 @@ kdesvn (1.0.4-2) unstable; urgency=low
 
  -- Michael Biebl <biebl@debian.org>  Fri, 10 Oct 2008 22:46:45 +0200
 
-kdesvn (1.0.4-1) unstable; urgency=low
+tdesvn (1.0.4-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Michael Biebl <biebl@debian.org>  Sat, 04 Oct 2008 06:55:22 +0200
 
-kdesvn (1.0.2-1) unstable; urgency=low
+tdesvn (1.0.2-1) unstable; urgency=low
 
   * New upstream release.
   * Switch to quilt for patch handling. 
   * debian/patches/01-shortcuts.patch
     - Make sure we use unique shortcuts which don't interfere with other
-      components when kdesvn is embedded as kpart. Closes: #452245
+      components when tdesvn is embedded as kpart. Closes: #452245
 
  -- Michael Biebl <biebl@debian.org>  Sat, 20 Sep 2008 10:46:07 +0200
 
-kdesvn (1.0.1-1) experimental; urgency=low
+tdesvn (1.0.1-1) experimental; urgency=low
 
   * New upstream release.
   * debian/patches/01-bashisms_kconf_update.patch
@@ -64,17 +64,17 @@ kdesvn (1.0.1-1) experimental; urgency=low
 
  -- Michael Biebl <biebl@debian.org>  Wed, 03 Sep 2008 02:40:29 +0200
 
-kdesvn (0.14.6-1) unstable; urgency=low
+tdesvn (0.14.6-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Michael Biebl <biebl@debian.org>  Tue, 15 Jul 2008 14:26:45 +0200
 
-kdesvn (0.14.5-1) unstable; urgency=low
+tdesvn (0.14.5-1) unstable; urgency=low
 
   * New upstream release.
   * debian/control
-    - Don't conflict with kde4 versions of kdesdk-kio-plugins. Closes: #483260
+    - Don't conflict with kde4 versions of tdesdk-kio-plugins. Closes: #483260
     - Bump Standards-Version to 3.8.0. No further changes.
   * debian/watch
     - Update watch file to match the new download location.
@@ -85,13 +85,13 @@ kdesvn (0.14.5-1) unstable; urgency=low
 
  -- Michael Biebl <biebl@debian.org>  Mon, 14 Jul 2008 20:06:12 +0200
 
-kdesvn (0.14.4-1) unstable; urgency=low
+tdesvn (0.14.4-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Michael Biebl <biebl@debian.org>  Mon, 19 May 2008 18:25:35 +0200
 
-kdesvn (0.14.3-1) unstable; urgency=low
+tdesvn (0.14.3-1) unstable; urgency=low
 
   * New upstream release.
   * debian/rules
@@ -106,7 +106,7 @@ kdesvn (0.14.3-1) unstable; urgency=low
 
  -- Michael Biebl <biebl@debian.org>  Fri, 04 Apr 2008 01:02:42 +0200
 
-kdesvn (0.14.2-2) unstable; urgency=low
+tdesvn (0.14.2-2) unstable; urgency=low
 
   * debian/rules
     - Pass -DLIB_SUFFIX="" to DEB_CMAKE_EXTRA_FLAGS. This ensures that the
@@ -116,7 +116,7 @@ kdesvn (0.14.2-2) unstable; urgency=low
 
  -- Michael Biebl <biebl@debian.org>  Tue, 26 Feb 2008 23:31:17 +0100
 
-kdesvn (0.14.2-1) unstable; urgency=low
+tdesvn (0.14.2-1) unstable; urgency=low
 
   * New upstream release.
   * debian/control
@@ -124,7 +124,7 @@ kdesvn (0.14.2-1) unstable; urgency=low
 
  -- Michael Biebl <biebl@debian.org>  Wed, 20 Feb 2008 00:15:24 +0100
 
-kdesvn (0.14.1-1) unstable; urgency=low
+tdesvn (0.14.1-1) unstable; urgency=low
 
   * New upstream release.
   * debian/watch
@@ -132,10 +132,10 @@ kdesvn (0.14.1-1) unstable; urgency=low
 
  -- Michael Biebl <biebl@debian.org>  Mon, 12 Nov 2007 11:36:34 +0100
 
-kdesvn (0.14.0-1) unstable; urgency=low
+tdesvn (0.14.0-1) unstable; urgency=low
 
   * New upstream release.
-  * debian/kdesvn.menu
+  * debian/tdesvn.menu
     - Change section to "Applications/Programming" to comply with the new menu
       spec.
   * debian/patches/01-bashisms_kconf_update.patch
@@ -144,20 +144,20 @@ kdesvn (0.14.0-1) unstable; urgency=low
     - Use the new "Homepage:" field to specify the upstream URL.
     - SONAME bump, rename the libsvnqt3 package to libsvnqt4.
   * Rename libsvnqt3.install to libsvnqt4.install.
-  * debian/kdesvn.install
+  * debian/tdesvn.install
     - Install the kconf_update files.
   * debian/libsvnqt-dev.install
     - No longer install the libtool *.la files for libsvnqt.
 
  -- Michael Biebl <biebl@debian.org>  Thu, 18 Oct 2007 02:20:32 +0200
 
-kdesvn (0.13.0-1) unstable; urgency=low
+tdesvn (0.13.0-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Michael Biebl <biebl@debian.org>  Fri, 10 Aug 2007 00:13:38 +0200
 
-kdesvn (0.12.1-1) unstable; urgency=low
+tdesvn (0.12.1-1) unstable; urgency=low
 
   * New upstream release.
   * debian/watch
@@ -167,7 +167,7 @@ kdesvn (0.12.1-1) unstable; urgency=low
 
  -- Michael Biebl <biebl@debian.org>  Wed, 13 Jun 2007 16:07:32 +0200
 
-kdesvn (0.12.0-1) unstable; urgency=low
+tdesvn (0.12.0-1) unstable; urgency=low
 
   * New upstream release.
   * debian/patches/01-po_ca.patch
@@ -175,7 +175,7 @@ kdesvn (0.12.0-1) unstable; urgency=low
 
  -- Michael Biebl <biebl@debian.org>  Sat, 05 May 2007 02:07:52 +0200
 
-kdesvn (0.11.2-2) unstable; urgency=low
+tdesvn (0.11.2-2) unstable; urgency=low
 
   * debian/patches/01-po_ca.patch
     - Added. Updates to the Catalan translation by Antoni Bella Pérez. Thanks!
@@ -183,30 +183,30 @@ kdesvn (0.11.2-2) unstable; urgency=low
 
  -- Michael Biebl <biebl@debian.org>  Thu, 05 Apr 2007 21:16:11 +0200
 
-kdesvn (0.11.2-1) unstable; urgency=low
+tdesvn (0.11.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Michael Biebl <biebl@debian.org>  Mon, 26 Mar 2007 00:51:07 +0200
 
-kdesvn (0.11.1-1) unstable; urgency=low
+tdesvn (0.11.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Michael Biebl <biebl@debian.org>  Mon,  5 Mar 2007 06:44:49 +0100
 
-kdesvn (0.11.0-1) unstable; urgency=low
+tdesvn (0.11.0-1) unstable; urgency=low
 
   * New upstream release.
   * debian/patches/01-kompare_diff.patch
     + Removed. Fixed upstream.
   * debian/control
-    + Add a "Suggests: kdiff3" to kdesvn. kdiff3 can be used as an external
+    + Add a "Suggests: kdiff3" to tdesvn. kdiff3 can be used as an external
       merge program.
 
  -- Michael Biebl <biebl@debian.org>  Fri, 27 Oct 2006 12:52:15 +0200
 
-kdesvn (0.10.0-2) unstable; urgency=low
+tdesvn (0.10.0-2) unstable; urgency=low
 
   * Update maintainer email address to biebl@debian.org.
   * debian/patches/01-kompare_diff.patch
@@ -215,7 +215,7 @@ kdesvn (0.10.0-2) unstable; urgency=low
 
  -- Michael Biebl <biebl@debian.org>  Mon, 23 Oct 2006 13:12:45 +0200
 
-kdesvn (0.10.0-1) unstable; urgency=low
+tdesvn (0.10.0-1) unstable; urgency=low
 
   * New upstream release.
   * API bump for libsvnqt
@@ -224,7 +224,7 @@ kdesvn (0.10.0-1) unstable; urgency=low
 
  -- Michael Biebl <biebl@teco.edu>  Thu,  5 Oct 2006 01:50:41 +0200
 
-kdesvn (0.9.3-1) unstable; urgency=low
+tdesvn (0.9.3-1) unstable; urgency=low
 
   * New upstream release.
   * debian/control
@@ -237,11 +237,11 @@ kdesvn (0.9.3-1) unstable; urgency=low
 
  -- Michael Biebl <biebl@teco.edu>  Sat, 16 Sep 2006 16:54:55 +0200
 
-kdesvn (0.9.2-1) unstable; urgency=low
+tdesvn (0.9.2-1) unstable; urgency=low
 
   * New upstream release.
     + Improved UTF-8 handling. Closes: #381424
-    + Dynamic context menues can now be disabled from within kdesvn.
+    + Dynamic context menues can now be disabled from within tdesvn.
       Closes: #377592. This also addresses #370303.
   * Switched the build system to CMake.
     + Added debian/cdbs/cmake.mk, a cdbs class for CMake (taken from the
@@ -255,7 +255,7 @@ kdesvn (0.9.2-1) unstable; urgency=low
 
  -- Michael Biebl <biebl@teco.edu>  Fri,  1 Sep 2006 13:40:57 +0200
 
-kdesvn (0.9.1-1) unstable; urgency=medium
+tdesvn (0.9.1-1) unstable; urgency=medium
 
   * New upstream release.
     + Correct diffs for non-UTF8 locales. Closes: #369809
@@ -263,7 +263,7 @@ kdesvn (0.9.1-1) unstable; urgency=medium
 
  -- Michael Biebl <biebl@teco.edu>  Tue, 25 Jul 2006 22:36:03 +0200
 
-kdesvn (0.9.0-1) unstable; urgency=low
+tdesvn (0.9.0-1) unstable; urgency=low
 
   * New upstream release.
     + The dynamic context menu entries are now in their own, exclusive
@@ -272,59 +272,59 @@ kdesvn (0.9.0-1) unstable; urgency=low
 
  -- Michael Biebl <biebl@teco.edu>  Mon, 24 Jul 2006 02:52:17 +0200
 
-kdesvn (0.8.5-1) unstable; urgency=low
+tdesvn (0.8.5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Michael Biebl <biebl@teco.edu>  Sun, 25 Jun 2006 08:00:01 +0200
 
-kdesvn (0.8.4-1) unstable; urgency=low
+tdesvn (0.8.4-1) unstable; urgency=low
 
   * New upstream release.
   * Bumped Standards-Version to 3.7.2, no further changes required.
 
  -- Michael Biebl <biebl@teco.edu>  Sun, 21 May 2006 13:32:16 +0200
 
-kdesvn (0.8.3-1) unstable; urgency=low
+tdesvn (0.8.3-1) unstable; urgency=low
 
   * New upstream release. Closes: #365643
     + Local characters in URLs are properly encoded now. Closes: #364910
-    + Do not print a warning message if svnqt and kdesvn version differ.
+    + Do not print a warning message if svnqt and tdesvn version differ.
       Closes: #365743
   * Bumped Standards-Version to 3.7.1, no further changes required.
 
  -- Michael Biebl <biebl@teco.edu>  Thu,  4 May 2006 00:18:09 +0200
 
-kdesvn (0.8.2-1) unstable; urgency=low
+tdesvn (0.8.2-1) unstable; urgency=low
 
   * New upstream release.
-  * Added a "Recommends: graphviz" to kdesvn. dot is part of the graphviz
-    package and used by kdesvn to generate nice looking revision graphs.
+  * Added a "Recommends: graphviz" to tdesvn. dot is part of the graphviz
+    package and used by tdesvn to generate nice looking revision graphs.
   * The soname of svnqt changed from 1 to 2. Updated the control files
     accordingly.
-  * Moved libsvnqt2 in front of kdesvn in debian/control. This way the shlibs
-    file of libsvnqt2 is created before dh_shlibdeps for kdesvn is run.
+  * Moved libsvnqt2 in front of tdesvn in debian/control. This way the shlibs
+    file of libsvnqt2 is created before dh_shlibdeps for tdesvn is run.
 
  -- Michael Biebl <biebl@teco.edu>  Sun, 23 Apr 2006 00:40:43 +0200
 
-kdesvn (0.8.1-1) unstable; urgency=low
+tdesvn (0.8.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Michael Biebl <biebl@teco.edu>  Sun,  2 Apr 2006 15:18:56 +0200
 
-kdesvn (0.8.0-1) unstable; urgency=low
+tdesvn (0.8.0-1) unstable; urgency=low
 
   * New upstream release.
   * Added two new binary packages libsvnqt1 and libsvnqt-dev. svnqt is a Qt
-    wrapper library for subversion. kdesvn uses it to ease the access to
+    wrapper library for subversion. tdesvn uses it to ease the access to
     libsvn.
   * Updated copyright file and added information about svnqt.
   * Bumped debhelper compatibility to 5. 
 
  -- Michael Biebl <biebl@teco.edu>  Fri, 24 Mar 2006 08:56:09 +0100
 
-kdesvn (0.7.4-1) unstable; urgency=low
+tdesvn (0.7.4-1) unstable; urgency=low
 
   * New upstream release.
   * Fixed indentation of homepage url in the long description.
@@ -333,7 +333,7 @@ kdesvn (0.7.4-1) unstable; urgency=low
 
  -- Michael Biebl <biebl@teco.edu>  Wed,  1 Mar 2006 22:19:30 +0100
 
-kdesvn (0.7.3-1) unstable; urgency=low
+tdesvn (0.7.3-1) unstable; urgency=low
 
   * New upstream release.
     + Removed patch store_passwords_config.diff, merged upstream.
@@ -341,14 +341,14 @@ kdesvn (0.7.3-1) unstable; urgency=low
 
  -- Michael Biebl <biebl@teco.edu>  Thu,  2 Feb 2006 15:25:50 +0100
 
-kdesvn (0.7.2-2) unstable; urgency=low
+tdesvn (0.7.2-2) unstable; urgency=low
 
   * subversion_settings.cpp was not regenerated from the patched ui file.
     Enforce its recreation via rm. This really fixes #345518. 
 
  -- Michael Biebl <biebl@teco.edu>  Fri, 13 Jan 2006 16:09:35 +0100
 
-kdesvn (0.7.2-1) unstable; urgency=low
+tdesvn (0.7.2-1) unstable; urgency=low
 
   * New upstream release.
     + Removed patch context_menu.diff, merged upstream.
@@ -358,15 +358,15 @@ kdesvn (0.7.2-1) unstable; urgency=low
 
  -- Michael Biebl <biebl@teco.edu>  Fri, 13 Jan 2006 04:31:54 +0100
 
-kdesvn (0.7.1-1) unstable; urgency=low
+tdesvn (0.7.1-1) unstable; urgency=low
 
   * New upstream release.
-  * Tightened build dependency on kdelibs4-dev because of the C++ allocator
+  * Tightened build dependency on tdelibs4-dev because of the C++ allocator
     change.
-  * Tightened build dependency on libsvn0-dev as kdesvn now requires subversion
+  * Tightened build dependency on libsvn0-dev as tdesvn now requires subversion
     1.2 or higher.
-  * Split up package into core application kdesvn and KIO plugin package
-    kdesvn-kio-plugins.
+  * Split up package into core application tdesvn and KIO plugin package
+    tdesvn-kio-plugins.
   * Updated menu icon.
   * Use Debian libtool and regenerate the autotools files. Closes: #343952
     + Add build dependencies to automake1.9, autoconf and libtool.
@@ -375,41 +375,41 @@ kdesvn (0.7.1-1) unstable; urgency=low
 
  -- Michael Biebl <biebl@teco.edu>  Mon, 19 Dec 2005 21:47:39 +0100
 
-kdesvn (0.6.3-1) unstable; urgency=low
+tdesvn (0.6.3-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Michael Biebl <biebl@teco.edu>  Mon, 24 Oct 2005 17:37:02 +0200
 
-kdesvn (0.6.2-1) unstable; urgency=low
+tdesvn (0.6.2-1) unstable; urgency=low
 
   * New upstream release.
   * Added a versioned build dependency to libssl-dev (>= 0.9.8a-1) to make
-    sure kdesvn links against a version of openssl which has symbol
+    sure tdesvn links against a version of openssl which has symbol
     versioning.
 
  -- Michael Biebl <biebl@teco.edu>  Wed,  5 Oct 2005 15:40:53 +0200
 
-kdesvn (0.6.1-1) unstable; urgency=low
+tdesvn (0.6.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Michael Biebl <biebl@teco.edu>  Tue,  4 Oct 2005 04:04:14 +0200
 
-kdesvn (0.6.0-1) unstable; urgency=low
+tdesvn (0.6.0-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Michael Biebl <biebl@teco.edu>  Fri, 23 Sep 2005 16:47:04 +0200
 
-kdesvn (0.5.3-2) unstable; urgency=low
+tdesvn (0.5.3-2) unstable; urgency=low
 
   * Removed useless build dependency on build-essential which was 
     generated by cdbs. Closes: #326638
 
  -- Michael Biebl <biebl@teco.edu>  Mon,  5 Sep 2005 18:50:39 +0200
 
-kdesvn (0.5.3-1) unstable; urgency=low
+tdesvn (0.5.3-1) unstable; urgency=low
 
   * Initial release. Closes: #323697
 
diff --git a/ubuntu/maverick/applications/tdesvn/debian/control b/ubuntu/maverick/applications/tdesvn/debian/control
index 8345fa9de..e8d828bb8 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/control
+++ b/ubuntu/maverick/applications/tdesvn/debian/control
@@ -1,11 +1,11 @@
-Source: kdesvn-trinity
+Source: tdesvn-trinity
 Section: devel
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs (>= 0.4.50), debhelper (>= 5.0.0), cmake (>= 2.4), kdelibs4-trinity-dev (>= 4:3.4.3-2), libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, gettext, quilt, libaprutil1-dev
+Build-Depends: cdbs (>= 0.4.50), debhelper (>= 5.0.0), cmake (>= 2.4), tdelibs4-trinity-dev (>= 4:3.4.3-2), libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, gettext, quilt, libaprutil1-dev
 Standards-Version: 3.8.4
-Homepage: http://kdesvn.alwins-world.de/
+Homepage: http://tdesvn.alwins-world.de/
 
 Package: libsvnqt4-trinity
 Section: libs
@@ -30,12 +30,12 @@ Description: Qt wrapper library for subversion (development files) [Trinity]
  This package contains the header files and symbolic links that developers
  using svnqt will need.
 
-Package: kdesvn-trinity
+Package: tdesvn-trinity
 Section: devel
 Architecture: any
-Replaces: kdesvn-kde3 (<< 4:3.5.13)
-Breaks: kdesvn-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, ${misc:Depends}, kdesvn-kio-plugins-trinity (= ${binary:Version})
+Replaces: tdesvn-kde3 (<< 4:3.5.13)
+Breaks: tdesvn-kde3 (<< 4:3.5.13)
+Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-kio-plugins-trinity (= ${binary:Version})
 Recommends: kompare-trinity, graphviz
 Suggests: khelpcenter-trinity, kdiff3-trinity
 Description: subversion client with tight KDE integration [Trinity]
@@ -46,16 +46,16 @@ Description: subversion client with tight KDE integration [Trinity]
  a tight integration into KDE and can be embedded into other KDE 
  applications like konqueror via the KDE component technology KParts.
 
-Package: kdesvn-kio-plugins-trinity
+Package: tdesvn-kio-plugins-trinity
 Section: devel
 Architecture: any
-Replaces: kdesvn-kio-plugins-kde3 (<< 4:3.5.13)
-Breaks: kdesvn-kio-plugins-kde3 (<< 4:3.5.13)
+Replaces: tdesvn-kio-plugins-kde3 (<< 4:3.5.13)
+Breaks: tdesvn-kio-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: kdesdk-kio-plugins-trinity
+Conflicts: tdesdk-kio-plugins-trinity
 Description: subversion I/O slaves for Trinity
  This packages includes KIO slaves for svn, svn+file, svn+http, 
  svn+https, svn+ssh. This allows you to access subversion repositories 
  inside any KIO enabled KDE application.
  .
- This package is part of kdesvn-trinity.
+ This package is part of tdesvn-trinity.
diff --git a/ubuntu/maverick/applications/tdesvn/debian/copyright b/ubuntu/maverick/applications/tdesvn/debian/copyright
index a3d664a33..74f00ccfd 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/copyright
+++ b/ubuntu/maverick/applications/tdesvn/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Michael Biebl <biebl@teco.edu> on
 Sun, 21 Aug 2005 01:08:16 +0200.
 
-It was downloaded from http://www.alwins-world.de/programs/kdesvn/
+It was downloaded from http://www.alwins-world.de/programs/tdesvn/
 
 Upstream Author: Rajko Albrecht <ral@alwins-world.de>
 
diff --git a/ubuntu/maverick/applications/tdesvn/debian/icons/kdesvn.xpm b/ubuntu/maverick/applications/tdesvn/debian/icons/tdesvn.xpm
index d5e2abf6a..38da00075 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/icons/kdesvn.xpm
+++ b/ubuntu/maverick/applications/tdesvn/debian/icons/tdesvn.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * kdesvn_xpm[] = {
+static char * tdesvn_xpm[] = {
 "32 32 179 2",
 "  	c None",
 ". 	c #567CB8",
diff --git a/ubuntu/maverick/applications/tdesvn/debian/kdesvn-trinity.manpages b/ubuntu/maverick/applications/tdesvn/debian/kdesvn-trinity.manpages
deleted file mode 100644
index c834c876c..000000000
--- a/ubuntu/maverick/applications/tdesvn/debian/kdesvn-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kdesvn.1
-debian/man/kdesvnaskpass.1
diff --git a/ubuntu/maverick/applications/tdesvn/debian/man/kdesvn.1 b/ubuntu/maverick/applications/tdesvn/debian/man/tdesvn.1
index 0e4816669..bc8ceb053 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/man/kdesvn.1
+++ b/ubuntu/maverick/applications/tdesvn/debian/man/tdesvn.1
@@ -1,10 +1,10 @@
 .\" This file was generated by kdemangen.pl
 .TH KDESVN 1 "Dez 2005" "K Desktop Environment" "A Subversion Client for KDE (standalone application)"
 .SH NAME
-kdesvn
+tdesvn
 \- A Subversion client for KDE (standalone application)
 .SH SYNOPSIS
-kdesvn [Qt\-options] [KDE\-options] [options] exec <command> [URL] 
+tdesvn [Qt\-options] [KDE\-options] [options] exec <command> [URL] 
 .SH DESCRIPTION
 A Subversion client for KDE (standalone application)
 .SH OPTIONS
@@ -153,15 +153,15 @@ mirrors the whole layout of widgets
 .SS 
 
 .SH EXAMPLE
-kdesvn file:///path/to/local/working/copy
+tdesvn file:///path/to/local/working/copy
 .br
-kdesvn http://remote/svn/project/trunk
+tdesvn http://remote/svn/project/trunk
 
 .SH SEE ALSO
 Full user documentation is available through the KDE Help Center.  You can also enter the URL
-.BR help:/kdesvn/
+.BR help:/tdesvn/
 directly into konqueror or you can run 
-.BR "`khelpcenter help:/kdesvn/'"
+.BR "`khelpcenter help:/tdesvn/'"
 from the command-line.
 .br
 .SH AUTHORS
diff --git a/ubuntu/maverick/applications/tdesvn/debian/man/kdesvnaskpass.1 b/ubuntu/maverick/applications/tdesvn/debian/man/tdesvnaskpass.1
index 4cc8f03ad..053bb8cdd 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/man/kdesvnaskpass.1
+++ b/ubuntu/maverick/applications/tdesvn/debian/man/tdesvnaskpass.1
@@ -1,12 +1,12 @@
 .\" This file was generated by kdemangen.pl
-.TH KDESVNASKPASS 1 "Aug 2005" "K Desktop Environment" "ssh-askpass for kdesvn"
+.TH KDESVNASKPASS 1 "Aug 2005" "K Desktop Environment" "ssh-askpass for tdesvn"
 .SH NAME
-kdesvnaskpass
-\- ssh-askpass for kdesvn
+tdesvnaskpass
+\- ssh-askpass for tdesvn
 .SH SYNOPSIS
-kdesvnaskpass [Qt\-options] [KDE\-options] [prompt] 
+tdesvnaskpass [Qt\-options] [KDE\-options] [prompt] 
 .SH DESCRIPTION
-ssh-askpass for kdesvn. 
+ssh-askpass for tdesvn. 
 .SH OPTIONS
 .SS
 .SS Arguments:
@@ -136,7 +136,7 @@ mirrors the whole layout of widgets
 .SS 
 
 .SH SEE ALSO
-.BR kdesvn(1)
+.BR tdesvn(1)
 .br
 .SH AUTHORS
 .nf
diff --git a/ubuntu/maverick/applications/tdesvn/debian/kdesvn-kio-plugins-trinity.install b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
index f461ccbef..32155110b 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/kdesvn-kio-plugins-trinity.install
+++ b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/share/services/*.protocol
 debian/tmp/opt/trinity/lib/kio*
-debian/tmp/opt/trinity/lib/kded_kdesvnd.*
+debian/tmp/opt/trinity/lib/kded_tdesvnd.*
 debian/tmp/opt/trinity/share/services/kded/
diff --git a/ubuntu/maverick/applications/tdesvn/debian/kdesvn-trinity.install b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.install
index a222a6ad4..f3c840c12 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/kdesvn-trinity.install
+++ b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.install
@@ -1,8 +1,8 @@
-debian/icons/kdesvn.xpm	/opt/trinity/share/pixmaps/
+debian/icons/tdesvn.xpm	/opt/trinity/share/pixmaps/
 debian/tmp/opt/trinity/bin/
-debian/tmp/opt/trinity/lib/libkdesvnpart.*
-debian/tmp/opt/trinity/share/apps/kdesvn/
-debian/tmp/opt/trinity/share/apps/kdesvnpart/
+debian/tmp/opt/trinity/lib/libtdesvnpart.*
+debian/tmp/opt/trinity/share/apps/tdesvn/
+debian/tmp/opt/trinity/share/apps/tdesvnpart/
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/
 debian/tmp/opt/trinity/share/apps/kconf_update/
 debian/tmp/opt/trinity/share/icons/
diff --git a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.manpages b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.manpages
new file mode 100644
index 000000000..8cb778203
--- /dev/null
+++ b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.manpages
@@ -0,0 +1,2 @@
+debian/man/tdesvn.1
+debian/man/tdesvnaskpass.1
diff --git a/ubuntu/maverick/applications/tdesvn/debian/kdesvn-trinity.menu b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.menu
index c85d2665d..12595e540 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/kdesvn-trinity.menu
+++ b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.menu
@@ -1,8 +1,8 @@
-?package(kdesvn):\
+?package(tdesvn):\
   needs="X11"\
   section="Applications/Programming"\
   hints="KDE,Version control"\
   title="KDESvn"\
   longtitle="SVN client"\
-  icon="/usr/share/pixmaps/kdesvn.xpm"\
-  command="/opt/trinity/bin/kdesvn"
+  icon="/usr/share/pixmaps/tdesvn.xpm"\
+  command="/opt/trinity/bin/tdesvn"
diff --git a/ubuntu/maverick/applications/tdesvn/debian/watch b/ubuntu/maverick/applications/tdesvn/debian/watch
index 190c9f8f7..80c0f090c 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/watch
+++ b/ubuntu/maverick/applications/tdesvn/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://kdesvn.alwins-world.de/trac.fcgi/wiki/DownLoads .*kdesvn-(.*)\.tar\.bz2
+http://tdesvn.alwins-world.de/trac.fcgi/wiki/DownLoads .*tdesvn-(.*)\.tar\.bz2
diff --git a/ubuntu/maverick/applications/tellico/debian/changelog b/ubuntu/maverick/applications/tellico/debian/changelog
index 01268f186..bced6a6bb 100644
--- a/ubuntu/maverick/applications/tellico/debian/changelog
+++ b/ubuntu/maverick/applications/tellico/debian/changelog
@@ -20,7 +20,7 @@ tellico-trinity (1.3.2.1-1ubuntu1) intrepid; urgency=low
 tellico (1.3.2.1-1ubuntu1) intrepid; urgency=low
 
   [ Fabrice Coutadeur ]
-  * debian/control: Building without kdemultimedia-dev and libkcal2-dev
+  * debian/control: Building without tdemultimedia-dev and libkcal2-dev
   * debian/rules: delete libtool and config.log files in the cleaning part
   * Close LP: #264168
 
@@ -142,10 +142,10 @@ tellico (1.2.4-1) unstable; urgency=low
     backports again. Thanks Robby for caring about that. (Closes: #396508).
     This package actually includes patches from the 1.2.x branch, up top
     r1203, which contains several bugfixes.
-  * Have tellico-data depend on kdelibs-data, so we don't have broken symlinks.
+  * Have tellico-data depend on tdelibs-data, so we don't have broken symlinks.
     (Closes: #387795). Thanks Lars Wirzenius for pointing at it.
-  * All the official arch have at least kdepim 3.5.5, drop build-dep on
-    kdepim-dev.
+  * All the official arch have at least tdepim 3.5.5, drop build-dep on
+    tdepim-dev.
   * Bump Standards-Version to 3.7.2.2
 
  -- Regis Boudin <regis@boudin.name>  Thu,  2 Nov 2006 20:32:48 +0000
@@ -159,10 +159,10 @@ tellico (1.2.2-1) unstable; urgency=low
   * Drop remove_zlib_link.diff patch. xml2-config and xslt-config
     return only the necessary flags now.
   * libkcal2-dev now contains libemailfunctions/idmapper.h, so no need to
-    build-depend on the whole kdepim-dev anymore. Thanks Christopher Martin
+    build-depend on the whole tdepim-dev anymore. Thanks Christopher Martin
     for applying the patch. Build-depend on
-    libkcal2-dev( >= 3.5.4-1) | kdepim-dev, so the package can build with
-    older versions of kdepim.
+    libkcal2-dev( >= 3.5.4-1) | tdepim-dev, so the package can build with
+    older versions of tdepim.
 
  -- Regis Boudin <regis@boudin.name>  Fri,  8 Sep 2006 08:47:29 +0100
 
@@ -264,9 +264,9 @@ tellico (1.0.3+SVNr327-1) unstable; urgency=low
     + Fixes various bugs (including some crashes)
     + Update IMDB search
     + Include fix from Aurelien Jarno to build on GNU/kFreeBSD (Closes: #336949)
-  * Remove tight dependency on kdepim-related packages, the C++ ABI transition
+  * Remove tight dependency on tdepim-related packages, the C++ ABI transition
     is complete for them. Also remove build-dependency on libkcal2-dev, which is
-    pulled by kdepim-dev
+    pulled by tdepim-dev
   * Upload sponsored by Thibaut VARENE <varenet@debian.org>
 
  -- Regis Boudin <regis@boudin.name>  Mon,  6 Dec 2005 14:14:47 +0100
@@ -277,11 +277,11 @@ tellico (1.0-1) unstable; urgency=high
     +Updated license to add an exception to allow linking against the OpenSSL
      library. Thanks to Daffyd for pointing it and Robby for modifing the
      license. debian/copyright modified accordingly
-    +New feature for loans, to use the kde calendar. Added kdepim-dev to
+    +New feature for loans, to use the kde calendar. Added tdepim-dev to
      Build-Depends to enable it.
     +Builds with gcc-4.0 (Closes: #326645)
-    +To complete C++ ABI transition, tight dependencies on kdemultimedia-dev
-     and kdepim (Closes: #326850, #328009)
+    +To complete C++ ABI transition, tight dependencies on tdemultimedia-dev
+     and tdepim (Closes: #326850, #328009)
   * Updated FSF adress in debian/copyright
   * Replaced references to my old email address in debian/copyright and
     debian/tellico.1x
@@ -342,7 +342,7 @@ tellico (0.12-1) unstable; urgency=medium
     rebranded as Tellico because of a trademark issue.
   * For smooth transition, provide an empty bookcase package depending on
     tellico.
-  * Build depend on kdemultimedia-dev (>> 4:3.2.2-1). This specific version of
+  * Build depend on tdemultimedia-dev (>> 4:3.2.2-1). This specific version of
     the package has a bug which prevent tellico from building.
   * Bookcase 0.11 has been in sid for ~10 days, so it is already tested. Set
     the priority to medium to increase the chances of getting this package in
diff --git a/ubuntu/maverick/applications/tellico/debian/control b/ubuntu/maverick/applications/tellico/debian/control
index d6832f838..d1f2283c5 100644
--- a/ubuntu/maverick/applications/tellico/debian/control
+++ b/ubuntu/maverick/applications/tellico/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Regis Boudin <regis@debian.org>
-Build-Depends: debhelper (>= 5.0.51~), kdelibs4-trinity-dev, libxml2-dev, libxslt1-dev, libtag1-dev, libyaz3-dev | libyaz4-dev, libpoppler-tqt-dev, libexempi-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.51~), tdelibs4-trinity-dev, libxml2-dev, libxslt1-dev, libtag1-dev, libyaz3-dev | libyaz4-dev, libpoppler-tqt-dev, libexempi-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://periapsis.org/tellico/
 
@@ -28,7 +28,7 @@ Description: collection manager for books, videos, music [Trinity]
 
 Package: tellico-data-trinity
 Architecture: all
-Depends: kdelibs-data-trinity
+Depends: tdelibs-data-trinity
 Replaces: tellico-data-kde3 (<< 4:3.5.13)
 Breaks: tellico-data-kde3 (<< 4:3.5.13)
 Recommends: tellico-trinity
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/changelog b/ubuntu/maverick/applications/twin-style-crystal/debian/changelog
index f330cbc5f..b2d80f32a 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/changelog
+++ b/ubuntu/maverick/applications/twin-style-crystal/debian/changelog
@@ -1,29 +1,29 @@
-kwin-style-crystal-trinity (1.0.5-0ubuntu3) karmic; urgency=low
+twin-style-crystal-trinity (1.0.5-0ubuntu3) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kwin-style-crystal-trinity (1.0.5-0ubuntu2) intrepid; urgency=low
+twin-style-crystal-trinity (1.0.5-0ubuntu2) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
 
-kwin-style-crystal-trinity (1.0.5-0ubuntu1) intrepid; urgency=low
+twin-style-crystal-trinity (1.0.5-0ubuntu1) intrepid; urgency=low
 
   * Added -trinity suffix
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 05 Dec 2008 02:20:00 -0600
 
-kwin-style-crystal (1.0.5-0ubuntu4) hardy; urgency=low
+twin-style-crystal (1.0.5-0ubuntu4) hardy; urgency=low
 
   * Update kubuntu_02_hardyfication.diff, all buttons are in now
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 11 Mar 2008 10:25:13 +0100
 
-kwin-style-crystal (1.0.5-0ubuntu3) hardy; urgency=low
+twin-style-crystal (1.0.5-0ubuntu3) hardy; urgency=low
 
   * Added hardyfication patch by Stefan Skotte
   * Fixed packaging to use cdbs
@@ -31,13 +31,13 @@ kwin-style-crystal (1.0.5-0ubuntu3) hardy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 16 Feb 2008 13:55:32 +0100
 
-kwin-style-crystal (1.0.5-0ubuntu2) hardy; urgency=low
+twin-style-crystal (1.0.5-0ubuntu2) hardy; urgency=low
 
   * removed shadow on inactive windows
 
  -- Stefan Skotte <sfs@enhance-it.dk>  Tue, 05 Feb 2008 14:46:34 +0100
 
-kwin-style-crystal (1.0.5-0ubuntu1) hardy; urgency=low
+twin-style-crystal (1.0.5-0ubuntu1) hardy; urgency=low
 
   * New upstream release.
   * Changed Maintainer as per Ubuntu spec.
@@ -46,7 +46,7 @@ kwin-style-crystal (1.0.5-0ubuntu1) hardy; urgency=low
 
  -- Jonathan Patrick Davies <jpatrick@kubuntu.org>  Sat, 27 Oct 2007 19:59:54 +0200
 
-kwin-style-crystal (1.0.2-1ubuntu1) feisty; urgency=low
+twin-style-crystal (1.0.2-1ubuntu1) feisty; urgency=low
 
   * Sync with debian.
   * Removed obsolete patch kubuntu_01_new_buttons.diff.uu
@@ -55,44 +55,44 @@ kwin-style-crystal (1.0.2-1ubuntu1) feisty; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 22 Jan 2007 12:59:21 +0100
 
-kwin-style-crystal (1.0.2-1) unstable; urgency=low
+twin-style-crystal (1.0.2-1) unstable; urgency=low
 
   * New upstream release
 
  -- Sune Vuorela <debian@pusling.com>  Thu, 12 Oct 2006 09:56:35 +0200
 
-kwin-style-crystal (1.0.1-0ubuntu6) edgy; urgency=low
+twin-style-crystal (1.0.1-0ubuntu6) edgy; urgency=low
 
   * Improved buttons from Ken Wimer 
 
  -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Wed, 20 Sep 2006 11:54:18 -0500
 
-kwin-style-crystal (1.0.1-0ubuntu5) edgy; urgency=low
+twin-style-crystal (1.0.1-0ubuntu5) edgy; urgency=low
 
   * Fix patch kubuntu_01_new_buttons.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 29 Aug 2006 15:07:56 +0100
 
-kwin-style-crystal (1.0.1-0ubuntu4) edgy; urge ncy=low
+twin-style-crystal (1.0.1-0ubuntu4) edgy; urge ncy=low
 
   * Improved close buttons from Ken Wimer
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 29 Aug 2006 11:57:33 +0100
 
-kwin-style-crystal (1.0.1-0ubuntu3) edgy; urgency=low
+twin-style-crystal (1.0.1-0ubuntu3) edgy; urgency=low
 
   * Improved buttons from Ken Wimer
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 24 Aug 2006 14:44:47 +0100
 
-kwin-style-crystal (1.0.1-0ubuntu2) edgy; urgency=low
+twin-style-crystal (1.0.1-0ubuntu2) edgy; urgency=low
 
   * Add kubuntu_01_new_buttons.diff.uu with new Edgy buttons 
     from Ken Wimer 
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 22 Aug 2006 18:42:24 +0100
 
-kwin-style-crystal (1.0.1-0ubuntu1) edgy; urgency=low
+twin-style-crystal (1.0.1-0ubuntu1) edgy; urgency=low
 
   * New Upstream Version
   * Merge with Debian
@@ -100,33 +100,33 @@ kwin-style-crystal (1.0.1-0ubuntu1) edgy; urgency=low
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Fri, 28 Jul 2006 00:56:02 +1000
 
-kwin-style-crystal (1.0.0-1) unstable; urgency=low
+twin-style-crystal (1.0.0-1) unstable; urgency=low
 
   * Initial release Closes: #364360
 
  -- Sune Vuorela <debian@pusling.com>  Wed,  5 Apr 2006 21:07:23 +0000
 
-kwin-style-crystal (0.9.9-0ubuntu4) dapper; urgency=low
+twin-style-crystal (0.9.9-0ubuntu4) dapper; urgency=low
 
   * Add missing build-dep on sharutils
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 18 Apr 2006 20:27:43 +0200
 
-kwin-style-crystal (0.9.9-0ubuntu3) dapper; urgency=low
+twin-style-crystal (0.9.9-0ubuntu3) dapper; urgency=low
 
   * Add kubuntu_02_new_images.diff and 
     kubuntu_03_new_theme.diff with new style from Ken Wimer
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Apr 2006 23:55:07 +0100
 
-kwin-style-crystal (0.9.9-0ubuntu2) dapper; urgency=low
+twin-style-crystal (0.9.9-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_01_branch.diff to include transparency 
     turn off feature
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 30 Mar 2006 15:04:13 +0100
 
-kwin-style-crystal (0.9.9-0ubuntu1) dapper; urgency=low
+twin-style-crystal (0.9.9-0ubuntu1) dapper; urgency=low
 
   [ Jonathan Patrick Davies ]
   * Initial release.
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/control b/ubuntu/maverick/applications/twin-style-crystal/debian/control
index 66a930c71..a22f0413b 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/control
+++ b/ubuntu/maverick/applications/twin-style-crystal/debian/control
@@ -1,16 +1,16 @@
-Source: kwin-style-crystal-trinity
+Source: twin-style-crystal-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com>
-Build-Depends: debhelper (>= 5.0.0), cdbs, kdebase-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, tdebase-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kwin-style-crystal-trinity
+Package: twin-style-crystal-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kwin-style-crystal-kde3 (<< 4:3.5.13)
-Breaks: kwin-style-crystal-kde3 (<< 4:3.5.13)
+Replaces: twin-style-crystal-kde3 (<< 4:3.5.13)
+Breaks: twin-style-crystal-kde3 (<< 4:3.5.13)
 Description: semi transparant window decoration for Trinity
  Crystal offers you pseudo transparent titlebar, buttons and borders
  transparent, so you can see more of your lovely background image
diff --git a/ubuntu/maverick/applications/wlassistant/debian/changelog b/ubuntu/maverick/applications/wlassistant/debian/changelog
index 17905f7ed..02865da0c 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/changelog
+++ b/ubuntu/maverick/applications/wlassistant/debian/changelog
@@ -19,8 +19,8 @@ wlassistant-trinity (0.5.7-2~0ubuntu1) intrepid; urgency=low
 wlassistant (0.5.7-2) unstable; urgency=low
 
   * Fix clean target: cleanbuilddir common-configure-arch::
-  * Remove Depends: kdelibs-bin - proper depends are pulled in via shlibs
-    - wlassistant uninstallable after kdelibs(4:3.5.7.dfsg.1-4) (Closes:
+  * Remove Depends: tdelibs-bin - proper depends are pulled in via shlibs
+    - wlassistant uninstallable after tdelibs(4:3.5.7.dfsg.1-4) (Closes:
     #437413)
   * Move to Applications/Network/Monitoring:
     - lintian fix menu-item-uses-apps-section
diff --git a/ubuntu/maverick/applications/wlassistant/debian/control b/ubuntu/maverick/applications/wlassistant/debian/control
index e9b31a5a8..896dcc318 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/control
+++ b/ubuntu/maverick/applications/wlassistant/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: debhelper (>= 4.1.0), scons, cdbs, kdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev
+Build-Depends: debhelper (>= 4.1.0), scons, cdbs, tdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev
 Standards-Version: 3.8.4
 
 Package: wlassistant-trinity
diff --git a/ubuntu/maverick/applications/yakuake/debian/control b/ubuntu/maverick/applications/yakuake/debian/control
index 9f3c9aed6..98569dd19 100644
--- a/ubuntu/maverick/applications/yakuake/debian/control
+++ b/ubuntu/maverick/applications/yakuake/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Ana Beatriz Guerrero Lopez <ana@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://extragear.kde.org/apps/yakuake/
 
diff --git a/ubuntu/maverick/dependencies/arts/debian/changelog b/ubuntu/maverick/dependencies/arts/debian/changelog
index 2fe0652db..5d592f00a 100644
--- a/ubuntu/maverick/dependencies/arts/debian/changelog
+++ b/ubuntu/maverick/dependencies/arts/debian/changelog
@@ -58,7 +58,7 @@ arts (1.5.9-2) unstable; urgency=low
   +++ Changes by Modestas Vainius:
  
   * Bump shlibs to 1.5.9.
-  * Conflict with automake-dirty kdelibs4c2a (Closes: #473375).
+  * Conflict with automake-dirty tdelibs4c2a (Closes: #473375).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 30 Mar 2008 14:23:49 +0300
 
@@ -66,7 +66,7 @@ arts (1.5.9-1lenny1) testing-proposed-updates; urgency=low
 
   * Disable 01_admin_cleanup.diff and 97_automake_cleanup.diff patches
   * Rebuild 98_buildprep.diff
-  * Going to t-p-u to fix breakage in testing as kdelibs is not going into
+  * Going to t-p-u to fix breakage in testing as tdelibs is not going into
     testing anytime soon.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 29 Mar 2008 13:30:01 +0200
@@ -357,9 +357,9 @@ arts (1.4.3-1) experimental; urgency=low
 
 arts (1.4.2-5) unstable; urgency=medium
 
-  * Rebuild with the latest gcc-4.0. Rebuilding kdebase with the latest
+  * Rebuild with the latest gcc-4.0. Rebuilding tdebase with the latest
     gcc-4.0/libstdc++ resulted in symbols added and removed (despite no code
-    changes) when compared to the previous kdebase upload. This causes crashes
+    changes) when compared to the previous tdebase upload. This causes crashes
     when run in conjunction with arts packages that have not been built with
     the latest gcc-4.0/libstdc++.
 
@@ -576,7 +576,7 @@ arts (1.1.4-1) unstable; urgency=low
 arts (1.1.3-1) unstable; urgency=low
 
   * New upstream release.
-  * Added kdelibs3 to libartsc0-dev conflicts. (Closes: #195412)
+  * Added tdelibs3 to libartsc0-dev conflicts. (Closes: #195412)
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue, 29 Jul 2003 11:00:00 -0500
 
@@ -615,7 +615,7 @@ arts (1.1.0-2) unstable; urgency=low
 arts (1.1.0-1) unstable; urgency=low
 
   * Initial Release.
-  * Split out of kdelibs source.
+  * Split out of tdelibs source.
   * Thanks to Daniel Stone (daniel@sfarc.net) and David "dpash" Pashley
     (david@davidpashley.com) for their initial work on this.
 
diff --git a/ubuntu/maverick/dependencies/arts/debian/control.in b/ubuntu/maverick/dependencies/arts/debian/control.in
index e6466cf19..bbdeaac4b 100644
--- a/ubuntu/maverick/dependencies/arts/debian/control.in
+++ b/ubuntu/maverick/dependencies/arts/debian/control.in
@@ -32,7 +32,7 @@ Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, oss-compat
 Recommends: libarts1-akode
-Conflicts: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), kdelibs4c2a (<< 4:3.5.9)
+Conflicts: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), tdelibs4c2a (<< 4:3.5.9)
 Replaces: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0)
 Description: aRts sound system core components
  aRts is a short form for "analog realtime synthesizer". aRts is highly
diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/copyright b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/copyright
index 2369bdcef..7a556c0d1 100644
--- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/copyright
+++ b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/copyright
@@ -2,7 +2,7 @@ This package was debianised by Jonathan Riddell <jriddell@ubuntu.com> on
 Thu, 03 Jul 2008 18:21:06 +0100
 
 Copyright (C) 2011 Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Copyright (C) 2005 Harald Fernengel <harry@kdevelop.org>
+Copyright (C) 2005 Harald Fernengel <harry@tdevelop.org>
 Copyright (C) 2005,2007 Kevin Krammer <kevin.krammer@gmx.at>
 
 The software of this project is distributed under the terms of three
diff --git a/ubuntu/maverick/dependencies/qt3/debian/changelog b/ubuntu/maverick/dependencies/qt3/debian/changelog
index 8d00b1ad6..24e9a2fab 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/changelog
+++ b/ubuntu/maverick/dependencies/qt3/debian/changelog
@@ -639,7 +639,7 @@ qt-x11-free (3:3.3.5-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Drop qt-copy's gamma patch, now that kdelibs has incorporated a
+  * Drop qt-copy's gamma patch, now that tdelibs has incorporated a
     cleaner fix. (Closes: #333542)
 
   * Fix a new-for-3.3.5 QListView problem that was causing myriad random
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/rules b/ubuntu/maverick/dependencies/tqtinterface/debian/rules
index 0322b3e5b..9f873f0dd 100755
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/rules
+++ b/ubuntu/maverick/dependencies/tqtinterface/debian/rules
@@ -1,5 +1,5 @@
 #! /usr/bin/make -f
-# see debian/rules file for kdesvn for cmake examples
+# see debian/rules file for tdesvn for cmake examples
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/changelog b/ubuntu/maverick/libraries/kipi-plugins/debian/changelog
index da8fca349..d9e80a9a4 100755
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/changelog
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/changelog
@@ -45,9 +45,9 @@ kipi-plugins (0.1.5-1) unstable; urgency=low
     + remove automake: not needed
     + remove libexif-dev: replaced upstream by libexiv2-dev
   * Cherry pick fixes from SVN:
-    + 40_kdesvn786355_timeadjusst_fix_filestat.diff
-    + 40_kdesvn786363_timeAdjust_update_DateTimeOriginal.diff
-    + 40_kdesvn786549_99_rawDecoding_jpeg_compression.diff
+    + 40_tdesvn786355_timeadjusst_fix_filestat.diff
+    + 40_tdesvn786363_timeAdjust_update_DateTimeOriginal.diff
+    + 40_tdesvn786549_99_rawDecoding_jpeg_compression.diff
     Thx to upstream for pointing me to those patches.
 
   [ Fathi Boudra ]
@@ -120,7 +120,7 @@ kipi-plugins (0.1.4~beta2-1) experimental; urgency=low
      50_libkexiv2-0.patch
      50_libkexiv2-1.patch
      50_libkexiv2-2.patch
-     15_kdesvn_655231_fix-gallery-2.2-export.diff
+     15_tdesvn_655231_fix-gallery-2.2-export.diff
      Bug#417297-GCC4.3.diff
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Tue, 26 Jun 2007 23:28:36 +0100
@@ -130,7 +130,7 @@ kipi-plugins (0.1.3-5) unstable; urgency=low
   [ Achim Bohnet ]
   * debian/control: set kipi-plugins-doc section to doc. Fixes override
     disparity on uploads.
-  * Add debian/patches/15_kdesvn_655231_fix-gallery-2.2-export.diff
+  * Add debian/patches/15_tdesvn_655231_fix-gallery-2.2-export.diff
     Fixes export to gallery 2.2: http://bugs.kde.org/show_bug.cgi?id=142259
   * Add debian/patches/50_libkexiv2-{1,2,3}.patch:  Fixes FTBFS with
     libexiv2 0.14.  This adds also a build dependency on libkexiv2-dev
@@ -206,8 +206,8 @@ kipi-plugins (0.1.3-1) experimental; urgency=low
     + ipodexport fix for relibtoolization (KDE bug 140279):
       ipodexport is calling g_type_init() explicitely without linking 
       against libgobject-2.0: debian/patches/40_fix_ipod_export_linking.diff
-  * remove patches/10_kdesvn_618170_Makefile.am_libs_used_only.diff and
-    patches/30_kdesvn_625568_pod.patch. Included upstream.
+  * remove patches/10_tdesvn_618170_Makefile.am_libs_used_only.diff and
+    patches/30_tdesvn_625568_pod.patch. Included upstream.
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Thu, 25 Jan 2007 21:34:40 +0100
 
@@ -236,7 +236,7 @@ kipi-plugins (0.1.3~rc1-1) experimental; urgency=low
     + order plugins list in long description as in README
     + avoid term 'plugins' in short description of the plugins
   * relibtoolization:
-      add patches/10_kdesvn_618170_Makefile.am_libs_used_only.diff
+      add patches/10_tdesvn_618170_Makefile.am_libs_used_only.diff
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Fri, 29 Dec 2006 13:46:46 +0100
 
@@ -366,7 +366,7 @@ kipi-plugins (0.1+rc1-1) unstable; urgency=low
 
   [ Achim Bohnet ]
   * Now that the pkgs are build on all archs, fix build dependencies
-     + kdelibs4-dev: remove version
+     + tdelibs4-dev: remove version
      + libkexif1-dev (>= 0.2-1), libkipi0-dev (>= 0.1-1): (re)set
        versions to last API change. (Helps backporting.)
   * patches/01_rawconverter_dcraw7.0+trinity.4-fixes-from-head.diff removed.
@@ -396,7 +396,7 @@ kipi-plugins (0.1+rc1-1) unstable; urgency=low
 kipi-plugins (0.1+beta2-22) unstable; urgency=low
 
   * C++ transition package
-  * Upgrade Build-Depends: kdelibs4-dev (>= 3.4.2-1), libkexif1-dev (>=
+  * Upgrade Build-Depends: tdelibs4-dev (>= 3.4.2-1), libkexif1-dev (>=
     0.2.1-5), libkipi0-dev (>= 0.1.1-3)
 
  -- Mark Purcell <msp@debian.org>  Sun, 21 Aug 2005 10:48:53 +0100
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/control b/ubuntu/maverick/libraries/kipi-plugins/debian/control
index bbbdb77a5..7a396b78c 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/control
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/control
@@ -3,10 +3,10 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, kdelibs4-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, tdelibs4-trinity-dev,
  libexiv2-dev, libgphoto2-2-dev, libgpod-nogtk-dev,
  libkcal2-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
- libkipi0-trinity-dev, libtiff4-dev, libxslt1-dev, kdepim-trinity-dev,
+ libkipi0-trinity-dev, libtiff4-dev, libxslt1-dev, tdepim-trinity-dev,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kipi-plugins.org/
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/control.in b/ubuntu/maverick/libraries/kipi-plugins/debian/control.in
index 2f1de6547..0d68a8196 100755
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/control.in
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/control.in
@@ -4,10 +4,10 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, kdelibs4-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, tdelibs4-trinity-dev,
  libexiv2-trinity-dev (>= 0.16), libgphoto2-2-dev, libgpod-nogtk-dev,
  libkcal2-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
- libkipi0-trinity-dev, libtiff4-dev, libxslt1-dev, kdepim-trinity-dev,
+ libkipi0-trinity-dev, libtiff4-dev, libxslt1-dev, tdepim-trinity-dev,
  automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 Homepage: http://www.kipi-plugins.org/
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/control b/ubuntu/maverick/libraries/libkdcraw/debian/control
index 33909fbf5..906728ee0 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/control
+++ b/ubuntu/maverick/libraries/libkdcraw/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs4-trinity-dev,
  liblcms1-dev, libjpeg62-dev, pkg-config,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/control.in b/ubuntu/maverick/libraries/libkdcraw/debian/control.in
index a28c0245d..db049eed3 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/control.in
+++ b/ubuntu/maverick/libraries/libkdcraw/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs4-trinity-dev,
  liblcms1-dev, libjpeg62-dev, pkg-config,
  automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/control b/ubuntu/maverick/libraries/libkexiv2/debian/control
index 1be032c44..6ebaea475 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/control
+++ b/ubuntu/maverick/libraries/libkexiv2/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: debhelper (>> 5), cdbs, libexiv2-dev, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>> 5), cdbs, libexiv2-dev, tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kipi-plugins.org/
 
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/control.in b/ubuntu/maverick/libraries/libkexiv2/debian/control.in
index 0225eb0fc..34658fb18 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/control.in
+++ b/ubuntu/maverick/libraries/libkexiv2/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>> 5), cdbs, libexiv2-trinity-dev (>= 0.12), kdelibs4-trinity-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>> 5), cdbs, libexiv2-trinity-dev (>= 0.12), tdelibs4-trinity-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 Homepage: http://www.kipi-plugins.org/
 
diff --git a/ubuntu/maverick/libraries/libkipi/debian/changelog b/ubuntu/maverick/libraries/libkipi/debian/changelog
index ed7cd918a..eaec4a227 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/changelog
+++ b/ubuntu/maverick/libraries/libkipi/debian/changelog
@@ -59,7 +59,7 @@ libkipi (0.1.4-1) unstable; urgency=low
 
   [ Achim Bohnet ]
   * new upstream release.  Fixes FTBFS on first installation.
-  * Remove 11_kdesvn_r540613_fix_include_path.diff.  Included upstream
+  * Remove 11_tdesvn_r540613_fix_include_path.diff.  Included upstream
   * Remove 06_disable_no_undefined.diff. Not needed. Pkg is properly
     relibtoolized
   * Update relibtoolization patches: 98_buildprep.diff 99_only_-lqt-mt.diff
@@ -69,7 +69,7 @@ libkipi (0.1.4-1) unstable; urgency=low
 libkipi (0.1.3-2) unstable; urgency=low
 
   [ Achim Bohnet ]
-  * Add 11_kdesvn_r540613_fix_include_path.diff.  Closes: #366933: libkipi -
+  * Add 11_tdesvn_r540613_fix_include_path.diff.  Closes: #366933: libkipi -
     FTBFS: error: libkipi/interface.h: No such file or directory
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Sun, 14 May 2006 11:03:25 +0200
@@ -125,7 +125,7 @@ libkipi (0.1.2-2) unstable; urgency=low
     future releases
 
   [ Achim Bohnet ]
-  * 2nd g++ v4 ABI change: Because we already depend on kdelibs4c2a,
+  * 2nd g++ v4 ABI change: Because we already depend on tdelibs4c2a,
     remove c2 that was unnecessarily introduced for the 1st g++ v4.0
     ABI change.  Now backporting and sync with kunbuntu needs no
     source changes again.
@@ -134,8 +134,8 @@ libkipi (0.1.2-2) unstable; urgency=low
         --list-missing
       + remove unnecessary --disable-debug configure option
       + build with --enable-final
-  * Temporarily Build-Depend on kdelibs4-dev (>= 4:3.4.3-2) to make
-    sure we build against kdelibs4c2a
+  * Temporarily Build-Depend on tdelibs4-dev (>= 4:3.4.3-2) to make
+    sure we build against tdelibs4c2a
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Fri,  2 Dec 2005 15:49:45 +0100
 
@@ -146,7 +146,7 @@ libkipi (0.1.2-1) unstable; urgency=low
 
   +++ Changes by Achim Bohnet:
 
-  * remove versioned build-dependency of kdelibs4-dev now that
+  * remove versioned build-dependency of tdelibs4-dev now that
     it's build on all archs with new C++ ABI.
   * patches/00_fix-home-page-url.patch removed. Fixed upstream.
   * updated debian/copyright for 0.1.2 tarball
@@ -163,7 +163,7 @@ libkipi (0.1.1-4) unstable; urgency=low
 libkipi (0.1.1-3) unstable; urgency=low
 
   * C++ transition package
-  * Upgrade Build-Depends: kdelibs4-dev (>= 3.4.2-1)
+  * Upgrade Build-Depends: tdelibs4-dev (>= 3.4.2-1)
   * Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell
     <msp@debian.org>
 
diff --git a/ubuntu/maverick/libraries/libkipi/debian/control b/ubuntu/maverick/libraries/libkipi/debian/control
index 4424ac60f..e33e73d15 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/control
+++ b/ubuntu/maverick/libraries/libkipi/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, kdelibs4-trinity-dev (>= 4:3.4.3-2), automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, tdelibs4-trinity-dev (>= 4:3.4.3-2), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: libkipi0-trinity-dev
diff --git a/ubuntu/maverick/libraries/libkipi/debian/control.in b/ubuntu/maverick/libraries/libkipi/debian/control.in
index 9c54b995b..3b1e241ef 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/control.in
+++ b/ubuntu/maverick/libraries/libkipi/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, kdelibs4-trinity-dev (>= 4:3.4.3-2), autotools-dev
+Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, tdelibs4-trinity-dev (>= 4:3.4.3-2), autotools-dev
 Standards-Version: 3.8.3
 
 Package: libkipi0-trinity-dev
diff --git a/ubuntu/maverick/libraries/mlt/debian/changelog b/ubuntu/maverick/libraries/mlt/debian/changelog
index 56a1c1fd2..d705cbdeb 100644
--- a/ubuntu/maverick/libraries/mlt/debian/changelog
+++ b/ubuntu/maverick/libraries/mlt/debian/changelog
@@ -63,7 +63,7 @@ mlt (0.2.4.svn20071228-0.0ubuntu1) hardy; urgency=low
 mlt (0.2.4.svn20071228-0.0) unstable; urgency=low
 
   * New svn release.
-  * Replace libqt3-mt-dev by kdelibs4-dev in Build-Depends.
+  * Replace libqt3-mt-dev by tdelibs4-dev in Build-Depends.
   * Install modules in /usr/lib instead of /usr/share
 
  -- Christian Marillat <marillat@debian.org>  Sat, 29 Dec 2007 17:12:24 +0100
diff --git a/ubuntu/maverick/libraries/mlt/debian/control b/ubuntu/maverick/libraries/mlt/debian/control
index b55371a4d..64fc2a37d 100644
--- a/ubuntu/maverick/libraries/mlt/debian/control
+++ b/ubuntu/maverick/libraries/mlt/debian/control
@@ -7,7 +7,7 @@ Homepage: http://mlt.sourceforge.net/
 Standards-Version: 3.8.3
 Build-Depends: debhelper (>= 5), libdv4-dev, libquicktime-dev (>= 2:1.0.0),
  libvorbis-dev, libsdl-dev | libsdl1.2-dev, libgtk2.0-dev, libjack-dev, quilt,
- libsamplerate-dev, libmad0-dev, kdelibs4-trinity-dev, imagemagick, ffmpeg, libflac-dev,
+ libsamplerate-dev, libmad0-dev, tdelibs4-trinity-dev, imagemagick, ffmpeg, libflac-dev,
  libavcodec-dev, libxml2-dev, ladspa-sdk, libavutil-dev, libxcursor-dev,
  libxinerama-dev, libxrandr-dev, libxrender-dev, libavformat-dev,
  libswscale-dev, libasound2-dev, libsox-dev
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/changelog b/ubuntu/maverick/libraries/pykdeextensions/debian/changelog
index 3c1ed6acf..92b728999 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/changelog
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/changelog
@@ -100,7 +100,7 @@ pykdeextensions (0.4.0-3) unstable; urgency=low
   * Added pycompat and pyversions
   * Force to use python2.4 (Closes: #375618)
   * Added to Build-Depends: python-support, python-all-dev,
-    kdelibs4c2a (for kde-config)
+    tdelibs4c2a (for kde-config)
   * Updated libpythonize0-dev, libpythonize0, and pykdextensions install files
   * Cleaned up rules
   * Added 12_force_python2.4_script.diff to force python2.4 in scripts
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/control b/ubuntu/maverick/libraries/pykdeextensions/debian/control
index b7719fae4..d82091f2d 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/control
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, kdelibs4c2a-trinity, libtool,
+Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs4c2a-trinity, libtool,
  libxml2-utils, libxrandr-dev, libxxf86vm-dev, pyqt-tools, python-trinity-trinity,
  python-qt-dev, python-sip4-dev, python-support (>= 0.6), python2.6, python2.6-dev
 Standards-Version: 3.8.4
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/changelog b/ubuntu/maverick/libraries/python-trinity/debian/changelog
index 48f8d4dae..688f8d49c 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/changelog
+++ b/ubuntu/maverick/libraries/python-trinity/debian/changelog
@@ -207,7 +207,7 @@ python-trinity (3.16.0-0ubuntu8) feisty; urgency=low
     adds setPtyFd() to sip/kpart/konsole_kpart.sip
 
   [ Jonathan Riddell ]
-  * Update build-dep version to kdelibs and konsole 3.5.6
+  * Update build-dep version to tdelibs and konsole 3.5.6
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 19 Jan 2007 10:43:29 +0100
 
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/control b/ubuntu/maverick/libraries/python-trinity/debian/control
index 73729642b..38a85e452 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/control
+++ b/ubuntu/maverick/libraries/python-trinity/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev
+Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), tdelibs4-trinity-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev
 Standards-Version: 3.8.4
 Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php
 XS-Python-Version: all
diff --git a/ubuntu/maverick/tde-i18n/debian/changelog b/ubuntu/maverick/tde-i18n/debian/changelog
index 6ae7ac4dc..a4347a2ca 100644
--- a/ubuntu/maverick/tde-i18n/debian/changelog
+++ b/ubuntu/maverick/tde-i18n/debian/changelog
@@ -1,16 +1,16 @@
-kde-i18n-trinity (4:3.5.10-4) karmic; urgency=low
+tde-i18n-trinity (4:3.5.10-4) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kde-i18n (4:3.5.10-2) unstable; urgency=high
+tde-i18n (4:3.5.10-2) unstable; urgency=high
 
   * Update copyright file. (Closes: #497290).
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 28 Sep 2008 23:01:47 +0200
 
-kde-i18n (4:3.5.10-1) unstable; urgency=low
+tde-i18n (4:3.5.10-1) unstable; urgency=low
 
   * New upstream release:
     - New language: uz@cyrillic (Cyrillic Uzbek).
@@ -19,7 +19,7 @@ kde-i18n (4:3.5.10-1) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 23 Aug 2008 10:50:32 +0200
 
-kde-i18n (4:3.5.9-2) unstable; urgency=low
+tde-i18n (4:3.5.9-2) unstable; urgency=low
 
   +++ Changes by Modestas Vainius:
 
@@ -41,7 +41,7 @@ kde-i18n (4:3.5.9-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 14 Mar 2008 21:28:00 +0200
 
-kde-i18n (4:3.5.9-1) unstable; urgency=low
+tde-i18n (4:3.5.9-1) unstable; urgency=low
 
   * New upstream release:
     - New language: be.
@@ -50,7 +50,7 @@ kde-i18n (4:3.5.9-1) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 22 Jan 2008 01:52:51 +0100
 
-kde-i18n (4:3.5.8-1) unstable; urgency=low
+tde-i18n (4:3.5.8-1) unstable; urgency=low
 
   * New upstream release.
     - New languages: te, wa.
@@ -59,18 +59,18 @@ kde-i18n (4:3.5.8-1) unstable; urgency=low
     Thanks for all your work Noèl!
   * Update debhelper compatibility to 5 and moved it into a file.
   * Little tweaking of the rules.
-  * Update the deps of the packages to kdelibs4c2a (>= 4:3.5.8-1) to avoid
-    translations migrate to testing before kdelibs.
+  * Update the deps of the packages to tdelibs4c2a (>= 4:3.5.8-1) to avoid
+    translations migrate to testing before tdelibs.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 20 Oct 2007 02:35:57 +0200
 
-kde-i18n (4:3.5.7-1) unstable; urgency=low
+tde-i18n (4:3.5.7-1) unstable; urgency=low
 
   * new upstream release 3.5.7
 
  -- Noèl Köthe <noel@debian.org>  Fri, 15 Jun 2007 21:55:57 +0200
 
-kde-i18n (4:3.5.6-1) unstable; urgency=low
+tde-i18n (4:3.5.6-1) unstable; urgency=low
 
   * new upstream release 3.5.6
     (closes: Bug#410786)
@@ -78,26 +78,26 @@ kde-i18n (4:3.5.6-1) unstable; urgency=low
 
  -- Noèl Köthe <noel@debian.org>  Sat, 24 Feb 2007 12:38:52 +0100
 
-kde-i18n (4:3.5.5-1) unstable; urgency=low
+tde-i18n (4:3.5.5-1) unstable; urgency=low
 
   * new upstream release 3.5.5
   * updated Standards-Version
 
  -- Noèl Köthe <noel@debian.org>  Tue, 03 Oct 2006 14:31:11 +0200
 
-kde-i18n (4:3.5.4-1) unstable; urgency=low
+tde-i18n (4:3.5.4-1) unstable; urgency=low
 
   * new upstream release 3.5.4
 
  -- Noèl Köthe <noel@debian.org>  Sat, 16 Sep 2006 14:53:48 +0200
 
-kde-i18n (4:3.5.3-1) unstable; urgency=low
+tde-i18n (4:3.5.3-1) unstable; urgency=low
 
   * new upstream release 3.5.3
 
  -- Noèl Köthe <noel@debian.org>  Mon, 12 Jun 2006 21:17:14 +0200
 
-kde-i18n (4:3.5.2-1) unstable; urgency=low
+tde-i18n (4:3.5.2-1) unstable; urgency=low
 
   * new upstream release 3.5.2
   * he: fixed kmail typo (closes: Bug#269845)
@@ -105,25 +105,25 @@ kde-i18n (4:3.5.2-1) unstable; urgency=low
 
  -- Noèl Köthe <noel@debian.org>  Fri, 31 Mar 2006 21:01:31 +0200
 
-kde-i18n (4:3.5.1-1) unstable; urgency=low
+tde-i18n (4:3.5.1-1) unstable; urgency=low
 
   * new upstream release 3.5.1
 
  -- Noèl Köthe <noel@debian.org>  Sun, 05 Feb 2006 13:59:33 +0100
 
-kde-i18n (4:3.5.0-3) unstable; urgency=low
+tde-i18n (4:3.5.0-3) unstable; urgency=low
 
-  * upload kde-i18n 3.5 to unstable
+  * upload tde-i18n 3.5 to unstable
 
  -- Noèl Köthe <noel@debian.org>  Sun, 08 Jan 2006 13:34:33 +0100
 
-kde-i18n (4:3.5.0-2) experimental; urgency=low
+tde-i18n (4:3.5.0-2) experimental; urgency=low
 
-  * upload kde-i18n 3.5 to experimental
+  * upload tde-i18n 3.5 to experimental
 
  -- Noèl Köthe <noel@debian.org>  Sun, 18 Dec 2005 20:56:46 +0100
 
-kde-i18n (4:3.5.0-1) alioth; urgency=low
+tde-i18n (4:3.5.0-1) alioth; urgency=low
 
   * new upstream version
   * added new languages
@@ -142,17 +142,17 @@ kde-i18n (4:3.5.0-1) alioth; urgency=low
     - zh_TW (Chinese Traditional)
   * removed langauge
     - hsb (Upper Sorbian)
-  * corrected dependency to kdelibs4c2a
+  * corrected dependency to tdelibs4c2a
 
  -- Noèl Köthe <noel@debian.org>  Wed, 07 Dec 2005 17:42:26 +0100
 
-kde-i18n (4:3.4.3-1) unstable; urgency=low
+tde-i18n (4:3.4.3-1) unstable; urgency=low
 
   * new upstream version
 
  -- Noèl Köthe <noel@debian.org>  Sun, 09 Oct 2005 20:41:22 +0200
 
-kde-i18n (4:3.4.2-4) unstable; urgency=low
+tde-i18n (4:3.4.2-4) unstable; urgency=low
 
   * added versioned replace against kturtle (de, fr, nl, sr, sv)
     (closes: Bug#327332)
@@ -164,21 +164,21 @@ kde-i18n (4:3.4.2-4) unstable; urgency=low
 
  -- Noèl Köthe <noel@debian.org>  Tue, 13 Sep 2005 19:56:27 +0200
 
-kde-i18n (4:3.4.2-3) unstable; urgency=low
+tde-i18n (4:3.4.2-3) unstable; urgency=low
 
   * added missing bzip2 build-dependency
     (closes: Bug#326006)
 
  -- Noèl Köthe <noel@debian.org>  Thu, 01 Sep 2005 07:56:18 +0200
 
-kde-i18n (4:3.4.2-2) unstable; urgency=low
+tde-i18n (4:3.4.2-2) unstable; urgency=low
 
-  * correct dependency from kdelibs4 to kdelibs4c2
+  * correct dependency from tdelibs4 to tdelibs4c2
     (closes: Bug#325792)
 
  -- Noèl Köthe <noel@debian.org>  Wed, 31 Aug 2005 08:17:21 +0200
 
-kde-i18n (4:3.4.2-1) unstable; urgency=low
+tde-i18n (4:3.4.2-1) unstable; urgency=low
 
   * new upstream release
   * fixed broken build process which results in missing translations
@@ -193,7 +193,7 @@ kde-i18n (4:3.4.2-1) unstable; urgency=low
 
  -- Noèl Köthe <noel@debian.org>  Mon, 29 Aug 2005 18:35:01 +0200
 
-kde-i18n (4:3.4.1-1) experimental; urgency=low
+tde-i18n (4:3.4.1-1) experimental; urgency=low
 
   * new upstream release (svn revision 432479)
   * updated Standards-Version
@@ -205,7 +205,7 @@ kde-i18n (4:3.4.1-1) experimental; urgency=low
 
  -- Noèl Köthe <noel@debian.org>  Tue, 12 Jul 2005 23:36:42 +0200
 
-kde-i18n (4:3.4.0-1) unstable; urgency=low
+tde-i18n (4:3.4.0-1) unstable; urgency=low
 
   * new upstream release
   * languages added:
@@ -230,7 +230,7 @@ kde-i18n (4:3.4.0-1) unstable; urgency=low
 
  -- Noèl Köthe <noel@debian.org>  Wed, 16 Mar 2005 13:36:39 +0100
 
-kde-i18n (4:3.3.2-1) unstable; urgency=low
+tde-i18n (4:3.3.2-1) unstable; urgency=low
 
   * new upstream release
   * languages added: af (Afrikaans) and gl (Galician)
@@ -244,7 +244,7 @@ kde-i18n (4:3.3.2-1) unstable; urgency=low
 
  -- Noèl Köthe <noel@debian.org>  Sun, 05 Dec 2004 00:14:41 +0100
 
-kde-i18n (4:3.3.1-1) unstable; urgency=low
+tde-i18n (4:3.3.1-1) unstable; urgency=low
 
   * new upstream release
   * 3.3.1 has updated japanese translations
@@ -252,7 +252,7 @@ kde-i18n (4:3.3.1-1) unstable; urgency=low
 
  -- Noèl Köthe <noel@debian.org>  Mon, 04 Oct 2004 22:24:10 +0200
 
-kde-i18n (4:3.3.0-1) unstable; urgency=medium
+tde-i18n (4:3.3.0-1) unstable; urgency=medium
 
   * new upstream release
   * urgency=medium to get 3.3 into sarge if release
@@ -269,7 +269,7 @@ kde-i18n (4:3.3.0-1) unstable; urgency=medium
 
  -- Noèl Köthe <noel@debian.org>  Sun, 15 Aug 2004 11:20:27 +0200
 
-kde-i18n (4:3.2.3-2) unstable; urgency=low
+tde-i18n (4:3.2.3-2) unstable; urgency=low
 
   * fixed long string in KLaptop in de (upstream: #83648)
     (closes: Bug#251403)
@@ -278,7 +278,7 @@ kde-i18n (4:3.2.3-2) unstable; urgency=low
 
  -- Noèl Köthe <noel@debian.org>  Sat, 19 Jun 2004 14:41:39 +0200
 
-kde-i18n (4:3.2.3-1) unstable; urgency=low
+tde-i18n (4:3.2.3-1) unstable; urgency=low
 
   * new upstream release
   * added ar (Arabic), hr (Croatian), hsb (Upper Sorbian)
@@ -286,9 +286,9 @@ kde-i18n (4:3.2.3-1) unstable; urgency=low
 
  -- Noèl Köthe <noel@debian.org>  Sun, 06 Jun 2004 23:28:30 +0200
 
-kde-i18n (4:3.2.2-3) unstable; urgency=low
+tde-i18n (4:3.2.2-3) unstable; urgency=low
 
-  * removed kdevelop-data conflict because maintainer removed
+  * removed tdevelop-data conflict because maintainer removed
     i18n files from the package
     (closes: Bug#248507)
     (closes: Bug#246703)
@@ -298,17 +298,17 @@ kde-i18n (4:3.2.2-3) unstable; urgency=low
 
  -- Noèl Köthe <noel@debian.org>  Mon, 17 May 2004 23:49:50 +0200
 
-kde-i18n (4:3.2.2-2) unstable; urgency=low
+tde-i18n (4:3.2.2-2) unstable; urgency=low
 
   * corrected juk and kcachegrind conflict to <<4:3.2.1-1
-  * conflicting with kdevelop-data (kdevelop version 2)
-    because kdevelop version 3 translations are included in
-    kde-i18n
+  * conflicting with tdevelop-data (tdevelop version 2)
+    because tdevelop version 3 translations are included in
+    tde-i18n
     (closes: Bug#243372)
 
  -- Noèl Köthe <noel@debian.org>  Thu, 15 Apr 2004 23:51:41 +0200
 
-kde-i18n (4:3.2.2-1) unstable; urgency=low
+tde-i18n (4:3.2.2-1) unstable; urgency=low
 
   * new upstream from 2004-04-04
   * conflicting with koffice (<< 1.3.0-2) because of kdgantt.mo
@@ -318,7 +318,7 @@ kde-i18n (4:3.2.2-1) unstable; urgency=low
 
  -- Noèl Köthe <noel@debian.org>  Fri, 09 Apr 2004 15:00:28 +0200
 
-kde-i18n (4:3.2.1-1) unstable; urgency=low
+tde-i18n (4:3.2.1-1) unstable; urgency=low
 
   * new upstream:
     (closes: Bug#237045)
@@ -329,7 +329,7 @@ kde-i18n (4:3.2.1-1) unstable; urgency=low
 
  -- Noèl Köthe <noel@debian.org>  Mon, 23 Feb 2004 16:52:45 +0100
 
-kde-i18n (4:3.1.5-1) unstable; urgency=low
+tde-i18n (4:3.1.5-1) unstable; urgency=low
 
   * new upstream release
   * de upstream fixed "move" translation
@@ -337,18 +337,18 @@ kde-i18n (4:3.1.5-1) unstable; urgency=low
 
  -- Noèl Köthe <noel@debian.org>  Wed, 14 Jan 2004 19:07:00 +0100
 
-kde-i18n (4:3.1.4-2) unstable; urgency=low
+tde-i18n (4:3.1.4-2) unstable; urgency=low
 
-  * changed dependency from kdebase to kdelibs4
+  * changed dependency from tdebase to tdelibs4
     (closes: Bug#213245)
   * updated Standards-Version
 
  -- Noèl Köthe <noel@debian.org>  Fri, 14 Nov 2003 23:07:00 +0100
 
-kde-i18n (4:3.1.4-1) unstable; urgency=low
+tde-i18n (4:3.1.4-1) unstable; urgency=low
 
   * new upstream from 2003-09-17
-  * added version dependency so kde-i18n will
+  * added version dependency so tde-i18n will
     not move to sarge without the other kde stuff
     (closes: Bug#200928)
     (closes: Bug#211239)
@@ -356,7 +356,7 @@ kde-i18n (4:3.1.4-1) unstable; urgency=low
 
  -- Noèl Köthe <noel@debian.org>  Fri, 19 Sep 2003 10:22:00 +0200
 
-kde-i18n (4:3.1.3-1) unstable; urgency=low
+tde-i18n (4:3.1.3-1) unstable; urgency=low
 
   * new upstream from 2003-07-29
   * updated Standards-Version
@@ -364,7 +364,7 @@ kde-i18n (4:3.1.3-1) unstable; urgency=low
 
  -- Noel Koethe <noel@debian.org>  Tue, 29 Jul 2003 23:46:00 +0200
 
-kde-i18n (4:3.1.2-1) unstable; urgency=low
+tde-i18n (4:3.1.2-1) unstable; urgency=low
 
   * added the 4 new languages supported by 3.1.1
     (hr, is, se, ss)
@@ -374,19 +374,19 @@ kde-i18n (4:3.1.2-1) unstable; urgency=low
 
  -- Noel Koethe <noel@debian.org>  Mon, 19 May 2003 11:48:00 +0100
 
-kde-i18n (4:3.1.1-1) unstable; urgency=low
+tde-i18n (4:3.1.1-1) unstable; urgency=low
 
   * new upstream verion 3.1.1 from 2003-03-20
 
  -- Noel Koethe <noel@debian.org>  Thu, 20 Mar 2003 15:45:00 +0100
 
-kde-i18n (4:3.1-2) unstable; urgency=low
+tde-i18n (4:3.1-2) unstable; urgency=low
 
   * corrected application spelling in all descriptions
     (closes: Bug#180646)
     (closes: Bug#183615)
     (closes: Bug#183376)
-  * corrected dependency to kdebase (>= 4:3.1.0-1)
+  * corrected dependency to tdebase (>= 4:3.1.0-1)
     (closes: Bug#181794)
     (closes: Bug#181625)
   * s/i18n/internationalized (i18n) in description so it
@@ -395,7 +395,7 @@ kde-i18n (4:3.1-2) unstable; urgency=low
 
  -- Noel Koethe <noel@debian.org>  Sat,  8 Mar 2003 21:42:00 +0100
 
-kde-i18n (4:3.1-1) unstable; urgency=low
+tde-i18n (4:3.1-1) unstable; urgency=low
 
   * KDE 3.1 release version.
   * NY and no_NY are now corrected to nb and nn
@@ -415,7 +415,7 @@ kde-i18n (4:3.1-1) unstable; urgency=low
 
  -- Noel Koethe <noel@debian.org>  Mon,  3 Feb 2003 20:42:00 +0100
 
-kde-i18n (4:2.2.2-3) unstable; urgency=low
+tde-i18n (4:2.2.2-3) unstable; urgency=low
 
   * took package from QA
     (closes: Bug#114126)
@@ -426,7 +426,7 @@ kde-i18n (4:2.2.2-3) unstable; urgency=low
 
  -- Noel Koethe <noel@debian.org>  Thu,  3 Oct 2002 11:46:00 +0200
 
-kde-i18n (4:2.2.2-2) unstable; urgency=low
+tde-i18n (4:2.2.2-2) unstable; urgency=low
 
   * QA upload.
   * Don't install any files related to krayon (closes: #129285).
@@ -439,34 +439,34 @@ kde-i18n (4:2.2.2-2) unstable; urgency=low
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 16 Mar 2002 13:23:15 +0000
 
-kde-i18n (4:2.2.2-1) unstable; urgency=low
+tde-i18n (4:2.2.2-1) unstable; urgency=low
 
   * Sync with upstream
   * Fix -nl description (Closes: #118980)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 10 Nov 2001 12:51:00 -0700
 
-kde-i18n (4:2.2.1.0-1) unstable; urgency=low
+tde-i18n (4:2.2.1.0-1) unstable; urgency=low
 
   * Sync with upstream
   * Fix -no description
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 26 Oct 2001 12:51:00 -0700
 
-kde-i18n (4:2.2.1-3) unstable; urgency=low
+tde-i18n (4:2.2.1-3) unstable; urgency=low
 
-  * Include kdevelop and kdbg translations again (Closes: #113892)
+  * Include tdevelop and kdbg translations again (Closes: #113892)
   * Change maintainer
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 30 Sep 2001 01:08:00 -0700
 
-kde-i18n (4:2.2.1-2) unstable; urgency=low
+tde-i18n (4:2.2.1-2) unstable; urgency=low
 
   * post 2.2.1 updates
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 26 Sep 2001 08:38:00 -0700
 
-kde-i18n (4:2.2.1-1) unstable; urgency=low
+tde-i18n (4:2.2.1-1) unstable; urgency=low
  
   * New upstream version 2.2.1
   * Fixes crashes (Closes: #106791, #108158, #104416
@@ -474,179 +474,179 @@ kde-i18n (4:2.2.1-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 17 Sep 2001 14:00:00 -0700
 
-kde-i18n (4:2.2-0.3beta1-1) unstable; urgency=low
+tde-i18n (4:2.2-0.3beta1-1) unstable; urgency=low
  
   * Sync with upstream
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 27 Jul 2001 01:49:00 -0700
 
-kde-i18n (4:2.2-0.2beta1-1) unstable; urgency=low
+tde-i18n (4:2.2-0.2beta1-1) unstable; urgency=low
  
   * Sync with upstream
   * Expand descriptions (Closes: #102938)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 05 Jul 2001 22:39:00 -0700
 
-kde-i18n (4:2.2.0-final-1) unstable; urgency=low
+tde-i18n (4:2.2.0-final-1) unstable; urgency=low
  
   * New upstream version 2.2
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 30 Jul 2001 00:01:00 -0700
 
-kde-i18n (4:2.2-0.3beta1-1) unstable; urgency=low
+tde-i18n (4:2.2-0.3beta1-1) unstable; urgency=low
  
   * Sync with upstream
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 27 Jul 2001 01:49:00 -0700
 
-kde-i18n (4:2.2-0.2beta1-1) unstable; urgency=low
+tde-i18n (4:2.2-0.2beta1-1) unstable; urgency=low
  
   * Sync with upstream
   * Expand descriptions (Closes: #102938)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 05 Jul 2001 22:39:00 -0700
 
-kde-i18n (4:2.2-0.1beta1-1) unstable; urgency=low
+tde-i18n (4:2.2-0.1beta1-1) unstable; urgency=low
  
   * New upstream version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 27 Jun 2001 19:13:00 -0700
 
-kde-i18n (4:2.1-final-1) unstable; urgency=low
+tde-i18n (4:2.1-final-1) unstable; urgency=low
  
   * New upstream version
-  * Remove kdevelop files as kdevelop seems to keep them all...let that package
+  * Remove tdevelop files as tdevelop seems to keep them all...let that package
     be authoritative
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
 
-kde-i18n (4:2.1-20010115-1) unstable; urgency=low
+tde-i18n (4:2.1-20010115-1) unstable; urgency=low
  
   * New upstream cvs version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
 
-kde-i18n (4:2.1-20010109-1) unstable; urgency=low
+tde-i18n (4:2.1-20010109-1) unstable; urgency=low
  
   * New upstream cvs version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 09 Jan 2001 10:35:00 -0700
 
-kde-i18n (4:2.1-20010101-1) unstable; urgency=low
+tde-i18n (4:2.1-20010101-1) unstable; urgency=low
  
   * New upstream cvs version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Jan 2001 15:00:00 -0700
 
-kde-i18n (4:2.0.1-1) unstable; urgency=low
+tde-i18n (4:2.0.1-1) unstable; urgency=low
  
   * New upstream version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 27 Nov 2000 18:00:00 -0700
 
-kde-i18n (4:2.0-final-4) unstable; urgency=low
+tde-i18n (4:2.0-final-4) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 27 Nov 2000 05:00:00 -0700
 
-kde-i18n (4:2.0-final-3) unstable; urgency=low
+tde-i18n (4:2.0-final-3) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 25 Nov 2000 05:00:00 -0700
 
-kde-i18n (4:2.0-final-2) unstable; urgency=low
+tde-i18n (4:2.0-final-2) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 13 Nov 2000 09:11:00 -0700
 
-kde-i18n (4:2.0-final-1) unstable; urgency=low
+tde-i18n (4:2.0-final-1) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
 
-kde-i18n (4:2.0-final-0) unstable; urgency=low
+tde-i18n (4:2.0-final-0) unstable; urgency=low
 
   * KDE 2.0
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Oct 2000 00:00:00 -0700
 
-kde-i18n (4:2.0-20001013-0) unstable; urgency=low
+tde-i18n (4:2.0-20001013-0) unstable; urgency=low
  
   * More upstream fixes
   * Going back to multi-packages
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 13 Oct 2000 18:45:00 -0700
                                                                                 
-kde-i18n (4:2.0-20001011-0) unstable; urgency=low
+tde-i18n (4:2.0-20001011-0) unstable; urgency=low
  
   * KDE 2.0 RC2
   * Migrating back into 1 package (Closes: #71548)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 12 Oct 2000 08:45:00 -0700
                                                                                 
-kde-i18n (4:2.0-20001004-0) unstable; urgency=low
+tde-i18n (4:2.0-20001004-0) unstable; urgency=low
  
   * KDE 2.0 RC1
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 04 Oct 2000 22:45:00 -0700
                                                                                 
-kde-i18n (4:2.0-20000925-0) unstable; urgency=low
+tde-i18n (4:2.0-20000925-0) unstable; urgency=low
  
   * More upstream fixes
   * Fixing up build-depends
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
                                                                                 
-kde-i18n (4:2.0-20000909-0) unstable; urgency=low
+tde-i18n (4:2.0-20000909-0) unstable; urgency=low
 
   * Adding in a cleaner doc linker
   * More upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 09 Sep 2000 20:00:00 -0700
 
-kde-i18n (4:2.0-20000907-0) unstable; urgency=low
+tde-i18n (4:2.0-20000907-0) unstable; urgency=low
  
   * More upstream fixes
   * migrating in packging fixes into cvs
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 07 Sep 2000 04:00:00 -0700
                                                                                 
-kde-i18n (4:2.0-20000823-1.0) experimental; urgency=low
+tde-i18n (4: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:00 -0700
                                                                                 
-kde-i18n (4:2.0-20000816-1.0) experimental; urgency=low
+tde-i18n (4:2.0-20000816-1.0) experimental; urgency=low
 
   * New upstream beta version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 16 Aug 2000 22:30:00 -0700
 
-kde-i18n (4:2.0-20000308-1.0) experimental; urgency=low
+tde-i18n (4:2.0-20000308-1.0) experimental; urgency=low
  
   * New upstream CVS version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 08 Mar 2000 22:00:00 -0700
 
-kde-i18n (4:2.0-20000302-1.0) experimental; urgency=low
+tde-i18n (4:2.0-20000302-1.0) experimental; urgency=low
 
   * New upstream CVS version
   * Adding in build-depends
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 29 Feb 2000 22:00:00 -0700
 
-kde-i18n (4:2.0-19991001-1) unstable; urgency=low
+tde-i18n (4:2.0-19991001-1) unstable; urgency=low
 
   * New upstream CVS version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Oct 1999 04:00:41 -0400
 
-kde-i18n (4:2.0-19990916-1) unstable; urgency=low
+tde-i18n (4:2.0-19990916-1) unstable; urgency=low
 
   * New upstream CVS version
   * Committing changes to the rules script from the last build I made yet
@@ -654,14 +654,14 @@ kde-i18n (4:2.0-19990916-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 16 Sep 1999 21:00:41 -0400
 
-kde-i18n (4:2.0-19990824-1) unstable; urgency=low
+tde-i18n (4:2.0-19990824-1) unstable; urgency=low
 
   * Trying out case's instead of my if then's for building seperate packages
   * New upstream CVS changes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 24 Aug 1999 13:00:41 -0400
 
-kde-i18n (4:2.0-19990822-1) unstable; urgency=low
+tde-i18n (4:2.0-19990822-1) unstable; urgency=low
 
   * New upstream version
   * First time packaging
diff --git a/ubuntu/maverick/tde-i18n/debian/control b/ubuntu/maverick/tde-i18n/debian/control
index d20143263..66b972d43 100644
--- a/ubuntu/maverick/tde-i18n/debian/control
+++ b/ubuntu/maverick/tde-i18n/debian/control
@@ -1,859 +1,859 @@
-Source: kde-i18n-trinity
-Build-Depends: autoconf, debhelper (>= 5), kdelibs4-trinity-dev, gawk, gettext, bzip2, perl
+Source: tde-i18n-trinity
+Build-Depends: autoconf, debhelper (>= 5), tdelibs4-trinity-dev, gawk, gettext, bzip2, perl
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
 Standards-Version: 3.8.4
 
-Package: kde-i18n-af-trinity
+Package: tde-i18n-af-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-af-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-af-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-af-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-af-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Afrikaans (af) internationalized (i18n) files for KDE
  This package contains the Afrikaans internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-ar-trinity
+Package: tde-i18n-ar-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-ar-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-ar-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-ar-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-ar-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity-trinity
+Provides: tde-i18n-trinity-trinity
 Description: Arabic (ar) internationalized (i18n) files for KDE
  This package contains the Arabic internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-az-trinity
+Package: tde-i18n-az-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-az-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-az-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-az-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-az-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Azerbaijani (az) internationalized (i18n) files for KDE
  This package contains the Azerbaijani internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-be-trinity
+Package: tde-i18n-be-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-be-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-be-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-be-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-be-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Belarusian (be) internationalized (i18n) files for KDE
  This package contains the Belarusian internationalized (i18n) files
  for all KDE core applications.
 
-Package: kde-i18n-bg-trinity
+Package: tde-i18n-bg-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-bg-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-bg-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-bg-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-bg-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Bulgarian (bg) internationalized (i18n) files for KDE
  This package contains the Bulgarian internationalized (i18n) files
  for all KDE core applications.
 
-Package: kde-i18n-bn-trinity
+Package: tde-i18n-bn-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-bn-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-bn-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-bn-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-bn-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Bengali (bn) internationalized (i18n) files for KDE
  This package contains the Bengali internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-br-trinity
+Package: tde-i18n-br-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-br-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-br-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-br-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-br-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Breton (br) internationalized (i18n) files for KDE
  This package contains the Breton internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-bs-trinity
+Package: tde-i18n-bs-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-bs-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-bs-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-bs-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-bs-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Bosnian (bs) internationalized (i18n) files for KDE
  This package contains the Bosnian internationalized (i18n) files for
  all KDE core applications.
  
-Package: kde-i18n-ca-trinity
+Package: tde-i18n-ca-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-ca-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-ca-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-ca-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-ca-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Catalan (ca) internationalized (i18n) files for KDE
  This package contains the Catalan internationalized (i18n) files for
  all KDE core applications.
  
-Package: kde-i18n-cs-trinity
+Package: tde-i18n-cs-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-cs-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-cs-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-cs-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-cs-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Czech (cs) internationalized (i18n) files for KDE
  This package contains the Czech internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-csb-trinity
+Package: tde-i18n-csb-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-csb-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-csb-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-csb-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-csb-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Kashubian (csb) internationalized (i18n) files for KDE
  This package contains the Kashubian internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-cy-trinity
+Package: tde-i18n-cy-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-cy-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-cy-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-cy-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-cy-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Welsh (cy) internationalized (i18n) files for KDE
  This package contains the Welsh internationalized (i18n) files for
  all KDE core applications.
  
-Package: kde-i18n-da-trinity
+Package: tde-i18n-da-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-da-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-da-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-da-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-da-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Danish (da) internationalized (i18n) files for KDE
  This package contains the Danish internationalized (i18n) files for
  all KDE core applications.
  
-Package: kde-i18n-de-trinity
+Package: tde-i18n-de-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-de-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-de-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-de-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-de-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: German (de) internationalized (i18n) files for KDE
  This package contains the German internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-el-trinity
+Package: tde-i18n-el-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-el-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-el-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-el-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-el-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Greek (el) internationalized (i18n) files for KDE
  This package contains the greek internationalized (i18n) files for
  all KDE core applications.
  
-Package: kde-i18n-engb-trinity
+Package: tde-i18n-engb-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-engb-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-engb-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-engb-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-engb-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: British English (en_GB) internationalized (i18n) files for KDE
  This package contains the British English (en_GB) internationalized
  (i18n) files for all KDE core applications.
 
-Package: kde-i18n-eo-trinity
+Package: tde-i18n-eo-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-eo-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-eo-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-eo-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-eo-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Esperanto (eo) internationalized (i18n) files for KDE
  This package contains the Esperanto (eo) internationalized
  (i18n) files for all KDE core applications.
  
-Package: kde-i18n-es-trinity
+Package: tde-i18n-es-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-es-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-es-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-es-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-es-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Spanish (es) internationalized (i18n) files for KDE
  This package contains the Spanish internationalized (i18n) files for
  all KDE core applications.
  
-Package: kde-i18n-et-trinity
+Package: tde-i18n-et-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-et-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-et-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-et-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-et-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Estonian (et) internationalized (i18n) files for KDE
  This package contains the Estonian internationalized (i18n) files
  for all KDE core applications.
  
-Package: kde-i18n-eu-trinity
+Package: tde-i18n-eu-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-eu-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-eu-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-eu-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-eu-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Basque (eu) internationalized (i18n) files for KDE
  This package contains the Basque internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-fa-trinity
+Package: tde-i18n-fa-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-fa-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-fa-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-fa-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-fa-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Farsi (Persian) (fa) internationalized (i18n) files for KDE
  This package contains the Farsi (Persian) internationalized (i18n) files for
  all KDE core applications.
  
-Package: kde-i18n-fi-trinity
+Package: tde-i18n-fi-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-fi-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-fi-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-fi-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-fi-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Finnish (fi) internationalized (i18n) files for KDE
  This package contains the Finnish internationalized (i18n) files for
  all KDE core applications.
  
-Package: kde-i18n-fr-trinity
+Package: tde-i18n-fr-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-fr-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-fr-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-fr-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-fr-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: French (fr) internationalized (i18n) files for KDE
  This package contains the French internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-fy-trinity
+Package: tde-i18n-fy-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-fy-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-fy-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-fy-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-fy-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Frisian (fy) internationalized (i18n) files for KDE
  This package contains the Frisian internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-ga-trinity
+Package: tde-i18n-ga-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-ga-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-ga-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-ga-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-ga-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Irish Gaelic (ga) internationalized (i18n) files for KDE
  This package contains the Irish Gaelic internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-gl-trinity
+Package: tde-i18n-gl-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-gl-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-gl-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-gl-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-gl-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Galician (gl) internationalized (i18n) files for KDE
  This package contains the Galician internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-he-trinity
+Package: tde-i18n-he-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-he-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-he-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-he-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-he-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Hebrew (he) internationalized (i18n) files for KDE
  This package contains the Hebrew internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-hi-trinity
+Package: tde-i18n-hi-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-hi-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-hi-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-hi-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-hi-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Hindi (hi) internationalized (i18n) files for KDE
  This package contains the Hindi internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-hr-trinity
+Package: tde-i18n-hr-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-hr-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-hr-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-hr-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-hr-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Croatian (hr) internationalized (i18n) files for KDE
  This package contains the Croatian internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-hu-trinity
+Package: tde-i18n-hu-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-hu-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-hu-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-hu-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-hu-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Hungarian (hu) internationalized (i18n) files for KDE
  This package contains the Hungarian internationalized (i18n) files
  for all KDE core applications.
 
-Package: kde-i18n-is-trinity
+Package: tde-i18n-is-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-is-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-is-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-is-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-is-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Icelandic (is) internationalized (i18n) files for KDE
  This package contains the Icelandic internationalized (i18n) files for
  all KDE core applications.
  
-Package: kde-i18n-it-trinity
+Package: tde-i18n-it-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-it-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-it-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-it-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-it-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Italian (it) internationalized (i18n) files for KDE
  This package contains the Italian internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-ja-trinity
+Package: tde-i18n-ja-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-ja-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-ja-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-ja-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-ja-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Japanese (ja) internationalized (i18n) files for KDE
  This package contains the Japanese internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-kk-trinity
+Package: tde-i18n-kk-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-kk-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-kk-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-kk-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-kk-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Kazakh (kk) internationalized (i18n) files for KDE
  This package contains the Kazakh internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-km-trinity
+Package: tde-i18n-km-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-km-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-km-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-km-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-km-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Khmer (km) internationalized (i18n) files for KDE
  This package contains the Khmer internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-ko-trinity
+Package: tde-i18n-ko-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-ko-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-ko-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-ko-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-ko-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Korean (ko) internationalized (i18n) files for KDE
  This package contains the Korean internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-lt-trinity
+Package: tde-i18n-lt-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-lt-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-lt-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-lt-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-lt-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Lithuanian (lt) internationalized (i18n) files for KDE
  This package contains the Lithuanian internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-lv-trinity
+Package: tde-i18n-lv-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-lv-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-lv-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-lv-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-lv-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Latvian (lv) internationalized (i18n) files for KDE
  This package contains the Latvian internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-mk-trinity
+Package: tde-i18n-mk-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-mk-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-mk-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-mk-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-mk-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Macedonian (mk) internationalized (i18n) files for KDE
  This package contains the Macedonian internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-mn-trinity
+Package: tde-i18n-mn-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-mn-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-mn-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-mn-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-mn-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Mongolian (mn) internationalized (i18n) files for KDE
  This package contains the Mongolian internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-ms-trinity
+Package: tde-i18n-ms-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-ms-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-ms-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-ms-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-ms-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Malay (ms) internationalized (i18n) files for KDE
  This package contains the Malay internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-nb-trinity
+Package: tde-i18n-nb-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-nb-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-nb-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-nb-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-nb-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity, kde-i18n-no
+Provides: tde-i18n-trinity, tde-i18n-no
 Description: Norwegian Bookmal (nb) internationalized (i18n) files for KDE
  This package contains the Norwegian Bookmal internationalized (i18n)
  files for all KDE core applications.
 
-Package: kde-i18n-nds-trinity
+Package: tde-i18n-nds-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-nds-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-nds-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-nds-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-nds-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Low Saxon (nds) internationalized (i18n) files for KDE
  This package contains the Low Saxon internationalized (i18n)
  files for all KDE core applications.
  
-Package: kde-i18n-nl-trinity
+Package: tde-i18n-nl-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-nl-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-nl-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-nl-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-nl-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Dutch (nl) internationalized (i18n) files for KDE
  This package contains the Dutch internationalized (i18n) files for
  all KDE core applications.
  
-Package: kde-i18n-nn-trinity
+Package: tde-i18n-nn-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-nn-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-nn-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-nn-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-nn-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
 Description: Norwegian Nynorsk (nn) internationalized (i18n) files for KDE
  This package contains the Norwegian Nynorsk (nn) internationalized (i18n)
  files for all KDE core applications.
 
-Package: kde-i18n-pa-trinity
+Package: tde-i18n-pa-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-pa-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-pa-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-pa-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-pa-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Punjabi (pa) internationalized (i18n) files for KDE
  This package contains the Punjabi (pa) internationalized (i18n)
  files for all KDE core applications.
 
-Package: kde-i18n-pl-trinity
+Package: tde-i18n-pl-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-pl-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-pl-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-pl-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-pl-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Polish (pl) internationalized (i18n) files for KDE
  This package contains the Polish internationalized (i18n) files for
  all KDE core applications.
  
-Package: kde-i18n-pt-trinity
+Package: tde-i18n-pt-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-pt-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-pt-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-pt-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-pt-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Portuguese (pt) internationalized (i18n) files for KDE
  This package contains the Portuguese internationalized (i18n) files
  for all KDE core applications.
  
-Package: kde-i18n-ptbr-trinity
+Package: tde-i18n-ptbr-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-ptbr-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-ptbr-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-ptbr-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-ptbr-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Brazilian Portuguese (pt_BR) internationalized (i18n) files for KDE
  This package contains the Brazilian Portuguese internationalized
  (i18n) files for all KDE core applications.
  
-Package: kde-i18n-ro-trinity
+Package: tde-i18n-ro-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-ro-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-ro-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-ro-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-ro-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Romanian (ro) internationalized (i18n) files for KDE
  This package contains the Romanian internationalized (i18n) files
  for all KDE core applications.
  
-Package: kde-i18n-ru-trinity
+Package: tde-i18n-ru-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-ru-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-ru-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-ru-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-ru-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Russian (ru) internationalized (i18n) files for KDE
  This package contains the Russian internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-rw-trinity
+Package: tde-i18n-rw-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-rw-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-rw-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-rw-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-rw-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Kinyarwanda (rw) internationalized (i18n) files for KDE
  This package contains the Kinyarwanda internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-se-trinity
+Package: tde-i18n-se-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-se-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-se-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-se-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-se-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Northern Sami (se) internationalized (i18n) files for KDE
  This package contains the Northern Sami internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-sk-trinity
+Package: tde-i18n-sk-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-sk-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-sk-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-sk-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-sk-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Slovak (sk) internationalized (i18n) files for KDE
  This package contains the Slovak internationalized (i18n) files for
  all KDE core applications.
  
-Package: kde-i18n-sl-trinity
+Package: tde-i18n-sl-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-sl-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-sl-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-sl-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-sl-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Slovenian (sl) internationalized (i18n) files for KDE
  This package contains the Slovenian internationalized (i18n) files
  for all KDE core applications.
  
-Package: kde-i18n-sr-trinity
+Package: tde-i18n-sr-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-sr-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-sr-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-sr-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-sr-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Serbian (sr) internationalized (i18n) files for KDE
  This package contains the Serbian internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-ss-trinity
+Package: tde-i18n-ss-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-ss-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-ss-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-ss-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-ss-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Swati (ss) internationalized (i18n) files for KDE
  This package contains the Swati internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-srlatin-trinity
+Package: tde-i18n-srlatin-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-srlatin-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-srlatin-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-srlatin-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-srlatin-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Latin Serbian (sr@Latn) internationalized (i18n) files for KDE
  This package contains the latin Serbian internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-sv-trinity
+Package: tde-i18n-sv-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-sv-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-sv-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-sv-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-sv-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Swedish (sv) internationalized (i18n) files for KDE
  This package contains the Swedish internationalized (i18n) files for
  all KDE core applications.
  
-Package: kde-i18n-ta-trinity
+Package: tde-i18n-ta-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-ta-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-ta-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-ta-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-ta-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Tamil (ta) internationalized (i18n) files for KDE
  This package contains the Tamil internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-te-trinity
+Package: tde-i18n-te-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-te-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-te-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-te-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-te-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Telugu (te) internationalized (i18n) files for KDE
  This package contains the Telugu internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-tg-trinity
+Package: tde-i18n-tg-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-tg-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-tg-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-tg-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-tg-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Tajik (tg) internationalized (i18n) files for KDE
  This package contains the Tajik internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-th-trinity
+Package: tde-i18n-th-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-th-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-th-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-th-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-th-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Thai (th) internationalized (i18n) files for KDE
  This package contains the Thai internationalized (i18n) files for
  all KDE core applications.
 
-Package: kde-i18n-tr-trinity
+Package: tde-i18n-tr-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-tr-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-tr-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-tr-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-tr-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Turkish (tr) internationalized (i18n) files for KDE
  This package contains the Turkish internationalized (i18n) files for
  all KDE core applications.
  
-Package: kde-i18n-uk-trinity
+Package: tde-i18n-uk-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-uk-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-uk-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-uk-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-uk-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Ukrainian (uk) internationalized (i18n) files for KDE
  This package contains the Ukrainian internationalized (i18n) files
  for all KDE core applications.
 
-Package: kde-i18n-uz-trinity
+Package: tde-i18n-uz-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-uz-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-uz-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-uz-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-uz-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Uzbek (uz) internationalized (i18n) files for KDE
  This package contains the Uzbek internationalized (i18n) files
  for all KDE core applications.
 
 
-Package: kde-i18n-uzcyrillic-trinity
+Package: tde-i18n-uzcyrillic-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-uzcyrillic-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-uzcyrillic-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-uzcyrillic-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-uzcyrillic-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Cyrillic Uzbek (uz@cyrillic) internationalized (i18n) files for KDE
  This package contains the cyrillic Uzbek internationalized (i18n) files
  for all KDE core applications.
 
-Package: kde-i18n-vi-trinity
+Package: tde-i18n-vi-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-vi-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-vi-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-vi-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-vi-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Vietnamese (vi) internationalized (i18n) files for KDE
  This package contains the Vietnamese internationalized (i18n) files
  for all KDE core applications.
 
-Package: kde-i18n-wa-trinity
+Package: tde-i18n-wa-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-wa-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-wa-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-wa-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-wa-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Walloon (wa) internationalized (i18n) files for KDE
  This package contains the Walloon internationalized (i18n) files
  for all KDE core applications.
 
-Package: kde-i18n-zhcn-trinity
+Package: tde-i18n-zhcn-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-zhcn-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-zhcn-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-zhcn-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-zhcn-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Chinese Simplified (zh_CN) internationalized (i18n) files for KDE
  This package contains the Chinese Simplified internationalized (i18n)
  files for all KDE core applications.
 
-Package: kde-i18n-zhtw-trinity
+Package: tde-i18n-zhtw-trinity
 Architecture: all
 Section: kde
-Replaces: kde-i18n-zhtw-kde3 (<< 4:3.5.13)
-Breaks: kde-i18n-zhtw-kde3 (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity
+Replaces: tde-i18n-zhtw-kde3 (<< 4:3.5.13)
+Breaks: tde-i18n-zhtw-kde3 (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity
 Suggests: kde
-Provides: kde-i18n-trinity
+Provides: tde-i18n-trinity
 Description: Chinese Traditional (zh_TW) internationalized (i18n) files for KDE
  This package contains the Chinese Traditional internationalized (i18n)
  files for all KDE core applications.
diff --git a/ubuntu/maverick/tde-i18n/debian/copyright b/ubuntu/maverick/tde-i18n/debian/copyright
index aac858d55..7b6fde481 100644
--- a/ubuntu/maverick/tde-i18n/debian/copyright
+++ b/ubuntu/maverick/tde-i18n/debian/copyright
@@ -6,7 +6,7 @@ Re-packaged by Modestas Vainius in version 4:3.5.9-2 on Mar 2008.
 
 It was downloaded from ftp://ftp.kde.org/pub/kde/stable/
 
-Copyright (c) 1996-2008 The KDE Translation teams <kde-i18n-doc@kde.org>
+Copyright (c) 1996-2008 The KDE Translation teams <tde-i18n-doc@kde.org>
 Every language file is made by the respective translation team. You can find
 a list of the translation teams and their contact email addresses at:
 http://i18n.kde.org/teams-list.php
diff --git a/ubuntu/maverick/tde-i18n/debian/rules b/ubuntu/maverick/tde-i18n/debian/rules
index 0812f3e17..cdafc3d0f 100755
--- a/ubuntu/maverick/tde-i18n/debian/rules
+++ b/ubuntu/maverick/tde-i18n/debian/rules
@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-I18N_DIR_PREFIX := kde-i18n
+I18N_DIR_PREFIX := tde-i18n
 #I18N_VERSION := $(shell cat debian/changelog | head -n1 | sed 's/.*(\([[:digit:]]\+:\)\?\(.\+\)-.\+).*/\2/')
 I18N_VERSION := 3.5.10
 I18N_DIR_PAT := $(I18N_DIR_PREFIX)-%-$(I18N_VERSION)
@@ -65,16 +65,16 @@ install::
 
 install:: $(I18N_INSTALL)
 	# copying the non 2 letter languages into the correct directory
-	mkdir debian/kde-i18n-engb-trinity
-	cp -aR debian/kde-i18n-en_GB-trinity/* debian/kde-i18n-engb-trinity/
-	mkdir debian/kde-i18n-ptbr-trinity
-	cp -aR debian/kde-i18n-pt_BR-trinity/* debian/kde-i18n-ptbr-trinity/
-	mkdir debian/kde-i18n-srlatin-trinity
-	cp -aR debian/kde-i18n-sr@Latn-trinity/* debian/kde-i18n-srlatin-trinity/
-	mkdir debian/kde-i18n-zhcn-trinity
-	cp -aR debian/kde-i18n-zh_CN-trinity/* debian/kde-i18n-zhcn-trinity/
-	mkdir debian/kde-i18n-zhtw-trinity
-	cp -aR debian/kde-i18n-zh_TW-trinity/* debian/kde-i18n-zhtw-trinity/
+	mkdir debian/tde-i18n-engb-trinity
+	cp -aR debian/tde-i18n-en_GB-trinity/* debian/tde-i18n-engb-trinity/
+	mkdir debian/tde-i18n-ptbr-trinity
+	cp -aR debian/tde-i18n-pt_BR-trinity/* debian/tde-i18n-ptbr-trinity/
+	mkdir debian/tde-i18n-srlatin-trinity
+	cp -aR debian/tde-i18n-sr@Latn-trinity/* debian/tde-i18n-srlatin-trinity/
+	mkdir debian/tde-i18n-zhcn-trinity
+	cp -aR debian/tde-i18n-zh_CN-trinity/* debian/tde-i18n-zhcn-trinity/
+	mkdir debian/tde-i18n-zhtw-trinity
+	cp -aR debian/tde-i18n-zh_TW-trinity/* debian/tde-i18n-zhtw-trinity/
 
 $(I18N_INSTALL):
 	cd $(cur_lang_dir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/$(cur_pkg)-trinity
@@ -84,7 +84,7 @@ clean: debian-clean
 debian-clean:
 	dh_testdir
 	# delete unpacked bzip2 languages
-	rm -rf $(I18N_DIR_PREFIX)-*-$(I18N_VERSION)/ debian/kde-i18n-*
+	rm -rf $(I18N_DIR_PREFIX)-*-$(I18N_VERSION)/ debian/tde-i18n-*
 	rm -f debian/stamp__*
 	dh_clean
 
diff --git a/ubuntu/maverick/tdeaccessibility/debian/changelog b/ubuntu/maverick/tdeaccessibility/debian/changelog
index 6e6b5f441..ac6be6d0b 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/changelog
+++ b/ubuntu/maverick/tdeaccessibility/debian/changelog
@@ -1,50 +1,50 @@
-kdeaccessibility-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
+tdeaccessibility-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdeaccessibility-trinity (4:3.5.10-0ubuntu1~intrepid4) intrepid; urgency=low
+tdeaccessibility-trinity (4:3.5.10-0ubuntu1~intrepid4) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 28 Feb 2009 16:19:00 -0600
 
-kdeaccessibility-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
+tdeaccessibility-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
   * Import from SVN
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 26 Nov 2008 21:56:00 -0600
 
-kdeaccessibility (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdeaccessibility (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
-    - Bump build-dep version of kdelibs4-dev and kdemultimedia-dev to
+    - Bump build-dep version of tdelibs4-dev and tdemultimedia-dev to
       3.5.10
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:21:01 -0400
 
-kdeaccessibility (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdeaccessibility (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:05 +0000
 
-kdeaccessibility (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdeaccessibility (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 10:59:22 +0000
 
-kdeaccessibility (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdeaccessibility (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining change:
    - Remove Section: contrib/ from kttsd-contrib-plugins
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:46 +0000
 
-kdeaccessibility (4:3.5.8-1) unstable; urgency=low
+tdeaccessibility (4:3.5.8-1) unstable; urgency=low
 
   * New upstream release.
   * Implement uploaders.mk
@@ -56,44 +56,44 @@ kdeaccessibility (4:3.5.8-1) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 14 Oct 2007 18:28:25 +0200
 
-kdeaccessibility (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdeaccessibility (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * Remove contrib section
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 21:52:11 +0100
 
-kdeaccessibility (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdeaccessibility (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:27 +0100
 
-kdeaccessibility (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdeaccessibility (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * Merge with Debian for new upstream version
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 May 2007 17:00:20 +0100
 
-kdeaccessibility (4:3.5.7-1) unstable; urgency=low
+tdeaccessibility (4:3.5.7-1) unstable; urgency=low
 
   * New upstream version. 
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 16 May 2007 02:01:02 +0100
 
-kdeaccessibility (4:3.5.6-2ubuntu1) gutsy; urgency=low
+tdeaccessibility (4:3.5.6-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
   * No remaining changes besides patches
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 20:32:56 +0100
 
-kdeaccessibility (4:3.5.6-2) unstable; urgency=low
+tdeaccessibility (4:3.5.6-2) unstable; urgency=low
 
   * Upload to unstable after Etch release. 
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Fri, 20 Apr 2007 17:36:39 +0100
 
-kdeaccessibility (4:3.5.6-1) experimental; urgency=low
+tdeaccessibility (4:3.5.6-1) experimental; urgency=low
 
   * New upstream release.
 
@@ -103,10 +103,10 @@ kdeaccessibility (4:3.5.6-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 18 Jan 2007 00:20:08 +0100
 
-kdeaccessibility (4:3.5.5-2) unstable; urgency=low
+tdeaccessibility (4:3.5.5-2) unstable; urgency=low
 
   ++ Changes by Josh Metzler:
-  * Make kdeaccessibility-dbg depend on kdelibs-dbg to get useful backtraces
+  * Make tdeaccessibility-dbg depend on tdelibs-dbg to get useful backtraces
     when debugging.
 
   ++ Ana Beatriz Guerrero Lopez:
@@ -116,19 +116,19 @@ kdeaccessibility (4:3.5.5-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  7 Dec 2006 14:56:02 +0100
 
-kdeaccessibility (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdeaccessibility (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:31 +0000
 
-kdeaccessibility (4:3.5.5-1ubuntu1) feisty; urgency=low
+tdeaccessibility (4:3.5.5-1ubuntu1) feisty; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 22:12:42 +0000
 
-kdeaccessibility (4:3.5.5-1) unstable; urgency=low
+tdeaccessibility (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
     + Fixes ksayit: crash with "terminate called after throwing an instance
@@ -136,7 +136,7 @@ kdeaccessibility (4:3.5.5-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  4 Oct 2006 20:40:37 -0400
 
-kdeaccessibility (4:3.5.4-1) unstable; urgency=low
+tdeaccessibility (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -144,51 +144,51 @@ kdeaccessibility (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 29 Jul 2006 21:12:52 -0400
 
-kdeaccessibility (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdeaccessibility (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:05 +0000
 
-kdeaccessibility (4:3.5.4-0ubuntu5) edgy; urgency=low
+tdeaccessibility (4:3.5.4-0ubuntu5) edgy; urgency=low
 
   * Rebuild on latest cdbs to change .pot files to UTF8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 20 Sep 2006 13:09:37 +0100
 
-kdeaccessibility (4:3.5.4-0ubuntu4) edgy; urgency=low
+tdeaccessibility (4:3.5.4-0ubuntu4) edgy; urgency=low
 
   * Rebuild with latest cdbs to add gettext domain to .desktop files for
     langpacks-desktopfiles-kde, no source changes
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Sep 2006 22:53:10 +0000
 
-kdeaccessibility (4:3.5.4-0ubuntu3) edgy; urgency=low
+tdeaccessibility (4:3.5.4-0ubuntu3) edgy; urgency=low
 
   * Build-dep on new akode so it doesn't bring in akode-mpeg
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  2 Aug 2006 13:35:28 +0000
 
-kdeaccessibility (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdeaccessibility (4:3.5.4-0ubuntu2) edgy; urgency=low
 
   * Build-dep on new akode so it doesn't bring in Jack
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 30 Jul 2006 16:28:24 +0100
 
-kdeaccessibility (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdeaccessibility (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:17 +0000
 
-kdeaccessibility (4:3.5.3-1ubuntu1) edgy; urgency=low
+tdeaccessibility (4:3.5.3-1ubuntu1) edgy; urgency=low
 
   * Sync with Debian
   * Don't build-dep on gstreamer0.8 and remove --with-gstreamer (it's in universe)
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Jul 2006 15:12:40 +0000
 
-kdeaccessibility (4:3.5.3-1) unstable; urgency=low
+tdeaccessibility (4:3.5.3-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -196,13 +196,13 @@ kdeaccessibility (4:3.5.3-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun,  4 Jun 2006 18:34:43 -0400
 
-kdeaccessibility (4:3.5.2-1) unstable; urgency=low
+tdeaccessibility (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 29 Mar 2006 21:18:53 -0500
 
-kdeaccessibility (4:3.5.1-1) unstable; urgency=low
+tdeaccessibility (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -212,7 +212,7 @@ kdeaccessibility (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 29 Jan 2006 10:44:07 -0500
 
-kdeaccessibility (4:3.5.0-3) unstable; urgency=low
+tdeaccessibility (4:3.5.0-3) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -222,7 +222,7 @@ kdeaccessibility (4:3.5.0-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  7 Jan 2006 17:25:45 -0500
 
-kdeaccessibility (4:3.5.0-2) experimental; urgency=low
+tdeaccessibility (4:3.5.0-2) experimental; urgency=low
 
   * Upload to experimental.
 
@@ -235,45 +235,45 @@ kdeaccessibility (4:3.5.0-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 28 Dec 2005 13:31:29 -0500
 
-kdeaccessibility (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdeaccessibility (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * debian/cdbs/debian-qt-kde.mk to call dh_iconcache
 
  -- Gauvain Pocentek <gauvainpocentek@ubuntu.com>  Wed, 24 May 2006 12:55:38 +0200
 
-kdeaccessibility (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdeaccessibility (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:27 +0100
 
-kdeaccessibility (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdeaccessibility (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:28 +0000
 
-kdeaccessibility (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdeaccessibility (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:05 +0000
 
-kdeaccessibility (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdeaccessibility (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:26:30 +0000
 
-kdeaccessibility (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdeaccessibility (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 Nov 2005 13:33:38 +0000
 
-kdeaccessibility (4:3.5.0-1) alioth; urgency=low
+tdeaccessibility (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
 
@@ -288,36 +288,36 @@ kdeaccessibility (4:3.5.0-1) alioth; urgency=low
 
   * Bump DH_COMPAT to 5. No changes.
 
-  * Add kdeaccessibility-dbg, to help track down problems.
+  * Add tdeaccessibility-dbg, to help track down problems.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 30 Nov 2005 18:41:50 -0500
 
-kdeaccessibility (4:3.4.3-2) unstable; urgency=low
+tdeaccessibility (4:3.4.3-2) unstable; urgency=low
 
-  * Upload to unstable, rebuilding against kdelibs4c2a.
+  * Upload to unstable, rebuilding against tdelibs4c2a.
 
   * KDE_3_4_BRANCH update (up to r484426).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 30 Nov 2005 19:49:02 +0100
 
-kdeaccessibility (4:3.4.3-1) experimental; urgency=low
+tdeaccessibility (4:3.4.3-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 16 Oct 2005 14:19:29 -0400
 
-kdeaccessibility (4:3.4.2-2) unstable; urgency=low
+tdeaccessibility (4:3.4.2-2) unstable; urgency=low
 
   +++ Changes by Luk Claes:
   
   * Add new files to respective debian/*.install files
   
-  * Build with g++-3.4 on arm, m68k and hppa; kdeaccessibility triggers the same
+  * Build with g++-3.4 on arm, m68k and hppa; tdeaccessibility triggers the same
     gcc 4.0 ICE as arts does.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri,  2 Sep 2005 20:18:02 +0200
 
-kdeaccessibility (4:3.4.2-1) unstable; urgency=low
+tdeaccessibility (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -329,13 +329,13 @@ kdeaccessibility (4:3.4.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  1 Sep 2005 17:31:25 +0200
 
-kdeaccessibility (4:3.4.1-1) experimental; urgency=low
+tdeaccessibility (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
 
-kdeaccessibility (4:3.4.0-0pre1) alioth; urgency=low
+tdeaccessibility (4:3.4.0-0pre1) alioth; urgency=low
 
   * New upstream release.
 
@@ -354,13 +354,13 @@ kdeaccessibility (4:3.4.0-0pre1) alioth; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * New kdeaccessibility-doc-html package, containing doc-base registered
+  * New tdeaccessibility-doc-html package, containing doc-base registered
     HTML versions of application handbooks, for users without Konqueror or
     KHelpCenter.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  5 Mar 2005 21:32:41 +0100
 
-kdeaccessibility (4:3.3.2-1) unstable; urgency=low
+tdeaccessibility (4:3.3.2-1) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -375,7 +375,7 @@ kdeaccessibility (4:3.3.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 23 Jan 2005 23:09:07 +0100
 
-kdeaccessibility (4:3.3.2-0pre1) experimental; urgency=low
+tdeaccessibility (4:3.3.2-0pre1) experimental; urgency=low
 
   * New upstream release.
   * KDE_3_3_BRANCH update.
@@ -383,7 +383,7 @@ kdeaccessibility (4:3.3.2-0pre1) experimental; urgency=low
 
  -- Christopher Martin <chrsmrtn@freeshell.org>  Thu, 16 Dec 2004 14:43:11 -0500
 
-kdeaccessibility (3.3.1-1) unstable; urgency=low
+tdeaccessibility (3.3.1-1) unstable; urgency=low
 
   * New upstream release.
   * KDE_3_3_BRANCH update.
@@ -391,45 +391,45 @@ kdeaccessibility (3.3.1-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu,  4 Nov 2004 22:30:00 -0600
 
-kdeaccessibility (3.3.0-2) unstable; urgency=low
+tdeaccessibility (3.3.0-2) unstable; urgency=low
 
   * KDE_3_3_BRANCH update.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat, 25 Sep 2004 23:00:00 -0500
 
-kdeaccessibility (3.3.0-1) unstable; urgency=high
+tdeaccessibility (3.3.0-1) unstable; urgency=high
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri, 13 Aug 2004 22:30:00 -0500
 
-kdeaccessibility (3.2.3-1) unstable; urgency=high
+tdeaccessibility (3.2.3-1) unstable; urgency=high
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue,  3 Aug 2004 05:00:00 -0500
 
-kdeaccessibility (3.2.2-1) unstable; urgency=low
+tdeaccessibility (3.2.2-1) unstable; urgency=low
 
   * New upstream release.
   * debian/*.menu: remove the obsolete kderemove tag.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sun, 11 Apr 2004 23:00:00 -0500
 
-kdeaccessibility (3.2.1-1) unstable; urgency=low
+tdeaccessibility (3.2.1-1) unstable; urgency=low
 
   * New upstream release.
   * Added Build-Depends: groff-base. (Closes: #235015)
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri,  5 Mar 2004 17:00:00 -0600
 
-kdeaccessibility (3.2.0-0pre1v1) unstable; urgency=low
+tdeaccessibility (3.2.0-0pre1v1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu, 19 Feb 2004 17:00:00 -0600
 
-kdeaccessibility (3.1.95-1) unstable; urgency=low
+tdeaccessibility (3.1.95-1) unstable; urgency=low
 
   * Initial Release.
 
diff --git a/ubuntu/maverick/tdeaccessibility/debian/control b/ubuntu/maverick/tdeaccessibility/debian/control
index 47a53326d..9bdfff8d9 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/control
+++ b/ubuntu/maverick/tdeaccessibility/debian/control
@@ -1,20 +1,20 @@
-Source: kdeaccessibility-trinity
+Source: tdeaccessibility-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, gettext, groff-base, kdelibs4-trinity-dev, kdemultimedia-trinity-dev, libakode-dev, libxtst-dev, sharutils, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, gettext, groff-base, tdelibs4-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev, sharutils, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kdeaccessibility-trinity
+Package: tdeaccessibility-trinity
 Section: kde
 Architecture: all
-Replaces: kdeaccessibility-kde3 (<< 4:3.5.13)
-Breaks: kdeaccessibility-kde3 (<< 4:3.5.13)
+Replaces: tdeaccessibility-kde3 (<< 4:3.5.13)
+Breaks: tdeaccessibility-kde3 (<< 4:3.5.13)
 Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version})
 Recommends: kde-icons-mono-trinity (>= ${Source-Version})
-Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), kdeaccessibility-trinity-doc-html (>= ${Source-Version})
+Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version})
 Description: accessibility packages 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,
@@ -26,12 +26,12 @@ Description: accessibility packages from the official Trinity release
  .
   Homepage: http://accessibility.kde.org
 
-Package: kdeaccessibility-trinity-doc-html
+Package: tdeaccessibility-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: kdeaccessibility-kde3-doc-html (<< 4:3.5.13)
-Breaks: kdeaccessibility-kde3-doc-html (<< 4:3.5.13)
-Suggests: konqueror-trinity | www-browser, kdebase-trinity
+Replaces: tdeaccessibility-kde3-doc-html (<< 4:3.5.13)
+Breaks: tdeaccessibility-kde3-doc-html (<< 4:3.5.13)
+Suggests: konqueror-trinity | www-browser, tdebase-trinity
 Description: KDE accessibility documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -44,7 +44,7 @@ Description: KDE accessibility documentation in HTML format
  KDE accessibility packages.
  .
  This package is part of Trinity, and a component of the KDE accessibility
- module. See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
+ module. See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information.
 
 Package: kde-icons-mono-trinity
 Section: kde
@@ -55,7 +55,7 @@ Description: a monochromatic icons theme for KDE
  A monochromatic icon theme for KDE, designed for accessibility purposes.
  .
  This package is part of Trinity, as a component of the KDE accessibility module.
- See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information.
 
 Package: kbstate-trinity
 Section: utils
@@ -68,7 +68,7 @@ Description: a keyboard status applet for KDE
  A panel applet that displays the keyboard status.
  .
  This package is part of Trinity, as a component of the KDE accessibility module.
- See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information.
 
 Package: kmag-trinity
 Section: utils
@@ -86,7 +86,7 @@ Description: a screen magnifier for KDE
  people with low vision.
  .
  This package is part of Trinity, as a component of the KDE accessibility module.
- See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information.
 
 Package: kmousetool-trinity
 Section: utils
@@ -101,7 +101,7 @@ Description: KDE mouse manipulation tool for the disabled
  buttons hurts.
  .
  This package is part of Trinity, as a component of the KDE accessibility module.
- See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information.
 
 Package: kmouth-trinity
 Section: utils
@@ -117,7 +117,7 @@ Description: a type-and-say KDE frontend for speech synthesizers
  sentences to be re-spoken.
  .
  This package is part of Trinity, as a component of the KDE accessibility module.
- See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information.
 
 Package: ksayit-trinity
 Section: utils
@@ -130,7 +130,7 @@ Description: a frontend for the KDE Text-to-Speech system
  Text-to-speech front-end to kttsd.
  .
  This package is part of Trinity, as a component of the KDE accessibility module.
- See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information.
 
 
 Package: kttsd-trinity
@@ -149,7 +149,7 @@ Description: a Text-to-Speech system for KDE
  festival, flite, and epos are essential back-ends.
  .
  This package is part of Trinity, as a component of the KDE accessibility module.
- See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information.
  .
   Homepage: http://accessibility.kde.org/developer/kttsd
 
@@ -167,16 +167,16 @@ Description: the KDE Text-to-Speech system
  non free software to work.
  .
  This package is part of Trinity, as a component of the KDE accessibility module.
- See the 'kde-trinity' and 'kdeaccessibility-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information.
 
-Package: kdeaccessibility-trinity-dbg
+Package: tdeaccessibility-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: kdeaccessibility-kde3-dbg (<< 4:3.5.13)
-Breaks: kdeaccessibility-kde3-dbg (<< 4:3.5.13)
-Depends: kdelibs-trinity-dbg
+Replaces: tdeaccessibility-kde3-dbg (<< 4:3.5.13)
+Breaks: tdeaccessibility-kde3-dbg (<< 4:3.5.13)
+Depends: tdelibs-trinity-dbg
 Priority: extra
-Description: debugging symbols for kdeaccessibility-trinity
- This package contains the debugging symbols associated with kdeaccessibility-trinity.
- They will automatically be used by gdb for debugging kdeaccessibility-related
+Description: debugging symbols for tdeaccessibility-trinity
+ This package contains the debugging symbols associated with tdeaccessibility-trinity.
+ They will automatically be used by gdb for debugging tdeaccessibility-related
  issues.
diff --git a/ubuntu/maverick/tdeaccessibility/debian/control.in b/ubuntu/maverick/tdeaccessibility/debian/control.in
index 6ebf7d51f..ece22c85f 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/control.in
+++ b/ubuntu/maverick/tdeaccessibility/debian/control.in
@@ -1,18 +1,18 @@
-Source: kdeaccessibility
+Source: tdeaccessibility
 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), gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.5.8), kdemultimedia-dev (>= 4:3.5.8), libakode-dev, libxtst-dev, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, gettext, groff-base, tdelibs4-dev (>= 4:3.5.8), tdemultimedia-dev (>= 4:3.5.8), libakode-dev, libxtst-dev, sharutils
 Standards-Version: 3.7.2
 
-Package: kdeaccessibility
+Package: tdeaccessibility
 Section: kde
 Architecture: all
 Depends: kmag (>= ${Source-Version}), kmousetool (>= ${Source-Version}), kmouth (>= ${Source-Version}), kbstate (>= ${Source-Version}), ksayit  (>= ${Source-Version}), kttsd (>= ${Source-Version})
 Recommends: kde-icons-mono (>= ${Source-Version})
-Suggests: kttsd-contrib-plugins (>= ${Source-Version}), kdeaccessibility-doc-html (>= ${Source-Version})
+Suggests: kttsd-contrib-plugins (>= ${Source-Version}), tdeaccessibility-doc-html (>= ${Source-Version})
 Description: accessibility packages from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -24,10 +24,10 @@ Description: accessibility packages from the official KDE release
  .
   Homepage: http://accessibility.kde.org
 
-Package: kdeaccessibility-doc-html
+Package: tdeaccessibility-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror | www-browser, kdebase
+Suggests: konqueror | www-browser, tdebase
 Description: KDE accessibility documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -40,7 +40,7 @@ Description: KDE accessibility documentation in HTML format
  KDE accessibility packages.
  .
  This package is part of KDE, and a component of the KDE accessibility
- module. See the 'kde' and 'kdeaccessibility' packages for more information.
+ module. See the 'kde' and 'tdeaccessibility' packages for more information.
 
 Package: kde-icons-mono
 Section: kde
@@ -49,7 +49,7 @@ Description: a monochromatic icons theme for KDE
  A monochromatic icon theme for KDE, designed for accessibility purposes.
  .
  This package is part of KDE, as a component of the KDE accessibility module.
- See the 'kde' and 'kdeaccessibility' packages for more information.
+ See the 'kde' and 'tdeaccessibility' packages for more information.
 
 Package: kbstate
 Section: utils
@@ -60,7 +60,7 @@ Description: a keyboard status applet for KDE
  A panel applet that displays the keyboard status.
  .
  This package is part of KDE, as a component of the KDE accessibility module.
- See the 'kde' and 'kdeaccessibility' packages for more information.
+ See the 'kde' and 'tdeaccessibility' packages for more information.
 
 Package: kmag
 Section: utils
@@ -76,7 +76,7 @@ Description: a screen magnifier for KDE
  people with low vision.
  .
  This package is part of KDE, as a component of the KDE accessibility module.
- See the 'kde' and 'kdeaccessibility' packages for more information.
+ See the 'kde' and 'tdeaccessibility' packages for more information.
 
 Package: kmousetool
 Section: utils
@@ -89,7 +89,7 @@ Description: KDE mouse manipulation tool for the disabled
  buttons hurts.
  .
  This package is part of KDE, as a component of the KDE accessibility module.
- See the 'kde' and 'kdeaccessibility' packages for more information.
+ See the 'kde' and 'tdeaccessibility' packages for more information.
 
 Package: kmouth
 Section: utils
@@ -103,7 +103,7 @@ Description: a type-and-say KDE frontend for speech synthesizers
  sentences to be re-spoken.
  .
  This package is part of KDE, as a component of the KDE accessibility module.
- See the 'kde' and 'kdeaccessibility' packages for more information.
+ See the 'kde' and 'tdeaccessibility' packages for more information.
 
 Package: ksayit
 Section: utils
@@ -114,7 +114,7 @@ Description: a frontend for the KDE Text-to-Speech system
  Text-to-speech front-end to kttsd.
  .
  This package is part of KDE, as a component of the KDE accessibility module.
- See the 'kde' and 'kdeaccessibility' packages for more information.
+ See the 'kde' and 'tdeaccessibility' packages for more information.
 
 
 Package: kttsd
@@ -131,7 +131,7 @@ Description: a Text-to-Speech system for KDE
  festival, flite, and epos are essential back-ends.
  .
  This package is part of KDE, as a component of the KDE accessibility module.
- See the 'kde' and 'kdeaccessibility' packages for more information.
+ See the 'kde' and 'tdeaccessibility' packages for more information.
  .
   Homepage: http://accessibility.kde.org/developer/kttsd
 
@@ -147,14 +147,14 @@ Description: the KDE Text-to-Speech system
  non free software to work.
  .
  This package is part of KDE, as a component of the KDE accessibility module.
- See the 'kde' and 'kdeaccessibility' packages for more information.
+ See the 'kde' and 'tdeaccessibility' packages for more information.
 
-Package: kdeaccessibility-dbg
+Package: tdeaccessibility-dbg
 Section: libdevel
 Architecture: any
-Depends: kdelibs-dbg
+Depends: tdelibs-dbg
 Priority: extra
-Description: debugging symbols for kdeaccessibility
- This package contains the debugging symbols associated with kdeaccessibility.
- They will automatically be used by gdb for debugging kdeaccessibility-related
+Description: debugging symbols for tdeaccessibility
+ This package contains the debugging symbols associated with tdeaccessibility.
+ They will automatically be used by gdb for debugging tdeaccessibility-related
  issues.
diff --git a/ubuntu/maverick/tdeaccessibility/debian/man/kdeopt-trinity.part b/ubuntu/maverick/tdeaccessibility/debian/man/kdeopt-trinity.part
index 9ab90ed9c..0822e8cc6 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/man/kdeopt-trinity.part
+++ b/ubuntu/maverick/tdeaccessibility/debian/man/kdeopt-trinity.part
@@ -1,5 +1,5 @@
 .\" This portion of the manual page is from kdeopt.man, from the
-.\" kdeaccessibility Debian package.
+.\" tdeaccessibility Debian package.
 .SH GENERIC OPTIONS
 .TP
 .B \-\-help
diff --git a/ubuntu/maverick/tdeaccessibility/debian/rules b/ubuntu/maverick/tdeaccessibility/debian/rules
index fa8e35bb3..0f40f42e0 100755
--- a/ubuntu/maverick/tdeaccessibility/debian/rules
+++ b/ubuntu/maverick/tdeaccessibility/debian/rules
@@ -16,7 +16,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
 	--enable-ksayit-audio-plugins --with-akode --prefix=/opt/trinity \
 	--with-extra-libs=/opt/trinity/lib
 
-DEB_DH_STRIP_ARGS  := --dbg-package=kdeaccessibility-trinity-dbg
+DEB_DH_STRIP_ARGS  := --dbg-package=tdeaccessibility-trinity-dbg
 
 PACKAGES_WITH_LIBS := kttsd-trinity ksayit-trinity
 
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmag b/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmag
index 9e627946f..0c754d661 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmag
+++ b/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmag
@@ -1,4 +1,4 @@
-Document: kdeaccessibility-doc-html-kmag
+Document: tdeaccessibility-doc-html-kmag
 Title: KMag Handbook
 Author: Sarang Lakare 
 Abstract: KMag is a screen magnifier.
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmousetool b/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmousetool
index aeacb8937..082e122c8 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmousetool
+++ b/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmousetool
@@ -1,4 +1,4 @@
-Document: kdeaccessibility-doc-html-kmousetool
+Document: tdeaccessibility-doc-html-kmousetool
 Title: KMouseTool Handbook
 Author: Jeff Roush
 Abstract: KMouseTool clicks the mouse whenever the mouse cursor pauses briefly.
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmouth b/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmouth
index cc7ecc345..041d8f235 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmouth
+++ b/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmouth
@@ -1,4 +1,4 @@
-Document: kdeaccessibility-doc-html-kmouth
+Document: tdeaccessibility-doc-html-kmouth
 Title: KMouth Handbook
 Author: Gunnar Schmidt
 Abstract: KMouth is an application that allows people that cannot speak
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kttsd b/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kttsd
index d142d25ed..0780c2ece 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kttsd
+++ b/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kttsd
@@ -1,4 +1,4 @@
-Document: kdeaccessibility-doc-html-kttsd
+Document: tdeaccessibility-doc-html-kttsd
 Title: Kttsd Handbook
 Author: Gary R. Cramblitt 
 Abstract: The KDE Text-to-Speech system is a plugin based service that
diff --git a/ubuntu/maverick/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
index da64a9233..4ce41232d 100644
--- a/ubuntu/maverick/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/maverick/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -6,5 +6,5 @@ Added debian/rules entry to remove /usr/share/apps/konqueror/servicemenus/media_
  install/konq-plugins::
  	rm -f debian/tmp/usr/share/apps/konqueror/servicemenus/media_realfolder.desktop
 
-  * Stop kdeaddons meta-package depending on knewsticker-scripts, 
+  * Stop tdeaddons meta-package depending on knewsticker-scripts, 
     it depends on stuff in universe
diff --git a/ubuntu/maverick/tdeaddons/debian/changelog b/ubuntu/maverick/tdeaddons/debian/changelog
index d7003caa9..8094804b6 100644
--- a/ubuntu/maverick/tdeaddons/debian/changelog
+++ b/ubuntu/maverick/tdeaddons/debian/changelog
@@ -1,81 +1,81 @@
-kdeaddons-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
+tdeaddons-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdeaddons-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
+tdeaddons-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
   * Fixed conflict with konqueror-plugin-imagerotation and konqueror-plugin-fsview
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 26 Apr 2009 13:57:00 -0600
 
-kdeaddons-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
+tdeaddons-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 14:24:00 -0600
 
-kdeaddons-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
+tdeaddons-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
 
   * Import from SVN
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 29 Nov 2008 12:30:00 -0600
 
-kdeaddons (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdeaddons (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
     - Freshen kubuntu_06_dirfilter_plugin_fix.diff
-    - Bump required build-dep version for kdelibs4-dev, atlantik-dev,
-      kdebase-dev, kdemultimedia-dev, libkdegames-dev, libkonq4-dev, and
-      kdepim-dev to 3.5.10
+    - Bump required build-dep version for tdelibs4-dev, atlantik-dev,
+      tdebase-dev, tdemultimedia-dev, libtdegames-dev, libkonq4-dev, and
+      tdepim-dev to 3.5.10
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:31:29 -0400
 
-kdeaddons (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdeaddons (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:05 +0000
 
-kdeaddons (4:3.5.8-1ubuntu5) hardy; urgency=low
+tdeaddons (4:3.5.8-1ubuntu5) hardy; urgency=low
 
   * Fix build failures with g++-4.3.
 
  -- Matthias Klose <doko@ubuntu.com>  Thu, 24 Jan 2008 12:18:22 +0000
 
-kdeaddons (4:3.5.8-1ubuntu4) hardy; urgency=low
+tdeaddons (4:3.5.8-1ubuntu4) hardy; urgency=low
 
   * Rebuild for botched shlibs, so kaddressbook-plugins is installable.
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 28 Nov 2007 22:53:21 +1100
 
-kdeaddons (4:3.5.8-1ubuntu3) hardy; urgency=low
+tdeaddons (4:3.5.8-1ubuntu3) hardy; urgency=low
 
-  * Downgrade kdepim dependency to 3.5.7
+  * Downgrade tdepim dependency to 3.5.7
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 11:09:08 +0000
 
-kdeaddons (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdeaddons (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 11:00:37 +0000
 
-kdeaddons (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdeaddons (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining changes in debian/KUBUNTU-DEBIAN-DIFFERENCES
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:47 +0000
 
-kdeaddons (4:3.5.8-1) unstable; urgency=low
+tdeaddons (4:3.5.8-1) unstable; urgency=low
 
   * New upstream release. 
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 14 Oct 2007 22:55:30 +0200
 
-kdeaddons (4:3.5.7-3) unstable; urgency=low
+tdeaddons (4:3.5.7-3) unstable; urgency=low
   
   * Implement uploaders.mk - and update control file based on it.
 
@@ -86,90 +86,90 @@ kdeaddons (4:3.5.7-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 23 Apr 2007 13:16:00 +0100
 
-kdeaddons (4:3.5.7-2) unstable; urgency=low
+tdeaddons (4:3.5.7-2) unstable; urgency=low
 
   * Add new documentation for ksig and some forgotten .hidden files to
     konq-plugins.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 23 May 2007 20:37:51 +0100
 
-kdeaddons (4:3.5.8-0ubuntu2) gutsy; urgency=low
+tdeaddons (4:3.5.8-0ubuntu2) gutsy; urgency=low
 
   * Added kubuntu_06_dirfilter_plugin_fix.diff, fixed kbuildsyscoca
     output reguarding to dirfilterplugin.desktop
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 15 Oct 2007 11:54:28 +0200
 
-kdeaddons (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdeaddons (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:27 +0100
 
-kdeaddons (4:3.5.7-1ubuntu5) gutsy; urgency=low
+tdeaddons (4:3.5.7-1ubuntu5) gutsy; urgency=low
 
   * Fixed fsview.desktop patch again, uses Hidden instead of NoDisplay
     to also hide fsview from konqueror's context menu
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 30 Jun 2007 13:07:37 +0200
 
-kdeaddons (4:3.5.7-1ubuntu4) gutsy; urgency=low
+tdeaddons (4:3.5.7-1ubuntu4) gutsy; urgency=low
 
   * Renamed kubuntu_05_hide_fsview.desktop to
     kubuntu_05_hide_fsview.diff for the patch to apply
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 30 Jun 2007 02:53:47 +0200
 
-kdeaddons (4:3.5.7-1ubuntu3) gutsy; urgency=low
+tdeaddons (4:3.5.7-1ubuntu3) gutsy; urgency=low
 
   * Hide fsview from menu with patch kubuntu_05_hide_fsview.desktop
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 06 Jun 2007 18:45:56 +0100
 
-kdeaddons (4:3.5.7-1ubuntu2) gutsy; urgency=low
+tdeaddons (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
   * Add missing .desktop files to konq-plugins.install
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 May 2007 19:32:32 +0100
 
-kdeaddons (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdeaddons (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * Merge with Debian for new upstream version
   * Build-dep on libdb4.4++-dev not libdb4.3++-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 May 2007 17:35:16 +0100
 
-kdeaddons (4:3.5.7-1) unstable; urgency=low
+tdeaddons (4:3.5.7-1) unstable; urgency=low
 
   * New upstream release. (Closes: #417271) 
-  * Remove patch 10_kdeaddons-r626814.diff, merged upstream.
+  * Remove patch 10_tdeaddons-r626814.diff, merged upstream.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 16 May 2007 17:04:12 +0200
 
-kdeaddons (4:3.5.6-2ubuntu1) gutsy; urgency=low
+tdeaddons (4:3.5.6-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 20:32:56 +0100
 
-kdeaddons (4:3.5.6-2) unstable; urgency=low
+tdeaddons (4:3.5.6-2) unstable; urgency=low
 
   * Upload to unstable after Etch release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 23 Apr 2007 13:16:00 +0100
 
-kdeaddons (4:3.5.6-1) experimental; urgency=low
+tdeaddons (4:3.5.6-1) experimental; urgency=low
 
   * New upstream release.
-  * Make kdeaddons-dbg depend on kdelibs-dbg to get useful backtraces when
+  * Make tdeaddons-dbg depend on tdelibs-dbg to get useful backtraces when
     debugging. 
   * Update Uploaders.
-  * Add patch 10_kdeaddons-r626814.diff to fix a minor but annoying privacy
+  * Add patch 10_tdeaddons-r626814.diff to fix a minor but annoying privacy
     issue.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 18 Jan 2007 01:02:53 +0100
 
-kdeaddons (4:3.5.6-0ubuntu2) feisty; urgency=low
+tdeaddons (4:3.5.6-0ubuntu2) feisty; urgency=low
 
   * Add kubuntu_04_webarchiver.diff for correct names on war archives.
     Patch from Shriramana Sharma
@@ -177,7 +177,7 @@ kdeaddons (4:3.5.6-0ubuntu2) feisty; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 23 Feb 2007 11:26:02 +0100
 
-kdeaddons (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdeaddons (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
   * Remove kubuntu_03_ark.diff, applied upstream
@@ -186,20 +186,20 @@ kdeaddons (4:3.5.6-0ubuntu1) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:31 +0000
 
-kdeaddons (4:3.5.5-1ubuntu2) feisty; urgency=low
+tdeaddons (4:3.5.5-1ubuntu2) feisty; urgency=low
 
-  * Stop kdeaddons meta-package depending on knewsticker-scripts, 
+  * Stop tdeaddons meta-package depending on knewsticker-scripts, 
     it depends on stuff in universe
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  3 Jan 2007 12:37:46 +0000
 
-kdeaddons (4:3.5.5-1ubuntu1) feisty; urgency=low
+tdeaddons (4:3.5.5-1ubuntu1) feisty; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 22:25:37 +0000
 
-kdeaddons (4:3.5.5-1) unstable; urgency=low
+tdeaddons (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
     + Doesn't force use of gmake. (Closes: 364214)
@@ -210,7 +210,7 @@ kdeaddons (4:3.5.5-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 10 Oct 2006 01:29:11 +0200
 
-kdeaddons (4:3.5.4-1) unstable; urgency=low
+tdeaddons (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -218,85 +218,85 @@ kdeaddons (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 26 Aug 2006 14:26:46 -0400
 
-kdeaddons (4:3.5.5-0ubuntu2) feisty; urgency=low
+tdeaddons (4:3.5.5-0ubuntu2) feisty; urgency=low
 
   * Add kubuntu_03_ark.diff for better 7z management.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri,  20 Oct 2006 18:36:06 +0200
 
-kdeaddons (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdeaddons (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:06 +0000
 
-kdeaddons (4:3.5.4-0ubuntu6) edgy; urgency=low
+tdeaddons (4:3.5.4-0ubuntu6) edgy; urgency=low
 
   * Added kubuntu_02_adblock_kpart.diff for improved adblock
     management
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Wed,  27 Sep 2006 01:13:12 +0200
 
-kdeaddons (4:3.5.4-0ubuntu5) edgy; urgency=low
+tdeaddons (4:3.5.4-0ubuntu5) edgy; urgency=low
 
   * Added debian/rules to also remove media_realfolder.desktop
     from the servicemenus
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Sat,  16 Sep 2006 15:36:12 +0200
 
-kdeaddons (4:3.5.4-0ubuntu4) edgy; urgency=low
+tdeaddons (4:3.5.4-0ubuntu4) edgy; urgency=low
 
   * Removed media_realfolder.desktop from konq-plugins to match
     Simon Edwards patches to media:/
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu,  14 Sep 2006 19:26:12 +0200
 
-kdeaddons (4:3.5.4-0ubuntu3) edgy; urgency=low
+tdeaddons (4:3.5.4-0ubuntu3) edgy; urgency=low
 
   * Rebuild with latest cdbs to add gettext domain to .desktop files for
     langpacks-desktopfiles-kde, no source changes
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Sep 2006 22:53:12 +0000
 
-kdeaddons (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdeaddons (4:3.5.4-0ubuntu2) edgy; urgency=low
 
   * Add kubuntu_01_google_suggest.diff from Stephan Binner
     adds Google suggest to existing search plugin, not creating a new one
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  1 Sep 2006 15:52:19 +0000
 
-kdeaddons (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdeaddons (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:17 +0000
 
-kdeaddons (4:3.5.3-0ubuntu4) edgy; urgency=low
+tdeaddons (4:3.5.3-0ubuntu4) edgy; urgency=low
 
   * Rebuild so it doesnt build-dep on libgamin0
 
  -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Tue, 18 Jul 2006 12:09:26 -0500
 
-kdeaddons (4:3.5.3-0ubuntu3) edgy; urgency=low
+tdeaddons (4:3.5.3-0ubuntu3) edgy; urgency=low
 
-  * Up build-dep for kdepim to 3.5.3-2ubuntu3 to avoid libfam.la breakage
+  * Up build-dep for tdepim to 3.5.3-2ubuntu3 to avoid libfam.la breakage
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Jul 2006 15:12:47 +0000
 
-kdeaddons (4:3.5.3-0ubuntu2) edgy; urgency=low
+tdeaddons (4:3.5.3-0ubuntu2) edgy; urgency=low
 
   * Rebuild without libfam.la (no changes).
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 12 Jul 2006 10:41:41 +0000
 
-kdeaddons (4:3.5.3-0ubuntu1) edgy; urgency=low
+tdeaddons (4:3.5.3-0ubuntu1) edgy; urgency=low
 
   * New upstream release
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Jul 2006 16:57:51 +0000
 
-kdeaddons (4:3.5.2-1) unstable; urgency=low
+tdeaddons (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -309,7 +309,7 @@ kdeaddons (4:3.5.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  5 Apr 2006 09:01:52 -0400
 
-kdeaddons (4:3.5.1-1) unstable; urgency=low
+tdeaddons (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -323,7 +323,7 @@ kdeaddons (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 19 Feb 2006 12:19:46 -0500
 
-kdeaddons (4:3.5.0-3) unstable; urgency=low
+tdeaddons (4:3.5.0-3) unstable; urgency=low
 
   * Upload to unstable.
 
@@ -331,7 +331,7 @@ kdeaddons (4:3.5.0-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 12 Jan 2006 14:20:02 +0100
 
-kdeaddons (4:3.5.0-2) experimental; urgency=low
+tdeaddons (4:3.5.0-2) experimental; urgency=low
 
   * Upload to experimental.
 
@@ -344,11 +344,11 @@ kdeaddons (4:3.5.0-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 28 Dec 2005 13:40:05 -0500
 
-kdeaddons (4:3.5.0-1) alioth; urgency=low
+tdeaddons (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
 
-  * vimpart has been removed from kdeaddons.
+  * vimpart has been removed from tdeaddons.
 
   * konq-plugins now includes a new Konqueror metabar, a media folder helper,
     a microformat availability indicator, and a del.icio.us bookmarks sidebar.
@@ -358,11 +358,11 @@ kdeaddons (4:3.5.0-1) alioth; urgency=low
   * Lower kicker-applet's dependency on xmms to a Recommends.
     (Closes: #238846, #314795)
 
-  * Add a kdeaddons-dbg package for helping to trace problems.
+  * Add a tdeaddons-dbg package for helping to trace problems.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri,  9 Dec 2005 13:42:29 -0500
 
-kdeaddons (4:3.4.3-1) unstable; urgency=low
+tdeaddons (4:3.4.3-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -378,14 +378,14 @@ kdeaddons (4:3.4.3-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun,  4 Dec 2005 23:07:51 -0500
 
-kdeaddons (4:3.5.2-0ubuntu4) dapper; urgency=low
+tdeaddons (4:3.5.2-0ubuntu4) dapper; urgency=low
 
   * debian/rules:
     - added dh_iconcache.
 
  -- Daniel Holbach <daniel.holbach@ubuntu.com>  Thu, 18 May 2006 15:13:32 +0200
 
-kdeaddons (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdeaddons (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Add build-dep on sharutils (for uuencode, uudecode).
   * Googlebar now suppresses the searchbar, so users upgrading from breezy
@@ -394,19 +394,19 @@ kdeaddons (4:3.5.2-0ubuntu3) dapper; urgency=low
 
  -- Tobi Vollebregt <tobivollebregt@gmail.com>  Mon,  1 May 2006 16:14:06 +0200
 
-kdeaddons (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdeaddons (4:3.5.2-0ubuntu2) dapper; urgency=low
 
   * Edit debian/rules to generate .po files
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Apr 2006 16:25:58 +0100
 
-kdeaddons (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdeaddons (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:30 +0000
 
-kdeaddons (4:3.5.1-0ubuntu3) dapper; urgency=low
+tdeaddons (4:3.5.1-0ubuntu3) dapper; urgency=low
 
   * New google suggest bar patch kubuntu_01_googlebar_suggest.diff
   * Separates google suggest bar and searchbar, making it possible to use the
@@ -417,46 +417,46 @@ kdeaddons (4:3.5.1-0ubuntu3) dapper; urgency=low
 
  -- Tobi Vollebregt <tobivollebregt@gmail.com>  Tue,  7 Mar 2006 15:59:38 +0100
 
-kdeaddons (4:3.5.1-0ubuntu2) dapper; urgency=low
+tdeaddons (4:3.5.1-0ubuntu2) dapper; urgency=low
 
   * Remove build-dep on xmms-dev to get xmms out of main
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  2 Feb 2006 22:37:52 +0000
 
-kdeaddons (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdeaddons (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:06 +0000
 
-kdeaddons (4:3.5.0-0ubuntu3) dapper; urgency=low
+tdeaddons (4:3.5.0-0ubuntu3) dapper; urgency=low
 
   * Rebuild because libXft.la is gone
 
  -- Stephan Hermann <sh@sourcecode.de>  Sat, 14 Jan 2006 16:17:16 +0100
 
-kdeaddons (4:3.5.0-0ubuntu2) dapper; urgency=low
+tdeaddons (4:3.5.0-0ubuntu2) dapper; urgency=low
 
   * Add back an updated kubuntu_01_googlebar_suggest.diff from 
     Tobi Vollebregt <tobivollebregt@gmail.com>
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  7 Dec 2005 18:46:05 +0000
 
-kdeaddons (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdeaddons (4:3.5.0-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Remove GCC 3.4 on hppa
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Dec 2005 12:26:46 +0000
 
-kdeaddons (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdeaddons (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 24 Nov 2005 01:13:18 +0000
 
-kdeaddons (4:3.4.2-2.1) unstable; urgency=low
+tdeaddons (4:3.4.2-2.1) unstable; urgency=low
 
   * NMU.
   * Build with gcc-3.4 on arm, m68k, and hppa, to avoid ICEs.
@@ -464,20 +464,20 @@ kdeaddons (4:3.4.2-2.1) unstable; urgency=low
   
  -- Christopher Martin <chrsmrtn@debian.org>  Fri, 21 Oct 2005 14:57:37 -0400
 
-kdeaddons (4:3.4.3-0ubuntu1) breezy; urgency=low
+tdeaddons (4:3.4.3-0ubuntu1) breezy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat,  8 Oct 2005 19:53:04 +0000
 
-kdeaddons (4:3.4.2-2ubuntu2) breezy; urgency=low
+tdeaddons (4:3.4.2-2ubuntu2) breezy; urgency=low
 
   * Update kubuntu_01_googlebar_suggest.diff fixes bar going blank
     when no suggest items are returned, and blank icons
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  3 Oct 2005 19:41:44 +0100
 
-kdeaddons (4:3.4.2-2ubuntu1) breezy; urgency=low
+tdeaddons (4:3.4.2-2ubuntu1) breezy; urgency=low
 
   * Sync with Debian
   * Add kubuntu_01_googlebar_suggest.diff for Google suggest support
@@ -485,13 +485,13 @@ kdeaddons (4:3.4.2-2ubuntu1) breezy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 12 Sep 2005 16:52:21 +0100
 
-kdeaddons (4:3.4.2-2) unstable; urgency=low
+tdeaddons (4:3.4.2-2) unstable; urgency=low
 
   * Built against libfam-dev, not libgamin-dev (closes: #326535).
 
  -- Ben Burton <bab@debian.org>  Sun,  4 Sep 2005 10:58:17 +1000
 
-kdeaddons (4:3.4.2-1) unstable; urgency=low
+tdeaddons (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
   * First g++-4 upload to sid.
@@ -509,20 +509,20 @@ kdeaddons (4:3.4.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun,  4 Sep 2005 01:14:27 +1000
 
-kdeaddons (4:3.4.1-0ubuntu1) breezy; urgency=low
+tdeaddons (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number following KDE 3.4.1 release.
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue, 31 May 2005 23:49:48 +0000
 
-kdeaddons (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+tdeaddons (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
 
   * New upstream release
   * Sync with Debian
 
  -- Jonathan Riddell <jr@jriddell.org>  Fri, 27 May 2005 09:26:43 +0000
 
-kdeaddons (4:3.4.0-0pre2) unstable; urgency=low
+tdeaddons (4:3.4.0-0pre2) unstable; urgency=low
 
   * Merge in recent packaging changes from the 3.3 branch.
   * Now that KDE has moved to subversion, disable cvs-clean in debian/rules
@@ -530,7 +530,7 @@ kdeaddons (4:3.4.0-0pre2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 14 May 2005 19:20:58 +1000
 
-kdeaddons (4:3.4.0-0pre1) unstable; urgency=low
+tdeaddons (4:3.4.0-0pre1) unstable; urgency=low
 
   * New major upstream release.
   * Removed obsolete kderemove tags from menu items.
@@ -539,7 +539,7 @@ kdeaddons (4:3.4.0-0pre1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Tue,  8 Mar 2005 07:43:35 +1100
 
-kdeaddons (4:3.3.2-4) unstable; urgency=low
+tdeaddons (4:3.3.2-4) unstable; urgency=low
 
   * Replaced vimpart's long list of GUI vim dependencies with the single
     (vim-gtk | gvim).  This removes an indirect (and unnecessary) conflict
@@ -548,25 +548,25 @@ kdeaddons (4:3.3.2-4) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun,  1 May 2005 13:41:04 +1000
 
-kdeaddons (4:3.4.0-0ubuntu2) hoary; urgency=low
+tdeaddons (4:3.4.0-0ubuntu2) hoary; urgency=low
 
   * Sync with Debian to install missing files
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed,  6 Apr 2005 03:31:29 +0000
 
-kdeaddons (4:3.4.0-0ubuntu1) hoary; urgency=low
+tdeaddons (4:3.4.0-0ubuntu1) hoary; urgency=low
 
   * New upstream release
 
  -- Andreas Mueller <amu@ubuntu.com>  Fri, 11 Mar 2005 10:29:39 +0000
 
-kdeaddons (4:3.3.2-1ubuntu1) hoary; urgency=low
+tdeaddons (4:3.3.2-1ubuntu1) hoary; urgency=low
 
   * New upstream bugfix release. 
 
  -- Andreas Mueller <amu@canonical.com>  Sun, 16 Jan 2005 13:31:15 +0100
 
-kdeaddons (4:3.3.2-3) unstable; urgency=low
+tdeaddons (4:3.3.2-3) unstable; urgency=low
 
   * Made the default vimpart dependency vim-gtk (closes: #304189).
     Previously it was kvim, but kvim has since been removed from debian.
@@ -576,20 +576,20 @@ kdeaddons (4:3.3.2-3) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Mon, 25 Apr 2005 23:08:18 +1000
 
-kdeaddons (4:3.3.2-2) unstable; urgency=low
+tdeaddons (4:3.3.2-2) unstable; urgency=low
 
   * Include the full text of the GFDL in debian/copyright, since all of the
     docbook documentation is under this license.
 
  -- Ben Burton <bab@debian.org>  Sat, 26 Mar 2005 09:55:33 +1100
 
-kdeaddons (4:3.3.2-1) unstable; urgency=low
+tdeaddons (4:3.3.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
 
  -- Ben Burton <bab@debian.org>  Sat, 22 Jan 2005 06:53:59 +1100
 
-kdeaddons (4:3.3.1-1) unstable; urgency=medium
+tdeaddons (4:3.3.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.
   * Patched .lnk kfile plugin and /usr/bin/lnkforward so that they can
@@ -604,7 +604,7 @@ kdeaddons (4:3.3.1-1) unstable; urgency=medium
 
  -- Ben Burton <bab@debian.org>  Sat, 23 Oct 2004 15:17:56 +1000
 
-kdeaddons (4:3.3.0-1) unstable; urgency=low
+tdeaddons (4:3.3.0-1) unstable; urgency=low
 
   * New upstream release (closes: #270161).
   * Package kontact-plugins no longer exists (closes: #268892, #238971).
@@ -614,7 +614,7 @@ kdeaddons (4:3.3.0-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Thu, 14 Oct 2004 00:10:01 +1000
 
-kdeaddons (4:3.2.3-2) unstable; urgency=low
+tdeaddons (4:3.2.3-2) unstable; urgency=low
 
   * Patched vimpart so that the kvim process is reliably caught and embedded
     by the vimpart parent.  This is still hit-and-miss though when using
@@ -624,23 +624,23 @@ kdeaddons (4:3.2.3-2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Thu,  1 Jul 2004 08:21:20 +1000
 
-kdeaddons (4:3.2.3-1) unstable; urgency=low
+tdeaddons (4:3.2.3-1) unstable; urgency=low
 
   * New upstream bugfix release.
   * Don't have atlantikdesigner suggest atlantik since it already depends
     on it.
-  * Suggests (konqueror | www-browser) for kdeaddons-doc-html instead of
+  * Suggests (konqueror | www-browser) for tdeaddons-doc-html instead of
     just www-browser.
 
  -- Ben Burton <bab@debian.org>  Sun, 20 Jun 2004 09:48:28 +1000
 
-kdeaddons (4:3.2.2-1) unstable; urgency=low
+tdeaddons (4:3.2.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
 
  -- Ben Burton <bab@debian.org>  Sat, 24 Apr 2004 08:53:43 +1000
 
-kdeaddons (4:3.2.1-1) unstable; urgency=low
+tdeaddons (4:3.2.1-1) unstable; urgency=low
 
   * First KDE 3.2 upload to sid.
   * Expanded list of vimpart dependencies to include all available graphical
@@ -652,15 +652,15 @@ kdeaddons (4:3.2.1-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 13 Mar 2004 09:58:54 +1100
 
-kdeaddons (4:3.2.0-2) experimental; urgency=low
+tdeaddons (4:3.2.0-2) experimental; urgency=low
 
   * First KDE 3.2 upload to experimental.
   * Sync from KDE_3_2_BRANCH for recent bugfixes.
-  * Using versioned dependencies for the kdeaddons metapackage.
+  * Using versioned dependencies for the tdeaddons metapackage.
 
  -- Ben Burton <bab@debian.org>  Mon, 23 Feb 2004 08:14:22 +1100
 
-kdeaddons (4:3.2.0-1) unstable; urgency=low
+tdeaddons (4:3.2.0-1) unstable; urgency=low
 
   * New upstream release.
   * Many thanks to Ralf Nolden for all his help with packaging KDE 3.2.
@@ -668,24 +668,24 @@ kdeaddons (4:3.2.0-1) unstable; urgency=low
   * New binary packages kaddressbook-plugins, kontact-plugins, ksig and
     vimpart.
   * Note that the rename dialog plugins have been merged into the
-    kdeaddons-kfile-plugins package.
+    tdeaddons-kfile-plugins package.
 
  -- Ben Burton <bab@debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
 
-kdeaddons (4:3.1.5-2) unstable; urgency=low
+tdeaddons (4:3.1.5-2) unstable; urgency=low
 
   * Build-depend on libxine-dev as a temporary workaround for
     libtool bug #199423.
 
  -- Ben Burton <bab@debian.org>  Wed, 21 Jan 2004 11:40:51 +1100
 
-kdeaddons (4:3.1.5-1) unstable; urgency=low
+tdeaddons (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <bab@debian.org>  Sun, 18 Jan 2004 12:55:12 +1100
 
-kdeaddons (4:3.1.4-2) unstable; urgency=low
+tdeaddons (4:3.1.4-2) unstable; urgency=low
 
   * New pull from BRANCH; includes bugfixes for atlantikdesigner and
     knewsticker-scripts.
@@ -693,7 +693,7 @@ kdeaddons (4:3.1.4-2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 13 Dec 2003 09:10:25 +1100
 
-kdeaddons (4:3.1.4-1) unstable; urgency=low
+tdeaddons (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
   * Removed SDL patches which it seems are no longer necessary.
@@ -701,14 +701,14 @@ kdeaddons (4:3.1.4-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun, 12 Oct 2003 19:52:13 +1000
 
-kdeaddons (4:3.1.3-1) unstable; urgency=low
+tdeaddons (4:3.1.3-1) unstable; urgency=low
 
   * New upstream release.
   * Bumped standards-version to 3.6.0.
 
  -- Ben Burton <bab@debian.org>  Wed, 13 Aug 2003 11:02:26 +1000
 
-kdeaddons (4:3.1.2-1) unstable; urgency=low
+tdeaddons (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
   * Using new libtool (closes: #194647).
@@ -716,13 +716,13 @@ kdeaddons (4:3.1.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun,  1 Jun 2003 14:15:47 +1000
 
-kdeaddons (4:3.1.1-1) unstable; urgency=low
+tdeaddons (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <bab@debian.org>  Sun, 23 Mar 2003 15:23:23 +1100
 
-kdeaddons (4:3.1.0-4) unstable; urgency=low
+tdeaddons (4:3.1.0-4) unstable; urgency=low
 
   * Rebuilt against libvorbis0a (closes: #184713).
   * Removed alpha compile flags.
@@ -730,14 +730,14 @@ kdeaddons (4:3.1.0-4) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun, 16 Mar 2003 16:00:19 +1100
 
-kdeaddons (4:3.1.0-3) unstable; urgency=low
+tdeaddons (4:3.1.0-3) unstable; urgency=low
 
   * New binary package atlantikdesigner.
-  * Build-depends on atlantik-dev, libkdegames-dev and libqt3-compat-headers.
+  * Build-depends on atlantik-dev, libtdegames-dev and libqt3-compat-headers.
 
  -- Ben Burton <bab@debian.org>  Sat, 15 Feb 2003 15:47:37 +1100
 
-kdeaddons (4:3.1.0-2) unstable; urgency=low
+tdeaddons (4:3.1.0-2) unstable; urgency=low
 
   * First Trinity upload to debian!
   * Applied Ewald Snel's patch for xine support.
@@ -746,13 +746,13 @@ kdeaddons (4:3.1.0-2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Thu,  6 Feb 2003 16:44:26 +1100
 
-kdeaddons (3.1.0-1) unstable; urgency=low
+tdeaddons (3.1.0-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <bab@debian.org>  Mon, 18 Nov 2002 14:15:59 +1100
 
-kdeaddons (3.0.9-1) unstable; urgency=low
+tdeaddons (3.0.9-1) unstable; urgency=low
 
   * New upstream release.
   * Built with g++-3.2.
@@ -760,7 +760,7 @@ kdeaddons (3.0.9-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Tue, 22 Oct 2002 11:57:39 +1000
 
-kdeaddons (3.0.8-1) unstable; urgency=low
+tdeaddons (3.0.8-1) unstable; urgency=low
 
   * New upstream release.
   * Moved to Chris Cheney's style of debian/rules.
@@ -768,58 +768,58 @@ kdeaddons (3.0.8-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sun, 22 Sep 2002 17:57:55 +1000
 
-kdeaddons (3.0.3-1) unstable; urgency=low
+tdeaddons (3.0.3-1) unstable; urgency=low
 
   * New upstream release.
   * Build-depends on automake1.5.
 
  -- Ben Burton <benb@acm.org>  Thu, 15 Aug 2002 13:22:22 +1000
 
-kdeaddons (3.0.2-1) unstable; urgency=low
+tdeaddons (3.0.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Thu,  4 Jul 2002 19:36:49 +1000
 
-kdeaddons (3.0.1-1) unstable; urgency=low
+tdeaddons (3.0.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Sun, 19 May 2002 18:44:16 +1000
 
-kdeaddons (2.2.2-4) unstable; urgency=low
+tdeaddons (2.2.2-4) unstable; urgency=low
 
   * Fixed documentation conflicts.
 
  -- Ben Burton <benb@acm.org>  Mon,  1 Apr 2002 16:42:29 +1000
 
-kdeaddons (2.2.2-3) unstable; urgency=low
+tdeaddons (2.2.2-3) unstable; urgency=low
 
   * Build-Depends: xlibs-pic (closes: Bug#129716).
-  * Build requires newer kdemultimedia-dev to fix libesd0-dev bug.
+  * Build requires newer tdemultimedia-dev to fix libesd0-dev bug.
 
  -- Ben Burton <benb@acm.org>  Sun, 20 Jan 2002 22:10:37 +1100
 
-kdeaddons (2.2.2-2) unstable; urgency=low
+tdeaddons (2.2.2-2) unstable; urgency=low
 
   * Uses sdlconfig --plugin-libs (closes: Bug#117053).
 
  -- Ben Burton <benb@acm.org>  Sun, 30 Dec 2001 12:40:14 +1000
 
-kdeaddons (2.2.2-1) unstable; urgency=low
+tdeaddons (2.2.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Wed,  7 Nov 2001 10:49:53 -0600
 
-kdeaddons (2.2.1-4) unstable; urgency=low
+tdeaddons (2.2.1-4) unstable; urgency=low
 
   * Uses automake again to solve new alpha problems.
   * Updated to reflect new python policy.
 
  -- Ben Burton <benb@acm.org>  Tue,  6 Nov 2001 23:51:27 -0600
 
-kdeaddons (2.2.1-3) unstable; urgency=low
+tdeaddons (2.2.1-3) unstable; urgency=low
 
   * The "finally finished the AIC marking!" upload.
   * SDL scopes now included in noatun-plugins (closes: Bug#114307).
@@ -828,30 +828,30 @@ kdeaddons (2.2.1-3) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Tue, 23 Oct 2001 09:18:03 -0500
 
-kdeaddons (2.2.1-2) unstable; urgency=low
+tdeaddons (2.2.1-2) unstable; urgency=low
 
   * Updated parameters for alpha build (closes: Bug#113099).
 
  -- Ben Burton <benb@acm.org>  Sat, 22 Sep 2001 12:00:37 -0500
 
-kdeaddons (2.2.1-1) unstable; urgency=low
+tdeaddons (2.2.1-1) unstable; urgency=low
 
   * New upstream release.
   * Fixed doc-base entries to refer to real directories instead of symlinks.
 
  -- Ben Burton <benb@acm.org>  Fri, 31 Aug 2001 21:08:56 -0500
 
-kdeaddons (2.2.0-final-2) unstable; urgency=low
+tdeaddons (2.2.0-final-2) unstable; urgency=low
 
-  * Requires newer version of kdemultimedia-dev (closes: #104369).
+  * Requires newer version of tdemultimedia-dev (closes: #104369).
 
  -- Ben Burton <benb@acm.org>  Tue, 21 Aug 2001 22:59:30 -0500
 
-kdeaddons (2.2.0-final-1) unstable; urgency=low
+tdeaddons (2.2.0-final-1) unstable; urgency=low
 
   * New upstream release.
-  * Added packages knewsticker-scripts and kdeaddons-doc-html.
-  * Build-Depends: requires newer kdelibs-dev for working meinproc.
+  * Added packages knewsticker-scripts and tdeaddons-doc-html.
+  * Build-Depends: requires newer tdelibs-dev for working meinproc.
   * Added suggests: konqueror to packages including docbook documentation.
   * Ensures .bz2 files are not recompressed.
   * Bumped standards-version to 3.5.6.
@@ -859,26 +859,26 @@ kdeaddons (2.2.0-final-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sun, 29 Jul 2001 17:48:59 +1000
 
-kdeaddons (2.2-beta1-4) unstable; urgency=low
+tdeaddons (2.2-beta1-4) unstable; urgency=low
 
   * Builds on alpha.
 
  -- Ben Burton <benb@acm.org>  Fri, 27 Jul 2001 03:23:10 +1000
 
-kdeaddons (2.2-beta1-3) unstable; urgency=low
+tdeaddons (2.2-beta1-3) unstable; urgency=low
 
-  * Build-Depends: added kdebase-dev (closes: Bug#104058).
+  * Build-Depends: added tdebase-dev (closes: Bug#104058).
 
  -- Ben Burton <benb@acm.org>  Tue, 10 Jul 2001 14:37:45 +1000
 
-kdeaddons (2.2-beta1-2) unstable; urgency=low
+tdeaddons (2.2-beta1-2) unstable; urgency=low
 
   * Build-Depends: versioned some KDE libraries; added kate
     (closes: Bug#103515).
 
  -- Ben Burton <benb@acm.org>  Wed,  4 Jul 2001 11:41:50 -0500
 
-kdeaddons (2.2-beta1-1) unstable; urgency=low
+tdeaddons (2.2-beta1-1) unstable; urgency=low
 
   * Initial Release (closes: Bug#101347).
 
diff --git a/ubuntu/maverick/tdeaddons/debian/control b/ubuntu/maverick/tdeaddons/debian/control
index 8e6600157..d106c2e74 100644
--- a/ubuntu/maverick/tdeaddons/debian/control
+++ b/ubuntu/maverick/tdeaddons/debian/control
@@ -1,19 +1,19 @@
-Source: kdeaddons-trinity
+Source: tdeaddons-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.8++-dev | libdb++-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.8++-dev | libdb++-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kdeaddons-trinity
+Package: tdeaddons-trinity
 Architecture: all
 Section: kde
-Replaces: kdeaddons-kde3 (<< 4:3.5.13)
-Breaks: kdeaddons-kde3 (<< 4:3.5.13)
-Depends: atlantikdesigner-trinity (>= ${Source-Version}), kaddressbook-plugins-trinity (>= ${Source-Version}), kate-plugins-trinity (>= ${Source-Version}), kdeaddons-kfile-plugins-trinity (>= ${Source-Version}), kicker-applets-trinity (>= ${Source-Version}), konq-plugins-trinity (>= ${Source-Version}), ksig-trinity (>= ${Source-Version}), noatun-plugins-trinity (>= ${Source-Version})
-Suggests: kdeaddons-trinity-doc-html
+Replaces: tdeaddons-kde3 (<< 4:3.5.13)
+Breaks: tdeaddons-kde3 (<< 4:3.5.13)
+Depends: atlantikdesigner-trinity (>= ${Source-Version}), kaddressbook-plugins-trinity (>= ${Source-Version}), kate-plugins-trinity (>= ${Source-Version}), tdeaddons-kfile-plugins-trinity (>= ${Source-Version}), kicker-applets-trinity (>= ${Source-Version}), konq-plugins-trinity (>= ${Source-Version}), ksig-trinity (>= ${Source-Version}), noatun-plugins-trinity (>= ${Source-Version})
+Suggests: tdeaddons-trinity-doc-html
 Description: add-on plugins and applets provided with Trinity
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -23,12 +23,12 @@ Description: add-on plugins and applets provided with Trinity
  This metapackage includes a collection of add-on plugins and applets
  provided with the official release of Trinity.
 
-Package: kdeaddons-trinity-doc-html
+Package: tdeaddons-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: kdeaddons-kde3-doc-html (<< 4:3.5.13)
-Breaks: kdeaddons-kde3-doc-html (<< 4:3.5.13)
-Suggests: konqueror-trinity | www-browser, kdeaddons-trinity
+Replaces: tdeaddons-kde3-doc-html (<< 4:3.5.13)
+Breaks: tdeaddons-kde3-doc-html (<< 4:3.5.13)
+Suggests: konqueror-trinity | www-browser, tdeaddons-trinity
 Description: KDE add-ons documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -41,7 +41,7 @@ Description: KDE add-ons documentation in HTML format
  most KDE addons packages.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: atlantikdesigner-trinity
 Architecture: any
@@ -60,7 +60,7 @@ Description: game board designer for Atlantik
  America and Europe.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: kaddressbook-plugins-trinity
 Architecture: any
@@ -68,7 +68,7 @@ Section: kde
 Replaces: kaddressbook-plugins-kde3 (<< 4:3.5.13)
 Breaks: kaddressbook-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
-Suggests: kworldclock-trinity, khelpcenter-trinity, kdeaddons-trinity-doc-html
+Suggests: kworldclock-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html
 Enhances: kaddressbook-trinity
 Description: plugins for KAddressBook, the Trinity address book
  This package contains a variety of useful plugins for the KDE address
@@ -79,7 +79,7 @@ Description: plugins for KAddressBook, the Trinity address book
  by the German freemail provider GMX.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: kate-plugins-trinity
 Architecture: any
@@ -87,7 +87,7 @@ Section: editors
 Replaces: kate-plugins-kde3 (<< 4:3.5.13)
 Breaks: kate-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, tidy
-Suggests: khelpcenter-trinity, kdeaddons-trinity-doc-html, kaddressbook-trinity
+Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html, kaddressbook-trinity
 Enhances: kate-trinity
 Description: plugins for Kate, the KDE Advanced Text Editor
  This package contains a variety of useful plugins for Kate, the KDE
@@ -100,13 +100,13 @@ Description: plugins for Kate, the KDE Advanced Text Editor
  a tab bar, a Python browser and even more.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
-Package: kdeaddons-kfile-plugins-trinity
+Package: tdeaddons-kfile-plugins-trinity
 Architecture: any
 Section: kde
-Replaces: kdeaddons-kfile-plugins-kde3 (<< 4:3.5.13)
-Breaks: kdeaddons-kfile-plugins-kde3 (<< 4:3.5.13)
+Replaces: tdeaddons-kfile-plugins-kde3 (<< 4:3.5.13)
+Breaks: tdeaddons-kfile-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Provides: renamedlg-plugins-trinity
 Description: Trinity file dialog plugins for text files and folders
@@ -121,7 +121,7 @@ Description: Trinity file dialog plugins for text files and folders
  provided for audio and image files.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: kicker-applets-trinity
 Architecture: any
@@ -129,7 +129,7 @@ Section: kde
 Replaces: kicker-applets-kde3 (<< 4:3.5.13)
 Breaks: kicker-applets-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, kicker-trinity
-Suggests: xmms-kde-trinity, khelpcenter-trinity, kdeaddons-trinity-doc-html
+Suggests: xmms-kde-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html
 Provides: ktimemon-trinity
 Enhances: kicker-trinity
 Description: applets for Kicker, the Trinity panel
@@ -144,7 +144,7 @@ Description: applets for Kicker, the Trinity panel
  controls XMMS, install the xmms-kde-trinity package.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: knewsticker-scripts-trinity
 Architecture: all
@@ -163,7 +163,7 @@ Description: scripts for KNewsTicker, the Trinity news ticker
  and various local news sources.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: konq-plugins-trinity
 Architecture: any
@@ -172,7 +172,7 @@ Replaces: konq-plugins-kde3 (<< 4:3.5.13)
 Breaks: konq-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, libjpeg-progs, python, rsync, unison
 Recommends: akregator-trinity, ark-trinity, imagemagick
-Suggests: khelpcenter-trinity, kdeaddons-trinity-doc-html
+Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html
 Enhances: konqueror-trinity, akregator-trinity
 Provides: akregator-konq-plugin-trinity
 Description: plugins for Konqueror, the Trinity file/web/doc browser
@@ -192,7 +192,7 @@ Description: plugins for Konqueror, the Trinity file/web/doc browser
  graphical disk usage viewer and image conversions and transformations.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: ksig-trinity
 Architecture: any
@@ -213,7 +213,7 @@ Description: graphical tool for managing multiple email signatures
  /opt/trinity/share/doc/ksig/README.Debian for details on how this can be done.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: noatun-plugins-trinity
 Architecture: any
@@ -232,16 +232,16 @@ Description: plugins for Noatun, the Trinity media player
  of user interfaces, playlists and visualisation plugins.
  .
  This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
 
-Package: kdeaddons-trinity-dbg
+Package: tdeaddons-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: kdeaddons-kde3-dbg (<< 4:3.5.13)
-Breaks: kdeaddons-kde3-dbg (<< 4:3.5.13)
-Depends: kdelibs-trinity-dbg
+Replaces: tdeaddons-kde3-dbg (<< 4:3.5.13)
+Breaks: tdeaddons-kde3-dbg (<< 4:3.5.13)
+Depends: tdelibs-trinity-dbg
 Priority: extra
-Description: debugging symbols for kdeaddons-trinity
- This package contains the debugging symbols associated with kdeaddons-trinity.
- They will automatically be used by gdb for debugging kdeaddons-related
+Description: debugging symbols for tdeaddons-trinity
+ This package contains the debugging symbols associated with tdeaddons-trinity.
+ They will automatically be used by gdb for debugging tdeaddons-related
  issues.
diff --git a/ubuntu/maverick/tdeaddons/debian/control.in b/ubuntu/maverick/tdeaddons/debian/control.in
index ba83c7f63..1911a0d6d 100644
--- a/ubuntu/maverick/tdeaddons/debian/control.in
+++ b/ubuntu/maverick/tdeaddons/debian/control.in
@@ -1,17 +1,17 @@
-Source: kdeaddons
+Source: tdeaddons
 Section: kde
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), atlantik-dev (>= 4:3.5.8), kdebase-dev (>= 4:3.5.8), kdemultimedia-dev (>= 4:3.5.8), libkdegames-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), kdepim-dev (>= 4:3.5.8), libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.6++-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), atlantik-dev (>= 4:3.5.8), tdebase-dev (>= 4:3.5.8), tdemultimedia-dev (>= 4:3.5.8), libtdegames-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), tdepim-dev (>= 4:3.5.8), libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.6++-dev
 Standards-Version: 3.7.2
 
-Package: kdeaddons
+Package: tdeaddons
 Architecture: all
 Section: kde
-Depends: atlantikdesigner (>= ${Source-Version}), kaddressbook-plugins (>= ${Source-Version}), kate-plugins (>= ${Source-Version}), kdeaddons-kfile-plugins (>= ${Source-Version}), kicker-applets (>= ${Source-Version}), knewsticker-scripts (>= ${Source-Version}), konq-plugins (>= ${Source-Version}), ksig (>= ${Source-Version}), noatun-plugins (>= ${Source-Version})
-Suggests: kdeaddons-doc-html
+Depends: atlantikdesigner (>= ${Source-Version}), kaddressbook-plugins (>= ${Source-Version}), kate-plugins (>= ${Source-Version}), tdeaddons-kfile-plugins (>= ${Source-Version}), kicker-applets (>= ${Source-Version}), knewsticker-scripts (>= ${Source-Version}), konq-plugins (>= ${Source-Version}), ksig (>= ${Source-Version}), noatun-plugins (>= ${Source-Version})
+Suggests: tdeaddons-doc-html
 Description: add-on plugins and applets provided with KDE
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -21,10 +21,10 @@ Description: add-on plugins and applets provided with KDE
  This metapackage includes a collection of add-on plugins and applets
  provided with the official release of KDE.
 
-Package: kdeaddons-doc-html
+Package: tdeaddons-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror | www-browser, kdeaddons
+Suggests: konqueror | www-browser, tdeaddons
 Description: KDE add-ons documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -37,7 +37,7 @@ Description: KDE add-ons documentation in HTML format
  most KDE addons packages.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
 Package: atlantikdesigner
 Architecture: any
@@ -54,13 +54,13 @@ Description: game board designer for Atlantik
  America and Europe.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
 Package: kaddressbook-plugins
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
-Suggests: kworldclock, khelpcenter, kdeaddons-doc-html
+Suggests: kworldclock, khelpcenter, tdeaddons-doc-html
 Enhances: kaddressbook
 Description: plugins for KAddressBook, the KDE address book
  This package contains a variety of useful plugins for the KDE address
@@ -71,13 +71,13 @@ Description: plugins for KAddressBook, the KDE address book
  by the German freemail provider GMX.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
 Package: kate-plugins
 Architecture: any
 Section: editors
 Depends: ${shlibs:Depends}, tidy
-Suggests: khelpcenter, kdeaddons-doc-html, kaddressbook
+Suggests: khelpcenter, tdeaddons-doc-html, kaddressbook
 Enhances: kate
 Description: plugins for Kate, the KDE Advanced Text Editor
  This package contains a variety of useful plugins for Kate, the KDE
@@ -90,9 +90,9 @@ Description: plugins for Kate, the KDE Advanced Text Editor
  a tab bar, a Python browser and even more.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
-Package: kdeaddons-kfile-plugins
+Package: tdeaddons-kfile-plugins
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
@@ -111,13 +111,13 @@ Description: KDE file dialog plugins for text files and folders
  provided for audio and image files.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
 Package: kicker-applets
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, kicker
-Suggests: xmms-kde, khelpcenter, kdeaddons-doc-html
+Suggests: xmms-kde, khelpcenter, tdeaddons-doc-html
 Conflicts: ktimemon (<< 4:2.2-alpha1-0)
 Replaces: ktimemon (<< 4:2.2-alpha1-0)
 Provides: ktimemon
@@ -134,7 +134,7 @@ Description: applets for Kicker, the KDE panel
  controls XMMS, install the xmms-kde package.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
 Package: knewsticker-scripts
 Architecture: all
@@ -151,14 +151,14 @@ Description: scripts for KNewsTicker, the KDE news ticker
  and various local news sources.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
 Package: konq-plugins
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, libjpeg-progs, python
 Recommends: akregator, ark, imagemagick
-Suggests: khelpcenter, kdeaddons-doc-html
+Suggests: khelpcenter, tdeaddons-doc-html
 Enhances: konqueror, akregator
 Replaces: akregator (<< 1.1), akregator-konq-plugin (<< 1.1)
 Conflicts: akregator-konq-plugin (<< 1.1)
@@ -180,7 +180,7 @@ Description: plugins for Konqueror, the KDE file/web/doc browser
  graphical disk usage viewer and image conversions and transformations.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
 Package: ksig
 Architecture: any
@@ -199,7 +199,7 @@ Description: graphical tool for managing multiple email signatures
  /opt/trinity/share/doc/ksig/README.Debian for details on how this can be done.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
 Package: noatun-plugins
 Architecture: any
@@ -216,14 +216,14 @@ Description: plugins for Noatun, the KDE media player
  of user interfaces, playlists and visualisation plugins.
  .
  This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'kdeaddons' packages for more information.
+ See the 'kde' and 'tdeaddons' packages for more information.
 
-Package: kdeaddons-dbg
+Package: tdeaddons-dbg
 Section: libdevel
 Architecture: any
-Depends: kdelibs-dbg
+Depends: tdelibs-dbg
 Priority: extra
-Description: debugging symbols for kdeaddons
- This package contains the debugging symbols associated with kdeaddons.
- They will automatically be used by gdb for debugging kdeaddons-related
+Description: debugging symbols for tdeaddons
+ This package contains the debugging symbols associated with tdeaddons.
+ They will automatically be used by gdb for debugging tdeaddons-related
  issues.
diff --git a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.README.Debian b/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.README.Debian
index 933d86cd0..fae96c9fe 100644
--- a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.README.Debian
+++ b/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.README.Debian
@@ -3,6 +3,6 @@ Kate Plugins for Debian
 
 This package provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeaddons-doc-html.
+web browser, see the package tdeaddons-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.README.Debian b/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.README.Debian
index 881d7b395..d095c4e14 100644
--- a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.README.Debian
+++ b/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.README.Debian
@@ -3,6 +3,6 @@ Kicker Applets for Debian
 
 This package provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeaddons-doc-html.
+web browser, see the package tdeaddons-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.README.Debian b/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.README.Debian
index 75c1d8461..97fd38a7b 100644
--- a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.README.Debian
+++ b/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.README.Debian
@@ -3,6 +3,6 @@ Konqueror Plugins for Debian
 
 This package provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeaddons-doc-html.
+web browser, see the package tdeaddons-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeaddons/debian/rules b/ubuntu/maverick/tdeaddons/debian/rules
index 8e11cd8a6..c872980f3 100755
--- a/ubuntu/maverick/tdeaddons/debian/rules
+++ b/ubuntu/maverick/tdeaddons/debian/rules
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_CONFIGURE_EXTRA_FLAGS := --without-xmms --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --mandir=/opt/trinity/share/man
 
-DEB_DH_STRIP_ARGS := --dbg-package=kdeaddons-trinity-dbg
+DEB_DH_STRIP_ARGS := --dbg-package=tdeaddons-trinity-dbg
 
 DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter
 
@@ -28,9 +28,9 @@ binary-install/konq-plugins-trinity::
 #		debian/konq-plugins-trinity/opt/trinity/share/man/man1/orient.py.1; \
 #	rm -rf debian/konq-plugins-trinity/opt/trinity/share/man/py;
 
-binary-install/kdeaddons-kfile-plugins-trinity::
+binary-install/tdeaddons-kfile-plugins-trinity::
 	install -p -D -m644 renamedlgplugins/README \
-		debian/kdeaddons-kfile-plugins-trinity/opt/trinity/share/doc/kdeaddons-kfile-plugins/README.renamedlgplugins
+		debian/tdeaddons-kfile-plugins-trinity/opt/trinity/share/doc/tdeaddons-kfile-plugins/README.renamedlgplugins
 
 binary-install/knewsticker-scripts-trinity::
 	chmod 755 debian/knewsticker-scripts-trinity/opt/trinity/share/apps/knewsticker/scripts/*.pl
diff --git a/ubuntu/maverick/tdeaddons/debian/kdeaddons-doc-html.doc-base.kate-plugins b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kate-plugins
index 17a559b85..f267f739c 100644
--- a/ubuntu/maverick/tdeaddons/debian/kdeaddons-doc-html.doc-base.kate-plugins
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kate-plugins
@@ -1,4 +1,4 @@
-Document: kdeaddons-doc-html_kate-plugins
+Document: tdeaddons-doc-html_kate-plugins
 Title: Kate Plugins Handbook
 Author: Various
 Abstract: This is the handbook for the plugins for Kate, KDE's Advanced Text
diff --git a/ubuntu/maverick/tdeaddons/debian/kdeaddons-doc-html.doc-base.kicker-applets b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kicker-applets
index d6b7c2d36..c83edbc2a 100644
--- a/ubuntu/maverick/tdeaddons/debian/kdeaddons-doc-html.doc-base.kicker-applets
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kicker-applets
@@ -1,4 +1,4 @@
-Document: kdeaddons-doc-html_kicker-applets
+Document: tdeaddons-doc-html_kicker-applets
 Title: Kicker Applets Handbook
 Author: Various
 Abstract: This is the handbook for the addon applets for Kicker, KDE's panel.
diff --git a/ubuntu/maverick/tdeaddons/debian/kdeaddons-doc-html.doc-base.konq-plugins b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.konq-plugins
index fa8870830..ac6bcd0fd 100644
--- a/ubuntu/maverick/tdeaddons/debian/kdeaddons-doc-html.doc-base.konq-plugins
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.konq-plugins
@@ -1,4 +1,4 @@
-Document: kdeaddons-doc-html_konq-plugins
+Document: tdeaddons-doc-html_konq-plugins
 Title: Konqueror Plugins Handbook
 Author: Lauri Watts <lauri@kde.org> and others
 Abstract: This is the handbook for the additional plugins for Konqueror, the
diff --git a/ubuntu/maverick/tdeaddons/debian/kdeaddons-kfile-plugins-trinity.install b/ubuntu/maverick/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.install
index a85a16b55..0350b2f3e 100644
--- a/ubuntu/maverick/tdeaddons/debian/kdeaddons-kfile-plugins-trinity.install
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.install
@@ -28,4 +28,4 @@ debian/tmp/opt/trinity/share/services/kfile_mhtml.desktop
 debian/tmp/opt/trinity/share/services/kfile_txt.desktop
 debian/tmp/opt/trinity/share/services/renaudiodlg.desktop
 debian/tmp/opt/trinity/share/services/renimagedlg.desktop
-kfile-plugins/lnk/README /opt/trinity/share/doc/kdeaddons-kfile-plugins/lnk
+kfile-plugins/lnk/README /opt/trinity/share/doc/tdeaddons-kfile-plugins/lnk
diff --git a/ubuntu/maverick/tdeaddons/debian/kdeaddons-kfile-plugins-trinity.manpages b/ubuntu/maverick/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.manpages
index eda9949fb..eda9949fb 100644
--- a/ubuntu/maverick/tdeaddons/debian/kdeaddons-kfile-plugins-trinity.manpages
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-kfile-plugins-trinity.manpages
diff --git a/ubuntu/maverick/tdeaddons/debian/kdeaddons-trinity.README.Debian b/ubuntu/maverick/tdeaddons/debian/tdeaddons-trinity.README.Debian
index 0daab22b0..889a705e6 100644
--- a/ubuntu/maverick/tdeaddons/debian/kdeaddons-trinity.README.Debian
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-trinity.README.Debian
@@ -1,11 +1,11 @@
 KDE Add-On Plugins and Applets for Debian
 -----------------------------------------
 
-Package kdeaddons is a metapackage that depends on the full set of add-on
+Package tdeaddons is a metapackage that depends on the full set of add-on
 plugins and applets provided with the official release of KDE.
 
 Some packages provide documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeaddons-doc-html.
+web browser, see the package tdeaddons-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeadmin/debian/changelog b/ubuntu/maverick/tdeadmin/debian/changelog
index 254472cd9..4c2296fcb 100644
--- a/ubuntu/maverick/tdeadmin/debian/changelog
+++ b/ubuntu/maverick/tdeadmin/debian/changelog
@@ -1,29 +1,29 @@
-kdeadmin-trinity (4:3.5.10-0ubuntu4) karmic; urgency=low
+tdeadmin-trinity (4:3.5.10-0ubuntu4) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdeadmin-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
+tdeadmin-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 01 March 2009 12:46:00 -0600
 
-kdeadmin-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
+tdeadmin-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
   * Improved KDE4 interop
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 21 Dec 2008 10:37:00 -0600
 
-kdeadmin-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
+tdeadmin-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
 
   * SVN import
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 27 Nov 2008 16:53:00 -0600
 
-kdeadmin (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdeadmin (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
     - Drop patches/01_really_recognize_etch.diff, etch and lenny added
@@ -32,7 +32,7 @@ kdeadmin (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:32:20 -0400
 
-kdeadmin (4:3.5.9-0ubuntu5) hardy; urgency=low
+tdeadmin (4:3.5.9-0ubuntu5) hardy; urgency=low
 
   * Added kubuntu_14_dhcp_knm_back.diff:
     Knetworkmanager ignores cards defined in /etc/network/interfaces
@@ -41,7 +41,7 @@ kdeadmin (4:3.5.9-0ubuntu5) hardy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 03 Apr 2008 18:25:48 +0200
 
-kdeadmin (4:3.5.9-0ubuntu4) hardy; urgency=low
+tdeadmin (4:3.5.9-0ubuntu4) hardy; urgency=low
 
   * Added kubuntu_13_no_samba_tweak.diff.
     Knetworkconf reads smb.conf parameters but doesn't write them
@@ -51,33 +51,33 @@ kdeadmin (4:3.5.9-0ubuntu4) hardy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 03 Apr 2008 15:30:44 +0200
 
-kdeadmin (4:3.5.9-0ubuntu3) hardy; urgency=low
+tdeadmin (4:3.5.9-0ubuntu3) hardy; urgency=low
 
   * Added workarround patch kubuntu_12_fix_localhost_for_sudo.patch
     Avoids sudo to break due to 127.0.*.* beeing deleted.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 28 Mar 2008 11:41:56 +0100
 
-kdeadmin (4:3.5.9-0ubuntu2) hardy; urgency=low
+tdeadmin (4:3.5.9-0ubuntu2) hardy; urgency=low
 
   * Add kubuntu_11_knetworkconf_icons.diff from Adam Spain, 
     closes LP: #93878  "low quality icons"
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 03 Mar 2008 14:20:34 +0000
 
-kdeadmin (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdeadmin (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:05 +0000
 
-kdeadmin (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdeadmin (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 09:40:36 +0000
 
-kdeadmin (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdeadmin (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining changes
    - kubuntu_08_kpackage_sudo.diff, sudo support
@@ -86,7 +86,7 @@ kdeadmin (4:3.5.8-1ubuntu1) hardy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:38 +0000
 
-kdeadmin (4:3.5.8-1) unstable; urgency=low
+tdeadmin (4:3.5.8-1) unstable; urgency=low
 
   * New upstream release.
   * Implement use of uploaders.mk and update control.
@@ -98,37 +98,37 @@ kdeadmin (4:3.5.8-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 11 Oct 2007 01:22:40 +0200
 
-kdeadmin (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdeadmin (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:22 +0100
 
-kdeadmin (4:3.5.7-1ubuntu2) gutsy; urgency=low
+tdeadmin (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
   * Fix build failure with g++-4.3. LP: #138590.
 
  -- Matthias Klose <doko@ubuntu.com>  Thu, 13 Sep 2007 00:08:50 +0000
 
-kdeadmin (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdeadmin (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * Merge with Debian for new upstream version
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 May 2007 15:38:29 +0100
 
-kdeadmin (4:3.5.7-1) unstable; urgency=low
+tdeadmin (4:3.5.7-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 15 May 2007 23:46:52 +0100
 
-kdeadmin (4:3.5.6-2ubuntu1) gutsy; urgency=low
+tdeadmin (4:3.5.6-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 15:08:30 +0100
 
-kdeadmin (4:3.5.6-2) unstable; urgency=low
+tdeadmin (4:3.5.6-2) unstable; urgency=low
 
   * Upload to unstable after Etch release.
   * Update Uploaders.
@@ -148,17 +148,17 @@ kdeadmin (4:3.5.6-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 19 Apr 2007 14:15:20 +0100
 
-kdeadmin (4:3.5.6-1) experimental; urgency=low
+tdeadmin (4:3.5.6-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 16 Jan 2007 23:59:27 +0100
 
-kdeadmin (4:3.5.5-3) unstable; urgency=medium
+tdeadmin (4:3.5.5-3) unstable; urgency=medium
 
   +++ Changes by Sune Vuorela:
   
-  * Make kdeaddons-dbg depend on kdelibs-dbg to get useful backtraces when
+  * Make tdeaddons-dbg depend on tdelibs-dbg to get useful backtraces when
     debugging.
   * Really recognize sarge and etch stable versions (Closes: #405696, #387047).
   
@@ -168,7 +168,7 @@ kdeadmin (4:3.5.5-3) unstable; urgency=medium
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon,  8 Jan 2007 10:17:47 +0100
 
-kdeadmin (4:3.5.5-2) unstable; urgency=low
+tdeadmin (4:3.5.5-2) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
@@ -176,40 +176,40 @@ kdeadmin (4:3.5.5-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 21 Nov 2006 00:00:56 +0100
 
-kdeadmin (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdeadmin (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
   * Remove kubuntu_12_knetworkconf_feisty.diff, applied upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:29 +0000
 
-kdeadmin (4:3.5.5-1ubuntu4) feisty; urgency=low
+tdeadmin (4:3.5.5-1ubuntu4) feisty; urgency=low
 
   * Re-write kubuntu_12_kubuntu_feisty.diff since it didn't apply
     on previous build
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 19 Jan 2006 01:07:23 +0100
 
-kdeadmin (4:3.5.5-1ubuntu3) feisty; urgency=low
+tdeadmin (4:3.5.5-1ubuntu3) feisty; urgency=low
 
   * Added kubuntu_12_knetworkconf_feisty.diff to properly autodetect
     feisty as knetworkconf backend.
 
  -- Luka Renko <lure@ubuntu.com>  Sun, 10 Dec 2006 16:16:12 +0100
 
-kdeadmin (4:3.5.5-1ubuntu2) feisty; urgency=low
+tdeadmin (4:3.5.5-1ubuntu2) feisty; urgency=low
 
   * rebuild with --enable-gcc-hidden-visibility
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 19:39:16 +0000
 
-kdeadmin (4:3.5.5-1ubuntu1) feisty; urgency=low
+tdeadmin (4:3.5.5-1ubuntu1) feisty; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Nov 2006 22:22:50 +0000
 
-kdeadmin (4:3.5.5-1) unstable; urgency=low
+tdeadmin (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -225,7 +225,7 @@ kdeadmin (4:3.5.5-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  4 Oct 2006 20:13:07 -0400
 
-kdeadmin (4:3.5.4-1) unstable; urgency=low
+tdeadmin (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -233,7 +233,7 @@ kdeadmin (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 29 Jul 2006 20:46:53 -0400
 
-kdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low
+tdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low
 
   * kubuntu_10_knetworkconf_localhost.diff added, hostname should not 
     be appended as alias to localhost in /etc/hosts
@@ -241,52 +241,52 @@ kdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low
 
  -- Luka Renko <lure@ubuntu.com>  Thu, 19 Oct 2006 23:06:57 +0200
 
-kdeadmin (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdeadmin (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
   * kubuntu_09_networkconf_edgy.diff removed, merged upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:07 +0000
 
-kdeadmin (4:3.5.4-0ubuntu3) edgy; urgency=low
+tdeadmin (4:3.5.4-0ubuntu3) edgy; urgency=low
 
   * Rebuild with latest cdbs to add gettext domain to .desktop files for
     langpacks-desktopfiles-kde, no source changes
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Sep 2006 22:53:10 +0000
 
-kdeadmin (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdeadmin (4:3.5.4-0ubuntu2) edgy; urgency=low
 
   * Add kubuntu_09_networkconf_edgy.diff to support Edgy in knetworkconf
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  7 Aug 2006 09:08:39 -0400
 
-kdeadmin (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdeadmin (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:17 +0000
 
-kdeadmin (4:3.5.3-1ubuntu3) edgy; urgency=low
+tdeadmin (4:3.5.3-1ubuntu3) edgy; urgency=low
 
   * Add kubuntu_08_kpackage_sudo.diff, use sudo in kpackage,
     closes Malone #47741
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Jun 2006 17:40:42 +0000
 
-kdeadmin (4:3.5.3-1ubuntu2) edgy; urgency=low
+tdeadmin (4:3.5.3-1ubuntu2) edgy; urgency=low
 
-  * Rebuild with build-dep on latest kdelibs, fixes Qt binary compatibility break
+  * Rebuild with build-dep on latest tdelibs, fixes Qt binary compatibility break
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Jun 2006 16:11:40 +0000
 
-kdeadmin (4:3.5.3-1ubuntu1) edgy; urgency=low
+tdeadmin (4:3.5.3-1ubuntu1) edgy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 27 Jun 2006 16:22:44 +0000
 
-kdeadmin (4:3.5.3-1) unstable; urgency=low
+tdeadmin (4:3.5.3-1) unstable; urgency=low
 
   * New upstream release.
     + Fixes x-debian-package/x-deb inconsistency. (Closes: #362968)
@@ -301,17 +301,17 @@ kdeadmin (4:3.5.3-1) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Fix kdeadmin description typo. (Closes: #364036)
+  * Fix tdeadmin description typo. (Closes: #364036)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun,  4 Jun 2006 18:11:09 -0400
 
-kdeadmin (4:3.5.2-1) unstable; urgency=low
+tdeadmin (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 29 Mar 2006 13:13:03 -0500
 
-kdeadmin (4:3.5.1-2) unstable; urgency=low
+tdeadmin (4:3.5.1-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -320,7 +320,7 @@ kdeadmin (4:3.5.1-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 19 Feb 2006 14:30:28 -0500
 
-kdeadmin (4:3.5.1-1) unstable; urgency=low
+tdeadmin (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -330,7 +330,7 @@ kdeadmin (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 29 Jan 2006 10:10:44 -0500
 
-kdeadmin (4:3.5.0-4) unstable; urgency=low
+tdeadmin (4:3.5.0-4) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -340,7 +340,7 @@ kdeadmin (4:3.5.0-4) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  7 Jan 2006 17:21:53 -0500
 
-kdeadmin (4:3.5.0-3) experimental; urgency=low
+tdeadmin (4:3.5.0-3) experimental; urgency=low
 
   * Upload to experimental.
 
@@ -348,14 +348,14 @@ kdeadmin (4:3.5.0-3) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 16 Dec 2005 10:14:03 -0500
 
-kdeadmin (4:3.5.2-0ubuntu8) dapper; urgency=low
+tdeadmin (4:3.5.2-0ubuntu8) dapper; urgency=low
 
   * debian/cdbs/kde.mk:
     - added dh_iconcache.
 
  -- Daniel Holbach <daniel.holbach@ubuntu.com>  Thu, 18 May 2006 21:01:04 +0200
 
-kdeadmin (4:3.5.2-0ubuntu7) dapper; urgency=low
+tdeadmin (4:3.5.2-0ubuntu7) dapper; urgency=low
 
   * Add kubuntu_07_enabled_dhcp.patch to fix problem where interface 
     without IP address was considered as down/disabled and therefore 
@@ -363,7 +363,7 @@ kdeadmin (4:3.5.2-0ubuntu7) dapper; urgency=low
 
  -- Luka Renko <lure.net@gmail.com>  Sun, 30 Apr 2006 21:42:59 +0200
 
-kdeadmin (4:3.5.2-0ubuntu6) dapper; urgency=low
+tdeadmin (4:3.5.2-0ubuntu6) dapper; urgency=low
 
   * Add kubuntu_06_route_byte_order.patch to fix wrong gateway due to 
     byte order on PPC (Malone: #23750)   
@@ -372,7 +372,7 @@ kdeadmin (4:3.5.2-0ubuntu6) dapper; urgency=low
 
  -- Luka Renko <lure.net@gmail.com>  Fri, 28 Apr 2006 15:03:32 +0200
 
-kdeadmin (4:3.5.2-0ubuntu5) dapper; urgency=low
+tdeadmin (4:3.5.2-0ubuntu5) dapper; urgency=low
 
   * Add kubuntu_03_dns_alias.diff to fix wrong warning about missing 
     alias in DNS server add dialog (Malone #35507)
@@ -384,37 +384,37 @@ kdeadmin (4:3.5.2-0ubuntu5) dapper; urgency=low
 
  -- Luka Renko <lure.net@gmail.com>  Tue, 26 Apr 2006 00:07:20 +0200
 
-kdeadmin (4:3.5.2-0ubuntu4) dapper; urgency=low
+tdeadmin (4:3.5.2-0ubuntu4) dapper; urgency=low
 
   * Added kubuntu_02_wep_key.diff to fix WEP key (Malone #24516)
 
  -- Luka Renko <lure.net@gmail.com>  Mon, 24 Apr 2006 21:45:42 +0200
 
-kdeadmin (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdeadmin (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Edit debian/cdbs/kde.mk to mark .po files as UTF-8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Apr 2006 19:14:28 +0100
 
-kdeadmin (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdeadmin (4:3.5.2-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_01_ubuntu_version.diff change dapper version number
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 31 Mar 2006 00:50:12 +0100
 
-kdeadmin (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdeadmin (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:28 +0000
 
-kdeadmin (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdeadmin (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:06 +0000
 
-kdeadmin (4:3.5.0-0ubuntu2) dapper; urgency=low
+tdeadmin (4:3.5.0-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_01_knetworkconf_branch_fixes.diff fixes
     - http://bugzilla.ubuntu.com/9871 knetworkconf doesn't save gateway
@@ -424,26 +424,26 @@ kdeadmin (4:3.5.0-0ubuntu2) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 19 Dec 2005 15:19:17 +0000
 
-kdeadmin (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdeadmin (4:3.5.0-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Dec 2005 12:26:57 +0000
 
-kdeadmin (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdeadmin (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Generate .pot files
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 21:44:24 +0000
 
-kdeadmin (4:3.5-rc1-1ubuntu1) dapper; urgency=low
+tdeadmin (4:3.5-rc1-1ubuntu1) dapper; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 13 Nov 2005 16:22:21 +0000
 
-kdeadmin (4:3.5.0-2) alioth; urgency=low
+tdeadmin (4:3.5.0-2) alioth; urgency=low
 
   * New upstream release.
 
@@ -455,27 +455,27 @@ kdeadmin (4:3.5.0-2) alioth; urgency=low
 
   * Bump DH_COMPAT to 5. No changes.
 
-  * Add kdeadmin-dbg, to help track down problems.
+  * Add tdeadmin-dbg, to help track down problems.
 
   * Build lilo-config on amd64.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  1 Dec 2005 16:51:09 -0500
 
-kdeadmin (4:3.4.3-2) unstable; urgency=low
+tdeadmin (4:3.4.3-2) unstable; urgency=low
 
-  * Upload to unstable, rebuilding against kdelibs4c2a.
+  * Upload to unstable, rebuilding against tdelibs4c2a.
 
   * KDE_3_4_BRANCH update (up to r484392).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 30 Nov 2005 18:01:38 +0100
 
-kdeadmin (4:3.4.3-1) experimental; urgency=low
+tdeadmin (4:3.4.3-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 16 Oct 2005 14:26:58 -0400
 
-kdeadmin (4:3.4.2-1) unstable; urgency=low
+tdeadmin (4:3.4.2-1) unstable; urgency=low
 
   [ Debian Qt/KDE Maintainers ]
   * New upstream release.
@@ -486,39 +486,39 @@ kdeadmin (4:3.4.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 26 Aug 2005 17:18:42 +0200
 
-kdeadmin (4:3.4.1-1) experimental; urgency=low
+tdeadmin (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
 
-kdeadmin (4:3.4.3-0ubuntu1) breezy; urgency=low
+tdeadmin (4:3.4.3-0ubuntu1) breezy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun,  9 Oct 2005 02:21:28 +0000
 
-kdeadmin (4:3.4.2-0ubuntu1) breezy; urgency=low
+tdeadmin (4:3.4.2-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Build using unsermake
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 16:24:00 +0000
 
-kdeadmin (4:3.4.1-0ubuntu1) breezy; urgency=low
+tdeadmin (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number following KDE 3.4.1 release.
   * Add all packaged back to meta-package
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed,  1 Jun 2005 00:02:05 +0000
 
-kdeadmin (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+tdeadmin (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue, 24 May 2005 16:52:30 +0000
 
-kdeadmin (4:3.4.0-0pre2) alioth; urgency=low
+tdeadmin (4:3.4.0-0pre2) alioth; urgency=low
 
   * New upstream release.
 
@@ -531,8 +531,8 @@ kdeadmin (4:3.4.0-0pre2) alioth; urgency=low
 
   +++ Changes by Pierre Habouzit:
 
-  * Recommends kdebase-bin for lilo-config (kdesu in the menu command).
-  * Remove kcmlinuz from Depends for kdeadmin meta package.
+  * Recommends tdebase-bin for lilo-config (kdesu in the menu command).
+  * Remove kcmlinuz from Depends for tdeadmin meta package.
   * Wrote a man page for kdat.
 
   * [debian/control] :
@@ -546,13 +546,13 @@ kdeadmin (4:3.4.0-0pre2) alioth; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * New kdeadmin-doc-html package, containing doc-base registered HTML
+  * New tdeadmin-doc-html package, containing doc-base registered HTML
     versions of application handbooks, for users without Konqueror or
     KHelpCenter.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  7 Apr 2005 20:20:24 -0400
 
-kdeadmin (4:3.3.2-1) unstable; urgency=low
+tdeadmin (4:3.3.2-1) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -567,7 +567,7 @@ kdeadmin (4:3.3.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 23 Jan 2005 23:10:27 +0100
 
-kdeadmin (4:3.3.2-0pre1) experimental; urgency=low
+tdeadmin (4:3.3.2-0pre1) experimental; urgency=low
 
   * New upstream release.
   * KDE_3_3_BRANCH update.
@@ -575,32 +575,32 @@ kdeadmin (4:3.3.2-0pre1) experimental; urgency=low
 
  -- Christopher Martin <chrsmrtn@freeshell.org>  Thu, 16 Dec 2004 13:59:53 -0500
 
-kdeadmin (4:3.3.1-1) unstable; urgency=low
+tdeadmin (4:3.3.1-1) unstable; urgency=low
 
   * New upstream release.
   * KDE_3_3_BRANCH update.
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu,  4 Nov 2004 23:30:00 -0600
 
-kdeadmin (4:3.3.0-2) unstable; urgency=low
+tdeadmin (4:3.3.0-2) unstable; urgency=low
 
   * KDE_3_3_BRANCH update.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat, 25 Sep 2004 23:51:24 -0500
 
-kdeadmin (4:3.3.0-1) unstable; urgency=high
+tdeadmin (4:3.3.0-1) unstable; urgency=high
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri, 13 Aug 2004 23:30:00 -0500
 
-kdeadmin (4:3.2.3-1) unstable; urgency=high
+tdeadmin (4:3.2.3-1) unstable; urgency=high
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue,  3 Aug 2004 14:00:00 -0500
 
-kdeadmin (4:3.2.2-1) unstable; urgency=low
+tdeadmin (4:3.2.2-1) unstable; urgency=low
 
   * New upstream release.
   * debian/kpackage.mime: fix the entries to use a proper
@@ -609,38 +609,38 @@ kdeadmin (4:3.2.2-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon, 12 Apr 2004 01:00:00 -0500
 
-kdeadmin (4:3.2.1-1) unstable; urgency=low
+tdeadmin (4:3.2.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri,  5 Mar 2004 18:00:00 -0600
 
-kdeadmin (4:3.2.0-0pre1v1) experimental; urgency=low
+tdeadmin (4:3.2.0-0pre1v1) experimental; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed, 18 Feb 2004 19:00:00 -0600
 
-kdeadmin (4:3.1.95-1) unstable; urgency=low
+tdeadmin (4:3.1.95-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri, 23 Jan 2004 23:00:00 -0600
 
-kdeadmin (4:3.1.5-1) unstable; urgency=low
+tdeadmin (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
   * Added libtool arm patch.
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon, 12 Jan 2004 14:00:00 -0600
 
-kdeadmin (4:3.1.4-2) unstable; urgency=low
+tdeadmin (4:3.1.4-2) unstable; urgency=low
 
   * Changed Maintainer to Debian Qt/KDE Maintainers
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue,  6 Jan 2004 19:00:00 -0600
 
-kdeadmin (4:3.1.4-1) unstable; urgency=low
+tdeadmin (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
   * Added patch to update autotools files.
@@ -649,33 +649,33 @@ kdeadmin (4:3.1.4-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu, 16 Oct 2003 01:00:00 -0500
 
-kdeadmin (4:3.1.3-1) unstable; urgency=low
+tdeadmin (4:3.1.3-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri,  1 Aug 2003 14:00:00 -0500
 
-kdeadmin (4:3.1.2-1) unstable; urgency=low
+tdeadmin (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu, 22 May 2003 22:00:00 -0500
 
-kdeadmin (4:3.1.1-1) unstable; urgency=low
+tdeadmin (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release.
   * Add 'chmod +x configure' to rules. (Closes: #181357, #181563)
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed, 12 Mar 2003 01:00:00 -0600
 
-kdeadmin (4:3.1.0-1) unstable; urgency=low
+tdeadmin (4:3.1.0-1) unstable; urgency=low
 
   * New upstream release.
   * Rebuilt debian dir.
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon, 03 Feb 2003 22:00:00 -0600
 
-kdeadmin (4:2.2.2-7.2) stable-security; urgency=high
+tdeadmin (4:2.2.2-7.2) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Added special detection routine for big/little endianess on MIPS since
@@ -685,7 +685,7 @@ kdeadmin (4:2.2.2-7.2) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Wed,  8 Jan 2003 20:01:04 +0100
 
-kdeadmin (4:2.2.2-7.1) stable-security; urgency=high
+tdeadmin (4:2.2.2-7.1) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Applied upstream patches to fix several potential vulnerabilities.
@@ -693,20 +693,20 @@ kdeadmin (4:2.2.2-7.1) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Sun,  5 Jan 2003 21:09:43 +0100
 
-kdeadmin (4:2.2.2-7) unstable; urgency=high
+tdeadmin (4:2.2.2-7) unstable; urgency=high
 
   * Fixed lilo Build-Dep (added [i386])
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon,  4 Mar 2002 08:00:00 -0600
 
-kdeadmin (4:2.2.2-6) unstable; urgency=high
+tdeadmin (4:2.2.2-6) unstable; urgency=high
 
   * Changing Maintainer to Chris.
   * Fixing PowerPC breakage.
 
  -- Daniel Stone <daniel@sfarc.net>  Wed, 27 Feb 2002 21:28:09 +1100
 
-kdeadmin (4:2.2.2-5) unstable; urgency=low
+tdeadmin (4:2.2.2-5) unstable; urgency=low
 
   * debian/control, kpackage/Makefile.am:
     - Update kpackage for rpm 4.0.3, thanks Joey Hess. (Tighten [Build]Deps on
@@ -716,7 +716,7 @@ kdeadmin (4:2.2.2-5) unstable; urgency=low
 
  -- Daniel Stone <daniel@sfarc.net>  Tue,  1 Jan 2002 06:50:15 -0500
 
-kdeadmin (4:2.2.2-4) unstable; urgency=low
+tdeadmin (4:2.2.2-4) unstable; urgency=low
 
   * Crap! I lost the Build-Dep on docbook-to-man in the merge between my -2
     and RevKrusty's; reinstated. (closes: #122044)
@@ -724,19 +724,19 @@ kdeadmin (4:2.2.2-4) unstable; urgency=low
 
  -- Daniel Stone <daniel@sfarc.net>  Sun,  2 Dec 2001 11:23:19 +1100
 
-kdeadmin (4:2.2.2-3) unstable; urgency=low
+tdeadmin (4:2.2.2-3) unstable; urgency=low
 
   * New maintainer. (closes: #114101)
   * debian/{secpolicy,kwuftpd,kuser,ksysv,kpackage,kcron}.sgml:
     - New manpages.
   * secpolicy/main.cpp: fix this dodgyness, it now gives an actual description:
-    daniel@tsubasa:~/kde-2.2.2/kdeadmin-2.2.2/kdeadmin-2.2.2% ./secpolicy/secpolicy --help
+    daniel@tsubasa:~/kde-2.2.2/tdeadmin-2.2.2/tdeadmin-2.2.2% ./secpolicy/secpolicy --help
     Usage: secpolicy [Qt-options] [KDE-options]
     What does this do?
 
  -- Daniel Stone <daniel@sfarc.net>  Sat,  1 Dec 2001 23:59:40 +1100
 
-kdeadmin (4:2.2.2-2) unstable; urgency=low
+tdeadmin (4:2.2.2-2) unstable; urgency=low
 
   * Sync with upstream
   * Cleanup build process
@@ -745,7 +745,7 @@ kdeadmin (4:2.2.2-2) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 29 Nov 2001 04:15:00 -0700
 
-kdeadmin (4:2.2.2-1) unstable; urgency=low
+tdeadmin (4:2.2.2-1) unstable; urgency=low
 
   * New upstream version
   * use auto* again
@@ -753,25 +753,25 @@ kdeadmin (4:2.2.2-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Nov 2001 19:26:00 -0700
 
-kdeadmin (4:2.2.1-1.3) unstable; urgency=low
+tdeadmin (4:2.2.1-1.3) unstable; urgency=low
 
   * take out checks for auto* as it just hoses things
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 08 Oct 2001 19:26:00 -0700
 
-kdeadmin (4:2.2.1-1.2) unstable; urgency=low
+tdeadmin (4:2.2.1-1.2) unstable; urgency=low
 
   * fix configure
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 05 Oct 2001 09:28:00 -0700
 
-kdeadmin (4:2.2.1-1.1) unstable; urgency=low
+tdeadmin (4:2.2.1-1.1) unstable; urgency=low
 
   * Workaround for stupid automake 1.5 issues
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 03 Oct 2001 09:28:00 -0700
 
-kdeadmin (4:2.2.1-1) unstable; urgency=low
+tdeadmin (4:2.2.1-1) unstable; urgency=low
  
   * New upstream version
   * Change maintainer
@@ -779,19 +779,19 @@ kdeadmin (4:2.2.1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 25 Aug 2001 14:31:00 -0700
 
-kdeadmin (4:2.2.0-final-1) unstable; urgency=low
+tdeadmin (4:2.2.0-final-1) unstable; urgency=low
  
   * New upstream version 2.2
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 30 Jul 2001 00:01:00 -0700
 
-kdeadmin (4:2.2.0-0.1beta1-2) unstable; urgency=low
+tdeadmin (4:2.2.0-0.1beta1-2) unstable; urgency=low
  
   * Use apt by default and not rpm for kpackage (Closes: #106937)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 28 Jul 2001 18:33:00 -0700
 
-kdeadmin (4:2.2.0-0.1beta1-1) unstable; urgency=low
+tdeadmin (4:2.2.0-0.1beta1-1) unstable; urgency=low
  
   * sync with upstream
   * gcc3 build fixes
@@ -799,7 +799,7 @@ kdeadmin (4:2.2.0-0.1beta1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 26 Jul 2001 18:05:00 -0700
 
-kdeadmin (4:2.2.0-0beta1-3) unstable; urgency=low
+tdeadmin (4:2.2.0-0beta1-3) unstable; urgency=low
  
   * Depend on proper version of rpm so we don't crash (Closes: #103439)
   * Sync with upstream
@@ -807,21 +807,21 @@ kdeadmin (4:2.2.0-0beta1-3) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 07 Jul 2001 03:25:00 -0700
 
-kdeadmin (4:2.2.0-0beta1-2) unstable; urgency=low
+tdeadmin (4:2.2.0-0beta1-2) unstable; urgency=low
  
   * Sync with upstream
   * Autobuild for alpha now
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 03 Jul 2001 02:20:00 -0700
 
-kdeadmin (4:2.2.0-0beta1-1) unstable; urgency=low
+tdeadmin (4:2.2.0-0beta1-1) unstable; urgency=low
  
   * Sync with upstream
   * fix mips build
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 30 Jun 2001 20:30:00 -0700
 
-kdeadmin (4:2.2-cvs20010622-1) unstable; urgency=low
+tdeadmin (4:2.2-cvs20010622-1) unstable; urgency=low
  
   * New upstream version
   * 2.2 beta1
@@ -832,7 +832,7 @@ kdeadmin (4:2.2-cvs20010622-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
 
-kdeadmin (4:2.1.1-2) unstable; urgency=low
+tdeadmin (4:2.1.1-2) unstable; urgency=low
  
   * Update menu tags to include new kde menu removal tag
   * Update build-depends to recognize real | virtual
@@ -840,32 +840,32 @@ kdeadmin (4:2.1.1-2) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Apr 2001 17:28:00 -0700
 
-kdeadmin (4:2.1.1-1.0.1) unstable; urgency=low
+tdeadmin (4:2.1.1-1.0.1) unstable; urgency=low
  
   * Rebuild with older libc
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 26 Mar 2001 16:33:00 -0700
 
-kdeadmin (4:2.1.1-1) unstable; urgency=low
+tdeadmin (4:2.1.1-1) unstable; urgency=low
  
   * New upstream version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Mar 2001 10:29:00 -0700
 
-kdeadmin (4:2.1.0-3) unstable; urgency=low
+tdeadmin (4:2.1.0-3) unstable; urgency=low
  
   * Change Build-Depends and rebuild with new librpm packages (Closes: #89695)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 15 Mar 2001 10:29:00 -0700
 
-kdeadmin (4:2.1.0-2) unstable; urgency=low
+tdeadmin (4:2.1.0-2) unstable; urgency=low
  
   * Adding rpm to build-depends (Closes: #87412) 
   * Upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 11 Mar 2001 04:58:00 -0700
 
-kdeadmin (4:2.1.0-1) unstable; urgency=low
+tdeadmin (4:2.1.0-1) unstable; urgency=low
  
   * Fresh CVS sync with future 2.1.1 version
   * Fixing build process for non-i386 systems (Closes: #87412)
@@ -873,73 +873,73 @@ kdeadmin (4:2.1.0-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 04 Mar 2001 06:46:00 -0700
 
-kdeadmin (4:2.1-final-1) unstable; urgency=low
+tdeadmin (4:2.1-final-1) unstable; urgency=low
  
   * New upstream version
   * Updating standards version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
 
-kdeadmin (4:2.1-beta2-1) unstable; urgency=low
+tdeadmin (4:2.1-beta2-1) unstable; urgency=low
  
   * New upstream beta
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 22 Jan 2001 06:00:00 -0700
 
-kdeadmin (4:2.1-20010115-1) unstable; urgency=low
+tdeadmin (4:2.1-20010115-1) unstable; urgency=low
  
   * More upstream fixes
   * Fixes assertion problems (Closes: #75073)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
 
-kdeadmin (4:2.1-20010106-1) unstable; urgency=low
+tdeadmin (4:2.1-20010106-1) unstable; urgency=low
  
   * More upstream fixes
   * Fixing depends as well as updating them
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 06 Jan 2001 23:30:00 -0700
 
-kdeadmin (4:2.1-20010101-1) unstable; urgency=low
+tdeadmin (4:2.1-20010101-1) unstable; urgency=low
  
   * More upstream fixes
     
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Jan 2001 17:05:00 -0700
      
-kdeadmin (4:2.1-20001218-1) unstable; urgency=low
+tdeadmin (4:2.1-20001218-1) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Dec 2000 13:11:00 -0700
 
-kdeadmin (4:2.1-20001216-1) unstable; urgency=low
+tdeadmin (4:2.1-20001216-1) unstable; urgency=low
  
   * More upstream fixes
-  * Adding in conflicts for kdeadmin which I forgot to to along time ago
+  * Adding in conflicts for tdeadmin which I forgot to to along time ago
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 16 Dec 2000 23:50:00 -0700
 
-kdeadmin (4:2.1-20001213-1) unstable; urgency=low
+tdeadmin (4:2.1-20001213-1) unstable; urgency=low
  
   * New upstream beta version
   * Fix deb package indexing (Closes: #79060)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 13 Dec 2000 18:00:00 -0700
 
-kdeadmin (4:2.0-final-8) unstable; urgency=low
+tdeadmin (4:2.0-final-8) unstable; urgency=low
  
   * Fixing file conflicts (Closes: #77853)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 25 Nov 2000 06:45:00 -0700
 
-kdeadmin (4:2.0-final-7) unstable; urgency=low
+tdeadmin (4:2.0-final-7) unstable; urgency=low
  
   * More upstream fixes
   * build rules cleanup
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 21 Nov 2000 04:45:00 -0700
 
-kdeadmin (4:2.0-final-6) unstable; urgency=low
+tdeadmin (4:2.0-final-6) unstable; urgency=low
  
   * More upstream fixes
   * More dependency cleanup - xlib6g vs xlibs
@@ -947,79 +947,79 @@ kdeadmin (4:2.0-final-6) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 18 Nov 2000 00:45:00 -0700
 
-kdeadmin (4:2.0-final-5) unstable; urgency=low
+tdeadmin (4:2.0-final-5) unstable; urgency=low
  
   * More upstream fixes
   * More dependency cleanup
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 18 Nov 2000 00:45:00 -0700
 
-kdeadmin (4:2.0-final-4) unstable; urgency=low
+tdeadmin (4:2.0-final-4) unstable; urgency=low
  
   * More upstream fixes
   * adding menu hints
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
                                                                                 
-kdeadmin (4:2.0-final-3) unstable; urgency=low
+tdeadmin (4:2.0-final-3) unstable; urgency=low
  
   * More upstream fixes
   * build against new xlibs
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 04 Nov 2000 18:00:00 -0700
                                                                                 
-kdeadmin (4:2.0-final-2) unstable; urgency=low
+tdeadmin (4:2.0-final-2) unstable; urgency=low
  
   * More upstream fixes
   * kdat no longer provided
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
                                                                                 
-kdeadmin (4:2.0-final-0) unstable; urgency=low
+tdeadmin (4:2.0-final-0) unstable; urgency=low
 
   * KDE 2.0
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Oct 2000 00:00:00 -0700
 
-kdeadmin (4:2.0-20001013-0) unstable; urgency=low
+tdeadmin (4:2.0-20001013-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 13 Oct 2000 23:45:00 -0700
                                                                                 
-kdeadmin (4:2.0-20001011-0) unstable; urgency=low
+tdeadmin (4:2.0-20001011-0) unstable; urgency=low
  
   * KDE 2.0 RC2
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 11 Oct 2000 06:00:00 -0700
                                                                                 
-kdeadmin (4:2.0-20001006-0) unstable; urgency=low
+tdeadmin (4:2.0-20001006-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 06 Oct 2000 04:00:00 -0700
                                                                                 
-kdeadmin (4:2.0-20001005-0) unstable; urgency=low
+tdeadmin (4:2.0-20001005-0) unstable; urgency=low
  
   * More upstream fixes
-  * Compiling against non-versioned kdelibs once again
+  * Compiling against non-versioned tdelibs once again
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 05 Oct 2000 15:00:00 -0700
                                                                                 
-kdeadmin (4:2.0-20001002-0) unstable; urgency=low
+tdeadmin (4:2.0-20001002-0) unstable; urgency=low
  
   * KDE 2.0 RC1
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Oct 2000 01:30:00 -0700
                                                                                 
-kdeadmin (4:2.0-20000927-0) unstable; urgency=low
+tdeadmin (4:2.0-20000927-0) unstable; urgency=low
  
   * More upstream fixes
   * Building in RPM support to kpackage again.
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 28 Sep 2000 04:30:00 -0700
 
-kdeadmin (4:2.0-20000925-0) unstable; urgency=low
+tdeadmin (4:2.0-20000925-0) unstable; urgency=low
  
   * More upstream fixes
   * Updating build-depends
@@ -1027,99 +1027,99 @@ kdeadmin (4:2.0-20000925-0) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
 
-kdeadmin (4:2.0-20000920-0) unstable; urgency=low
+tdeadmin (4:2.0-20000920-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Sep 2000 22:00:00 -0700
 
-kdeadmin (4:2.0-20000918-0) unstable; urgency=low
+tdeadmin (4:2.0-20000918-0) unstable; urgency=low
  
   * More upstream fixes
-  * Breaking down kdeadmin into individual packages
+  * Breaking down tdeadmin into individual packages
   * Changing section from utils to admin (Closes: #71870)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Sep 2000 18:00:00 -0700
 
-kdeadmin (4:2.0-20000909-0) unstable; urgency=low
+tdeadmin (4:2.0-20000909-0) unstable; urgency=low
 
   * More upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 09 Sep 2000 22:00:00 -0700
 
-kdeadmin (4:2.0-20000907-0) unstable; urgency=low
+tdeadmin (4:2.0-20000907-0) unstable; urgency=low
 
   * More upstream fixes
   * Built against new QT 2.2
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 07 Sep 2000 04:00:00 -0700
 
-kdeadmin (4:2.0-20000901-0) unstable; urgency=low
+tdeadmin (4:2.0-20000901-0) unstable; urgency=low
  
   * More upstream fixes
   * Merging package changes into upstream CVS
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Sep 2000 17:00:00 -0700
                                                                                
-kdeadmin (4:2.0-20000825-1.0) experimental; urgency=low
+tdeadmin (4:2.0-20000825-1.0) experimental; urgency=low
  
   * KDE 2.0 beta 4
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 25 Aug 2000 22:30:00 -0700
 
-kdeadmin (4:2.0-20000820-1.0) experimental; urgency=low
+tdeadmin (4:2.0-20000820-1.0) experimental; urgency=low
  
   * New upstream beta version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 20 Aug 2000 09:30:00 -0700
 
-kdeadmin-cvs (4:2.0-20000521-1.0) experimental; urgency=low
+tdeadmin-cvs (4:2.0-20000521-1.0) experimental; urgency=low
  
   * New upstream CVS version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 21 May 2000 18:15:00 -0700
                                                                               
-kdeadmin-cvs (4:2.0-20000512-1.1) experimental; urgency=low
+tdeadmin-cvs (4:2.0-20000512-1.1) experimental; urgency=low
 
   * New upstream CVS version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 12 May 2000 22:30:00 -0700
 
-kdeadmin-cvs (4:2.0-20000308-1.0) experimental; urgency=low
+tdeadmin-cvs (4:2.0-20000308-1.0) experimental; urgency=low
  
   * New upstream CVS version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 08 Mar 2000 22:30:00 -0700
 
-kdeadmin-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+tdeadmin-cvs (4:2.0-20000302-1.0) experimental; urgency=low
  
   * New upstream CVS version
   * Adding in build options for pam
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Mar 2000 22:00:00 -0700
                                                              
-kdeadmin-cvs (4:2.0-20000229-1.0) experimental; urgency=low
+tdeadmin-cvs (4:2.0-20000229-1.0) experimental; urgency=low
 
   * New upstream CVS version 
   * Adding in build-depends
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 29 Feb 2000 22:00:00 -0700
 
-kdeadmin-cvs (4:2.0-19991001-1) unstable; urgency=low
+tdeadmin-cvs (4:2.0-19991001-1) unstable; urgency=low
 
   * Cleaning out old workaround in menu.in
   * Fixing up dependencies
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Oct 1999 14:22:41 -0400
 
-kdeadmin-cvs (4:2.0-19990820-1) unstable; urgency=low
+tdeadmin-cvs (4:2.0-19990820-1) unstable; urgency=low
 
   * new upstream CVS version
   * migrating back to /usr from /opt
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 20 Aug 1999 14:22:41 -0400
 
-kdeadmin-cvs (4:2.0-19990524-1) unstable; urgency=low
+tdeadmin-cvs (4:2.0-19990524-1) unstable; urgency=low
 
   * new upstream version
   * migrating back to / from /opt
@@ -1127,43 +1127,43 @@ kdeadmin-cvs (4:2.0-19990524-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 24 May 1999 07:00:41 -0400
 
-kdeadmin (4:1.1-19990217-1) unstable; urgency=low
+tdeadmin (4:1.1-19990217-1) unstable; urgency=low
 
   * new upstream version
 
  -- Patricia Jung <trish@freiburg.linux.de>  Wed, 17 Feb 1999 19:09:41 +0100
 
-kdeadmin (4:1.1-19990207-3) unstable; urgency=low
+tdeadmin (4:1.1-19990207-3) unstable; urgency=low
 
   * fixed ScriptPath and RunlevelPath for ksysv
 
  -- Patricia Jung <trish@freiburg.linux.de>  Thu, 11 Feb 1999 22:58:00 +0100 
 
-kdeadmin (4:1.1-19990207-2) unstable; urgency=low
+tdeadmin (4:1.1-19990207-2) unstable; urgency=low
 
   * fixed a bug with the wrong libjpeg version
 
  -- Stephan Kulow <coolo@kde.org>  Tue,  9 Feb 1999 10:43:42 +0100
 
-kdeadmin (4:1.1-19990207-1) unstable; urgency=low
+tdeadmin (4:1.1-19990207-1) unstable; urgency=low
 
   * new upstream version 1.1 and new epoche
 
  -- Stephan Kulow <coolo@kde.org>  Sun,  7 Feb 1999 12:12:58 +0100
 
-kdeadmin (2:980419-b4-1) unstable; urgency=low
+tdeadmin (2:980419-b4-1) unstable; urgency=low
 
   * new upstream version Beta4
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 19 Apr 1998 18:20:53 +0200
 
-kdeadmin (2:980402-1) frozen; urgency=low
+tdeadmin (2:980402-1) frozen; urgency=low
 
   * new upstream version with bugfixes
 
  -- Stephan Kulow <coolo@kde.org>  Thu,  2 Apr 1998 18:05:34 +0200
 
-kdeadmin (2:980309-1) unstable; urgency=low
+tdeadmin (2:980309-1) unstable; urgency=low
 
   * Initial Release.
 
diff --git a/ubuntu/maverick/tdeadmin/debian/control b/ubuntu/maverick/tdeadmin/debian/control
index 33e19eaf9..d3165c338 100644
--- a/ubuntu/maverick/tdeadmin/debian/control
+++ b/ubuntu/maverick/tdeadmin/debian/control
@@ -1,20 +1,20 @@
-Source: kdeadmin-trinity
+Source: tdeadmin-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kdeadmin-trinity
+Package: tdeadmin-trinity
 Section: kde
 Architecture: all
-Replaces: kdeadmin-kde3 (<< 4:3.5.13)
-Breaks: kdeadmin-kde3 (<< 4:3.5.13)
-Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), kdeadmin-kfile-plugins-trinity (>= ${Source-Version}), knetworkconf-trinity (>= ${Source-Version}), kpackage-trinity (>= ${Source-Version}), ksysv-trinity (>= ${Source-Version}), kuser-trinity (>= ${Source-Version})
+Replaces: tdeadmin-kde3 (<< 4:3.5.13)
+Breaks: tdeadmin-kde3 (<< 4:3.5.13)
+Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-kfile-plugins-trinity (>= ${Source-Version}), knetworkconf-trinity (>= ${Source-Version}), kpackage-trinity (>= ${Source-Version}), ksysv-trinity (>= ${Source-Version}), kuser-trinity (>= ${Source-Version})
 Recommends: lilo-config-trinity (>= ${Source-Version})
-Suggests: kdeadmin-trinity-doc-html (>= ${Source-Version})
+Suggests: tdeadmin-trinity-doc-html (>= ${Source-Version})
 Description: system administration tools from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -24,12 +24,12 @@ Description: system administration tools from the official Trinity release
  This metapackage includes a collection of system administration tools
  provided with the official release of KDE.
 
-Package: kdeadmin-trinity-doc-html
+Package: tdeadmin-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: kdeadmin-kde3-doc-html (<< 4:3.5.13)
-Breaks: kdeadmin-kde3-doc-html (<< 4:3.5.13)
-Suggests: konqueror-trinity | www-browser, kdebase-trinity
+Replaces: tdeadmin-kde3-doc-html (<< 4:3.5.13)
+Breaks: tdeadmin-kde3-doc-html (<< 4:3.5.13)
+Suggests: konqueror-trinity | www-browser, tdebase-trinity
 Description: KDE administration documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -42,7 +42,7 @@ Description: KDE administration documentation in HTML format
  KDE administration packages.
  .
  This package is part of Trinity, and a component of the KDE administration
- module. See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ module. See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: kcron-trinity
 Section: admin
@@ -56,7 +56,7 @@ Description: the Trinity crontab editor
  It is a graphical user interface to cron, the UNIX system scheduler.
  .
  This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: kdat-trinity
 Section: admin
@@ -77,19 +77,19 @@ Description: a Trinity tape backup tool
   * Backup profiles for frequently used backups.
  .
  This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
-Package: kdeadmin-kfile-plugins-trinity
+Package: tdeadmin-kfile-plugins-trinity
 Section: kde
 Architecture: any
-Replaces: kdeadmin-kfile-plugins-kde3 (<< 4:3.5.13)
-Breaks: kdeadmin-kfile-plugins-kde3 (<< 4:3.5.13)
+Replaces: tdeadmin-kfile-plugins-kde3 (<< 4:3.5.13)
+Breaks: tdeadmin-kfile-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Description: Trinity file metainfo plugins for deb and rpm files
  File metainfo plugins for deb and rpm package files.
  .
  This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: knetworkconf-trinity
 Section: kde
@@ -102,7 +102,7 @@ Description: Trinity network configuration tool
  can be used to manage network devices and settings for each device.
  .
  This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: kpackage-trinity
 Section: admin
@@ -118,7 +118,7 @@ Description: Trinity package management tool
  install/remove them.
  .
  This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: ksysv-trinity
 Section: admin
@@ -132,7 +132,7 @@ Description: Trinity SysV-style init configuration editor
  drag and drop GUI.
  .
  This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: kuser-trinity
 Section: admin
@@ -145,7 +145,7 @@ Description: Trinity user/group administration tool
  A user/group administration tool for KDE.
  .
  This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: lilo-config-trinity
 Section: kde
@@ -153,26 +153,26 @@ Architecture: none
 Replaces: lilo-config-kde3 (<< 4:3.5.13)
 Breaks: lilo-config-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, kcontrol-trinity
-Recommends: kdebase-trinity-bin
+Recommends: tdebase-trinity-bin
 Suggests: lilo
 Description: Trinity frontend for lilo configuration
  lilo-config is a KDE based frontend to the lilo boot manager configuration.
  It runs out of the KDE Control Center.
  .
  If you want to use the menu entry to launch lilo-config, you need to install
- kdebase-bin since it uses the kdesu command to gain root privileges.
+ tdebase-bin since it uses the kdesu command to gain root privileges.
  .
  This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'kdeadmin-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
-Package: kdeadmin-trinity-dbg
+Package: tdeadmin-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: kdeadmin-kde3-dbg (<< 4:3.5.13)
-Breaks: kdeadmin-kde3-dbg (<< 4:3.5.13)
-Depends: kdelibs-trinity-dbg
+Replaces: tdeadmin-kde3-dbg (<< 4:3.5.13)
+Breaks: tdeadmin-kde3-dbg (<< 4:3.5.13)
+Depends: tdelibs-trinity-dbg
 Priority: extra
-Description: debugging symbols for kdeadmin-trinity
- This package contains the debugging symbols associated with kdeadmin-trinity.
- They will automatically be used by gdb for debugging kdeadmin-related
+Description: debugging symbols for tdeadmin-trinity
+ This package contains the debugging symbols associated with tdeadmin-trinity.
+ They will automatically be used by gdb for debugging tdeadmin-related
  issues.
diff --git a/ubuntu/maverick/tdeadmin/debian/control.in b/ubuntu/maverick/tdeadmin/debian/control.in
index 570400afa..8fd3732e5 100644
--- a/ubuntu/maverick/tdeadmin/debian/control.in
+++ b/ubuntu/maverick/tdeadmin/debian/control.in
@@ -1,18 +1,18 @@
-Source: kdeadmin
+Source: tdeadmin
 Section: kde
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, kdelibs4-dev (>= 4:3.5.7), libbz2-dev, libpam0g-dev, lilo [i386 amd64], sharutils, texinfo, rpm
+Build-Depends: cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, tdelibs4-dev (>= 4:3.5.7), libbz2-dev, libpam0g-dev, lilo [i386 amd64], sharutils, texinfo, rpm
 Standards-Version: 3.7.2
 
-Package: kdeadmin
+Package: tdeadmin
 Section: kde
 Architecture: all
-Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), kdeadmin-kfile-plugins (>= ${Source-Version}), knetworkconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version})
+Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), tdeadmin-kfile-plugins (>= ${Source-Version}), knetworkconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version})
 Recommends: lilo-config (>= ${Source-Version})
-Suggests: kdeadmin-doc-html (>= ${Source-Version})
+Suggests: tdeadmin-doc-html (>= ${Source-Version})
 Description: system administration tools from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -22,10 +22,10 @@ Description: system administration tools from the official KDE release
  This metapackage includes a collection of system administration tools
  provided with the official release of KDE.
 
-Package: kdeadmin-doc-html
+Package: tdeadmin-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror | www-browser, kdebase
+Suggests: konqueror | www-browser, tdebase
 Description: KDE administration documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -38,7 +38,7 @@ Description: KDE administration documentation in HTML format
  KDE administration packages.
  .
  This package is part of KDE, and a component of the KDE administration
- module. See the 'kde' and 'kdeadmin' packages for more information.
+ module. See the 'kde' and 'tdeadmin' packages for more information.
 
 Package: kcron
 Section: admin
@@ -50,7 +50,7 @@ Description: the KDE crontab editor
  It is a graphical user interface to cron, the UNIX system scheduler.
  .
  This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'kdeadmin' packages for more information.
+ See the 'kde' and 'tdeadmin' packages for more information.
 
 Package: kdat
 Section: admin
@@ -69,9 +69,9 @@ Description: a KDE tape backup tool
   * Backup profiles for frequently used backups.
  .
  This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'kdeadmin' packages for more information.
+ See the 'kde' and 'tdeadmin' packages for more information.
 
-Package: kdeadmin-kfile-plugins
+Package: tdeadmin-kfile-plugins
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -79,7 +79,7 @@ Description: KDE file metainfo plugins for deb and rpm files
  File metainfo plugins for deb and rpm package files.
  .
  This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'kdeadmin' packages for more information.
+ See the 'kde' and 'tdeadmin' packages for more information.
 
 Package: knetworkconf
 Section: kde
@@ -90,7 +90,7 @@ Description: KDE network configuration tool
  can be used to manage network devices and settings for each device.
  .
  This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'kdeadmin' packages for more information.
+ See the 'kde' and 'tdeadmin' packages for more information.
 
 Package: kpackage
 Section: admin
@@ -104,7 +104,7 @@ Description: KDE package management tool
  install/remove them.
  .
  This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'kdeadmin' packages for more information.
+ See the 'kde' and 'tdeadmin' packages for more information.
 
 Package: ksysv
 Section: admin
@@ -116,7 +116,7 @@ Description: KDE SysV-style init configuration editor
  drag and drop GUI.
  .
  This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'kdeadmin' packages for more information.
+ See the 'kde' and 'tdeadmin' packages for more information.
 
 Package: kuser
 Section: admin
@@ -127,30 +127,30 @@ Description: KDE user/group administration tool
  A user/group administration tool for KDE.
  .
  This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'kdeadmin' packages for more information.
+ See the 'kde' and 'tdeadmin' packages for more information.
 
 Package: lilo-config
 Section: kde
 Architecture: i386 amd64
 Depends: ${shlibs:Depends}, kcontrol
-Recommends: kdebase-bin
+Recommends: tdebase-bin
 Suggests: lilo
 Description: KDE frontend for lilo configuration
  lilo-config is a KDE based frontend to the lilo boot manager configuration.
  It runs out of the KDE Control Center.
  .
  If you want to use the menu entry to launch lilo-config, you need to install
- kdebase-bin since it uses the kdesu command to gain root privileges.
+ tdebase-bin since it uses the kdesu command to gain root privileges.
  .
  This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'kdeadmin' packages for more information.
+ See the 'kde' and 'tdeadmin' packages for more information.
 
-Package: kdeadmin-dbg
+Package: tdeadmin-dbg
 Section: libdevel
 Architecture: any
-Depends: kdelibs-dbg
+Depends: tdelibs-dbg
 Priority: extra
-Description: debugging symbols for kdeadmin
- This package contains the debugging symbols associated with kdeadmin.
- They will automatically be used by gdb for debugging kdeadmin-related
+Description: debugging symbols for tdeadmin
+ This package contains the debugging symbols associated with tdeadmin.
+ They will automatically be used by gdb for debugging tdeadmin-related
  issues.
diff --git a/ubuntu/maverick/tdeadmin/debian/rules b/ubuntu/maverick/tdeadmin/debian/rules
index dec35a720..19e9ac01b 100755
--- a/ubuntu/maverick/tdeadmin/debian/rules
+++ b/ubuntu/maverick/tdeadmin/debian/rules
@@ -12,7 +12,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
 
 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
-DEB_DH_STRIP_ARGS  := --dbg-package=kdeadmin-trinity-dbg
+DEB_DH_STRIP_ARGS  := --dbg-package=tdeadmin-trinity-dbg
 
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--without-rpm --with-pam=kde --with-shadow --with-nis \
diff --git a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.kcron b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kcron
index a209fd796..9c4a9007a 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.kcron
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kcron
@@ -1,4 +1,4 @@
-Document: kdeadmin-doc-html-kcron
+Document: tdeadmin-doc-html-kcron
 Title: Kcron Handbook
 Author: Morgan Sandquist, Gary Meyer, Lauri Watts
 Abstract: Kcron is an application that schedules programs to be run.
diff --git a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.kdat b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kdat
index 8b6cc0217..f6910c928 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.kdat
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kdat
@@ -1,4 +1,4 @@
-Document: kdeadmin-doc-html-kdat
+Document: tdeadmin-doc-html-kdat
 Title: Kdat Handbook
 Author: Sean Vyain
 Abstract: KDE tape management.
diff --git a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf
index aeb73ead3..4a8a2da69 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf
@@ -1,4 +1,4 @@
-Document: kdeadmin-doc-html-knetworkconf
+Document: tdeadmin-doc-html-knetworkconf
 Title: KNetworkConf Handbook
 Author: Sean Wheller, Christoph Eckert
 Abstract: KNetworkConf is a graphical manager for network devices and settings.
diff --git a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.kpackage b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kpackage
index 9b1257bd6..87046af71 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.kpackage
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kpackage
@@ -1,4 +1,4 @@
-Document: kdeadmin-doc-html-kpackage
+Document: tdeadmin-doc-html-kpackage
 Title: KPackage Handbook
 Author: Toivo Pedaste, Lauri Watts 
 Abstract: KPackage is a graphical interface to the RPM, Debian,
diff --git a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.ksysv b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.ksysv
index c3df6fcf6..97cdaae29 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.ksysv
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.ksysv
@@ -1,4 +1,4 @@
-Document: kdeadmin-doc-html-ksysv
+Document: tdeadmin-doc-html-ksysv
 Title: KSysV Handbook
 Author: Peter Putzer 
 Abstract: KSysV is a graphical editor for the SysV style init configuration.
diff --git a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.kuser b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kuser
index 3e4010703..c3c5e7728 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdeadmin-doc-html.doc-base.kuser
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kuser
@@ -1,4 +1,4 @@
-Document: kdeadmin-doc-html-kuser
+Document: tdeadmin-doc-html-kuser
 Title: KUser Handbook
 Author: Matt Johnston, Lauri Watts, Jonathan Singer
 Abstract: KUser allows you to manage users and groups on your system. 
diff --git a/ubuntu/maverick/tdeadmin/debian/kdeadmin-kfile-plugins-trinity.install b/ubuntu/maverick/tdeadmin/debian/tdeadmin-kfile-plugins-trinity.install
index e3b00f7da..e3b00f7da 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdeadmin-kfile-plugins-trinity.install
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-kfile-plugins-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/changelog b/ubuntu/maverick/tdeartwork/debian/changelog
index 39c479ae0..f0bfe7054 100644
--- a/ubuntu/maverick/tdeartwork/debian/changelog
+++ b/ubuntu/maverick/tdeartwork/debian/changelog
@@ -1,63 +1,63 @@
-kdeartwork-trinity (4:3.5.10-0ubuntu1) karmic; urgency=low
+tdeartwork-trinity (4:3.5.10-0ubuntu1) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdeartwork-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
+tdeartwork-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 28 Feb 2009 14:52:00 -0600
 
-kdeartwork-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
+tdeartwork-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
   * Intrepid -trinity packaging update
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 24 Nov 2008 16:53:00 -0600
 
-kdeartwork (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdeartwork (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
-    - Bump build-dep version of kdelibs4-dev and kdebase-dev to 3.5.10
+    - Bump build-dep version of tdelibs4-dev and tdebase-dev to 3.5.10
     - Add xscreensaver-data-extra to build-dep
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:41:02 -0400
 
-kdeartwork (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdeartwork (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:06 +0000
 
-kdeartwork (4:3.5.8-1ubuntu4) hardy; urgency=low
+tdeartwork (4:3.5.8-1ubuntu4) hardy; urgency=low
 
   * Fix kscreensaver-xsavers-webcollage.install
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 10 Dec 2007 16:06:47 +0000
 
-kdeartwork (4:3.5.8-1ubuntu3) hardy; urgency=low
+tdeartwork (4:3.5.8-1ubuntu3) hardy; urgency=low
 
   * Edit kscreensaver-xsaver-webcollage.install to use the file
     from sources, since it does not get installed during build.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 23:36:57 +0000
 
-kdeartwork (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdeartwork (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 10:51:47 +0000
 
-kdeartwork (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdeartwork (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining change:
    - Add package kscreensaver-xsavers-extra
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:44 +0000
 
-kdeartwork (4:3.5.8-1) unstable; urgency=low
+tdeartwork (4:3.5.8-1) unstable; urgency=low
  
   * New upstream release. 
 
@@ -68,13 +68,13 @@ kdeartwork (4:3.5.8-1) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
-  * Only make kdeartwork recommend kscreensaver-xsavers, not depend. It pulls
+  * Only make tdeartwork recommend kscreensaver-xsavers, not depend. It pulls
     all sorts of weird gtk-stuff in.
   * Fix spelling error in control file.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 11 Oct 2007 00:25:56 +0200
 
-kdeartwork (4:3.5.7-2) unstable; urgency=low
+tdeartwork (4:3.5.7-2) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -89,13 +89,13 @@ kdeartwork (4:3.5.7-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 07 Aug 2007 19:00:51 +0200
 
-kdeartwork (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdeartwork (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:25 +0100
 
-kdeartwork (4:3.5.7-1ubuntu3) gutsy; urgency=low
+tdeartwork (4:3.5.7-1ubuntu3) gutsy; urgency=low
 
   * Added kubuntu_01_dont_use_xscreensaver_by_default.diff which is the
     last upload, in patch form, as opposed to directly patching the
@@ -103,7 +103,7 @@ kdeartwork (4:3.5.7-1ubuntu3) gutsy; urgency=low
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Mon, 02 Jul 2007 19:14:40 +1000
 
-kdeartwork (4:3.5.7-1ubuntu2) gutsy; urgency=low
+tdeartwork (4:3.5.7-1ubuntu2) gutsy; urgency=low
  .
    * Removed TryExec=xscreensaver from all the
      kscreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be
@@ -111,37 +111,37 @@ kdeartwork (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Mon, 02 Jul 2007 17:13:01 +1000
 
-kdeartwork (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdeartwork (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * Merge with Debian for new upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 May 2007 16:01:05 +0100
 
-kdeartwork (4:3.5.7-1) unstable; urgency=low
+tdeartwork (4:3.5.7-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 15 May 2007 22:30:44 +0100
 
-kdeartwork (4:3.5.6-4ubuntu1) gutsy; urgency=low
+tdeartwork (4:3.5.6-4ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 20:32:55 +0100
 
-kdeartwork (4:3.5.6-4) unstable; urgency=low
+tdeartwork (4:3.5.6-4) unstable; urgency=low
 
   * Really upload to unstable after Etch release.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Fri, 20 Apr 2007 13:57:49 +0100
 
-kdeartwork (4:3.5.6-3) experimental; urgency=low
+tdeartwork (4:3.5.6-3) experimental; urgency=low
 
   * Upload to unstable after Etch release.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Fri, 20 Apr 2007 12:48:34 +0100
 
-kdeartwork (4:3.5.6-2) experimental; urgency=low
+tdeartwork (4:3.5.6-2) experimental; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -154,34 +154,34 @@ kdeartwork (4:3.5.6-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 31 Jan 2007 06:01:40 +0100
 
-kdeartwork (4:3.5.6-1) experimental; urgency=low
+tdeartwork (4:3.5.6-1) experimental; urgency=low
 
   * New upstream release.
-  * Make kdeartwork-dbg depend on kdelibs-dbg to get useful backtraces when
+  * Make tdeartwork-dbg depend on tdelibs-dbg to get useful backtraces when
     debugging.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 16 Jan 2007 19:21:21 +0100
 
-kdeartwork (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdeartwork (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:30 +0000
 
-kdeartwork (4:3.5.5-1ubuntu1) feisty; urgency=low
+tdeartwork (4:3.5.5-1ubuntu1) feisty; urgency=low
 
   * Merge with Debian
   * Compile with --enable-gcc-hidden-visibility
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 20:30:07 +0000
 
-kdeartwork (4:3.5.5-1) unstable; urgency=low
+tdeartwork (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  4 Oct 2006 20:38:54 -0400
 
-kdeartwork (4:3.5.4-1) unstable; urgency=low
+tdeartwork (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -189,40 +189,40 @@ kdeartwork (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 29 Jul 2006 21:11:16 -0400
 
-kdeartwork (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdeartwork (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:05 +0000
 
-kdeartwork (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdeartwork (4:3.5.4-0ubuntu2) 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:12 +0000
 
-kdeartwork (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdeartwork (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:18 +0000
 
-kdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low
+tdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low
 
   * Removed kpartsaver.desktop from debian/kscreensavers-xsaver.install.  
     Closes bug #53065
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Fri, 21 Jul 2006 23:10:26 +1000
 
-kdeartwork (4:3.5.3-1ubuntu1) edgy; urgency=low
+tdeartwork (4:3.5.3-1ubuntu1) edgy; urgency=low
 
   * Sync with Debian
   * Create kscreensaver-xsavers-extra with the universe xscreensavers
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Jul 2006 12:39:40 +0000
 
-kdeartwork (4:3.5.3-1) unstable; urgency=low
+tdeartwork (4:3.5.3-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -234,7 +234,7 @@ kdeartwork (4:3.5.3-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun,  4 Jun 2006 18:27:48 -0400
 
-kdeartwork (4:3.5.2-1) unstable; urgency=low
+tdeartwork (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -242,18 +242,18 @@ kdeartwork (4:3.5.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 29 Mar 2006 20:29:56 -0500
 
-kdeartwork (4:3.5.1-2) unstable; urgency=low
+tdeartwork (4:3.5.1-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Add a missing kdeartwork-theme-icon Replaces for old versions of
-    kdelibs-data. (Closes: #350868)
+  * Add a missing tdeartwork-theme-icon Replaces for old versions of
+    tdelibs-data. (Closes: #350868)
 
   * Upload to unstable.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  1 Feb 2006 11:05:29 -0500
 
-kdeartwork (4:3.5.1-1) unstable; urgency=low
+tdeartwork (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -263,7 +263,7 @@ kdeartwork (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 29 Jan 2006 10:45:34 -0500
 
-kdeartwork (4:3.5.0.dfsg.1-2) unstable; urgency=low
+tdeartwork (4:3.5.0.dfsg.1-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -273,7 +273,7 @@ kdeartwork (4:3.5.0.dfsg.1-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  7 Jan 2006 17:24:48 -0500
 
-kdeartwork (4:3.5.0.dfsg.1-1) experimental; urgency=low
+tdeartwork (4:3.5.0.dfsg.1-1) experimental; urgency=low
 
   * Upload to experimental.
 
@@ -281,14 +281,14 @@ kdeartwork (4:3.5.0.dfsg.1-1) experimental; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * kdeartwork shipped with the YazooSmileys emoticons, which were not under a
+  * tdeartwork shipped with the YazooSmileys emoticons, which were not under a
     Free license. This revision of the orig.tar.gz removes the problem files.
     Upstream has followed suit, and so KDE 3.5.1 will not need special
     handling. (Closes: #342163)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 18 Dec 2005 18:44:19 -0500
 
-kdeartwork (4:3.5.0-1) alioth; urgency=low
+tdeartwork (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
 
@@ -296,20 +296,20 @@ kdeartwork (4:3.5.0-1) alioth; urgency=low
 
   * Bump DH_COMPAT to 5. No changes.
 
-  * Add kdeartwork-dbg, to help track down problems.
+  * Add tdeartwork-dbg, to help track down problems.
    
   +++ Changes by Josh Metzler:
 
   * Remove obsolete conflicts/replaces relationships against packages/versions
     not in Sarge.
   
-  * Add kdewallpapers replaces against kdebase-data due to fulmine.jpg.desktop
+  * Add kdewallpapers replaces against tdebase-data due to fulmine.jpg.desktop
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 30 Nov 2005 13:09:32 -0500
 
-kdeartwork (4:3.4.3-2) unstable; urgency=low
+tdeartwork (4:3.4.3-2) unstable; urgency=low
 
-  * Upload to unstable, rebuilding against kdelibs4c2a.
+  * Upload to unstable, rebuilding against tdelibs4c2a.
 
   * KDE_3_4_BRANCH update (up to r484707).
 
@@ -320,13 +320,13 @@ kdeartwork (4:3.4.3-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  1 Dec 2005 15:58:30 +0100
 
-kdeartwork (4:3.5.2-0ubuntu4) dapper; urgency=low
+tdeartwork (4:3.5.2-0ubuntu4) dapper; urgency=low
 
   * Edit debian/cdbs/kde.mk to mark .po files as UTF-8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Apr 2006 19:14:28 +0100
 
-kdeartwork (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdeartwork (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Reverse previous change and list screensavers explicity, can't use
     wildcard as some .desktop files should go into kscreensavers 
@@ -334,7 +334,7 @@ kdeartwork (4:3.5.2-0ubuntu3) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 30 Mar 2006 16:54:24 +0100
 
-kdeartwork (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdeartwork (4:3.5.2-0ubuntu2) dapper; urgency=low
 
   * The upstream makefile cleverly detects the presense of screensavers
     in /usr/lib/xscreensaver/ and only installs .desktop files for those
@@ -343,7 +343,7 @@ kdeartwork (4:3.5.2-0ubuntu2) dapper; urgency=low
 
  -- Adam Conrad <adconrad@ubuntu.com>  Wed, 29 Mar 2006 16:37:23 +1100
 
-kdeartwork (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdeartwork (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Add kubuntu_01_xscreensaver_detect.diff, flame is no longer in the
@@ -351,33 +351,33 @@ kdeartwork (4:3.5.2-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:30 +0000
 
-kdeartwork (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdeartwork (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:06 +0000
 
-kdeartwork (4:3.5.0-0ubuntu2) dapper; urgency=low
+tdeartwork (4:3.5.0-0ubuntu2) dapper; urgency=low
 
   * Do not install ant.desktop, xscreensaver no longer 
     includes it
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  7 Dec 2005 18:46:44 +0000
 
-kdeartwork (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdeartwork (4:3.5.0-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Dec 2005 12:27:12 +0000
 
-kdeartwork (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdeartwork (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Generate .pot files
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 22:06:39 +0000
 
-kdeartwork (4:3.5-rc1-0ubuntu1) dapper; urgency=low
+tdeartwork (4:3.5-rc1-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Sync with Debian
@@ -385,13 +385,13 @@ kdeartwork (4:3.5-rc1-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 13 Nov 2005 20:02:30 +0000
 
-kdeartwork (4:3.4.3-1) experimental; urgency=low
+tdeartwork (4:3.4.3-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 16 Oct 2005 13:56:19 -0400
 
-kdeartwork (4:3.4.2-1) unstable; urgency=low
+tdeartwork (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -402,7 +402,7 @@ kdeartwork (4:3.4.2-1) unstable; urgency=low
   * Replace the build-dep on xlibmesa-glu-dev with libglu1-xorg-dev for the
     X.Org transition.
 
-  * Remove the dummy transitional package kdeartwork-theme-desktop, as Sarge
+  * Remove the dummy transitional package tdeartwork-theme-desktop, as Sarge
     was released and Woody --> Sarge upgrades are no longer a concern.
     (Closes: #322008)
 
@@ -420,20 +420,20 @@ kdeartwork (4:3.4.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  1 Sep 2005 18:52:58 +0200
 
-kdeartwork (4:3.4.1-1) experimental; urgency=low
+tdeartwork (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
 
-kdeartwork (4:3.4.0-0pre2) alioth; urgency=low
+tdeartwork (4:3.4.0-0pre2) alioth; urgency=low
 
   * New upstream release.
 
   +++ Changes by Christopher Martin:
 
   * Converted packaging to CDBS.
-  * Added a new package, kdeartwork-emoticons (containing the former
+  * Added a new package, tdeartwork-emoticons (containing the former
     Kopete emoticons, now usable by everyone).
   * Forward port a patch from KDE 3.3 that fixes the building of the
     KFireSaver screensaver.
@@ -442,13 +442,13 @@ kdeartwork (4:3.4.0-0pre2) alioth; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 25 Mar 2005 08:48:21 -0500
 
-kdeartwork (4:3.3.2-1) unstable; urgency=low
+tdeartwork (4:3.3.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
 
  -- Ben Burton <bab@debian.org>  Sat, 22 Jan 2005 06:53:59 +1100
 
-kdeartwork (4:3.3.1-1) unstable; urgency=medium
+tdeartwork (4:3.3.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.
   * Added kdeclassic/locolor icon license to debian/copyright, which has been
@@ -463,11 +463,11 @@ kdeartwork (4:3.3.1-1) unstable; urgency=medium
 
  -- Ben Burton <bab@debian.org>  Sun, 31 Oct 2004 15:17:56 +1100
 
-kdeartwork (4:3.3.0-1) unstable; urgency=low
+tdeartwork (4:3.3.0-1) unstable; urgency=low
 
   * New upstream release (closes: #267571).
   * The previous versioned libqt3-mt-dev build-depends is no longer
-    necessary, since kdelibs4-dev already forces Qt 3.3.
+    necessary, since tdelibs4-dev already forces Qt 3.3.
   * Split xscreensaver hooks into a separate package kscreensaver-xsavers,
     along with kxsconfig and kxsrun (closes: #208769, #244538).  Two years
     of confusion is enough.
@@ -480,97 +480,97 @@ kdeartwork (4:3.3.0-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Thu, 14 Oct 2004 08:30:34 +1000
 
-kdeartwork (4:3.2.3-1) unstable; urgency=low
+tdeartwork (4:3.2.3-1) unstable; urgency=low
 
   * New upstream bugfix release.
-  * Rebuilt against STL-enabled Qt and corresponding kdelibs (closes: #254021).
+  * Rebuilt against STL-enabled Qt and corresponding tdelibs (closes: #254021).
   * Patched the autoconf tests for kxsconfig so that xscreensaver
     configuration works again (closes: #238180, #243150).
   * Suggests (kwin | x-window-manager) for kdewallpapers instead of just
     x-window-manager.
-  * Removed recommends: kwin from kdeartwork-theme-window since this is
+  * Removed recommends: kwin from tdeartwork-theme-window since this is
     already coming in as a depends from the kwin shlibs file.
 
  -- Ben Burton <bab@debian.org>  Tue, 15 Jun 2004 08:38:18 +1000
 
-kdeartwork (4:3.2.2-1) unstable; urgency=low
+tdeartwork (4:3.2.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
   * Don't use Conflicts/Replaces where we should just use Replaces.
 
  -- Ben Burton <bab@debian.org>  Mon, 26 Apr 2004 09:25:01 +1000
 
-kdeartwork (4:3.2.1-1) unstable; urgency=low
+tdeartwork (4:3.2.1-1) unstable; urgency=low
 
   * First KDE 3.2 upload to sid.
 
  -- Ben Burton <bab@debian.org>  Sun,  7 Mar 2004 17:42:59 +1100
 
-kdeartwork (4:3.2.0.1-1) experimental; urgency=low
+tdeartwork (4:3.2.0.1-1) experimental; urgency=low
 
   * First KDE 3.2 upload to experimental.
   * Sync from KDE_3_2_BRANCH for recent bugfixes (this requires an upstream
     version change since some binary files have been updated).
-  * Using versioned dependencies for the kdeartwork metapackage.
+  * Using versioned dependencies for the tdeartwork metapackage.
 
  -- Ben Burton <bab@debian.org>  Mon, 23 Feb 2004 08:14:22 +1100
 
-kdeartwork (4:3.2.0-1) unstable; urgency=low
+tdeartwork (4:3.2.0-1) unstable; urgency=low
 
   * New upstream release.
   * Many thanks to Ralf Nolden for all his help with packaging KDE 3.2.
 
  -- Ben Burton <bab@debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
 
-kdeartwork (4:3.1.5-2) unstable; urgency=low
+tdeartwork (4:3.1.5-2) unstable; urgency=low
 
-  * Made kscreensaver depend on kdebase-bin (closes: #203185).
+  * Made kscreensaver depend on tdebase-bin (closes: #203185).
 
  -- Ben Burton <bab@debian.org>  Mon, 19 Jan 2004 11:08:45 +1100
 
-kdeartwork (4:3.1.5-1) unstable; urgency=low
+tdeartwork (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <bab@debian.org>  Sun, 18 Jan 2004 12:55:12 +1100
 
-kdeartwork (4:3.1.4-2) unstable; urgency=low
+tdeartwork (4:3.1.4-2) unstable; urgency=low
 
   * Fixed paths to xscreensaver XML files in kxsconfig (closes: #221974).
 
  -- Ben Burton <bab@debian.org>  Sat, 13 Dec 2003 09:34:11 +1100
 
-kdeartwork (4:3.1.4-1) unstable; urgency=low
+tdeartwork (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
   * Bumped standards-version to 3.6.1.
 
  -- Ben Burton <bab@debian.org>  Sun, 12 Oct 2003 19:52:13 +1000
 
-kdeartwork (4:3.1.3-1) unstable; urgency=low
+tdeartwork (4:3.1.3-1) unstable; urgency=low
 
   * New upstream release.
-  * Added dummy kdeartwork-theme-desktop upgrade package.
+  * Added dummy tdeartwork-theme-desktop upgrade package.
   * Bumped standards-version to 3.6.0.
 
  -- Ben Burton <bab@debian.org>  Wed, 13 Aug 2003 11:02:26 +1000
 
-kdeartwork (4:3.1.2-2) unstable; urgency=low
+tdeartwork (4:3.1.2-2) unstable; urgency=low
 
-  * Split kdeartwork-theme-desktop into kdeartwork-theme-icon and
+  * Split tdeartwork-theme-desktop into tdeartwork-theme-icon and
     kdewallpapers (closes: #189804)
   * Bumped standards-version to 3.5.10.0.
 
  -- Ben Burton <bab@debian.org>  Mon,  9 Jun 2003 13:13:35 +1000
 
-kdeartwork (4:3.1.2-1) unstable; urgency=low
+tdeartwork (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
   * Man page overhaul.
 
  -- Ben Burton <bab@debian.org>  Sun,  1 Jun 2003 14:15:47 +1000
 
-kdeartwork (4:3.1.1-1) unstable; urgency=low
+tdeartwork (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release.
   * Package kscreensaver recommends xscreensaver-gl.
@@ -578,29 +578,29 @@ kdeartwork (4:3.1.1-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun, 23 Mar 2003 15:23:23 +1100
 
-kdeartwork (4:3.1.0-3) unstable; urgency=low
+tdeartwork (4:3.1.0-3) unstable; urgency=low
 
-  * Made kdeartwork-theme-desktop conflict with kdewallpapers
+  * Made tdeartwork-theme-desktop conflict with kdewallpapers
     (closes: #180209).
 
  -- Ben Burton <bab@debian.org>  Tue, 11 Feb 2003 14:45:59 +1100
 
-kdeartwork (4:3.1.0-2) unstable; urgency=low
+tdeartwork (4:3.1.0-2) unstable; urgency=low
 
   * First Trinity upload to debian!
   * Build-depends on xlibmesa-gl-dev and xlibmesa-glu-dev.
 
  -- Ben Burton <bab@debian.org>  Mon,  3 Feb 2003 08:53:03 +1100
 
-kdeartwork (4:3.1.0-1) unstable; urgency=low
+tdeartwork (4:3.1.0-1) unstable; urgency=low
 
   * New upstream release.
-  * Renamed kdeartwork-screensaver to kscreensaver.
-  * Shifted epoch to 4: since kdebase used to provide kscreensaver 4:3.0.x.
+  * Renamed tdeartwork-screensaver to kscreensaver.
+  * Shifted epoch to 4: since tdebase used to provide kscreensaver 4:3.0.x.
 
  -- Ben Burton <bab@debian.org>  Sat,  4 Jan 2003 20:06:44 +1100
 
-kdeartwork (3.0.9-1) unstable; urgency=low
+tdeartwork (3.0.9-1) unstable; urgency=low
 
   * New upstream release.
   * Built with g++-3.2.
@@ -608,7 +608,7 @@ kdeartwork (3.0.9-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Tue, 22 Oct 2002 11:57:39 +1000
 
-kdeartwork (3.0.8-1) unstable; urgency=low
+tdeartwork (3.0.8-1) unstable; urgency=low
 
   * New upstream release.
   * Moved to Chris Cheney's style of debian/rules.
@@ -616,75 +616,75 @@ kdeartwork (3.0.8-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sun, 22 Sep 2002 17:57:55 +1000
 
-kdeartwork (3.0.3-1) unstable; urgency=low
+tdeartwork (3.0.3-1) unstable; urgency=low
 
   * New upstream release.
   * Build-depends on automake1.5.
 
  -- Ben Burton <benb@acm.org>  Thu, 15 Aug 2002 13:22:22 +1000
 
-kdeartwork (3.0.2-1) unstable; urgency=low
+tdeartwork (3.0.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Thu,  4 Jul 2002 19:36:49 +1000
 
-kdeartwork (3.0.1-1) unstable; urgency=low
+tdeartwork (3.0.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Mon, 13 May 2002 15:29:23 +1000
 
-kdeartwork (2.2.2-1) unstable; urgency=low
+tdeartwork (2.2.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Wed,  7 Nov 2001 10:49:53 -0600
 
-kdeartwork (2.2.1-5) unstable; urgency=low
+tdeartwork (2.2.1-5) unstable; urgency=low
 
   * Uses automake again to solve new alpha problems.
 
  -- Ben Burton <benb@acm.org>  Tue,  6 Nov 2001 23:51:27 -0600
 
-kdeartwork (2.2.1-4) unstable; urgency=low
+tdeartwork (2.2.1-4) unstable; urgency=low
 
   * Cleaned up automake-related material.
 
  -- Ben Burton <benb@acm.org>  Sun, 28 Oct 2001 13:48:04 -0600
 
-kdeartwork (2.2.1-3) unstable; urgency=low
+tdeartwork (2.2.1-3) unstable; urgency=low
 
   * Builds with automake 1.5.
 
  -- Ben Burton <benb@acm.org>  Thu, 11 Oct 2001 15:31:32 -0500
 
-kdeartwork (2.2.1-2) unstable; urgency=low
+tdeartwork (2.2.1-2) unstable; urgency=low
 
   * Updated parameters for alpha build (closes: Bug#113125).
 
  -- Ben Burton <benb@acm.org>  Sat, 22 Sep 2001 12:00:37 -0500
 
-kdeartwork (2.2.1-1) unstable; urgency=low
+tdeartwork (2.2.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Fri, 31 Aug 2001 21:08:56 -0500
 
-kdeartwork (2.2.0-final-1) unstable; urgency=low
+tdeartwork (2.2.0-final-1) unstable; urgency=low
 
   * New upstream release.
   * Bumped standards-version to 3.5.6.
 
  -- Ben Burton <benb@acm.org>  Sun, 29 Jul 2001 17:48:59 +1000
 
-kdeartwork (2.2-beta1-2) unstable; urgency=low
+tdeartwork (2.2-beta1-2) unstable; urgency=low
 
   * Builds on alpha.
 
  -- Ben Burton <benb@acm.org>  Sun, 29 Jul 2001 00:20:23 +1000
 
-kdeartwork (2.2-beta1-1) unstable; urgency=low
+tdeartwork (2.2-beta1-1) unstable; urgency=low
 
   * Initial Release (closes: Bug#101244).
 
diff --git a/ubuntu/maverick/tdeartwork/debian/control b/ubuntu/maverick/tdeartwork/debian/control
index 391ca8986..34956beb8 100644
--- a/ubuntu/maverick/tdeartwork/debian/control
+++ b/ubuntu/maverick/tdeartwork/debian/control
@@ -1,19 +1,19 @@
-Source: kdeartwork-trinity
+Source: tdeartwork-trinity
 Section: kde
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, kdelibs4-trinity-dev, gawk, gettext, sharutils, kdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev
 Build-Conflicts: autoconf2.13, nvidia-glx
 Standards-Version: 3.8.4
 
-Package: kdeartwork-trinity
+Package: tdeartwork-trinity
 Architecture: all
 Section: kde
-Replaces: kdeartwork-kde3 (<< 4:3.5.13)
-Breaks: kdeartwork-kde3 (<< 4:3.5.13)
-Depends: kdeartwork-misc-trinity (>= ${Source-Version}), kdeartwork-emoticons-trinity (>= ${Source-Version}), kdeartwork-style-trinity (>= ${Source-Version}), kdeartwork-theme-icon-trinity (>= ${Source-Version}), kdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), kscreensaver-trinity (>= ${Source-Version})
+Replaces: tdeartwork-kde3 (<< 4:3.5.13)
+Breaks: tdeartwork-kde3 (<< 4:3.5.13)
+Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), kscreensaver-trinity (>= ${Source-Version})
 Recommends: kscreensaver-xsavers-trinity
 Description: themes, styles and more from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -27,37 +27,37 @@ Description: themes, styles and more from the official Trinity release
  .
  Homepage: http://artist.kde.org 
 
-Package: kdeartwork-emoticons-trinity
+Package: tdeartwork-emoticons-trinity
 Architecture: all
 Section: kde
-Replaces: kdeartwork-emoticons-kde3 (<< 4:3.5.13)
-Breaks: kdeartwork-emoticons-kde3 (<< 4:3.5.13)
+Replaces: tdeartwork-emoticons-kde3 (<< 4:3.5.13)
+Breaks: tdeartwork-emoticons-kde3 (<< 4:3.5.13)
 Enhances: kopete-trinity
 Description: emoticon collections for KDE chat clients
  This package contains several collections of emoticons used by official
  and unofficial KDE chat clients, such as Kopete and Konversation.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kdeartwork-misc-trinity
+Package: tdeartwork-misc-trinity
 Architecture: all
 Section: kde
-Replaces: kdeartwork-misc-kde3 (<< 4:3.5.13)
-Breaks: kdeartwork-misc-kde3 (<< 4:3.5.13)
+Replaces: tdeartwork-misc-kde3 (<< 4:3.5.13)
+Breaks: tdeartwork-misc-kde3 (<< 4:3.5.13)
 Suggests: kworldclock
 Description: various multimedia goodies released with KDE
  This package contains miscellaneous multimedia goodies for KDE.
  Included are additional KDE sounds and kworldclock themes.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kdeartwork-style-trinity
+Package: tdeartwork-style-trinity
 Architecture: any
 Section: kde
-Replaces: kdeartwork-style-kde3 (<< 4:3.5.13)
-Breaks: kdeartwork-style-kde3 (<< 4:3.5.13)
+Replaces: tdeartwork-style-kde3 (<< 4:3.5.13)
+Breaks: tdeartwork-style-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Description: widget styles released with Trinity
  This package contains additional widget styles for Trinity. Widget styles
@@ -66,13 +66,13 @@ Description: widget styles released with Trinity
  manager in the KDE Control Centre.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kdeartwork-theme-icon-trinity
+Package: tdeartwork-theme-icon-trinity
 Architecture: all
 Section: kde
-Replaces: kdeartwork-theme-icon-kde3 (<< 4:3.5.13)
-Breaks: kdeartwork-theme-icon-kde3 (<< 4:3.5.13)
+Replaces: tdeartwork-theme-icon-kde3 (<< 4:3.5.13)
+Breaks: tdeartwork-theme-icon-kde3 (<< 4:3.5.13)
 Recommends: kdesktop-trinity, kicker-trinity
 Description: icon themes released with Trinity
  This package contains additional icon themes for Trinity. Icon themes can be
@@ -80,13 +80,13 @@ Description: icon themes released with Trinity
  can be applied using the icon manager in the Trinity Control Centre.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kdeartwork-theme-window-trinity
+Package: tdeartwork-theme-window-trinity
 Architecture: any
 Section: kde
-Replaces: kdeartwork-theme-window-kde3 (<< 4:3.5.13)
-Breaks: kdeartwork-theme-window-kde3 (<< 4:3.5.13)
+Replaces: tdeartwork-theme-window-kde3 (<< 4:3.5.13)
+Breaks: tdeartwork-theme-window-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Description: window decoration themes released with Trinity
  This package contains additional window decoration themes for Trinity. Window
@@ -95,7 +95,7 @@ Description: window decoration themes released with Trinity
  Control Center.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: kdewallpapers-trinity
 Architecture: all
@@ -108,14 +108,14 @@ Description: wallpapers released with Trinity
  applied using the background manager in the KDE Control Centre.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: kscreensaver-trinity
 Architecture: any
 Section: kde
 Replaces: kscreensaver-kde3 (<< 4:3.5.13)
 Breaks: kscreensaver-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdebase-trinity-bin
+Depends: ${shlibs:Depends}, tdebase-trinity-bin
 Recommends: kwin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version})
 Description: additional screen savers released with Trinity
  This package contains the screen savers for Trinity. They can be tested and
@@ -127,14 +127,14 @@ Description: additional screen savers released with Trinity
  the KDE Control Center, install the separate package kscreensaver-xsavers.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: kscreensaver-xsavers-trinity
 Architecture: any
 Section: kde
 Replaces: kscreensaver-xsavers-kde3 (<< 4:3.5.13)
 Breaks: kscreensaver-xsavers-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdebase-trinity-bin, xscreensaver-data
+Depends: ${shlibs:Depends}, tdebase-trinity-bin, xscreensaver-data
 Recommends: kwin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl
 Suggests: kscreensaver-xsavers-webcollage-trinity
 Description: Trinity hooks for standard xscreensavers
@@ -150,7 +150,7 @@ Description: Trinity hooks for standard xscreensavers
  files to integrate these packages into Trinity.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: kscreensaver-xsavers-webcollage-trinity
 Architecture: all
@@ -175,7 +175,7 @@ Description: webcollage screensaver Trinity hook
  installation.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: kscreensaver-xsavers-extra-trinity
 Architecture: all
@@ -195,16 +195,16 @@ Description: Trinity hooks for standard xscreensavers
  kscreensaver.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kdeartwork-trinity-dbg
+Package: tdeartwork-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: kdeartwork-kde3-dbg (<< 4:3.5.13)
-Breaks: kdeartwork-kde3-dbg (<< 4:3.5.13)
-Depends: kdelibs-trinity-dbg
+Replaces: tdeartwork-kde3-dbg (<< 4:3.5.13)
+Breaks: tdeartwork-kde3-dbg (<< 4:3.5.13)
+Depends: tdelibs-trinity-dbg
 Priority: extra
-Description: debugging symbols for kdeartwork-trinity
- This package contains the debugging symbols associated with kdeartwork.
- They will automatically be used by gdb for debugging kdeartwork-related
+Description: debugging symbols for tdeartwork-trinity
+ This package contains the debugging symbols associated with tdeartwork.
+ They will automatically be used by gdb for debugging tdeartwork-related
  issues.
diff --git a/ubuntu/maverick/tdeartwork/debian/control.in b/ubuntu/maverick/tdeartwork/debian/control.in
index c12a75d6d..e2d1102a3 100644
--- a/ubuntu/maverick/tdeartwork/debian/control.in
+++ b/ubuntu/maverick/tdeartwork/debian/control.in
@@ -1,17 +1,17 @@
-Source: kdeartwork
+Source: tdeartwork
 Section: kde
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, kdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils, kdebase-dev (>= 4:3.5.7), kwin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils, tdebase-dev (>= 4:3.5.7), kwin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl
 Build-Conflicts: autoconf2.13, nvidia-glx
 Standards-Version: 3.7.2
 
-Package: kdeartwork
+Package: tdeartwork
 Architecture: all
 Section: kde
-Depends: kdeartwork-misc (>= ${Source-Version}), kdeartwork-emoticons (>= ${Source-Version}), kdeartwork-style (>= ${Source-Version}), kdeartwork-theme-icon (>= ${Source-Version}), kdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), kscreensaver (>= ${Source-Version})
+Depends: tdeartwork-misc (>= ${Source-Version}), tdeartwork-emoticons (>= ${Source-Version}), tdeartwork-style (>= ${Source-Version}), tdeartwork-theme-icon (>= ${Source-Version}), tdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), kscreensaver (>= ${Source-Version})
 Recommends: kscreensaver-xsavers
 Description: themes, styles and more from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -25,7 +25,7 @@ Description: themes, styles and more from the official KDE release
  .
  Homepage: http://artist.kde.org 
 
-Package: kdeartwork-emoticons
+Package: tdeartwork-emoticons
 Architecture: all
 Section: kde
 Enhances: kopete
@@ -34,9 +34,9 @@ Description: emoticon collections for KDE chat clients
  and unofficial KDE chat clients, such as Kopete and Konversation.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
-Package: kdeartwork-misc
+Package: tdeartwork-misc
 Architecture: all
 Section: kde
 Suggests: kworldclock
@@ -45,9 +45,9 @@ Description: various multimedia goodies released with KDE
  Included are additional KDE sounds and kworldclock themes.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
-Package: kdeartwork-style
+Package: tdeartwork-style
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
@@ -58,22 +58,22 @@ Description: widget styles released with KDE
  manager in the KDE Control Centre.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
-Package: kdeartwork-theme-icon
+Package: tdeartwork-theme-icon
 Architecture: all
 Section: kde
 Recommends: kdesktop, kicker
-Replaces: kdelibs-data (<< 4:3.5)
+Replaces: tdelibs-data (<< 4:3.5)
 Description: icon themes released with KDE
  This package contains additional icon themes for KDE. Icon themes can be
  used to customise the appearance of standard icons throughout KDE. They
  can be applied using the icon manager in the KDE Control Centre.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
-Package: kdeartwork-theme-window
+Package: tdeartwork-theme-window
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
@@ -84,24 +84,24 @@ Description: window decoration themes released with KDE
  Control Center.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
 Package: kdewallpapers
 Architecture: all
 Section: kde
 Suggests: kwin | x-window-manager
-Replaces: kdebase-data (<< 4:3.5)
+Replaces: tdebase-data (<< 4:3.5)
 Description: wallpapers released with KDE
  This package contains additional wallpapers for KDE. Wallpapers can be
  applied using the background manager in the KDE Control Centre.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
 Package: kscreensaver
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdebase-bin
+Depends: ${shlibs:Depends}, tdebase-bin
 Recommends: kwin, kscreensaver-xsavers (= ${Source-Version})
 Description: additional screen savers released with KDE
  This package contains the screen savers for KDE. They can be tested and
@@ -113,12 +113,12 @@ Description: additional screen savers released with KDE
  the KDE Control Center, install the separate package kscreensaver-xsavers.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
 Package: kscreensaver-xsavers
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdebase-bin, xscreensaver
+Depends: ${shlibs:Depends}, tdebase-bin, xscreensaver
 Recommends: kwin, kscreensaver (= ${Source-Version}), xscreensaver-gl
 Suggests: kscreensaver-xsavers-webcollage
 Description: KDE hooks for standard xscreensavers
@@ -134,7 +134,7 @@ Description: KDE hooks for standard xscreensavers
  files to integrate these packages into KDE.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
 Package: kscreensaver-xsavers-webcollage
 Architecture: all
@@ -157,14 +157,14 @@ Description: webcollage screensaver KDE hook
  installation.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
-Package: kdeartwork-dbg
+Package: tdeartwork-dbg
 Section: libdevel
 Architecture: any
-Depends: kdelibs-dbg
+Depends: tdelibs-dbg
 Priority: extra
-Description: debugging symbols for kdeartwork
- This package contains the debugging symbols associated with kdeartwork.
- They will automatically be used by gdb for debugging kdeartwork-related
+Description: debugging symbols for tdeartwork
+ This package contains the debugging symbols associated with tdeartwork.
+ They will automatically be used by gdb for debugging tdeartwork-related
  issues.
diff --git a/ubuntu/maverick/tdeartwork/debian/copyright b/ubuntu/maverick/tdeartwork/debian/copyright
index ae0c0cb2d..f98e0b7f5 100644
--- a/ubuntu/maverick/tdeartwork/debian/copyright
+++ b/ubuntu/maverick/tdeartwork/debian/copyright
@@ -5,7 +5,7 @@ It was downloaded from: http://www.kde.org/download
 
 Upstream Authors:
 
-  Note that kdeartwork has many contributers beyond those listed below.
+  Note that tdeartwork has many contributers beyond those listed below.
 
   Icon Themes:
     iKons: Kristof Borrey <kborrey@skynet.be>
@@ -193,7 +193,7 @@ Copyright:
 
   Since this change is generally though retroactive, the incompatibility
   is resolved, and we can ship the Virtual Machine screen saver with
-  kdeartwork.
+  tdeartwork.
 
   --------------------
 
diff --git a/ubuntu/maverick/tdeartwork/debian/rules b/ubuntu/maverick/tdeartwork/debian/rules
index 1a593022d..3e16d1ff2 100755
--- a/ubuntu/maverick/tdeartwork/debian/rules
+++ b/ubuntu/maverick/tdeartwork/debian/rules
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
-DEB_DH_STRIP_ARGS  := --dbg-package=kdeartwork-trinity-dbg
+DEB_DH_STRIP_ARGS  := --dbg-package=tdeartwork-trinity-dbg
 
 clean::
 	rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png
diff --git a/ubuntu/maverick/tdeartwork/debian/kdeartwork-emoticons-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdeartwork-emoticons-trinity.install
index 0fea42334..0fea42334 100644
--- a/ubuntu/maverick/tdeartwork/debian/kdeartwork-emoticons-trinity.install
+++ b/ubuntu/maverick/tdeartwork/debian/tdeartwork-emoticons-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/kdeartwork-misc-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdeartwork-misc-trinity.install
index 0285201e7..0285201e7 100644
--- a/ubuntu/maverick/tdeartwork/debian/kdeartwork-misc-trinity.install
+++ b/ubuntu/maverick/tdeartwork/debian/tdeartwork-misc-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/kdeartwork-style-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdeartwork-style-trinity.install
index 8fab1bcbf..8fab1bcbf 100644
--- a/ubuntu/maverick/tdeartwork/debian/kdeartwork-style-trinity.install
+++ b/ubuntu/maverick/tdeartwork/debian/tdeartwork-style-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/kdeartwork-theme-icon-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-icon-trinity.install
index 8a1dc19a0..8a1dc19a0 100644
--- a/ubuntu/maverick/tdeartwork/debian/kdeartwork-theme-icon-trinity.install
+++ b/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-icon-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/kdeartwork-theme-window-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-window-trinity.install
index 7f688e236..7f688e236 100644
--- a/ubuntu/maverick/tdeartwork/debian/kdeartwork-theme-window-trinity.install
+++ b/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-window-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/kdeartwork.README.Debian b/ubuntu/maverick/tdeartwork/debian/tdeartwork.README.Debian
index 1b9dfa1a7..079d4ba40 100644
--- a/ubuntu/maverick/tdeartwork/debian/kdeartwork.README.Debian
+++ b/ubuntu/maverick/tdeartwork/debian/tdeartwork.README.Debian
@@ -1,7 +1,7 @@
 KDE Artwork for Debian
 ----------------------
 
-Package kdeartwork is a metapackage that depends on the full set of
+Package tdeartwork is a metapackage that depends on the full set of
 themes, widget styles, screen savers and other artistic goodies provided
 with the official release of KDE.
 
diff --git a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
index 554f855b6..2a94294ef 100644
--- a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
@@ -11,34 +11,34 @@ konqueror.install:
 don't install konqueror/profiles except filemanagement and webbrowsing
 remove debian/tmp/share/apps/konqsidebartng/entries/system.desktop
 
-remove .svgz from kdebase-data.install
+remove .svgz from tdebase-data.install
 
 replace 10_kdmrc_defaults.diff with 10_kdmrc_defaults_kubuntu.diff
 
 install/klipper::
 	sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc
 
-binary-install/kdebase-bin::
-	install -p -D -m644 debian/kcheckpass.pam debian/kdebase-bin/etc/pam.d/kcheckpass
-	install -p -D -m644 debian/kscreensaver.pam debian/kdebase-bin/etc/pam.d/kscreensaver
-	install -p -D -m644 debian/ubuntu.xmodmap debian/kdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap
-	install -p -D -m644 debian/80ubuntu-xmodmap debian/kdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap
+binary-install/tdebase-bin::
+	install -p -D -m644 debian/kcheckpass.pam debian/tdebase-bin/etc/pam.d/kcheckpass
+	install -p -D -m644 debian/kscreensaver.pam debian/tdebase-bin/etc/pam.d/kscreensaver
+	install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap
+	install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap
 
 --with-sudo-kdesu-backend
 
-XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/kdebase/debian
+XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/tdebase/debian
 
 a couple of Replaces (search for ubuntu)
 
-kdebase-data.install: debian/tmp/etc/xdg/menus/applications-merged/kde-essential.menu into applications-merged not kde-applications-merged
+tdebase-data.install: debian/tmp/etc/xdg/menus/applications-merged/kde-essential.menu into applications-merged not kde-applications-merged
 
 in konsole.README.Debian s/fontconfig/fontconfig-config
 
 in kdm.postinst install at s/99/13/
 
-from kdebase-kio-plugins.install remove debian/tmp/usr/share/services/kfile_trash.desktop (that's to remove the trash from the "system applet")
+from tdebase-kio-plugins.install remove debian/tmp/usr/share/services/kfile_trash.desktop (that's to remove the trash from the "system applet")
 
-add debian/ubuntu.xmodmap  debian/80ubuntu-xmodmap and add install rules to binary-install/kdebase-bin::
+add debian/ubuntu.xmodmap  debian/80ubuntu-xmodmap and add install rules to binary-install/tdebase-bin::
 
 control: khelpcenter, suggest don't depend on htdig
 
@@ -50,7 +50,7 @@ Maintainer field
 
 make sure control and control.in are synced
 
-remove kdebase dependency on pmount
+remove tdebase dependency on pmount
 
 Support for KIO Media LUKS
 
diff --git a/ubuntu/maverick/tdebase/debian/NEWS b/ubuntu/maverick/tdebase/debian/NEWS
index 143897e3e..49b0bb6d4 100644
--- a/ubuntu/maverick/tdebase/debian/NEWS
+++ b/ubuntu/maverick/tdebase/debian/NEWS
@@ -1,4 +1,4 @@
-kdebase (4:3.4.2-3) unstable; urgency=low
+tdebase (4:3.4.2-3) unstable; urgency=low
 
   *** Changes to KDM conffiles:
 
@@ -44,7 +44,7 @@ kdebase (4:3.4.2-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  8 Sep 2005 11:13:41 -0400
 
-kdebase (4:3.3.2-1) unstable; urgency=low
+tdebase (4:3.3.2-1) unstable; urgency=low
 
   * Users upgrading from KDE 3.2 might find that their keyboards seem no longer
     to work in KDM. This problem is caused by a change in KDE's handling of
diff --git a/ubuntu/maverick/tdebase/debian/changelog b/ubuntu/maverick/tdebase/debian/changelog
index 9742e6bde..348bfd069 100644
--- a/ubuntu/maverick/tdebase/debian/changelog
+++ b/ubuntu/maverick/tdebase/debian/changelog
@@ -1,4 +1,4 @@
-kdebase-trinity (4:3.5.10-2ubuntu12) karmic; urgency=low
+tdebase-trinity (4:3.5.10-2ubuntu12) karmic; urgency=low
 
   * Repaired kdesktop crash on load
   * Fixed krandrtray crash when randr X extension is unavailable
@@ -6,7 +6,7 @@ kdebase-trinity (4:3.5.10-2ubuntu12) karmic; urgency=low
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 07 Dec 2009 13:24:00 -0600
 
-kdebase-trinity (4:3.5.10-2ubuntu11) karmic; urgency=low
+tdebase-trinity (4:3.5.10-2ubuntu11) karmic; urgency=low
 
   * Repaired kfind crash on premature close
   * Fixed multiple viewport wallpaper crash on select
@@ -14,57 +14,57 @@ kdebase-trinity (4:3.5.10-2ubuntu11) karmic; urgency=low
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 22 Nov 2009 20:06:00 -0600
 
-kdebase-trinity (4:3.5.10-2ubuntu10) karmic; urgency=low
+tdebase-trinity (4:3.5.10-2ubuntu10) karmic; urgency=low
 
   * Added support for Compiz and viewport desktop wallpaper switching
   * Repaired crash on desktop resize on certain systems
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 18 Nov 2009 18:56:00 -0600
 
-kdebase-trinity (4:3.5.10-2ubuntu9) karmic; urgency=low
+tdebase-trinity (4:3.5.10-2ubuntu9) karmic; urgency=low
 
   * Repaired fancy logout / Compiz graphical glitch
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 14 Nov 2009 15:23:00 -0600
 
-kdebase-trinity (4:3.5.10-2ubuntu8) karmic; urgency=low
+tdebase-trinity (4:3.5.10-2ubuntu8) karmic; urgency=low
 
   * Repaired Upstart script properly
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 11 Nov 2009 12:33:00 -0600
 
-kdebase-trinity (4:3.5.10-2ubuntu7) karmic; urgency=low
+tdebase-trinity (4:3.5.10-2ubuntu7) karmic; urgency=low
 
   * Repaired Upstart script (removed respawn stanza)
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 29 Oct 2009 07:31:00 -0600
 
-kdebase-trinity (4:3.5.10-2ubuntu6) karmic; urgency=low
+tdebase-trinity (4:3.5.10-2ubuntu6) karmic; urgency=low
 
   * Repaired KRandrTray failure when active output device was unplugged; also tweaked UI
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 23 Oct 2009 07:31:00 -0600
 
-kdebase-trinity (4:3.5.10-2ubuntu4) karmic; urgency=low
+tdebase-trinity (4:3.5.10-2ubuntu4) karmic; urgency=low
 
   * Repaired XRandR support for the desktop wallpaper; removed the annoying tiling issue
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 21 Oct 2009 01:57:00 -0600
 
-kdebase-trinity (4:3.5.10-2ubuntu3) karmic; urgency=low
+tdebase-trinity (4:3.5.10-2ubuntu3) karmic; urgency=low
 
   * Added missing directory for dpkg-divert to /etc/xdg/menus.kde4
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 20 Oct 2009 13:05:00 -0600
 
-kdebase-trinity (4:3.5.10-2ubuntu2) karmic; urgency=low
+tdebase-trinity (4:3.5.10-2ubuntu2) karmic; urgency=low
 
   * Added Start menu button icon configuration dialog
   * Delayed kdm-trinity startup to allow for graphics device configuration
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 18 Oct 2009 16:21:00 -0600
 
-kdebase-trinity (4:3.5.10-1ubuntu5) karmic; urgency=low
+tdebase-trinity (4:3.5.10-1ubuntu5) karmic; urgency=low
 
   * Added new ICC loading functionality to kcontrol and kdm
   * Added new display output switching functionality to krandrtray
@@ -72,38 +72,38 @@ kdebase-trinity (4:3.5.10-1ubuntu5) karmic; urgency=low
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 15 Oct 2009 10:46:00 -0600
 
-kdebase-trinity (4:3.5.10-1ubuntu4) karmic; urgency=low
+tdebase-trinity (4:3.5.10-1ubuntu4) karmic; urgency=low
 
   * Added Start menu button text option to panel configuration dialog
   * Added forcible termination option to kio unmount wrapper
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 14 Oct 2009 13:16:00 -0600
 
-kdebase-trinity (4:3.5.10-1ubuntu3) karmic; urgency=low
+tdebase-trinity (4:3.5.10-1ubuntu3) karmic; urgency=low
 
   * Default KDM theme set to kubuntu-trinity
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 10 Oct 2009 12:19:00 -0600
 
-kdebase-trinity (4:3.5.10-1ubuntu2) karmic; urgency=low
+tdebase-trinity (4:3.5.10-1ubuntu2) karmic; urgency=low
 
   * Converted startup to Upstart; boot time is vastly improved
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 07 Oct 2009 20:52:00 -0600
 
-kdebase-trinity (4:3.5.10-1ubuntu0) karmic; urgency=low
+tdebase-trinity (4:3.5.10-1ubuntu0) karmic; urgency=low
 
   * Repaired control file depends and recommends
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 17 Sep 2009 16:20:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu12) karmic; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu12) karmic; urgency=low
 
   * Repaired kdm looking at the wrong pam.d files
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 10 Sep 2009 11:20:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu11) karmic; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu11) karmic; urgency=low
 
   * Repaired startkde script to export DESKTOP_SESSION
   * Depends on libogg-dev-la
@@ -111,37 +111,37 @@ kdebase-trinity (4:3.5.10-0ubuntu11) karmic; urgency=low
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 06 Aug 2009 14:59:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu5) karmic; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu5) karmic; urgency=low
 
   * Repaired XDG conflict with KDE4
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 21 July 2009 11:01:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu4) karmic; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu4) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu4~intrepid17) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu4~intrepid17) intrepid; urgency=low
 
   * Repaired unwanted Plasma startup under Jaunty
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 16 Jun 2009 11:08:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu4~intrepid16) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu4~intrepid16) intrepid; urgency=low
 
   * Added tilde to autocompletion
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 05 Jun 2009 15:13:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu4~intrepid14) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu4~intrepid14) intrepid; urgency=low
 
   * Moved xdg items to /opt/trinity/etc/xdg, where they belong
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 17 Apr 2009 01:29:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu4~intrepid10) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu4~intrepid10) intrepid; urgency=low
 
   * Fixed kcontrol device menu items that ended up in lost and found
   * Removed kinfocenter feature, and moved peripheral information views to kcontrolcenter
@@ -150,57 +150,57 @@ kdebase-trinity (4:3.5.10-0ubuntu4~intrepid10) intrepid; urgency=low
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 17 Apr 2009 01:29:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu4~intrepid8) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu4~intrepid8) intrepid; urgency=low
 
   * Repaired plasma startup to autodetect Trinity/KDE4 and not run/run accordingly
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 15 Apr 2009 11:37:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu4~intrepid7) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu4~intrepid7) intrepid; urgency=low
 
   * Added a useful, configurable autocomplete feature to the KDE run dialog
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 13 Apr 2009 02:10:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu4~intrepid6) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu4~intrepid6) intrepid; urgency=low
 
   * Fixed Compiz multiple desktop problem with single screens (kubuntu_04_compiz_taskbar_multiple_desktops.patch)
-  * Removed old dependency on kdebase-runtime-data
+  * Removed old dependency on tdebase-runtime-data
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 27 Mar 2009 12:06:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu4~intrepid4) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu4~intrepid4) intrepid; urgency=low
 
   * Repaired KDM DATAPATH problem
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 20 Mar 2009 10:22:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu4~intrepid2) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu4~intrepid2) intrepid; urgency=low
 
   * Repaired accidental conflict with /etc/sysguarddrc
   * Repared KDM PATH (fixes bug #56)
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 17 Mar 2009 14:03:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu4~intrepid0) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu4~intrepid0) intrepid; urgency=low
 
   * Fixed KControlCenter
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 09 Mar 2009 13:07:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low
 
   * Repaired default kdm icons
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 07 Mar 2009 13:18:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low
 
   * Added XDG_DATA_DIRS and KDEDIRS to startkde, as suggested by zekica on the Debian forums
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 07 Mar 2009 13:18:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu3~intrepid15) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu3~intrepid15) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
@@ -208,85 +208,85 @@ kdebase-trinity (4:3.5.10-0ubuntu3~intrepid15) intrepid; urgency=low
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 26 Feb 2009 15:57:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu3~intrepid10) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu3~intrepid10) intrepid; urgency=low
 
   * Repaired games path problem
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 24 Jan 2008 13:29:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu3~intrepid9) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu3~intrepid9) intrepid; urgency=low
 
   * Repaired KDE4 interop
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 14 Jan 2008 09:37:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu3~intrepid8) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu3~intrepid8) intrepid; urgency=low
 
   * Fixed dependencies and conflicts
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 30 Dec 2008 02:41:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu3~intrepid5) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu3~intrepid5) intrepid; urgency=low
 
   * Fixed kioslave fish
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 07 Dec 2008 21:58:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu3~intrepid3) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu3~intrepid3) intrepid; urgency=low
 
-  * Updated kdebase-runtime-data-common-trinity to divert the existing KDE4 files to be fully compatible with KDE4
+  * Updated tdebase-runtime-data-common-trinity to divert the existing KDE4 files to be fully compatible with KDE4
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 06 Dec 2008 12:52:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu3~intrepid1) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu3~intrepid1) intrepid; urgency=low
 
   * Removed link /usr/lib/libkonsolepart.so for python-trinity-trinity and altered startkde script to function properly with the new .trinity home directory
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 05 Dec 2008 16:15:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu2~intrepid12) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu2~intrepid12) intrepid; urgency=low
 
   * Linked /usr/lib/libkonsolepart.so for python-trinity-trinity
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 03 Dec 2008 23:13:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu2~intrepid11) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu2~intrepid11) intrepid; urgency=low
 
   * Fixed startupconfig file problem
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 01 Dec 2008 00:34:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu2~intrepid9) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu2~intrepid9) intrepid; urgency=low
 
   * Fixed Trinity games path
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 01 Dec 2008 00:34:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu2~intrepid8) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu2~intrepid8) intrepid; urgency=low
 
-  * Altered to depend on and build off of the kdelibs-trinity package
+  * Altered to depend on and build off of the tdelibs-trinity package
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 19 Nov 2008 22:41:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu2~intrepid6) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu2~intrepid6) intrepid; urgency=low
 
   * Import from KDE SVN
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 19 Nov 2008 22:41:00 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu2~intrepid4) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu2~intrepid4) intrepid; urgency=low
 
   * kxkb Insert key fix; removed keycode 118 from ubuntu.xmodmap due to underlying Xorg changes
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 05 Oct 2008 02:34:45 -0600
 
-kdebase-trinity (4:3.5.10-0ubuntu2~intrepid3) intrepid; urgency=low
+tdebase-trinity (4:3.5.10-0ubuntu2~intrepid3) intrepid; urgency=low
 
   * ksmserver HAL interface patch; changed to newer can_suspend and can_hibernate DBUS queries
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 25 Sep 2008 17:48:24 -0600
 
-kdebase (4:3.5.10-0ubuntu1~hardy2) hardy-backports; urgency=low
+tdebase (4:3.5.10-0ubuntu1~hardy2) hardy-backports; urgency=low
 
   * Added kubuntu_99_upstream_r854109.diff:
     - This fixes layout (multiline) problems in systemtray.
@@ -296,16 +296,16 @@ kdebase (4:3.5.10-0ubuntu1~hardy2) hardy-backports; urgency=low
 
  -- Andreas Wenning <awen@awen.dk>  Tue, 16 Sep 2008 20:20:04 +0200
 
-kdebase (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdebase (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
     - 13_kdm_sessions_fixes.diff freshen patch
     - kubuntu_9908_nodisplay_opengl.diff freshen patch 
-    - Bump version of kdelibs-dev to 3.5.10
+    - Bump version of tdelibs-dev to 3.5.10
 
  -- Scott Kitterman <scott@kitterman.com>  Mon, 25 Aug 2008 23:52:43 -0400
 
-kdebase (4:3.5.9-0ubuntu7.3) hardy-proposed; urgency=low
+tdebase (4:3.5.9-0ubuntu7.3) hardy-proposed; urgency=low
 
   * Update 25_khelp_htdig.diff, fixes LP: #241916
     Fixes khelpcenters' indexer to work with dash.
@@ -313,7 +313,7 @@ kdebase (4:3.5.9-0ubuntu7.3) hardy-proposed; urgency=low
 
  -- Greg Newsome <mugginz1@gmail.com>  Sun, 13 Jul 2008 02:42:38 +1000
 
-kdebase (4:3.5.9-0ubuntu7.2) hardy-proposed; urgency=low
+tdebase (4:3.5.9-0ubuntu7.2) hardy-proposed; urgency=low
 
   * Add kubuntu_9924_remove_eject_error.diff, closes LP: #222041
     "unmounting a usb stick gives an error"
@@ -322,7 +322,7 @@ kdebase (4:3.5.9-0ubuntu7.2) hardy-proposed; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 01 May 2008 10:54:39 +0100
 
-kdebase (4:3.5.9-0ubuntu7.1) hardy-proposed; urgency=low
+tdebase (4:3.5.9-0ubuntu7.1) hardy-proposed; urgency=low
 
   * Update kubuntu_9913_kiomedialuks.diff to remove infinite loop,
     closes LP: #194474
@@ -330,42 +330,42 @@ kdebase (4:3.5.9-0ubuntu7.1) hardy-proposed; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 28 Apr 2008 19:32:46 +0100
 
-kdebase (4:3.5.9-0ubuntu7) hardy; urgency=low
+tdebase (4:3.5.9-0ubuntu7) hardy; urgency=low
 
-  * Removed kdebase-runtime-bin-kde4 dependency because it uses a different 
-    path than the kdebase-bin-trinity (LP #216529)
+  * Removed tdebase-runtime-bin-kde4 dependency because it uses a different 
+    path than the tdebase-bin-trinity (LP #216529)
 
  -- Jonathan Aquilina  <eagles051387@gmail.com>  Mon, 14 Apr 2008 15:30:25 +0200
 
-kdebase (4:3.5.9-0ubuntu6) hardy; urgency=low
+tdebase (4:3.5.9-0ubuntu6) hardy; urgency=low
 
   * Removed kubuntu_9924_kde4_no_medianotifier.diff, replaced by
-    kubuntu_9902_kde4_kded_blacklist_modules.diff in kdelibs
+    kubuntu_9902_kde4_kded_blacklist_modules.diff in tdelibs
 
  -- Guillaume Martres <smarter@ubuntu.com>  Mon, 31 Mar 2008 11:53:09 +0200
 
-kdebase (4:3.5.9-0ubuntu5) hardy; urgency=low
+tdebase (4:3.5.9-0ubuntu5) hardy; urgency=low
 
   * Added kubuntu_9924_kde4_no_medianotifier.diff:
     - Don't popup medianotifier if we're in KDE4
 
  -- Guillaume Martres <smarter@ubuntu.com>  Thu, 27 Mar 2008 20:49:54 +0100
 
-kdebase (4:3.5.9-0ubuntu4) hardy; urgency=low
+tdebase (4:3.5.9-0ubuntu4) hardy; urgency=low
 
   * Remove kubuntu_9920_startkde_dash_stupidness.diff, 
     Closes LP: #206187
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Mar 2008 23:05:42 +0000
 
-kdebase (4:3.5.9-0ubuntu3) hardy; urgency=low
+tdebase (4:3.5.9-0ubuntu3) hardy; urgency=low
 
   * Add kubuntu_9923_low_disk_space.diff from SuSE, warn about low
     disk space
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Mar 2008 17:15:50 +0000
 
-kdebase (4:3.5.9-0ubuntu2) hardy; urgency=low
+tdebase (4:3.5.9-0ubuntu2) hardy; urgency=low
 
   * Add kubuntu_9922_kio_man_utf8.diff: Recode manual pages to UTF-8 
     (LP: #44548)
@@ -376,7 +376,7 @@ kdebase (4:3.5.9-0ubuntu2) hardy; urgency=low
 
  -- Scott Kitterman <scott@kitterman.com>  Thu, 20 Mar 2008 08:35:34 -0400
 
-kdebase (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdebase (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   [ Jonathan Riddell ]
   * New upstream release
@@ -386,29 +386,29 @@ kdebase (4:3.5.9-0ubuntu1) hardy; urgency=low
 	
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:06 +0000
 
-kdebase (4:3.5.8-2ubuntu21) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu21) hardy; urgency=low
 
   * Add kubuntu_9921_kdm_bulletproof_x.diff, adds bulletproof X
     feature to KDM.
 
  -- Eugene Tretyak <etretyak@gmail.com>  Thu, 14 Feb 2008 10:40:12 +0000
 
-kdebase (4:3.5.8-2ubuntu20) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu20) hardy; urgency=low
 
   * debian/ubuntu.xmodmap:
     Add Brightness Up & Down keycode -> xkeysym mapping
 
  -- Luka Renko <lure@ubuntu.com>  Sun, 10 Feb 2008 20:25:47 +0100
 
-kdebase (4:3.5.8-2ubuntu19) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu19) hardy; urgency=low
 
-  * kdebase-kio-plugins replaces old kdebase-data, closes LP: #189963
+  * tdebase-kio-plugins replaces old tdebase-data, closes LP: #189963
   * Remove 70_kdm_consolekit.diff replace with kubuntu_70_kdm_consolekit.diff,
     updated version from http://bugs.kde.org/show_bug.cgi?id=147790
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 08 Feb 2008 12:32:50 +0000
 
-kdebase (4:3.5.8-2ubuntu18)  hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu18)  hardy; urgency=low
 
   * Edited debian/patches/70_kdm_consolekit.diff to fix a crash
     when attempting to connect to local kdm via XDMCP (Closes LP: #178242)
@@ -416,17 +416,17 @@ kdebase (4:3.5.8-2ubuntu18)  hardy; urgency=low
  
  -- Maxim Levitsky <maximlevitsky@gmail.com>  Tue, 06 Feb 2008 00:39:44 +0000
 
-kdebase (4:3.5.8-2ubuntu17) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low
 
   * Patch from Jan Klötzke to update LUKS support, Closes LP: #186841
    - Update kubuntu_9913_kiomedialuks.diff and icons (debian/img/medialuks)
-   - Package new icons in kdebase-kio-plugins (kdebase-kio-plugins.install updated)
+   - Package new icons in tdebase-kio-plugins (tdebase-kio-plugins.install updated)
    - Package "media_decrypt.desktop" in konqueror (konqueror.install updated)
    - "debian/rules" updated accordingly
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 06 Feb 2008 15:25:59 +0000
 
-kdebase (4:3.5.8-2ubuntu17) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low
 
   * Added kubuntu_9920_startkde_dash_stupidness.diff:
     - For some stupid reasons, env scripts are not parsed correctly
@@ -435,7 +435,7 @@ kdebase (4:3.5.8-2ubuntu17) hardy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 06 Feb 2008 11:52:05 +0100
 
-kdebase (4:3.5.8-2ubuntu16) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu16) hardy; urgency=low
 
   * Move kde-applications-merged/kde-essential.menu to
     applications-merged/, apparantly the prefix doesn't get used for merge
@@ -444,7 +444,7 @@ kdebase (4:3.5.8-2ubuntu16) hardy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 28 Jan 2008 18:29:54 +0000
 
-kdebase (4:3.5.8-2ubuntu15) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu15) hardy; urgency=low
 
   * Update kubuntu_9917_flash_xembed.diff:
     - Fix from KDE svn
@@ -453,40 +453,40 @@ kdebase (4:3.5.8-2ubuntu15) hardy; urgency=low
 
  -- Anthony Mercatante <tonio@kubuntu>  Tue, 22 Jan 2008 13:21:45 +0100
 
-kdebase (4:3.5.8-2ubuntu14) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu14) hardy; urgency=low
 
-  * Removed trash.desktop from .kdebase-kio-plugins.install:
+  * Removed trash.desktop from .tdebase-kio-plugins.install:
 
  -- Anthony Mercatante <tonio@kubuntu>  Tue, 08 Jan 2008 09:53:46 +0100
 
-kdebase (4:3.5.8-2ubuntu13) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu13) hardy; urgency=low
 
   * Added kubuntu_9919_kdm_preferuser.diff, uses the kubuntu-default-
     settings's settings for facesource if any
 
  -- Anthony Mercatante <tonio@kubuntu>  Fri, 04 Jan 2008 15:50:02 +0100
 
-kdebase (4:3.5.8-2ubuntu12) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu12) hardy; urgency=low
 
   * Really fix kubuntu_9918_kdm_systemlocale.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 04 Jan 2008 11:11:38 +0000
 
-kdebase (4:3.5.8-2ubuntu11) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu11) hardy; urgency=low
 
   * Previous patch was added twice, causing the build to fail.
     My fault.
 
  -- Anthony Mercatante <tonio@kubuntu>  Thu, 03 Jan 2008 16:17:25 +0100
 
-kdebase (4:3.5.8-2ubuntu10) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu10) hardy; urgency=low
 
   * Added kubuntu_9918_kdm_systemlocale.diff:
     - KDM uses the system locale
 
  -- Anthony Mercatante <tonio@kubuntu>  Wed, 02 Jan 2008 12:56:51 +0100
 
-kdebase (4:3.5.8-2ubuntu9) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu9) hardy; urgency=low
 
   * Edit kubuntu_9915_userdiskmount.diff
   Fixes for NTFS user hard disk mounting
@@ -494,23 +494,23 @@ kdebase (4:3.5.8-2ubuntu9) hardy; urgency=low
 
  -- Eugene Tretyak <etretyak@gmail.com>  Sun, 23 Dec 2007 22:00:03 +0200
 
-kdebase (4:3.5.8-2ubuntu8) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu8) hardy; urgency=low
 
   * debian/patches/kubuntu_95_kurl_not-so-pretty.diff:
-    - removed since is a patch for kdelibs (LP: #178233)
+    - removed since is a patch for tdelibs (LP: #178233)
   * debian/control, debian/control.in:
     - bumped Standars-Version to 3.7.3
 
  -- Mario Bonino <mariobonino@ubuntu-it.org>  Sun, 23 Dec 2007 11:25:53 +0100
 
-kdebase (4:3.5.8-2ubuntu7) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu7) hardy; urgency=low
 
   * Add kubuntu_9917_flash_xembed.diff from KDE SVN, adds support
     for latest Adobe Flash plugin with xembed.  Needs testing.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 20 Dec 2007 22:11:44 +0000
 
-kdebase (4:3.5.8-2ubuntu6) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu6) hardy; urgency=low
 
   * Add kubuntu_9915_userdiskmount.diff from Eugene Tretyak
     Adds user hard disk mounting
@@ -520,7 +520,7 @@ kdebase (4:3.5.8-2ubuntu6) hardy; urgency=low
 	
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 19 Dec 2007 14:03:58 +0000
 
-kdebase (4:3.5.8-2ubuntu5) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu5) hardy; urgency=low
 
   * Add kubuntu_9914_kdm_user_image_check.diff from upstream
     fixes potential KDM local DoS if users set an invalid image
@@ -528,27 +528,27 @@ kdebase (4:3.5.8-2ubuntu5) hardy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Dec 2007 12:24:17 +0000
 
-kdebase (4:3.5.8-2ubuntu4) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu4) hardy; urgency=low
 
   * Rebuild for libopenexr transition
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 11 Dec 2007 15:12:48 +0000
 
-kdebase (4:3.5.8-2ubuntu3) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu3) hardy; urgency=low
 
-  * Created binary-install/kdebase-kio-plugins to install new desktop files for
+  * Created binary-install/tdebase-kio-plugins to install new desktop files for
     LUKS support.
 
  -- Jonathan Patrick Davies <jpatrick@kubuntu.org>  Fri, 30 Nov 2007 19:06:10 +0100
 
-kdebase (4:3.5.8-2ubuntu2) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu2) hardy; urgency=low
 
-  * Fix version of kdebase-bin-trinity Replaces: kdebase-bin 
+  * Fix version of tdebase-bin-trinity Replaces: tdebase-bin 
     Closes LP: #173053
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 30 Nov 2007 14:39:31 +0000
 
-kdebase (4:3.5.8-2ubuntu1) hardy; urgency=low
+tdebase (4:3.5.8-2ubuntu1) hardy; urgency=low
 
   [ Jonathan Riddell ]
   * Merge with Debian for consolekit patch, closes LP: #172281
@@ -559,11 +559,11 @@ kdebase (4:3.5.8-2ubuntu1) hardy; urgency=low
     media KIO, thanks to Jan Klötzke. (LP: #128863)
   * Added icons for LUKS devices (debian/img/medialuks/) and added rules to make
     and remove them in debian/rules.
-  * Added dependency of cryptsetup to kdebase-kio-plugins.
+  * Added dependency of cryptsetup to tdebase-kio-plugins.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 29 Nov 2007 15:23:12 +0000
 
-kdebase (4:3.5.8.dfsg.1-2) unstable; urgency=low
+tdebase (4:3.5.8.dfsg.1-2) unstable; urgency=low
 
   +++ Changes by Fathi Boudra:
 
@@ -573,7 +573,7 @@ kdebase (4:3.5.8.dfsg.1-2) unstable; urgency=low
 
   +++ Changes by Armin Berres:
 
-  * Split off kdebase-bin-trinity which contains executables which can be provided by
+  * Split off tdebase-bin-trinity which contains executables which can be provided by
     Trinity or KDE4.
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
@@ -583,19 +583,19 @@ kdebase (4:3.5.8.dfsg.1-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 14 Nov 2007 22:59:58 +0100
 
-kdebase (4:3.5.8-1ubuntu3) hardy; urgency=low
+tdebase (4:3.5.8-1ubuntu3) hardy; urgency=low
 
-  * remove kdebase dependency on pmount
+  * remove tdebase dependency on pmount
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 27 Nov 2007 09:23:39 +0000
 
-kdebase (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdebase (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Fix fail to build caused by debian/patches/kubuntu_9912_enable_crypto.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 23 Nov 2007 18:08:36 +0000
 
-kdebase (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdebase (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining changes in debian/KUBUNTU-DEBIAN-CHANGES
   * Add kubuntu_9911_xdg_user_dirs_dirpath.diff from Mandriva, adds support for XDG Home Dirs
@@ -603,7 +603,7 @@ kdebase (4:3.5.8-1ubuntu1) hardy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 11:43:38 +0000
 
-kdebase (4:3.5.8.dfsg.1-1) unstable; urgency=low
+tdebase (4:3.5.8.dfsg.1-1) unstable; urgency=low
 
   * New upstream version.
 
@@ -621,7 +621,7 @@ kdebase (4:3.5.8.dfsg.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 09 Oct 2007 22:12:27 +0200
 
-kdebase (4:3.5.7.dfsg.1-1) unstable; urgency=low
+tdebase (4:3.5.7.dfsg.1-1) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
@@ -646,14 +646,14 @@ kdebase (4:3.5.7.dfsg.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 04 Oct 2007 11:41:14 +0200
 
-kdebase (4:3.5.7-4) unstable; urgency=low
+tdebase (4:3.5.7-4) unstable; urgency=low
 
   * Add patch to fix unauthorized login problem in kdm.
     CVE-2007-4569.
 
  -- Sune Vuorela <debian@pusling.com>  Wed, 19 Sep 2007 20:30:01 +0200
 
-kdebase (4:3.5.7-3) unstable; urgency=low
+tdebase (4:3.5.7-3) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
@@ -668,7 +668,7 @@ kdebase (4:3.5.7-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 27 Jul 2007 16:29:18 +0200
 
-kdebase (4:3.5.7-2) unstable; urgency=low
+tdebase (4:3.5.7-2) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -685,7 +685,7 @@ kdebase (4:3.5.7-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 07 Jul 2007 22:18:23 +0200
 
-kdebase (4:3.5.8-0ubuntu2) gutsy; urgency=low
+tdebase (4:3.5.8-0ubuntu2) gutsy; urgency=low
 
   * Added kubuntu_9910_fix_kdeeject.diff, fixes bug ejecting a USB key
     when 2 keys are pluged in, due to kio-umountwrapper we use to
@@ -693,27 +693,27 @@ kdebase (4:3.5.8-0ubuntu2) gutsy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 15 Oct 2007 12:11:23 +0200
 
-kdebase (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdebase (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue, 09 Oct 2007 10:00:33 +0100
 
-kdebase (4:3.5.7-1ubuntu28) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu28) gutsy; urgency=low
 
   * Add kubuntu_9908_nodisplay_opengl.diff to hide the kinfocentre
     openGL module, it has a habit of freezing systems dead
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 04 Oct 2007 22:09:31 +0100
 
-kdebase (4:3.5.7-1ubuntu27) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu27) gutsy; urgency=low
 
   * Add kubuntu_9907_remove_ksplash_cache.diff, removes ksplash cache when
     out of date
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 04 Oct 2007 15:40:39 +0100
 
-kdebase (4:3.5.7-1ubuntu26) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu26) gutsy; urgency=low
 
   * SECURITY UPDATE: addressbar spoofing possible via trailing spaces or
     timer manipulation.
@@ -726,13 +726,13 @@ kdebase (4:3.5.7-1ubuntu26) gutsy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 01 Oct 2007 22:49:20 +0100
 
-kdebase (4:3.5.7-1ubuntu25) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu25) gutsy; urgency=low
 
   * Fixed debian/patches/kubuntu_33_kubuntuify_about.diff, fixes ftbfs
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 29 Sep 2007 15:41:26 +0200
 
-kdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low
 
   [ Richard A. Johnson ]
   * SECURITY UPDATE: KDM password-less login
@@ -755,7 +755,7 @@ kdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Fri, 28 Sep 2007 18:56:10 +1000
 
-kdebase (4:3.5.7-1ubuntu23) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu23) gutsy; urgency=low
 
   * Fixed kubuntu_52_gtk_qt_engine_config.diff and
     kubuntu_53_kwallet_config.diff as $kdehome=$HOME/.kde so we should use
@@ -763,14 +763,14 @@ kdebase (4:3.5.7-1ubuntu23) gutsy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 19 Sep 2007 12:22:46 +0200
 
-kdebase (4:3.5.7-1ubuntu22) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu22) gutsy; urgency=low
 
   * Fixed kubuntu_52_gtk_qt_engine_config.diff, path for testing is not
     good
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 17 Sep 2007 16:01:52 +0200
 
-kdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low
 
   * Add kubuntu_9905_fix_konsole_forking.diff to revert to old code, fixes 
     https://bugs.launchpad.net/ubuntu/+source/python-trinity/+bug/117731
@@ -778,20 +778,20 @@ kdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 15 Sep 2007 23:59:58 +0100
 
-kdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low
 
   * Changed (again) $KDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and 
     kubuntu_53_kwallet_config.diff . (LP: #136560)
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 15 Sep 2007 23:12:26 +0100
 
-kdebase (4:3.5.7-1ubuntu19) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu19) gutsy; urgency=low
 
   * Re-apply changes from ubuntu17 which got lost in previous upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 06 Sep 2007 16:43:45 +0100
 
-kdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low
 
   [ Sarah Hobbs ]
   * Corrected path to .Xmodmap.  (LP: #106718)
@@ -804,7 +804,7 @@ kdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low
 
  -- Ryan Kavanagh <ryanakca@kubuntu.org>  Mon, 03 Sep 2007 10:26:36 -0400
 
-kdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low
 
   * Edit kubuntu_52_gtk_qt_engine_config.diff and
     kubuntu_53_kwallet_config.diff to use $KDEHOME instead of .kde
@@ -816,21 +816,21 @@ kdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 31 Aug 2007 13:34:53 +0100
 
- kdebase (4:3.5.7-1ubuntu16) gutsy; urgency=low
+ tdebase (4:3.5.7-1ubuntu16) gutsy; urgency=low
 
   * Added kubuntu_9902_nspluginviewer_hangs_cpu.diff. Fixes LP: #66573
   * Added libgtk2.0-dev build-dep according to the patch.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 28 Aug 2007 12:09:02 +0200
 
-kdebase (4:3.5.7-1ubuntu15) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu15) gutsy; urgency=low
 
   * Fixed kubuntu_77_kiosystem.diff:
     - URL set to media:/ instead of /media
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 30 Jul 2007 16:30:55 +0200
 
-kdebase (4:3.5.7-1ubuntu14) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu14) gutsy; urgency=low
 
   * Drop kubuntu_73_nomediaioslave_mounthelper.diff,
     kubuntu_76_kickermedia.diff and
@@ -840,21 +840,21 @@ kdebase (4:3.5.7-1ubuntu14) gutsy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 27 Jul 2007 17:12:11 +0200
 
-kdebase (4:3.5.7-1ubuntu13) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu13) gutsy; urgency=low
 
   * Removed non-standard konqueror.rc. Our default is stored in kubuntu-default-settings,
-    and hopefully it won't use kdebase's konqueror.rc unless k-d-s is removed.
+    and hopefully it won't use tdebase's konqueror.rc unless k-d-s is removed.
 
  -- Harald Sitter <sitter.harald@gmail.com>  Thu, 26 Jul 2007 15:46:40 +0100
 
-kdebase (4:3.5.7-1ubuntu12) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu12) gutsy; urgency=low
 
   * Remove kubuntu_95_safely-remove_umount_dialog.diff as
     kio_umountwrapper is being promoted to main
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jul 2007 11:41:02 +0100
 
-kdebase (4:3.5.7-1ubuntu11) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu11) gutsy; urgency=low
 
   * Add kubuntu_9901_location_cursor_at_start.diff
     always display the beginning of the url rather than its end 
@@ -862,7 +862,7 @@ kdebase (4:3.5.7-1ubuntu11) gutsy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 18 Jul 2007 12:04:25 +0100
 
-kdebase (4:3.5.7-1ubuntu10) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu10) gutsy; urgency=low
 
   * Added kubuntu_99_kate_crashfix_from_svn.diff.  (LP: #122296)
   * Committed into Bzr.
@@ -874,35 +874,35 @@ kdebase (4:3.5.7-1ubuntu10) gutsy; urgency=low
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Thu, 28 Jun 2007 15:37:31 +1000
 
-kdebase (4:3.5.7-1ubuntu9) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu9) gutsy; urgency=low
 
-  * Fixed kdebase-kio-plugins.install to remove the trash from the
+  * Fixed tdebase-kio-plugins.install to remove the trash from the
     systemview kicker applet
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 30 Jun 2007 02:41:16 +0200
 
-kdebase (4:3.5.7-1ubuntu8) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu8) gutsy; urgency=low
 
   * Fixed debian/kdm.init
     set kdm language to the system default.
-  * Droped pmount dependancy for kdebase.
+  * Droped pmount dependancy for tdebase.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 14 Jun 2007 17:15:21 +0200
 
-kdebase (4:3.5.7-1ubuntu7) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu7) gutsy; urgency=low
 
   * Fixed debian/kdm.init
     Previous code was bash code while the init script is sh
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 14 Jun 2007 13:13:22 +0200
 
-kdebase (4:3.5.7-1ubuntu6) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu6) gutsy; urgency=low
 
   * Don't install desktop icons (except in unused directory)
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 06 Jun 2007 17:43:35 +0100
 
-kdebase (4:3.5.7-1ubuntu5) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu5) gutsy; urgency=low
 
   * Move kde-applications-merged/kde-essential.menu to
     applications-merged/, apparantly the prefix doesn't get used for merge
@@ -910,7 +910,7 @@ kdebase (4:3.5.7-1ubuntu5) gutsy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 05 Jun 2007 01:52:38 +0100
 
-kdebase (4:3.5.7-1ubuntu4) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu4) gutsy; urgency=low
 
   * Removed kubuntu_55_kdm_usplash_down.diff, usplash is now launched
     via the kdm.init script, modified to launch usplash_down
@@ -924,7 +924,7 @@ kdebase (4:3.5.7-1ubuntu4) gutsy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 31 May 2007 13:00:24 +0200
 
-kdebase (4:3.5.7-1ubuntu3) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu3) gutsy; urgency=low
 
   * Add kubuntu_96_gdm_logout_moved.diff ; the GDM control socket moved in
     7.04 and we need to use the new path.  This fix makes the "Reboot" and
@@ -933,7 +933,7 @@ kdebase (4:3.5.7-1ubuntu3) gutsy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 25 May 2007 09:07:03 +0100
 
-kdebase (4:3.5.7-1ubuntu2) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
   * Update kubuntu_89_new_logout_ui.diff with changes from
     Stefan Skotte <sfs@enhance-it.dk> to fix shortcuts when
@@ -943,7 +943,7 @@ kdebase (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 May 2007 14:01:21 +0100
 
-kdebase (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdebase (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * Merge with Debian for new upstream release, remaining changes in
     KUBUNTU-DEBIAN-CHANGES
@@ -954,7 +954,7 @@ kdebase (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 22 May 2007 18:16:15 +0100
 
-kdebase (4:3.5.7-1) unstable; urgency=low
+tdebase (4:3.5.7-1) unstable; urgency=low
 
   * New upstream release:
     - Now checks lnusertmp return values. (Closes: #292078)
@@ -973,33 +973,33 @@ kdebase (4:3.5.7-1) unstable; urgency=low
 
   ++ Changes by Ana Beatriz Guerrero Lopez:
 
-  * Update kdebase-data.install to remove "Serbia and Montenegro" (yu), and 
+  * Update tdebase-data.install to remove "Serbia and Montenegro" (yu), and 
     add "Serbia" (rs) and "Montenegro" (me). 
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 15 May 2007 17:03:48 +0100
 
-kdebase (4:3.5.6-2ubuntu2) gutsy; urgency=low
+tdebase (4:3.5.6-2ubuntu2) gutsy; urgency=low
 
   * Add kubuntu_96_gdm_logout_moved.diff from Tollef Fog Heen
-    closes https://bugs.beta.launchpad.net/ubuntu/+source/kdebase/+bug/64695
+    closes https://bugs.beta.launchpad.net/ubuntu/+source/tdebase/+bug/64695
     "If GDM is the default display manager KDE logout dialog is
      missing shutdown and restart options"
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 12:17:55 +0100
 
-kdebase (4:3.5.6-2ubuntu1) gutsy; urgency=low
+tdebase (4:3.5.6-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 27 Apr 2007 18:45:03 +0100
 
-kdebase (4:3.5.6.dfsg.2-2) unstable; urgency=low
+tdebase (4:3.5.6.dfsg.2-2) unstable; urgency=low
 
   * Add patch 45_plugin-keyboard-handler.diff to fix keyboard events handling.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 19 Apr 2007 18:43:34 +0200
 
-kdebase (4:3.5.6.dfsg.2-1) unstable; urgency=low
+tdebase (4:3.5.6.dfsg.2-1) unstable; urgency=low
 
   * Upload to unstable after Etch release. Some bugs fixed in this release:
     - A javascript related crash is fixed. (Closes: #416142)
@@ -1067,7 +1067,7 @@ kdebase (4:3.5.6.dfsg.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 19 Apr 2007 13:27:00 +0100
 
-kdebase (4:3.5.6.dfsg.1-2) experimental; urgency=low
+tdebase (4:3.5.6.dfsg.1-2) experimental; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -1090,7 +1090,7 @@ kdebase (4:3.5.6.dfsg.1-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  8 Feb 2007 12:14:08 +0200
 
-kdebase (4:3.5.6-0ubuntu20) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu20) feisty; urgency=low
 
   * Add kubuntu_95_safely-remove_umount_dialog.diff
     On 'Safely Remove' this will make a kprogressdialog-popup telling 
@@ -1099,21 +1099,21 @@ kdebase (4:3.5.6-0ubuntu20) feisty; urgency=low
 
  -- Frode M. Døving <frode@ubuntu.com>  Sun,  8 Apr 2007 01:10:14 +0200
 
-kdebase (4:3.5.6-0ubuntu19) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu19) feisty; urgency=low
 
   * Fixes konsole.README.Debian according to debian changes.
     - Closes Malone #89858
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 03 Apr 2007 15:04:12 +0100
 
-kdebase (4:3.5.6-0ubuntu18) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu18) feisty; urgency=low
 
   * Add kubuntu_94_konqueror_nsplugins_amd64.diff:
     - Enables nsplugins support for AMD64 (Closes Malone #98551)
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 29 Mar 2007 17:45:20 +0100
 
-kdebase (4:3.5.6-0ubuntu17) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu17) feisty; urgency=low
 
   * Update kubuntu_52_gtk_qt_engine_config.diff:
     - copy the config file before ~/.kde/env/ scripts are
@@ -1121,7 +1121,7 @@ kdebase (4:3.5.6-0ubuntu17) feisty; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 23 Mar 2007 19:38:23 +0100
 
-kdebase (4:3.5.6-0ubuntu16) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu16) feisty; urgency=low
 
   [ Richard Johnson ]
   * Update kubuntu_93_konq_doc_remove_go_window_menu.diff
@@ -1129,7 +1129,7 @@ kdebase (4:3.5.6-0ubuntu16) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Mar 2007 13:48:08 +0000
 
-kdebase (4:3.5.6-0ubuntu15) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu15) feisty; urgency=low
 
   [ Richard Johnson ]
   * Add kubuntu_93_konq_doc_remove_go_window_menu.diff
@@ -1137,14 +1137,14 @@ kdebase (4:3.5.6-0ubuntu15) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Mar 2007 17:08:48 +0000
 
-kdebase (4:3.5.6-0ubuntu14) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu14) feisty; urgency=low
 
   * Update kubuntu_33_kubuntuify_about.diff for links to
     new Debian Docs
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 12 Mar 2007 16:41:45 +0000
 
-kdebase (4:3.5.6-0ubuntu13) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu13) feisty; urgency=low
 
   * Update of kubuntu_89_new_logout_ui.diff from 
     Stefan Skotte <sfs@enhance-it.dk>
@@ -1152,7 +1152,7 @@ kdebase (4:3.5.6-0ubuntu13) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  5 Mar 2007 10:38:55 +0000
 
-kdebase (4:3.5.6-0ubuntu12) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu12) feisty; urgency=low
 
   * Add kubuntu_92_krandrtray_config.diff, krandrtray now uses guidance
     display configuration module in the first place.
@@ -1160,14 +1160,14 @@ kdebase (4:3.5.6-0ubuntu12) feisty; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 23 Feb 2007 15:16:32 +0100
 
-kdebase (4:3.5.6-0ubuntu11) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu11) feisty; urgency=low
 
   * Fix kubuntu_52_gtk_qt_engine_config.diff to fit with new
     gtk-qt-engines package. Closes Malone #36256
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 23 Feb 2007 12:54:27 +0100
 
-kdebase (4:3.5.6-0ubuntu10) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu10) feisty; urgency=low
 
   * Add kubuntu_91_ksplash_fork_too_early_cond.diff, closes
     Malone #46682. Patch from  Mark Jenkins
@@ -1177,7 +1177,7 @@ kdebase (4:3.5.6-0ubuntu10) feisty; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 22 Feb 2007 17:18:34 +0100
 
-kdebase (4:3.5.6-0ubuntu9) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu9) feisty; urgency=low
 
   * Improved kubuntu_76_kickermedia.diff and 
     kubuntu_83_media_desktop.diff by Simon Edwards
@@ -1185,13 +1185,13 @@ kdebase (4:3.5.6-0ubuntu9) feisty; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Sun, 19 Feb 2007 00:25:47 +0100
 
-kdebase (4:3.5.6-0ubuntu8) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu8) feisty; urgency=low
 
-  * Rebuilt against new kdelibs.
+  * Rebuilt against new tdelibs.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 17 Feb 2007 11:44:23 +0100
 
-kdebase (4:3.5.6-0ubuntu7) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu7) feisty; urgency=low
 
   * Add kubuntu_90_execute_feedback.diff, replaces the zooming
     rectangle that is drawn if you activate an icon in konqueror
@@ -1208,33 +1208,33 @@ kdebase (4:3.5.6-0ubuntu7) feisty; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 13 Feb 2007 06:59:32 +0100
 
-kdebase (4:3.5.6-0ubuntu6) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu6) feisty; urgency=low
 
   * Add kubuntu_89_new_logout_ui.diff from Stefan Skotte
     <sfs@enhance-it.dk>, based on the ubuntu/gnome one
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Wed,  7 Feb 2007 23:42:47 +0100
 
-kdebase (4:3.5.6-0ubuntu5) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu5) feisty; urgency=low
 
   * Add kubuntu_88_logout_fade.diff from Stefan Skotte <sfs@enhance-it.dk>
     based on http://www.kde-look.org/content/show.php?content=20652
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  5 Feb 2007 12:29:23 +0000
 
-kdebase (4:3.5.6-0ubuntu4) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu4) feisty; urgency=low
 
-  * Fix syntax in kdebase-data.install
+  * Fix syntax in tdebase-data.install
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 29 Jan 2007 19:48:54 +0000
 
-kdebase (4:3.5.6-0ubuntu3) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu3) feisty; urgency=low
 
   * Use correct directory for kde-essentials.menu
 
  -- Stefan Skotte <sfs@enhance-itNOSPAM.dk>  Mon, 29 Jan 2007 14:28:10 +0100
 
-kdebase (4:3.5.6-0ubuntu2) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu2) feisty; urgency=low
 
   * Add kubuntu_87_kicker_restore_description_parents.diff
     Restores the parents in kmenu in name (description) mode
@@ -1242,7 +1242,7 @@ kdebase (4:3.5.6-0ubuntu2) feisty; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 26 Jan 2007 02:22:35 +0100
 
-kdebase (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdebase (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
   * Remove patched applied upstream:
@@ -1258,20 +1258,20 @@ kdebase (4:3.5.6-0ubuntu1) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:28 +0000
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu18) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu18) feisty; urgency=low
 
-  * Update replaces on kdebase data to fix https://launchpad.net/bugs/78947
+  * Update replaces on tdebase data to fix https://launchpad.net/bugs/78947
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 14 Jan 2007 12:54:34 +0000
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu17) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu17) feisty; urgency=low
 
   * Add kubuntu_85_language_selector.diff to complete
     kubuntu-feisty-language-selector integration
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 12 Jan 2007 11:00:51 +0000
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu16) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu16) feisty; urgency=low
 
   * Make debian/80ubuntu-xmodmap resistant to xmodmap failure that could
     make this script fail and stop processing other Xsession scripts.
@@ -1283,25 +1283,25 @@ kdebase (4:3.5.5a.dfsg.1-1ubuntu16) feisty; urgency=low
 
  -- Luka Renko <lure@ubuntu.com>  Sat,  6 Jan 2007 12:58:45 +0100
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu15) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu15) feisty; urgency=low
 
   * Make sure patches are not applied before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  5 Jan 2007 21:00:36 +0000
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu14) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu14) feisty; urgency=low
 
   * Fix syntax error in kubuntu_72_kxkb_xmodmap.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  5 Jan 2007 12:38:25 +0000
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu13) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu13) feisty; urgency=low
 
   * Update kdm init script to stop usplash with "start"
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  4 Jan 2007 23:05:08 +0000
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu12) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu12) feisty; urgency=low
 
   * Alter kubuntu_72_kxkb_xmodmap.diff and debian/80ubuntu-xmodmap to load
     ~/.Xmodmap for personalised keyboard mapping.  Based on patch from 
@@ -1309,7 +1309,7 @@ kdebase (4:3.5.5a.dfsg.1-1ubuntu12) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 23 Dec 2006 11:42:26 +0000
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu11) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu11) feisty; urgency=low
 
   * Improve kubuntu_76_ksmserver_suspend.diff to respect power-managerrc
     options for disabling suspend/hibernate buttons and lock on resume
@@ -1318,75 +1318,75 @@ kdebase (4:3.5.5a.dfsg.1-1ubuntu11) feisty; urgency=low
 
  -- Luka Renko <lure@ubuntu.com>  Thu,  7 Dec 2006 00:57:59 +0100
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu10) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu10) feisty; urgency=low
 
   * Install trash.desktop into unused directory, so it
     doesn't appear on the desktop.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Dec 2006 17:19:37 +0000
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu9) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu9) feisty; urgency=low
 
   * Add missing file debian/80ubuntu-xmodmap
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 22 Nov 2006 09:26:02 +0000
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu8) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu8) feisty; urgency=low
 
   * Add ubuntu.xmodmap and install rule
   * Add klipper.rc edit rule
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 21 Nov 2006 11:09:49 +0000
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu7) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu7) feisty; urgency=low
 
   * Removed debian/tmp/usr/share/services/kfile_trash.desktop
-    from kdebase-kio-plugins.install
+    from tdebase-kio-plugins.install
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 21 Nov 2006 00:01:43 +0200
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu6) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu6) feisty; urgency=low
 
   * Compile with --with-sudo-kdesu-backend
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Nov 2006 10:18:52 +0000
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu5) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu5) feisty; urgency=low
 
   * Add missing debian/konqueror.rc file
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 17 Nov 2006 20:37:45 +0000
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu4) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu4) feisty; urgency=low
 
   * Use correct kubuntu_01_kdepot.diff patch
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 23:52:10 +0000
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu3) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu3) feisty; urgency=low
 
-  * rebuild on latest kdelibs
+  * rebuild on latest tdelibs
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 19:39:16 +0000
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu2) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu2) feisty; urgency=low
 
   * Add missing kubuntu_01_kdepot.diff patch
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Nov 2006 21:19:33 +0000
 
-kdebase (4:3.5.5a.dfsg.1-1ubuntu1) feisty; urgency=low
+tdebase (4:3.5.5a.dfsg.1-1ubuntu1) feisty; urgency=low
 
   * Merge with Debian
   * Remove kubuntu_18_default_fonts.diff keep 18_default_fonts.diff
-  * Remove kubuntu_28_kdebase_rubberband.diff now in Debian as 28_kdebase_rubberband.diff
+  * Remove kubuntu_28_tdebase_rubberband.diff now in Debian as 28_tdebase_rubberband.diff
   * Remove 33_mounthelper_find_medium_by_url.diff, it clashes with our media ioslave patches
   * Build with --enable-gcc-hidden-visibility
   * Remove kubuntu_69_no_kcontrol_joystick.diff, it builds now
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 14 Nov 2006 23:20:10 +0000
 
-kdebase (4:3.5.6.dfsg.1-1) experimental; urgency=low
+tdebase (4:3.5.6.dfsg.1-1) experimental; urgency=low
 
   * New upstream release:
     * Fixes "kdm does not obey pam_limits". (Closes: #242641)
@@ -1410,7 +1410,7 @@ kdebase (4:3.5.6.dfsg.1-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 16 Jan 2007 18:13:20 +0100
 
-kdebase (4:3.5.5a.dfsg.1-5) unstable; urgency=high
+tdebase (4:3.5.5a.dfsg.1-5) unstable; urgency=high
 
   +++ Changes by Sune Vuorela:
   * Add | kfreebsd-gnu | hurd as dependencies to help installability on
@@ -1422,7 +1422,7 @@ kdebase (4:3.5.5a.dfsg.1-5) unstable; urgency=high
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 29 Dec 2006 19:15:23 +0200
 
-kdebase (4:3.5.5a.dfsg.1-4) unstable; urgency=low
+tdebase (4:3.5.5a.dfsg.1-4) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
   * Add a section to man page about how to use sudo as kdesu backend 
@@ -1434,7 +1434,7 @@ kdebase (4:3.5.5a.dfsg.1-4) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 13 Dec 2006 13:09:33 +0100
 
-kdebase (4:3.5.5a.dfsg.1-3) unstable; urgency=high
+tdebase (4:3.5.5a.dfsg.1-3) unstable; urgency=high
 
   * Urgency high for etch's KDE artwork.
 
@@ -1451,7 +1451,7 @@ kdebase (4:3.5.5a.dfsg.1-3) unstable; urgency=high
     (Closes: #385839)
 
   +++ Changes by Sune Vuorela:
-  * Add kdelibs-dbg to kdebase-dbg dependencies.
+  * Add tdelibs-dbg to tdebase-dbg dependencies.
 
   +++ Changes by Josh Metzler:
   * Restore kdm's default user face icon by adding a symlink to kdm.links.
@@ -1463,13 +1463,13 @@ kdebase (4:3.5.5a.dfsg.1-3) unstable; urgency=high
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 11 Dec 2006 17:26:16 +0100
 
-kdebase (4:3.5.5a.dfsg.1-2) unstable; urgency=medium
+tdebase (4:3.5.5a.dfsg.1-2) unstable; urgency=medium
 
   +++ Changes by Fathi Boudra:
 
-  * Remove kde-applications-merged directory in kdebase-data.preinst as we must
+  * Remove kde-applications-merged directory in tdebase-data.preinst as we must
     use applications-merged as the default merge directory.
-  * Urgency medium, as along with kdelibs this upload fixes broken fresh
+  * Urgency medium, as along with tdelibs this upload fixes broken fresh
     installs.
 
   +++ Changes by Sune Vuorela:
@@ -1485,7 +1485,7 @@ kdebase (4:3.5.5a.dfsg.1-2) unstable; urgency=medium
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 16 Nov 2006 17:08:46 -0500
 
-kdebase (4:3.5.5a.dfsg.1-1) unstable; urgency=medium
+tdebase (4:3.5.5a.dfsg.1-1) unstable; urgency=medium
 
   * Add 4 new patches. Thanks to Sune Vuorela for investigating and
     to Modestas Vainius for creating them:
@@ -1513,12 +1513,12 @@ kdebase (4:3.5.5a.dfsg.1-1) unstable; urgency=medium
         to just the filename. This unbreaks krusader 1.70.x media:/ 
         unmount/eject commands.
 
-  * Add psmisc to Depends of kdebase-kio-plugins since it provides 'fuser'
+  * Add psmisc to Depends of tdebase-kio-plugins since it provides 'fuser'
     utility, needed for listUsingProcesses() function added in
     29_halbackend_fstab_improvements patch. Thanks to Modestas Vainius.
 
   * Promote eject from Recommends to Depends for kdesktop, and make sure
-    kdebase-kio-plugins Depends on kdesktop, so that kdeeject is always
+    tdebase-kio-plugins Depends on kdesktop, so that kdeeject is always
     present.
 
   * Update 20_applications_menu_move patch to fix an incomptability with
@@ -1535,15 +1535,15 @@ kdebase (4:3.5.5a.dfsg.1-1) unstable; urgency=medium
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  2 Nov 2006 17:59:48 -0500
 
-kdebase (4:3.5.5a-2) unstable; urgency=low
+tdebase (4:3.5.5a-2) unstable; urgency=low
 
-  * Re-add pmount to kdebase's dependencies. It turns out that there remain
+  * Re-add pmount to tdebase's dependencies. It turns out that there remain
     strange cases where pmount is needed in conjunction with HAL to do the
     right thing.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 13 Oct 2006 17:05:08 -0400
 
-kdebase (4:3.5.5a-1) unstable; urgency=high
+tdebase (4:3.5.5a-1) unstable; urgency=high
 
   * New upstream tarball, with a number of fixes. Also include several
     important patches that didn't make the tarball.
@@ -1552,12 +1552,12 @@ kdebase (4:3.5.5a-1) unstable; urgency=high
     + This upload, and the last one, must make Etch with their RC fixes,
       so urgency=high.
 
-  * Drop the pmount Depends from the kdebase metapackage, since pmount isn't
+  * Drop the pmount Depends from the tdebase metapackage, since pmount isn't
     important with the latest HAL. (Closes: #391502)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 10 Oct 2006 17:12:10 -0400
 
-kdebase (4:3.5.5-1) unstable; urgency=low
+tdebase (4:3.5.5-1) unstable; urgency=low
 
   [ Debian Qt/KDE Maintainers ]
   * New upstream release.
@@ -1572,14 +1572,14 @@ kdebase (4:3.5.5-1) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Join the club by adding full depends on hal and pmount to the kdebase
-    metapackage. kdebase-kio-plugins will retain recommends for hal and
+  * Join the club by adding full depends on hal and pmount to the tdebase
+    metapackage. tdebase-kio-plugins will retain recommends for hal and
     pmount. This way, people who still really hate udev can simply ditch the
-    kdebase metapackage, but most users will automatically get the full
+    tdebase metapackage, but most users will automatically get the full
     Utopia. This is good, since nobody reads recommends anyway, and volume
     handling is becoming standard and expected basic functionality. The
     kde-desktop task depends on kde-core, a metapackage that in turn
-    depends on kdebase, so the kde-desktop task will now pull in hal/pmount
+    depends on tdebase, so the kde-desktop task will now pull in hal/pmount
     as well. (Closes: #384663)
 
   * Fix typo in /etc/pam.d/kdm-np. (Closes: #381908)
@@ -1598,7 +1598,7 @@ kdebase (4:3.5.5-1) unstable; urgency=low
     to wonder why their fonts suddenly became so ugly after they ran KControl
     and accepted the then-default 'medium' hinting level. (Closes: #381232)
 
-  * Clarify in the kdebase and kdebase-kio-plugins README.Debian files that
+  * Clarify in the tdebase and tdebase-kio-plugins README.Debian files that
     plugdev membership through /etc/security/group.conf doesn't cut it.
 
   * Add Romanian debconf translation, thanks to Stan Ioan-Eugen.
@@ -1618,7 +1618,7 @@ kdebase (4:3.5.5-1) unstable; urgency=low
 
   * Re-write kpersonalizer description. (Closes: #385309)
 
-  * Fix typos in kdebase-kio-plugins description. (Closes: #385734)
+  * Fix typos in tdebase-kio-plugins description. (Closes: #385734)
 
   * Remove non-free firefox icon. [CM: Add a prune-nonfree script to the
     debian packaging that makes it easy to drop the icons from a source
@@ -1633,21 +1633,21 @@ kdebase (4:3.5.5-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  4 Oct 2006 18:43:28 -0400
 
-kdebase (4:3.5.4-2) unstable; urgency=low
+tdebase (4:3.5.4-2) unstable; urgency=low
 
   * KDE_3_5_BRANCH update (up to r567687).
 
   +++ Changes by Christopher Martin:
 
   * Re-upload 3.5.4 with a new build hack that disables the use of
-    --enable-final on slow architectures. This will hopefully allow kdebase
+    --enable-final on slow architectures. This will hopefully allow tdebase
     (and other KDE modules) to build on arm and m68k more easily. This should
     in turn ease the movement of recent KDE modules into Testing. Thanks to
     Adeodato Simo for the fix.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 29 Jul 2006 15:41:35 -0400
 
-kdebase (4:3.5.4-1) unstable; urgency=low
+tdebase (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release:
     + fixes setting of the xrdb resource Xft.antialias to always match what's
@@ -1671,7 +1671,7 @@ kdebase (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 28 Jul 2006 00:04:41 +0200
 
-kdebase (4:3.5.5-0ubuntu4) edgy; urgency=low
+tdebase (4:3.5.5-0ubuntu4) edgy; urgency=low
 
   * Fix kubuntu_76_ksmserver_suspend.diff to not crash due to uninitialized
     HAL context pointer if shutdown options are disabled in logout dialog. 
@@ -1679,7 +1679,7 @@ kdebase (4:3.5.5-0ubuntu4) edgy; urgency=low
 
  -- Luka Renko <lure@ubuntu.com>  Tue, 24 Oct 2006 22:09:44 +0200
 
-kdebase (4:3.5.5-0ubuntu4) feisty; urgency=low
+tdebase (4:3.5.5-0ubuntu4) feisty; urgency=low
 
   * Update kubuntu_73_nomediaioslave_mounthelper.diff,
     kubuntu_76_kickermedia.diff and kubuntu_83_media_desktop.diff
@@ -1692,25 +1692,25 @@ kdebase (4:3.5.5-0ubuntu4) feisty; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu,  19 Oct 2006 18:35:23 +0200
 
-kdebase (4:3.5.5-0ubuntu3) edgy; urgency=low
+tdebase (4:3.5.5-0ubuntu3) edgy; urgency=low
 
   * Update kubuntu_73_nomediaioslave_mounthelper.diff to change
     media:/ to /media link in about:konqueror page
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu,  11 Oct 2006 13:27:23 +0200
 
-kdebase (4:3.5.5-0ubuntu2) edgy; urgency=low
+tdebase (4:3.5.5-0ubuntu2) edgy; urgency=low
 
-  * Build-dep on kdelibs 3.5.5
+  * Build-dep on tdelibs 3.5.5
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Oct 2006 10:18:56 +0100
 
-kdebase (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdebase (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
   * 18_default_fonts.diff now kubuntu_18_default_fonts.diff and first hunk
     removed to apply
-  * 28_kdebase_rubberband.diff now kubuntu_28_kdebase_rubberband.diff and hunk
+  * 28_tdebase_rubberband.diff now kubuntu_28_tdebase_rubberband.diff and hunk
     removed to apply
   * kubuntu_14_hide_konquerorsu_menu_entry.diff updated
   * kubuntu_20_kdesu_sudo.diff updated, merged upstream
@@ -1723,7 +1723,7 @@ kdebase (4:3.5.5-0ubuntu1) edgy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:06 +0000
 
-kdebase (4:3.5.4-0ubuntu28) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu28) edgy; urgency=low
 
   * Add kubuntu_84_group_toolbar_viewmode_icons.diff to get
     icons grouped in the viewmode actionlist.
@@ -1732,39 +1732,39 @@ kdebase (4:3.5.4-0ubuntu28) edgy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon,  25 Sep 2006 21:46:23 +0200
 
-kdebase (4:3.5.4-0ubuntu27) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu27) edgy; urgency=low
 
   * Update kubuntu_73_nomediaioslave_mounthelper.diff
     by Simon Edwards
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon,  25 Sep 2006 12:44:23 +0200
 
-kdebase (4:3.5.4-0ubuntu26) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu26) edgy; urgency=low
 
   * Install kdm at init level 13
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 22 Sep 2006 01:58:38 +0100
 
-kdebase (4:3.5.4-0ubuntu25) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu25) edgy; urgency=low
 
   * Rebuild on latest cdbs to change .pot files to UTF8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 20 Sep 2006 13:09:27 +0100
 
-kdebase (4:3.5.4-0ubuntu24) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu24) edgy; urgency=low
 
   * Update kubuntu_73_nomediaioslave_mounthelper.diff
     by Simon Edwards
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue,  19 Sep 2006 23:55:23 +0200
 
-kdebase (4:3.5.4-0ubuntu23) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu23) edgy; urgency=low
 
   * Update kubuntu_76_ksmserver_suspend.diff to use suspend/hibernate icons
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 19 Sep 2006 12:20:00 +0100
 
-kdebase (4:3.5.4-0ubuntu22) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu22) edgy; urgency=low
 
   * Improved kubuntu_73_nomediaioslave_mounthelper.diff and
     kubuntu_76_kickermedia.diff by Simon Edwards
@@ -1773,13 +1773,13 @@ kdebase (4:3.5.4-0ubuntu22) edgy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon,  18 Sep 2006 21:08:23 +0200
 
-kdebase (4:3.5.4-0ubuntu21) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu21) edgy; urgency=low
 
   * Add kubuntu_82_safari_useragent.diff to update user agent
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 18 Sep 2006 16:32:41 +0100
 
-kdebase (4:3.5.4-0ubuntu20) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu20) edgy; urgency=low
 
   * Improved kubuntu_73_nomediaioslave_mounthelper.diff
     by Simon Edwards
@@ -1788,14 +1788,14 @@ kdebase (4:3.5.4-0ubuntu20) edgy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu,  14 Sep 2006 19:19:23 +0200
 
-kdebase (4:3.5.4-0ubuntu19) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu19) edgy; urgency=low
 
   * Added kubuntu_80_kdm_grub.diff (closes #57066)
   * Added kubuntu_81_search_engines_config.diff (closes #60058)
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue,  12 Sep 2006 08:26:23 +0200
 
-kdebase (4:3.5.4-0ubuntu18) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu18) edgy; urgency=low
 
   * Improved patch kubuntu_79_kdm_halt.diff since kcontrol connection
     manager module also hardcodes the setting, instead of reading kdm
@@ -1803,33 +1803,33 @@ kdebase (4:3.5.4-0ubuntu18) edgy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon,  11 Sep 2006 13:19:23 +0200
 
-kdebase (4:3.5.4-0ubuntu17) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu17) edgy; urgency=low
 
   * Added patch kubuntu_79_kdm_halt.diff to change the shutdown command
     (closes #59134)
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon,  11 Sep 2006 11:50:23 +0200
 
-kdebase (4:3.5.4-0ubuntu16) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu16) edgy; urgency=low
 
   * Added binary-install/klipper entry in debian rule to fix klipperrc
     file (closes #56377)
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Sat,  9 Sep 2006 00:00:23 +0200
 
-kdebase (4:3.5.4-0ubuntu15) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu15) edgy; urgency=low
 
   * Improved kubuntu_05_kdm_theme_config.diff (closes #57428)
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri,  8 Sep 2006 15:06:20 +0200
 
-kdebase (4:3.5.4-0ubuntu14) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu14) edgy; urgency=low
 
   * Added kubuntu_78_kcontrol_hide_component_chooser.diff (closes #59435)
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri,  8 Sep 2006 11:43:20 +0200
 
-kdebase (4:3.5.4-0ubuntu13) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu13) edgy; urgency=low
 
   [ Jonathan Riddell ]
   * Update kubuntu_68_xinerama.diff with improved patch from Lubos Lunak
@@ -1843,7 +1843,7 @@ kdebase (4:3.5.4-0ubuntu13) edgy; urgency=low
 
  -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Fri,  1 Sep 2006 10:59:47 -0500
 
-kdebase (4:3.5.4-0ubuntu12) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu12) edgy; urgency=low
 
   * debian/patches/kubuntu_76_ksmserver_suspend.diff: provides Suspend
     and Hibernate buttons on KDE logout dialog. Uses HAL/dbus to detect
@@ -1851,20 +1851,20 @@ kdebase (4:3.5.4-0ubuntu12) edgy; urgency=low
 
  -- Luka Renko <lure@ubuntu.com>  Fri, 01 Sep 2006 14:33:00 +0200
 
-kdebase (4:3.5.4-0ubuntu11) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu11) edgy; urgency=low
 
   * Rebuild against dbus 0.90
 
  -- Sebastian Dröge <slomo@ubuntu.com>  Wed, 30 Aug 2006 13:13:55 +0200
 
-kdebase (4:3.5.4-0ubuntu10) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu10) edgy; urgency=low
 
-  * Changed kdebase-kio-plugins.install to remove the trash icon klipper
+  * Changed tdebase-kio-plugins.install to remove the trash icon klipper
     from system applet
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Sun, 27 Aug 2006 21:36:20 +0200
 
-kdebase (4:3.5.4-0ubuntu9) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu9) edgy; urgency=low
 
   [ Jonathan Riddell ]
   * Add kubuntu_74_sidebar_icons.diff from http://bugs.kde.org/101636
@@ -1878,7 +1878,7 @@ kdebase (4:3.5.4-0ubuntu9) edgy; urgency=low
 
  -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Tue, 22 Aug 2006 20:22:20 -0500
 
-kdebase (4:3.5.4-0ubuntu8) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu8) edgy; urgency=low
 
   * Modified kubuntu_70_hide_printers_desktop.diff or printers to
     still appear in SystemSettings whenever hidden in K menu
@@ -1887,14 +1887,14 @@ kdebase (4:3.5.4-0ubuntu8) edgy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 18 Aug 2006 20:22:20 +0200
 
-kdebase (4:3.5.4-0ubuntu7) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu7) edgy; urgency=low
 
   [ Jonathan Riddell ]
   * Add kubuntu_73_nomediaioslave_mounthelper.diff from
     Simon Edwards, http://www.kdedevelopers.org/node/2231
 
   [ Luka Renko ]
-  * Moved Ubuntu keycode -> xkeysym mapping from kdeutils/kmilo
+  * Moved Ubuntu keycode -> xkeysym mapping from tdeutils/kmilo
   * debian/ubuntu.xmodmap: Ubuntu laptop keycode -> xkeysym mapping
   * debian/80ubuntu-xmodmap: Xsession startup script for Ubuntu laptop xmodmap
   * debian/patches/kubuntu_72_kxkb_xmodmap.diff: reload Ubuntu laptop xmodmap on
@@ -1902,39 +1902,39 @@ kdebase (4:3.5.4-0ubuntu7) edgy; urgency=low
 
  -- Luka Renko <lure@ubuntu.com>  Sun, 20 Aug 2006 13:36:55 +0200
 
-kdebase (4:3.5.4-0ubuntu6) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu6) edgy; urgency=low
 
   * Added kubuntu_70_hide_printers_desktop.diff to hide the printers
     configuration entry in kmenu.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 18 Aug 2006 15:17:20 +0200
 
-kdebase (4:3.5.4-0ubuntu5) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu5) edgy; urgency=low
 
   * Fix string in kubuntu_67_easy_zeroconf.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  9 Aug 2006 11:25:20 +0000
 
-kdebase (4:3.5.4-0ubuntu4) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu4) edgy; urgency=low
 
   * Add missing includes to kubuntu_67_easy_zeroconf.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  7 Aug 2006 09:28:13 -0400
 
-kdebase (4:3.5.4-0ubuntu3) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu3) edgy; urgency=low
 
   * Add warning message dialogue when enabling Zeroconf in 
     in kubuntu_67_easy_zeroconf.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  1 Aug 2006 17:26:01 +0000
 
-kdebase (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu2) edgy; urgency=low
 
-  * Add kdebase-data replaces kcontrol << 3.5.4
+  * Add tdebase-data replaces kcontrol << 3.5.4
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  1 Aug 2006 15:10:17 +0000
 
-kdebase (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdebase (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
   * Add kubuntu_69_no_kcontrol_joystick.diff, compilation is 
@@ -1942,26 +1942,26 @@ kdebase (4:3.5.4-0ubuntu1) edgy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:43:22 +0000
 
-kdebase (4:3.5.3-2ubuntu8) edgy; urgency=low
+tdebase (4:3.5.3-2ubuntu8) edgy; urgency=low
 
   * Fix path to executables in kubuntu_67_easy_zeroconf.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 24 Jul 2006 14:49:07 +0100
 
-kdebase (4:3.5.3-2ubuntu7) edgy; urgency=low
+tdebase (4:3.5.3-2ubuntu7) edgy; urgency=low
 
   * Add kubuntu_68_xinerama.diff from 
     http://ktown.kde.org/~seli/xinerama/
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 20 Jul 2006 18:41:03 +0100
 
-kdebase (4:3.5.3-2ubuntu6) edgy; urgency=low
+tdebase (4:3.5.3-2ubuntu6) edgy; urgency=low
 
   * Remove bdftopcf from build-deps, not in xfont-utils
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 20 Jul 2006 14:57:22 +0100
 
-kdebase (4:3.5.3-2ubuntu5) edgy; urgency=low
+tdebase (4:3.5.3-2ubuntu5) edgy; urgency=low
 
   * Update kubuntu_40_xmkmf.diff for new X packages and remove 
     kubuntu_64_xbindir.diff
@@ -1971,32 +1971,32 @@ kdebase (4:3.5.3-2ubuntu5) edgy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 19 Jul 2006 23:02:19 +0100
 
-kdebase (4:3.5.3-2ubuntu4) edgy; urgency=low
+tdebase (4:3.5.3-2ubuntu4) edgy; urgency=low
 
   * Install directory.trash into unused
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 17 Jul 2006 21:45:33 +0000
 
-kdebase (4:3.5.3-2ubuntu3) edgy; urgency=low
+tdebase (4:3.5.3-2ubuntu3) edgy; urgency=low
 
   * Add kubuntu_66_xscreensaver.diff from 
     http://bugs.kde.org/128610
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Jul 2006 14:44:38 +0000
 
-kdebase (4:3.5.3-2ubuntu2) edgy; urgency=low
+tdebase (4:3.5.3-2ubuntu2) edgy; urgency=low
 
-  * Build-dep on latest kdelibs, fixes Qt binary compatibility break
+  * Build-dep on latest tdelibs, fixes Qt binary compatibility break
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Jun 2006 16:18:05 +0000
 
-kdebase (4:3.5.3-2ubuntu1) edgy; urgency=low
+tdebase (4:3.5.3-2ubuntu1) edgy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 27 Jun 2006 09:13:53 +0000
 
-kdebase (4:3.5.3-2) unstable; urgency=medium
+tdebase (4:3.5.3-2) unstable; urgency=medium
 
   * KDE_3_5_BRANCH update (up to r549661).
     + Fixes kpager crash. (Closes: #370158)
@@ -2016,7 +2016,7 @@ kdebase (4:3.5.3-2) unstable; urgency=medium
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri,  9 Jun 2006 09:51:32 -0400
 
-kdebase (4:3.5.3-1) unstable; urgency=low
+tdebase (4:3.5.3-1) unstable; urgency=low
 
   * New upstream release.
     + fix kwin alt-tab problems. (Closes: #363357, #361421, #361127)
@@ -2042,20 +2042,20 @@ kdebase (4:3.5.3-1) unstable; urgency=low
 
   +++ Changes by Pierre Habouzit:
 
-  * Move arch indep files from kcontrol into kdebase-data. (Closes: #233379)
+  * Move arch indep files from kcontrol into tdebase-data. (Closes: #233379)
     (still *.desktop files remains in kcontrol to avoid beeing advertised from
     KDE menus with no corresponding binaries).
 
   * Add 'ru' debconf templates translation, thanks to Yuriy Talakan.
     (Closes: #367206)
 
-  * Add konqueror.presubj (konqueror is responsible of 25% of the kdebase bug
+  * Add konqueror.presubj (konqueror is responsible of 25% of the tdebase bug
     reports) to ask for more precise bug reports, because often they lack the
     fundamental information necessary to make them useful.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 29 May 2006 09:55:11 +0200
 
-kdebase (4:3.5.2-2) unstable; urgency=low
+tdebase (4:3.5.2-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -2098,7 +2098,7 @@ kdebase (4:3.5.2-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 22 Apr 2006 20:00:39 -0400
 
-kdebase (4:3.5.2-1) unstable; urgency=low
+tdebase (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
     + Fixes the klipper + OpenOffice.org problems.
@@ -2125,7 +2125,7 @@ kdebase (4:3.5.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 28 Mar 2006 20:19:46 -0500
 
-kdebase (4:3.5.1-1) unstable; urgency=low
+tdebase (4:3.5.1-1) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -2144,7 +2144,7 @@ kdebase (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 26 Jan 2006 19:18:45 -0500
 
-kdebase (4:3.5.0-4) unstable; urgency=low
+tdebase (4:3.5.0-4) unstable; urgency=low
 
   +++ Changes by Isaac Clerencia
 
@@ -2152,11 +2152,11 @@ kdebase (4:3.5.0-4) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 11 Jan 2006 23:05:12 +0100
 
-kdebase (4:3.5.0-3) unstable; urgency=low
+tdebase (4:3.5.0-3) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Install kdm's NEWS file in all kdebase packages. This ensures that
+  * Install kdm's NEWS file in all tdebase packages. This ensures that
     apt-listchanges will display the news to all users. (Closes: #344947)
 
   +++ Changes by Adeodato Simó:
@@ -2171,7 +2171,7 @@ kdebase (4:3.5.0-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  7 Jan 2006 19:11:37 +0100
 
-kdebase (4:3.5.0-2) experimental; urgency=low
+tdebase (4:3.5.0-2) experimental; urgency=low
 
   * Upload to experimental.
 
@@ -2187,7 +2187,7 @@ kdebase (4:3.5.0-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 15 Dec 2005 19:25:37 -0500
 
-kdebase (4:3.5.2-0ubuntu27) dapper-security; urgency=low
+tdebase (4:3.5.2-0ubuntu27) dapper-security; urgency=low
 
   * SECURITY UPDATE: KDM symlink attack vulnerability
   * Add kubuntu_65_kdm_symlink_vunerability.diff
@@ -2201,14 +2201,14 @@ kdebase (4:3.5.2-0ubuntu27) dapper-security; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 12 Jun 2006 16:01:48 +0000
 
-kdebase (4:3.5.2-0ubuntu26) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu26) dapper; urgency=low
 
   * Add kubuntu_64_xbindir.diff to set XBINDIR to /usr/bin
     Fixed upgrades when xserver-xorg is not installed
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 22 May 2006 17:48:01 +0300
 
-kdebase (4:3.5.2-0ubuntu25) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu25) dapper; urgency=low
 
   * Fix kubuntu_53_kwallet_config.diff to not install kwallet 
     file in wrong directory, closes Malone #45999
@@ -2217,33 +2217,33 @@ kdebase (4:3.5.2-0ubuntu25) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 22 May 2006 17:09:21 +0300
 
-kdebase (4:3.5.2-0ubuntu24) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu24) dapper; urgency=low
 
   * debian/cdbs/kde.mk:
     - added dh_iconcache.
 
  -- Daniel Holbach <daniel.holbach@ubuntu.com>  Thu, 18 May 2006 21:03:58 +0200
 
-kdebase (4:3.5.2-0ubuntu23) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu23) dapper; urgency=low
 
   * Don't install Konqueror default profiles
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 12 May 2006 02:00:44 +0200
 
-kdebase (4:3.5.2-0ubuntu22) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu22) dapper; urgency=low
 
   * Update kubuntu_20_kdesu_sudo.diff to fix run as foo message in kdesu
     with -u switch (Closes: Malone #41184)
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Thu, 11 May 2006 12:12:44 +0200
 
-kdebase (4:3.5.2-0ubuntu21) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu21) dapper; urgency=low
 
   * Make sure all patches unapplied before uploading
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 10 May 2006 18:18:50 +0300
 
-kdebase (4:3.5.2-0ubuntu20) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu20) dapper; urgency=low
 
   * Add kubuntu_63_pot_generation_path.diff to create 
     some .pot files in the correct directory.
@@ -2251,13 +2251,13 @@ kdebase (4:3.5.2-0ubuntu20) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  9 May 2006 18:08:02 +0300
 
-kdebase (4:3.5.2-0ubuntu19) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu19) dapper; urgency=low
  
   * Add kubuntu_62_genkdmconf_fix.diff, closes Malone #39599 
 
  -- Frode M. Doeving <frode@lnix.net>  Mon,  1 May 2006 15:25:48 +0100
 
-kdebase (4:3.5.2-0ubuntu18) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu18) dapper; urgency=low
 
   * Fix wallpaper in kubuntu_05_kdm_theme_config.diff
   * Alter kubuntu_52_gtk_qt_engine_config.diff, don't make use of
@@ -2265,7 +2265,7 @@ kdebase (4:3.5.2-0ubuntu18) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  1 May 2006 15:02:46 +0100
 
-kdebase (4:3.5.2-0ubuntu17) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu17) dapper; urgency=low
 
   * Remove kubuntu_36_hide_kjobviewer_menu_entry.diff
     handy to be able to get at print job viewer
@@ -2273,13 +2273,13 @@ kdebase (4:3.5.2-0ubuntu17) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 29 Apr 2006 16:05:23 +0100
 
-kdebase (4:3.5.2-0ubuntu16) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu16) dapper; urgency=low
 
   * Update kubuntu_05_kdm_theme_config.diff for dapper wallpaper
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 27 Apr 2006 15:45:33 +0100
 
-kdebase (4:3.5.2-0ubuntu15) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu15) dapper; urgency=low
 
   * Removed kubuntu_17_hide_desktop_trash.diff and
     kubuntu_46_no_desktop_files.diff and install desktop files in
@@ -2287,7 +2287,7 @@ kdebase (4:3.5.2-0ubuntu15) dapper; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 26 Apr 2006 03:01:24 +0200
 
-kdebase (4:3.5.2-0ubuntu14) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu14) dapper; urgency=low
 
   * Added previously removed kubuntu_54_system_protocol_home_dir.diff  make
     system:/ use /home/foo not system:/home/foo
@@ -2299,86 +2299,86 @@ kdebase (4:3.5.2-0ubuntu14) dapper; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 24 Apr 2006 21:16:19 +0200
 
-kdebase (4:3.5.2-0ubuntu13) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu13) dapper; urgency=low
 
   * Add kubuntu_59_lisa_popup.diff to prevent displaying a popup error when
     the lisa package is not installed.
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Sun, 23 Apr 2006 23:19:19 +0200
 
-kdebase (4:3.5.2-0ubuntu12) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu12) dapper; urgency=low
 
   * Edit debian/cdbs/kde.mk to mark .po files as UTF-8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Apr 2006 19:14:28 +0100
 
-kdebase (4:3.5.2-0ubuntu11) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu11) dapper; urgency=low
 
   * Fix serverguide URL in kubuntu_33_kubuntuify_about.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Apr 2006 16:12:54 +0100
 
-kdebase (4:3.5.2-0ubuntu10) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu10) dapper; urgency=low
 
   * Add missing "|| true" in case the rmdir fails.
 
  -- Scott James Remnant <scott@ubuntu.com>  Fri, 21 Apr 2006 11:09:44 +0100
 
-kdebase (4:3.5.2-0ubuntu9) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu9) dapper; urgency=low
 
   * Drop hotplug script entirely and update udev rules to Ubuntu standards.
 
  -- Scott James Remnant <scott@ubuntu.com>  Thu, 20 Apr 2006 12:29:01 +0100
 
-kdebase (4:3.5.2-0ubuntu8) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu8) dapper; urgency=low
 
   * Add kubuntu_58_kwin_branch.diff fixes crash on alt-tab and 
     focus policies
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Apr 2006 15:35:56 +0000
 
-kdebase (4:3.5.2-0ubuntu7) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu7) dapper; urgency=low
 
   * konqueror: Put the system tab back in sidebar now that we deal with the
     kio properly.
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Fri, 14 Apr 2006 00:59:01 +0200
 
-kdebase (4:3.5.2-0ubuntu6) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu6) dapper; urgency=low
 
   * Remove kubuntu_54_system_protocol_home_dir.diff, restricting
     protocols in .desktop files is better. 
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Apr 2006 14:45:35 +0100
 
-kdebase (4:3.5.2-0ubuntu5) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu5) dapper; urgency=low
 
   * Fix compile error in kubuntu_33_kubuntuify_about.diff 
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  5 Apr 2006 16:10:20 +0100
 
-kdebase (4:3.5.2-0ubuntu4) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu4) dapper; urgency=low
 
   * Remove obsolete Quick Guide from 
     kubuntu_33_kubuntuify_about.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Apr 2006 12:10:33 +0100
 
-kdebase (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * konqueror: Remove system tab from sidebar (Close: Malone #33917)
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Fri, 31 Mar 2006 14:08:35 +0200
 
-kdebase (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu2) dapper; urgency=low
 
-  * kdebase-kio-plugins: Remove trash from the system applet 
+  * tdebase-kio-plugins: Remove trash from the system applet 
     (Close: Malone #14393).
   * kdesktop: Remove unused invisible desktop files on the Desktop.
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Wed, 29 Mar 2006 18:14:35 +0200
 
-kdebase (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdebase (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Update 25_khelp_htdig.diff
@@ -2392,20 +2392,20 @@ kdebase (4:3.5.2-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 11:22:14 +0000
 
-kdebase (4:3.5.1-0ubuntu14) dapper; urgency=low
+tdebase (4:3.5.1-0ubuntu14) dapper; urgency=low
 
   * Add kubuntu_55_kdm_usplash_down.diff run usplash on exit from KDM
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 17 Mar 2006 12:26:58 +0000
 
-kdebase (4:3.5.1-0ubuntu13) dapper; urgency=low
+tdebase (4:3.5.1-0ubuntu13) dapper; urgency=low
 
   * Update kdm background colour in kubuntu_05_kdm_theme_config.diff
     to match current artwork
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Mar 2006 21:17:36 +0000
 
-kdebase (4:3.5.1-0ubuntu12) dapper; urgency=low
+tdebase (4:3.5.1-0ubuntu12) dapper; urgency=low
 
   [ Anthony Mercatante ]
   * Add kubuntu_53_kwallet_config.diff copy a default 
@@ -2416,7 +2416,7 @@ kdebase (4:3.5.1-0ubuntu12) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  6 Mar 2006 12:10:14 +0000
 
-kdebase (4:3.5.1-0ubuntu11) dapper; urgency=low
+tdebase (4:3.5.1-0ubuntu11) dapper; urgency=low
 
   * Add kubuntu_52_gtk_qt_engine_config.diff install 
     gtk-qt-engine config files if suitable
@@ -2424,7 +2424,7 @@ kdebase (4:3.5.1-0ubuntu11) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 27 Feb 2006 17:30:59 +0000
 
-kdebase (4:3.5.1-0ubuntu10) dapper; urgency=low
+tdebase (4:3.5.1-0ubuntu10) dapper; urgency=low
 
   * Add kubuntu_50_kate_desktop.diff use existing Kate session
   * Add kubuntu_51_kdmrc_options.diff add back restart X option
@@ -2432,20 +2432,20 @@ kdebase (4:3.5.1-0ubuntu10) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 27 Feb 2006 15:18:06 +0000
 
-kdebase (4:3.5.1-0ubuntu9) dapper; urgency=low
+tdebase (4:3.5.1-0ubuntu9) dapper; urgency=low
 
   * Fix URLs on kubuntu_33_kubuntuify_about.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 23 Feb 2006 13:48:01 +0000
 
-kdebase (4:3.5.1-0ubuntu8) dapper; urgency=low
+tdebase (4:3.5.1-0ubuntu8) dapper; urgency=low
 
   * Add new line in kubuntu_33_kubuntuify_about.diff to fix 
     layout of about page
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Feb 2006 11:46:30 +0000
 
-kdebase (4:3.5.1-0ubuntu7) dapper; urgency=low
+tdebase (4:3.5.1-0ubuntu7) dapper; urgency=low
 
   * Update kubuntu_33_kubuntuify_about.diff for dapper
   * Add kubuntu_48_xkb_path.diff to fix keyboard layout lists in kxkb config
@@ -2454,20 +2454,20 @@ kdebase (4:3.5.1-0ubuntu7) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Feb 2006 23:05:11 +0000
 
-kdebase (4:3.5.1-0ubuntu6) dapper; urgency=low
+tdebase (4:3.5.1-0ubuntu6) dapper; urgency=low
 
   * Add kubuntu_48_hide_display.diff to hide display module
     from KControl, replaced by Guidance 0.6 displayconfig
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Feb 2006 15:26:25 +0000
 
-kdebase (4:3.5.1-0ubuntu5) dapper; urgency=low
+tdebase (4:3.5.1-0ubuntu5) dapper; urgency=low
 
   * Fix install path for Home.desktop and System.desktop
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  9 Feb 2006 16:22:53 +0000
 
-kdebase (4:3.5.1-0ubuntu4) dapper; urgency=low
+tdebase (4:3.5.1-0ubuntu4) dapper; urgency=low
 
   * Do install System.desktop or Home.desktop kdesktop icons and add
     kubuntu_46_no_desktop_files.diff to hide them 
@@ -2476,23 +2476,23 @@ kdebase (4:3.5.1-0ubuntu4) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  9 Feb 2006 13:26:36 +0000
 
-kdebase (4:3.5.1-0ubuntu3) dapper; urgency=low
+tdebase (4:3.5.1-0ubuntu3) dapper; urgency=low
 
   * Add kubuntu_45_kxkb_xx_XX_layouts.diff fix support for 
     xx_XX layouts in kxkb
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  3 Feb 2006 11:41:13 +0000
 
-kdebase (4:3.5.1-0ubuntu2) dapper; urgency=low
+tdebase (4:3.5.1-0ubuntu2) dapper; urgency=low
 
   * Added a desktop file for kdcop and added a line to
-    debian/kdebase-bin.install to install it in the system
+    debian/tdebase-bin.install to install it in the system
     (Closes : Malone #30112)
   * Patch from Raphaël Pinson <raphink@raphink.net>
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 31 Jan 2006 02:14:55 +0100
 
-kdebase (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdebase (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Add kubuntu_44_systray_show.diff, advised by upstream to 
@@ -2501,7 +2501,7 @@ kdebase (4:3.5.1-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:06 +0000
 
-kdebase (4:3.5.0-0ubuntu16) dapper; urgency=low
+tdebase (4:3.5.0-0ubuntu16) dapper; urgency=low
 
   * Add kubuntu_43_kdesu_terminal_output.diff to make kdesu
     have terminal output
@@ -2509,45 +2509,45 @@ kdebase (4:3.5.0-0ubuntu16) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 20 Jan 2006 15:13:49 +0000
 
-kdebase (4:3.5.0-0ubuntu15) dapper; urgency=low
+tdebase (4:3.5.0-0ubuntu15) dapper; urgency=low
 
-  * kcontrol replaces old kdebase-bin for kcm_kdnssd.desktop
+  * kcontrol replaces old tdebase-bin for kcm_kdnssd.desktop
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 17 Jan 2006 15:20:42 +0000
 
-kdebase (4:3.5.0-0ubuntu14) dapper; urgency=low
+tdebase (4:3.5.0-0ubuntu14) dapper; urgency=low
 
   * Remove /usr/share/apps/konsole/fonts/fonts.dir from konsole.install
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 20:28:48 +0000
 
-kdebase (4:3.5.0-0ubuntu13) dapper; urgency=low
+tdebase (4:3.5.0-0ubuntu13) dapper; urgency=low
 
-  * Tighten build-dep to kdelibs 4:3.5.0-0ubuntu9
+  * Tighten build-dep to tdelibs 4:3.5.0-0ubuntu9
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 18:22:00 +0000
 
-kdebase (4:3.5.0-0ubuntu12) dapper; urgency=low
+tdebase (4:3.5.0-0ubuntu12) dapper; urgency=low
 
-  * Tighten build-dep to kdelibs 4:3.5.0-0ubuntu8
+  * Tighten build-dep to tdelibs 4:3.5.0-0ubuntu8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 15:34:03 +0000
 
-kdebase (4:3.5.0-0ubuntu11) dapper; urgency=low
+tdebase (4:3.5.0-0ubuntu11) dapper; urgency=low
 
   * Add kubuntu_42_konsole_root_shell.diff for a working root shell via sudo
     (Closes: ubuntu bugzilla #12343)
 
  -- Stephan Hermann <sh@sourcecode.de>  Wed, 11 Jan 2006 18:42:39 +0100
 
-kdebase (4:3.5.0-0ubuntu10) dapper; urgency=low
+tdebase (4:3.5.0-0ubuntu10) dapper; urgency=low
 
   * Remove kubuntu_41_kcmdnssd_friendly_name.diff, which shouldn't
     have been there
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Jan 2006 14:48:28 +0000
 
-kdebase (4:3.5.0-0ubuntu9) dapper; urgency=low
+tdebase (4:3.5.0-0ubuntu9) dapper; urgency=low
 
   * Add kubuntu_40_xmkmf.diff for new imake/xmkmf path
   * Install kcm_kdnssd in kcontrol
@@ -2556,14 +2556,14 @@ kdebase (4:3.5.0-0ubuntu9) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 10 Jan 2006 23:51:15 +0000
 
-kdebase (4:3.5.0-0ubuntu8) dapper; urgency=low
+tdebase (4:3.5.0-0ubuntu8) dapper; urgency=low
 
   * Change xmkmf build-dep to imake
   * Remove build-dep on xutils (was for imake)
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 10 Jan 2006 22:16:38 +0000
 
-kdebase (4:3.5.0-0ubuntu7) dapper; urgency=low
+tdebase (4:3.5.0-0ubuntu7) dapper; urgency=low
 
   * Update 10_kdmrc_defaults_kubuntu.diff changing Debian to Debian
     and rename to kubuntu_10_kdmrc_defaults_kubuntu.diff
@@ -2572,33 +2572,33 @@ kdebase (4:3.5.0-0ubuntu7) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 10 Jan 2006 00:26:23 +0000
 
-kdebase (4:3.5.0-0ubuntu6) dapper; urgency=low
+tdebase (4:3.5.0-0ubuntu6) dapper; urgency=low
 
   * Add kubuntu_39_konqueror_focus_location_bar.diff fix 
     http://bugs.kde.org/117031
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  6 Jan 2006 00:49:25 +0000
 
-kdebase (4:3.5.0-0ubuntu5) dapper; urgency=low
+tdebase (4:3.5.0-0ubuntu5) dapper; urgency=low
 
   * rebuild against latest dbus, updated dependencies
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 20 Dec 2005 22:05:42 +0100
 
-kdebase (4:3.5.0-0ubuntu4) dapper; urgency=low
+tdebase (4:3.5.0-0ubuntu4) dapper; urgency=low
 
   * Remove printmgr.desktop from install target
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 17 Dec 2005 22:29:48 +0000
 
-kdebase (4:3.5.0-0ubuntu3) dapper; urgency=low
+tdebase (4:3.5.0-0ubuntu3) dapper; urgency=low
 
   * Add kubuntu_38_ksysguard_pot.diff fix ksysguard .pot generation
   * Edit kde.mk to allow for fail on gettext
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 17 Dec 2005 18:21:40 +0000
 
-kdebase (4:3.5.0-0ubuntu2) dapper; urgency=low
+tdebase (4:3.5.0-0ubuntu2) dapper; urgency=low
 
   * Do not install System.desktop or Home.desktop kdesktop icons
   * Add kubuntu_34_no_duplicate_desktop_file.diff for 
@@ -2610,25 +2610,25 @@ kdebase (4:3.5.0-0ubuntu2) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Dec 2005 21:51:29 +0000
 
-kdebase (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdebase (4:3.5.0-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Remove GCC 3.4 on hppa
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Dec 2005 12:27:26 +0000
 
-kdebase (4:3.5-rc2-0ubuntu2) dapper; urgency=low
+tdebase (4:3.5-rc2-0ubuntu2) dapper; urgency=low
 
-  * Tighten build-dep to pick up new kdelibs4-dev with libattr1-dev
+  * Tighten build-dep to pick up new tdelibs4-dev with libattr1-dev
     and libacl1-dev
-  * Remove gettext-kde and kdesdk-scripts from build-dep, now in kdelibs4-dev
+  * Remove gettext-kde and tdesdk-scripts from build-dep, now in tdelibs4-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 26 Nov 2005 00:22:58 +0000
 
-kdebase (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdebase (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
-  * Tighten kdelibs-dev build-dep for libstdc++ transition
+  * Tighten tdelibs-dev build-dep for libstdc++ transition
   * kdm depends on xauth not xbase-clients
   * Update 18_default_fonts.diff
   * Generate .pot files
@@ -2636,7 +2636,7 @@ kdebase (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 17:46:39 +0000
 
-kdebase (4:3.5-rc1-1ubuntu1) dapper; urgency=low
+tdebase (4:3.5-rc1-1ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Sync with Debian
@@ -2650,7 +2650,7 @@ kdebase (4:3.5-rc1-1ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 10 Nov 2005 23:29:58 +0000
 
-kdebase (4:3.5.0-1) alioth; urgency=low
+tdebase (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
 
@@ -2670,7 +2670,7 @@ kdebase (4:3.5.0-1) alioth; urgency=low
 
   * Bump DH_COMPAT to 5. No changes.
 
-  * Add a kdebase-dbg package for helping to trace problems.
+  * Add a tdebase-dbg package for helping to trace problems.
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
@@ -2678,9 +2678,9 @@ kdebase (4:3.5.0-1) alioth; urgency=low
   
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 30 Nov 2005 02:29:16 -0500
 
-kdebase (4:3.4.3-3) unstable; urgency=low
+tdebase (4:3.4.3-3) unstable; urgency=low
 
-  * Upload to unstable, rebuilding against kdelibs4c2a.
+  * Upload to unstable, rebuilding against tdelibs4c2a.
 
   * KDE_3_4_BRANCH update (up to r484262).
 
@@ -2688,7 +2688,7 @@ kdebase (4:3.4.3-3) unstable; urgency=low
 
   * Temporarily bump build-depends on dbus to >= 0.23.4-8, ensuring that
     we build against a package that doesn't link against the pre-transition
-    kdelibs4c2.
+    tdelibs4c2.
 
   * Add "noextendedglob" to zsh's options when reading the X startup scripts
     for kdm. This works around some of its quirks. (Closes: #336305)
@@ -2698,7 +2698,7 @@ kdebase (4:3.4.3-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 30 Nov 2005 01:14:06 +0100
 
-kdebase (4:3.4.3-2) experimental; urgency=low
+tdebase (4:3.4.3-2) experimental; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -2707,7 +2707,7 @@ kdebase (4:3.4.3-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 18 Oct 2005 17:49:19 -0400
 
-kdebase (4:3.4.3-1) experimental; urgency=low
+tdebase (4:3.4.3-1) experimental; urgency=low
 
   * New upstream release.
 
@@ -2727,17 +2727,17 @@ kdebase (4:3.4.3-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 15 Oct 2005 14:00:13 -0400
 
-kdebase (4:3.4.2-4) unstable; urgency=medium
+tdebase (4:3.4.2-4) unstable; urgency=medium
 
   +++ Changes by Christopher Martin:
 
-  * Fix kicker's dependency on kdebase-data so that a binNMU does not render
-    kdebase uninstallable. This is currently a problem on ia64.
+  * Fix kicker's dependency on tdebase-data so that a binNMU does not render
+    tdebase uninstallable. This is currently a problem on ia64.
     (Closes: #335285)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 23 Oct 2005 08:25:27 -0400
 
-kdebase (4:3.4.2-3) unstable; urgency=low
+tdebase (4:3.4.2-3) unstable; urgency=low
 
   * KDE_3_4_BRANCH update (up to r458655). This includes a fix for a local
     root exploit, CAN-2005-2494, in the kcheckpass binary (Closes: #327039)
@@ -2753,29 +2753,29 @@ kdebase (4:3.4.2-3) unstable; urgency=low
 
   * Add another "Improving KDE" patch that allows the selection of a special
     tranparent selection rectangle (off by default) to be made from the
-    Control Center's Style module. Temporarily bump our kdelibs build-depends,
-    to ensure that we build against a similarly patched Qt and kdelibs.
+    Control Center's Style module. Temporarily bump our tdelibs build-depends,
+    to ensure that we build against a similarly patched Qt and tdelibs.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 16 Sep 2005 16:59:45 -0400
 
-kdebase (4:3.4.2-2) unstable; urgency=low
+tdebase (4:3.4.2-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * For kdebase-data, add conflicts against old versions of kcontrol, kwin,
+  * For tdebase-data, add conflicts against old versions of kcontrol, kwin,
     and kicker. This should prevent users from unwittingly upgrading
-    kdebase-data to 3.4.x, while the rest of KDE stays at the 3.3.x level.
+    tdebase-data to 3.4.x, while the rest of KDE stays at the 3.3.x level.
     This had resulted in kcontrol breaking and other assorted issues.
     (Closes: #325592)
 
   +++ Changes by Adeodato Simó:
 
-  * Build with g++-3.4 on arm, m68k and hppa; kdebase also makes gcc 4.0 ICE
+  * Build with g++-3.4 on arm, m68k and hppa; tdebase also makes gcc 4.0 ICE
     as described in #323133.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 02 Sep 2005 10:59:00 +0200
 
-kdebase (4:3.4.2-1) unstable; urgency=low
+tdebase (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -2806,9 +2806,9 @@ kdebase (4:3.4.2-1) unstable; urgency=low
     C++ transitioned version. Can be removed once dbus (>= 0.23.4-5) is
     available on all arches.
 
-  * Tighten all package relations between packages in kdebase, preventing many
+  * Tighten all package relations between packages in tdebase, preventing many
     instances of potentially harmful partial upgrades. In particular, ensure
-    that kdm is upgraded along with kdebase-bin. (Closes: #312358)
+    that kdm is upgraded along with tdebase-bin. (Closes: #312358)
 
   * Fix typos in the kappfinder manpage. Thanks to A Costa. (Closes: #312767)
 
@@ -2818,7 +2818,7 @@ kdebase (4:3.4.2-1) unstable; urgency=low
     (Closes: #312217)
 
   * No longer set a random ForgingSeed in the kdmrc conffile, for this caused
-    each kdebase build to generate a different kdmrc, and therefore made
+    each tdebase build to generate a different kdmrc, and therefore made
     updates a nuissance.
 
   * Make kdm Suggest kdepasswd, since the later contains icons that can be
@@ -2840,47 +2840,47 @@ kdebase (4:3.4.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 25 Aug 2005 22:58:52 +0200
 
-kdebase (4:3.4.1-1) experimental; urgency=low
+tdebase (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
 
-kdebase (4:3.4.3-0ubuntu6) breezy-updates; urgency=low
+tdebase (4:3.4.3-0ubuntu6) breezy-updates; urgency=low
 
   * Add kubuntu_34_kdesu_sycoca_cache_path.diff fix administrator
     kcontrol module bug http://bugzilla.ubuntu.com/8681
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  2 Nov 2005 02:37:11 +0000
 
-kdebase (4:3.4.3-0ubuntu5) breezy-updates; urgency=low
+tdebase (4:3.4.3-0ubuntu5) breezy-updates; urgency=low
 
   * Fix kubuntu_23_hal_api.diff to include the proper configure 
     checks for hal 0.5  http://bugzilla.ubuntu.com/17625
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Oct 2005 13:39:57 +0000
 
-kdebase (4:3.4.3-0ubuntu4) breezy; urgency=low
+tdebase (4:3.4.3-0ubuntu4) breezy; urgency=low
 
   * Fix typo in kubuntu_18_default_fonts.diff to give anti-aliased
     fonts in kdm
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 11 Oct 2005 22:50:44 +0100
 
-kdebase (4:3.4.3-0ubuntu3) breezy; urgency=low
+tdebase (4:3.4.3-0ubuntu3) breezy; urgency=low
 
   * Add kubuntu_33_kubuntuify_about.diff to make about page point to
     documentation
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 10 Oct 2005 16:02:47 +0100
 
-kdebase (4:3.4.3-0ubuntu2) breezy; urgency=low
+tdebase (4:3.4.3-0ubuntu2) breezy; urgency=low
 
   * Add a build-dep on automake1.9 to clear up the failure to build.
 
  -- Adam Conrad <adconrad@ubuntu.com>  Mon, 10 Oct 2005 14:03:47 +1000
 
-kdebase (4:3.4.3-0ubuntu1) breezy; urgency=low
+tdebase (4:3.4.3-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Move 18_default_fonts.diff to kubuntu_18_default_fonts.diff and use DejaVu
@@ -2888,7 +2888,7 @@ kdebase (4:3.4.3-0ubuntu1) breezy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  7 Oct 2005 14:23:37 +0000
 
-kdebase (4:3.4.2-0ubuntu5) breezy; urgency=low
+tdebase (4:3.4.2-0ubuntu5) breezy; urgency=low
 
   * Add kubuntu_32_usplash_console_font.diff
     make sure to set console fonts when usplash is runing
@@ -2899,7 +2899,7 @@ kdebase (4:3.4.2-0ubuntu5) breezy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 27 Sep 2005 12:50:34 +0100
 
-kdebase (4:3.4.2-0ubuntu4) breezy; urgency=low
+tdebase (4:3.4.2-0ubuntu4) breezy; urgency=low
 
   * Add kubuntu_29_desktop_roundedge_icons.diff for rounded text
     on desktop icons
@@ -2915,14 +2915,14 @@ kdebase (4:3.4.2-0ubuntu4) breezy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 26 Sep 2005 12:40:50 +0100
 
-kdebase (4:3.4.2-0ubuntu3) breezy; urgency=low
+tdebase (4:3.4.2-0ubuntu3) breezy; urgency=low
 
   * Do not install System.desktop or Home.desktop kdesktop icons
   * Add back missing kubuntu_23_hal_api.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Sep 2005 20:51:54 +0000
 
-kdebase (4:3.4.2-0ubuntu2) breezy; urgency=low
+tdebase (4:3.4.2-0ubuntu2) breezy; urgency=low
 
   * SECURITY UPDATE: fix insecure lock file creation
   * If the directory /var/lock is writeable for a user that is allowed to
@@ -2934,7 +2934,7 @@ kdebase (4:3.4.2-0ubuntu2) breezy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Sep 2005 11:51:57 +0000
 
-kdebase (4:3.4.2-0ubuntu1) breezy; urgency=low
+tdebase (4:3.4.2-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Move 10_kdmrc_defaults.diff to kubuntu_10_kdmrc_defaults.diff 
@@ -2943,26 +2943,26 @@ kdebase (4:3.4.2-0ubuntu1) breezy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  1 Sep 2005 19:18:56 +0000
 
-kdebase (4:3.4.1-0ubuntu6) breezy; urgency=low
+tdebase (4:3.4.1-0ubuntu6) breezy; urgency=low
 
   * Add xmkmf to build-depends, as configure appears to want it.
 
  -- Adam Conrad <adconrad@ubuntu.com>  Fri, 19 Aug 2005 21:41:55 +1000
 
-kdebase (4:3.4.1-0ubuntu5) breezy; urgency=low
+tdebase (4:3.4.1-0ubuntu5) breezy; urgency=low
 
   * Rebuild to pick up new mesa shlibs and drop Xrender.la references.
 
  -- Adam Conrad <adconrad@ubuntu.com>  Fri, 19 Aug 2005 14:01:12 +1000
 
-kdebase (4:3.4.1-0ubuntu4) breezy; urgency=low
+tdebase (4:3.4.1-0ubuntu4) breezy; urgency=low
 
   * New kubuntu_23_hal_api.diff to fix problems 
     with HAL support
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 27 Jun 2005 16:08:59 +0000
 
-kdebase (4:3.4.1-0ubuntu3) breezy; urgency=low
+tdebase (4:3.4.1-0ubuntu3) breezy; urgency=low
 
   * Add build-depend on x11proto-kb-dev where 
     XKBstr.h has been moved to
@@ -2976,13 +2976,13 @@ kdebase (4:3.4.1-0ubuntu3) breezy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Jun 2005 09:15:07 +0000
 
-kdebase (4:3.4.1-0ubuntu2) breezy; urgency=low
+tdebase (4:3.4.1-0ubuntu2) breezy; urgency=low
 
   * Rebuild to get proper libglu1c2 shlibs dependencies.
 
  -- Adam Conrad <adconrad@ubuntu.com>  Fri, 17 Jun 2005 07:34:22 +0000
 
-kdebase (4:3.4.1-0ubuntu1) breezy; urgency=low
+tdebase (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number following KDE 3.4.1 release
   * Add kde-base conflict with kdm << 3.4.1
@@ -2990,20 +2990,20 @@ kdebase (4:3.4.1-0ubuntu1) breezy; urgency=low
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed,  1 Jun 2005 00:15:47 +0000
 
-kdebase (4:3.4.1-0ubuntu0pre3) breezy; urgency=low
+tdebase (4:3.4.1-0ubuntu0pre3) breezy; urgency=low
 
   * Add build-depend son libxcomposite-dev and libxdamage-dev
   * Add kubuntu_24_deb_web_shortcut.diff redirecting deb: to package.ubuntu.com
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 26 May 2005 10:38:42 +0000
 
-kdebase (4:3.4.1-0ubuntu0pre2) breezy; urgency=low
+tdebase (4:3.4.1-0ubuntu0pre2) breezy; urgency=low
 
   * Add build-dep on libxau-dev, libxdmcp-dev to let KDM compile
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue, 24 May 2005 19:23:39 +0000
 
-kdebase (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+tdebase (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
 
   * New upstream release.
   * Sync with Debian
@@ -3013,7 +3013,7 @@ kdebase (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue, 24 May 2005 11:34:02 +0000
 
-kdebase (4:3.4.0-0pre4) alioth; urgency=low
+tdebase (4:3.4.0-0pre4) alioth; urgency=low
 
   * New upstream release.
 
@@ -3050,11 +3050,11 @@ kdebase (4:3.4.0-0pre4) alioth; urgency=low
     set so that members of the plugdev group can make use of the Logitech
     KControl module (under Peripherals/Mouse).
 
-  * Added README.Debian files for kcontrol and kdebase-kio-plugins, explaining
+  * Added README.Debian files for kcontrol and tdebase-kio-plugins, explaining
     how to setup Logitech mouse advanced configuration, and the media
     kioslave.
 
-  * New kdebase-doc-html package, containing doc-base registered HTML versions
+  * New tdebase-doc-html package, containing doc-base registered HTML versions
     of application handbooks, for users without Konqueror or KHelpCenter.
 
   * Fixed typos in the kate manpage. Thanks to A. Costa. (Closes: #302812)
@@ -3082,15 +3082,15 @@ kdebase (4:3.4.0-0pre4) alioth; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 14 May 2005 13:00:44 -0400
 
-kdebase (4:3.3.2-1) unstable; urgency=low
+tdebase (4:3.3.2-1) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
   * KDE_3_3_BRANCH update.
 
-  * Fix typo in kdebase-bin description. (Closes: #286587)
+  * Fix typo in tdebase-bin description. (Closes: #286587)
 
-  * Update kdeprint documentation to sync with kdelibs patches.
+  * Update kdeprint documentation to sync with tdelibs patches.
 
   * Add NEWS.Debian for kdm, explaining the "keyboard doesn't work"
     problem when upgrading to KDE 3.3, and how to deal with it.
@@ -3107,7 +3107,7 @@ kdebase (4:3.3.2-1) unstable; urgency=low
   +++ Changes by Adeodato Simó:
 
   * debian/control:
-    - make kdebase-dev depend on kwin for the libkdecorations.so ->
+    - make tdebase-dev depend on kwin for the libkdecorations.so ->
       libkdecorations.so.1.0.0 symlink. (Closes: #289544)
 
   * Included Czech po-debconf translation by Miroslav Kure.
@@ -3118,60 +3118,60 @@ kdebase (4:3.3.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 23 Jan 2005 16:11:07 +0100
 
-kdebase (4:3.4.0-0ubuntu21) breezy; urgency=low
+tdebase (4:3.4.0-0ubuntu21) breezy; urgency=low
 
   * Remove visiblity=hidden from admin/acinclude.m4.in
 
  -- Jonathan Riddell <jr@jriddell.org>  Sat, 21 May 2005 14:54:28 +0000
 
-kdebase (4:3.4.0-0ubuntu20) breezy; urgency=low
+tdebase (4:3.4.0-0ubuntu20) breezy; urgency=low
 
-  * CXX transition: Tighten build-deps on kdelibs4-dev and libdbus-qt-1-dev.
+  * CXX transition: Tighten build-deps on tdelibs4-dev and libdbus-qt-1-dev.
 
  -- Matthias Klose <doko@ubuntu.com>  Fri, 20 May 2005 14:58:10 +0000
 
-kdebase (4:3.4.0-0ubuntu19) breezy; urgency=low
+tdebase (4:3.4.0-0ubuntu19) breezy; urgency=low
 
   * Add kubuntu_23_hal_api.diff and change build-depends to compile
     against new dbus/hal.
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 12 May 2005 15:29:39 +0000
 
-kdebase (4:3.4.0-0ubuntu18) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu18) hoary; urgency=low
 
   * Add kubuntu_21_konq_tab_colour.diff make loading tab text colour visible
   * Add kubuntu_22_kipper_menu.diff hide klipper from menu
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed,  6 Apr 2005 02:46:32 +0100
 
-kdebase (4:3.4.0-0ubuntu17) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu17) hoary; urgency=low
 
   * Changed kdm start from S13 to S21 (Ubuntu: 8029)  
   * More Linitian cleanup
 
  -- Andreas Mueller <amu@ubuntu.com>  Tue,  5 Apr 2005 16:00:01 +0200
 
-kdebase (4:3.4.0-0ubuntu16) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu16) hoary; urgency=low
 
   * Add kubuntu_20_kdesu_sudo.diff to fix string on kdesu for sudo.
     Fixes http://bugzilla.ubuntu.com/7327
 
  -- Jonathan Riddell <jr@jriddell.org>  Sat,  2 Apr 2005 17:01:37 +0100
 
-kdebase (4:3.4.0-0ubuntu15) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu15) hoary; urgency=low
 
   * Remove link to pmount from hal/devices.d for kiomedia
 
  -- Jonathan Riddell <jr@jriddell.org>  Fri,  1 Apr 2005 00:02:31 +0100
 
-kdebase (4:3.4.0-0ubuntu14) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu14) hoary; urgency=low
 
   * Change Hidden to OnlyShowIn=Old in kubuntu_10_hide_kmenuedit_menu_entry.diff
     Fixes https://bugzilla.ubuntu.com/8030
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 30 Mar 2005 19:24:00 +0100
 
-kdebase (4:3.4.0-0ubuntu13) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu13) hoary; urgency=low
 
   * Fix kdm login when shell is zsh. Thanks Antti S. Lankila for the hint.
      19_kdm_zsh_emulate.diff (Hoary #7620)
@@ -3179,144 +3179,144 @@ kdebase (4:3.4.0-0ubuntu13) hoary; urgency=low
 
  -- Chris Halls <chris.halls@credativ.co.uk>  Wed, 30 Mar 2005 01:01:26 +0100
 
-kdebase (4:3.4.0-0ubuntu12) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu12) hoary; urgency=low
 
   * Fix install command for edit-as-root.desktop
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue, 29 Mar 2005 00:16:01 +0100
 
-kdebase (4:3.4.0-0ubuntu11) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu11) hoary; urgency=low
 
-  * Move pmount and hal from depends to recommends for kdebase-kio-plugins
+  * Move pmount and hal from depends to recommends for tdebase-kio-plugins
   * Add edit-as-root.desktop Konqueror service menu
 
  -- Jonathan Riddell <jr@jriddell.org>  Mon, 28 Mar 2005 20:45:01 +0100
 
-kdebase (4:3.4.0-0ubuntu10) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu10) hoary; urgency=low
 
   * Add kubuntu_18_kate_initial_preference.diff to set make Kate
     default for text files, not OpenOffice.
 
  -- Jonathan Riddell <jr@jriddell.org>  Mon, 28 Mar 2005 14:51:20 +0000
 
-kdebase (4:3.4.0-0ubuntu9) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu9) hoary; urgency=low
 
-  * Move pmount and hal from recommends to depends for kdebase-kio-plugins
+  * Move pmount and hal from recommends to depends for tdebase-kio-plugins
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 24 Mar 2005 05:18:00 +0000
 
-kdebase (4:3.4.0-0ubuntu8) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu8) hoary; urgency=low
 
   * Make default background colour of kdm match wallpaper
   * Add kubuntu_17_hide_desktop_trash.diff to hide desktop wastebin
-  * Remove dependency on ktip from kdebase
+  * Remove dependency on ktip from tdebase
   * Change Hidden to OnlyShowIn in knetattach.desktop so it isn't hidden from remote:/
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 24 Mar 2005 04:12:14 +0000
 
-kdebase (4:3.4.0-0ubuntu7) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu7) hoary; urgency=low
 
   * Make kdm depend on kubuntu-default-settings
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 17 Mar 2005 07:11:28 +0000
 
-kdebase (4:3.4.0-0ubuntu6) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu6) hoary; urgency=low
 
   * Ensure patches are not applied before uploading
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 17 Mar 2005 03:54:25 +0000
 
-kdebase (4:3.4.0-0ubuntu5) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu5) hoary; urgency=low
 
   * Add further patches to hide menu entries
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 17 Mar 2005 02:34:41 +0000
 
-kdebase (4:3.4.0-0ubuntu4) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu4) hoary; urgency=low
 
   * Add kubuntu_07_hide_knetattach_menu_entry.diff-foo to hide knetattach menu entry.
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 17 Mar 2005 00:21:28 +0000
 
-kdebase (4:3.4.0-0ubuntu3) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu3) hoary; urgency=low
 
   * Fix kdm.postinst to correctly update existing S99kdm links to S13kdm
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 23:43:54 +0000
 
-kdebase (4:3.4.0-0ubuntu2) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu2) hoary; urgency=low
 
   * Fix kdm.postinst to update existing S99kdm links to S13kdm
   * Fix kubuntu_03_ksplash_settings.diff to change all references to icon
-  * Remove depend on kde-style-lipstik while still in universe
+  * Remove depend on tde-style-lipstik while still in universe
   * Add kubuntu_05_kdm_theme_config.diff to make kdm use Debian theme
   * Add kubuntu_06_hide_home_menu_entry.diff to hide Home from KMenu
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 17:26:25 +0000
 
-kdebase (4:3.4.0-0ubuntu1) hoary; urgency=low
+tdebase (4:3.4.0-0ubuntu1) hoary; urgency=low
 
   * Add kubuntu_03_ksplash_settings.diff to use correct icon on splash screen
-  * Depend kdebase on kde-style-lipstik
+  * Depend tdebase on tde-style-lipstik
   * Do not install System.desktop or Home.desktop kdesktop icons
   * Add kubuntu_04_hide_menu_entries.diff to hide kwrite menu entry
   * Add link to pmount from hal/devices.d for kiomedia
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 01:29:27 +0000
 
-kdebase (4:3.4.0-0pre1ubuntu6) hoary; urgency=low
+tdebase (4:3.4.0-0pre1ubuntu6) hoary; urgency=low
 
   * Make kdm start at at S13 rather than S99 (see Ubuntu Bugzilla No 3143
     for gdm).
-  * Make kdebase-bin depend on gdb for drkonqi
+  * Make tdebase-bin depend on gdb for drkonqi
   * Add patch kubuntu_02_kcontrol_only_kde_menu.diff making KControl only
     show in KDE's menu
 
  -- Jonathan Riddell <jr@jriddell.org>  Fri, 11 Mar 2005 21:47:56 +0000
 
-kdebase (4:3.4.0-0pre1ubuntu5) hoary; urgency=low
+tdebase (4:3.4.0-0pre1ubuntu5) hoary; urgency=low
 
-  * Add kwin conflicts with old kdeartwork-theme-window
+  * Add kwin conflicts with old tdeartwork-theme-window
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue,  8 Mar 2005 22:48:59 +0000
 
-kdebase (4:3.4.0-0pre1ubuntu4) hoary; urgency=low
+tdebase (4:3.4.0-0pre1ubuntu4) hoary; urgency=low
 
   * Regenerate Makefiles, this time with maintainer mode turned on
 
  -- Chris Halls <chris.halls@credativ.co.uk>  Mon,  7 Mar 2005 23:24:28 +0000
 
-kdebase (4:3.4.0-0pre1ubuntu3) hoary; urgency=low
+tdebase (4:3.4.0-0pre1ubuntu3) hoary; urgency=low
 
   * Revert last change and use debian/rules buildprep to update the build system
 
  -- Chris Halls <chris.halls@credativ.co.uk>  Mon,  7 Mar 2005 22:31:12 +0000
 
-kdebase (4:3.4.0-0pre1ubuntu2) hoary; urgency=low
+tdebase (4:3.4.0-0pre1ubuntu2) hoary; urgency=low
 
   * Sync 99_buildprep.diff from Debian to prevent aclocal invocation
     during build
 
  -- Chris Halls <chris.halls@credativ.co.uk>  Mon,  7 Mar 2005 21:34:35 +0000
 
-kdebase (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+tdebase (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
 
   * Sync with Debian
   * Remove kubuntu_2_acimake_configure.diff, now included by Debian
 
  -- Jonathan Riddell <jr@jriddell.org>  Sun,  6 Mar 2005 01:52:35 +0000
 
-kdebase (4:3.3.2-0pre1) experimental; urgency=low
+tdebase (4:3.3.2-0pre1) experimental; urgency=low
 
   * New upstream release.
-  * KDE_3_3_BRANCH update. Includes the kdebase part of the fix
+  * KDE_3_3_BRANCH update. Includes the tdebase part of the fix
     for CAN-2004-1158.
   * Lower kdeprint's dependency on gv to a Suggests. (Closes: #269590)
   * kwin is now registered as an x-window-manager. (Closes: #249162)
   * Added /usr/share/xsessions to KDM's default session path, so
     .desktop files installed there are found.
     (Closes: #243770, #247365, #247747, #250384)
-  * kdm can now be installed while building kdebase, without affecting
+  * kdm can now be installed while building tdebase, without affecting
     the generated kdmrc and other config files.
   * Adjust documentation to reflect the CUPS document path used by
     Debian.
@@ -3341,7 +3341,7 @@ kdebase (4:3.3.2-0pre1) experimental; urgency=low
 
  -- Christopher Martin <chrsmrtn@freeshell.org>  Sat, 18 Dec 2004 14:54:58 -0500
 
-kdebase (4:3.4.0~rc1-0ubuntu0.1) hoary; urgency=low
+tdebase (4:3.4.0~rc1-0ubuntu0.1) hoary; urgency=low
 
   * Add kubuntu_2_acimake_configure.diff to fix
     problem with acimake being called by rules.
@@ -3351,7 +3351,7 @@ kdebase (4:3.4.0~rc1-0ubuntu0.1) hoary; urgency=low
 
  -- Jonathan Riddell <jr@jriddell.org>  Sun, 23 Jan 2005 04:37:53 +0100
 
-kdebase (4:3.3.1-4) unstable; urgency=high
+tdebase (4:3.3.1-4) unstable; urgency=high
 
   +++ Changes by Adeodato Simó:
 
@@ -3367,20 +3367,20 @@ kdebase (4:3.3.1-4) unstable; urgency=high
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  5 Jan 2005 17:11:03 +0100
 
-kdebase (4:3.3.1-3) unstable; urgency=medium
+tdebase (4:3.3.1-3) unstable; urgency=medium
 
   * Include patch to fix CAN-2004-1171 ("plain text password exposure").
     Closes half of #285126.
 
  -- Adeodato Simó <asp16@alu.ua.es>  Fri, 10 Dec 2004 22:28:25 +0100
 
-kdebase (4:3.3.1-2) unstable; urgency=low
+tdebase (4:3.3.1-2) unstable; urgency=low
 
   * Forgot then in ksmserver.preinst.
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu,  4 Nov 2004 18:00:00 -0600
 
-kdebase (4:3.3.1-1) unstable; urgency=low
+tdebase (4:3.3.1-1) unstable; urgency=low
 
   * New upstream release.
   * KDE_3_3_BRANCH update.
@@ -3390,7 +3390,7 @@ kdebase (4:3.3.1-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu,  4 Nov 2004 04:00:00 -0600
 
-kdebase (4:3.3.0a-1) unstable; urgency=low
+tdebase (4:3.3.0a-1) unstable; urgency=low
 
   * Respin orig.tar.gz.
   * KDE_3_3_BRANCH update.
@@ -3403,13 +3403,13 @@ kdebase (4:3.3.0a-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat, 25 Sep 2004 20:00:00 -0500
 
-kdebase (4:3.3.0-1) unstable; urgency=high
+tdebase (4:3.3.0-1) unstable; urgency=high
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri, 13 Aug 2004 20:00:00 -0500
 
-kdebase (4:3.2.3-1) unstable; urgency=high
+tdebase (4:3.2.3-1) unstable; urgency=high
 
   * New upstream release.
   * ksmserver Provides: x-session-manager. (Closes: #258677)
@@ -3418,7 +3418,7 @@ kdebase (4:3.2.3-1) unstable; urgency=high
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue,  3 Aug 2004 02:00:00 -0500
 
-kdebase (4:3.2.2-1) unstable; urgency=low
+tdebase (4:3.2.2-1) unstable; urgency=low
 
   * New upstream release.
   * Added Build-Depends: libsensors-dev.
@@ -3431,47 +3431,47 @@ kdebase (4:3.2.2-1) unstable; urgency=low
   * Added Danish po-debconf translations. (Closes: #236480)
   * Remove old x-session-manager alternatives. (Closes: #236515, #236795,
     #237081, #240773)
-  * Removed kdebase and kicker menu-methods. (Closes: #236700)
+  * Removed tdebase and kicker menu-methods. (Closes: #236700)
   * Corrected kdm-np PAM service. (Closes: #236750, #238182, #242381)
-  * Added kcontrol Depends: kdebase-data. (Closes: #239297)
+  * Added kcontrol Depends: tdebase-data. (Closes: #239297)
   * Updated GDM session file. (Closes: #240980)
   * debian/*.menu: remove the obsolete kderemove tag.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sun, 11 Apr 2004 04:00:00 -0500
 
-kdebase (4:3.2.1-1) unstable; urgency=low
+tdebase (4:3.2.1-1) unstable; urgency=low
 
   * New upstream release.
   * Added Catalan po-deconf translations. (Closes: #139733)
   * Added Polish po-deconf translations. (Closes: #142540)
   * Added Japanese po-deconf translations. (Closes: #137940, #210431)
   * Updated kate Recommends: kregexpeditor. (Closes: #227677)
-  * Added konqueror Depends: kdebase-kio-plugins. (Closes: #230203)
+  * Added konqueror Depends: tdebase-kio-plugins. (Closes: #230203)
   * Added kdm Provides: x-display-manager. (Closes: #231442)
-  * Added kdebase-bin/kdm Depends libpam-runtime. (Closes: #233562, #236078)
+  * Added tdebase-bin/kdm Depends libpam-runtime. (Closes: #233562, #236078)
   * Added kate/konqueror mime nametemplate support. (Closes: #235216)
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri,  5 Mar 2004 04:00:00 -0600
 
-kdebase (4:3.2.0-0pre1v1) experimental; urgency=low
+tdebase (4:3.2.0-0pre1v1) experimental; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue, 17 Feb 2004 17:00:00 -0600
 
-kdebase (4:3.1.95-1) unstable; urgency=low
+tdebase (4:3.1.95-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri, 23 Jan 2004 18:00:00 -0600
 
-kdebase (4:3.1.5-2) unstable; urgency=low
+tdebase (4:3.1.5-2) unstable; urgency=low
 
   * Remove Build-Depends: libsensors-dev.
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu, 29 Jan 2004 22:00:00 -0600
 
-kdebase (4:3.1.5-1) unstable; urgency=low
+tdebase (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
   * Added pt_BR debconf translation. (Closes: #107023)
@@ -3479,7 +3479,7 @@ kdebase (4:3.1.5-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon, 12 Jan 2004 19:00:00 -0600
 
-kdebase (4:3.1.4-2) unstable; urgency=low
+tdebase (4:3.1.4-2) unstable; urgency=low
 
   * Added es debconf translation. (Closes: #128933)
   * Added fr debconf translation. (Closes: #132615, #225899)
@@ -3491,7 +3491,7 @@ kdebase (4:3.1.4-2) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon,  5 Jan 2004 23:00:00 -0600
 
-kdebase (4:3.1.4-1) unstable; urgency=low
+tdebase (4:3.1.4-1) unstable; urgency=low
 
   * The "Why isn't KDE installable yet" release.
   * New upstream release.
@@ -3507,21 +3507,21 @@ kdebase (4:3.1.4-1) unstable; urgency=low
   * Update package descriptions. (Closes: #209532, #209856)
   * Strip SUID root from kcheckpass since its not needed. (Closes: #212212)
   * Update kdm debconf and use po-debconf. (Closes: #218731)
-  * Make kicker depend on kdebase-data. (Closes: #223407)
+  * Make kicker depend on tdebase-data. (Closes: #223407)
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu, 18 Dec 2003 13:30:00 -0600
 
-kdebase (4:3.1.3-1) unstable; urgency=low
+tdebase (4:3.1.3-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed, 30 Jul 2003 15:00:00 -0500
 
-kdebase (4:3.1.2-1.1) unstable; urgency=low
+tdebase (4:3.1.2-1.1) unstable; urgency=low
 
   * NMU (Maintainer is aware for a while but is dumb)
-      - Summary: kdebase-dev depends on kdebase that is not installable
-                 some package have build-depends on kdebase-dev so they are
+      - Summary: tdebase-dev depends on tdebase that is not installable
+                 some package have build-depends on tdebase-dev so they are
                  buildable since at least 06 Jun 2003
   * Fix Depends: field (previous was libsensors1 and it was replaced by
     libsensors-1debian1) (Closes: #196370, #200224)
@@ -3535,7 +3535,7 @@ kdebase (4:3.1.2-1.1) unstable; urgency=low
 
  -- Igor Genibel <igenibel@debian.org>  Fri, 18 Jul 2003 10:35:34 +0200
 
-kdebase (4:3.1.2-1) unstable; urgency=low
+tdebase (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
   * Remove Build-Depends on libsasl-dev. (Closes: #189949, #193866)
@@ -3551,7 +3551,7 @@ kdebase (4:3.1.2-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed, 21 May 2003 08:00:00 -0500
 
-kdebase (4:3.1.1-1) unstable; urgency=low
+tdebase (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release. (Closes: #180816, #181309)
   * Corrected kdm-update-menu.sh kdm.options path. (Closes: #180355)
@@ -3567,27 +3567,27 @@ kdebase (4:3.1.1-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue, 11 Mar 2003 22:00:00 -0600
 
-kdebase (4:3.1.0-2) unstable; urgency=low
+tdebase (4:3.1.0-2) unstable; urgency=low
 
   * Add 'chmod +x configure' to rules.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat,  8 Feb 2003 02:00:00 -0600
 
-kdebase (4:3.1.0-1) unstable; urgency=low
+tdebase (4:3.1.0-1) unstable; urgency=low
 
   * New upstream release.
   * Redo debian dir.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat, 01 Feb 2003 23:00:00 -0600
 
-kdebase (4:2.2.2-14.7) stable-security; urgency=high
+tdebase (4:2.2.2-14.7) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Updated patch from KDE advisory 20030916
 
  -- Matt Zimmerman <mdz@debian.org>  Tue, 16 Sep 2003 15:18:59 -0400
 
-kdebase (4:2.2.2-14.6) stable-security; urgency=high
+tdebase (4:2.2.2-14.6) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Apply updated patch from KDE advisory 20030915
@@ -3596,7 +3596,7 @@ kdebase (4:2.2.2-14.6) stable-security; urgency=high
 
  -- Matt Zimmerman <mdz@debian.org>  Mon,  8 Sep 2003 19:56:40 -0400
 
-kdebase (4:2.2.2-14.5) stable-security; urgency=high
+tdebase (4:2.2.2-14.5) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Apply patch from KDE advisory 20030908 to fix local root vulnerability in
@@ -3604,7 +3604,7 @@ kdebase (4:2.2.2-14.5) stable-security; urgency=high
 
  -- Matt Zimmerman <mdz@debian.org>  Sun, 31 Aug 2003 04:39:47 -0400
 
-kdebase (4:2.2.2-14.4) stable-security; urgency=medium
+tdebase (4:2.2.2-14.4) stable-security; urgency=medium
 
   * Non-maintainer upload by the Security Team
   * Applied upstream patch from Dirk Mueller (uninitialized variable use)
@@ -3613,7 +3613,7 @@ kdebase (4:2.2.2-14.4) stable-security; urgency=medium
 
  -- Martin Schulze <joey@infodrom.org>  Sat, 12 Apr 2003 09:48:40 +0200
 
-kdebase (4:2.2.2-14.3) stable-security; urgency=high
+tdebase (4:2.2.2-14.3) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Applied upstream patch so ghostscript won't execute arbitrary commands
@@ -3621,7 +3621,7 @@ kdebase (4:2.2.2-14.3) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Thu, 10 Apr 2003 11:44:04 +0200
 
-kdebase (4:2.2.2-14.2) stable-security; urgency=high
+tdebase (4:2.2.2-14.2) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Added special detection routine for big/little endianess on MIPS since
@@ -3631,7 +3631,7 @@ kdebase (4:2.2.2-14.2) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Thu,  9 Jan 2003 09:38:33 +0100
 
-kdebase (4:2.2.2-14.1) stable-security; urgency=high
+tdebase (4:2.2.2-14.1) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Applied upstream patches to fix several potential vulnerabilities.
@@ -3639,13 +3639,13 @@ kdebase (4:2.2.2-14.1) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Sun,  5 Jan 2003 21:36:47 +0100
 
-kdebase (4:2.2.2-14) unstable; urgency=high
+tdebase (4:2.2.2-14) unstable; urgency=high
 
   * New maintainer.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sun,  3 Mar 2002 01:30:00 -0600
 
-kdebase (4:2.2.2-13) unstable; urgency=low
+tdebase (4:2.2.2-13) unstable; urgency=low
 
   * Adopting orphaned package. Thanks Ivan for all your great work on KDE over
     the years; you'll be sorely missed. (closes: #127706)
@@ -3657,7 +3657,7 @@ kdebase (4:2.2.2-13) unstable; urgency=low
     - Disallow remote users from shutting down the machine. (Yeah, yeah, I
       know - dodgy grammar). (closes: #127616)
   * debian/control:
-    - Depend on kdebase | x-s-m | x-w-m, instead of just the latter two, so
+    - Depend on tdebase | x-s-m | x-w-m, instead of just the latter two, so
       that KDE gets installed in preference to, say, GNOME. (closes: #128208)
     - Shuffle Build-Deps back to libpng2.
   * kpersonalizer/keyecandypage.cpp:
@@ -3666,72 +3666,72 @@ kdebase (4:2.2.2-13) unstable; urgency=low
 
  -- Daniel Stone <daniel@sfarc.net>  Fri,  4 Jan 2002 09:14:11 -0500
 
-kdebase (4:2.2.2-12) unstable; urgency=low
+tdebase (4:2.2.2-12) unstable; urgency=low
 
   * Yet another overwrite. (Closes: #126699)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 28 Dec 2001 00:15:00 -0700
 
-kdebase (4:2.2.2-11) unstable; urgency=low
+tdebase (4:2.2.2-11) unstable; urgency=low
 
   * Crap.  fix -audiolibs again.
   * Fix spelling error (Closes: #124779)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 17 Dec 2001 22:00:00 -0700
 
-kdebase (4:2.2.2-10) unstable; urgency=low
+tdebase (4:2.2.2-10) unstable; urgency=low
 
-  * Move the audio kcm modules over to kdebase-libs since they a) don't depend
+  * Move the audio kcm modules over to tdebase-libs since they a) don't depend
     on audio libs and b) are required for sound to automatically start.  
     (Closes: #124144)
   * More upstream konsole fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 16 Dec 2001 00:30:00 -0700
 
-kdebase (4:2.2.2-9) unstable; urgency=low
+tdebase (4:2.2.2-9) unstable; urgency=low
 
   * Fix klipperrc (Closes: #123904)
   * Add lynx/opera/etc to klipperrc
   * Add libfam-dev to Build-Depends as well as other packages which we
     depend on but have relied on other depended upon packages to provide.
-  * libkonq_sound.* needs to be in kdebase-audiolibs.  We don't need
+  * libkonq_sound.* needs to be in tdebase-audiolibs.  We don't need
     to require libarts to be installed in order to use konq.
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 15 Dec 2001 00:02:00 -0700
 
-kdebase (4:2.2.2-8) unstable; urgency=low
+tdebase (4:2.2.2-8) unstable; urgency=low
 
   * Sync with upstream
   * Fix Xsetup (Closes: #123115)
   * Fix file location (Closes: #122621)
-  * Move keditbookmarks stuff into kdebase-libs
+  * Move keditbookmarks stuff into tdebase-libs
   * Let's attempt to import mozilla bookmarks along with netscape automatically
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 09 Dec 2001 14:07:00 -0700
 
-kdebase (4:2.2.2-7) unstable; urgency=low
+tdebase (4:2.2.2-7) unstable; urgency=low
 
   * Sync with upstream
-  * Add missing dependency for kdebase-libs to kdebase
-  * Move Sound .desktop files to kdebase-audiolibs
+  * Add missing dependency for tdebase-libs to tdebase
+  * Move Sound .desktop files to tdebase-audiolibs
   * Fix file location...
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 05 Dec 2001 16:59:00 -0700
 
-kdebase (4:2.2.2-6) unstable; urgency=low
+tdebase (4:2.2.2-6) unstable; urgency=low
 
   * Move libkcm_launch.so to where it belongs (Closes: #122136)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 02 Dec 2001 15:49:00 -0700
 
-kdebase (4:2.2.2-5) unstable; urgency=low
+tdebase (4:2.2.2-5) unstable; urgency=low
 
-  * Crap.  Fix build-depends since we now need the latest kdelibs package
+  * Crap.  Fix build-depends since we now need the latest tdelibs package
     I uploaded first.  (Closes: #122066)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 01 Dec 2001 22:29:00 -0700
 
-kdebase (4:2.2.2-4) unstable; urgency=low
+tdebase (4:2.2.2-4) unstable; urgency=low
 
   * Sync with upstream
   * Build-Depends cleanup
@@ -3744,7 +3744,7 @@ kdebase (4:2.2.2-4) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 30 Nov 2001 02:30:00 -0700
 
-kdebase (4:2.2.2-3) unstable; urgency=low
+tdebase (4:2.2.2-3) unstable; urgency=low
 
   * Update Brazilian Portuguese debconf entries (Closes: #120841)
   * Remove kdmrc debconf note
@@ -3758,13 +3758,13 @@ kdebase (4:2.2.2-3) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 26 Nov 2001 14:47:00 -0700
 
-kdebase (4:2.2.2-2) unstable; urgency=low
+tdebase (4:2.2.2-2) unstable; urgency=low
 
   * Update deps to allow for temp -crypto packages
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 22 Nov 2001 22:54:00 -0700
 
-kdebase (4:2.2.2-1) unstable; urgency=low
+tdebase (4:2.2.2-1) unstable; urgency=low
 
   * new upstream version
   * Add in suggests for libpam-krb/heimdel to kdm so we can get rid of the
@@ -3779,7 +3779,7 @@ kdebase (4:2.2.2-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 21 Nov 2001 16:18:00 -0700
 
-kdebase (4:2.2.1.0-7) unstable; urgency=low
+tdebase (4:2.2.1.0-7) unstable; urgency=low
 
   * Update build-deps for lesstif-dev since certain recent versions do
     not contain files we need to build
@@ -3787,7 +3787,7 @@ kdebase (4:2.2.1.0-7) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 28 Oct 2001 11:37:00 -0700
 
-kdebase (4:2.2.1.0-6) unstable; urgency=low
+tdebase (4:2.2.1.0-6) unstable; urgency=low
 
   * Sync with upstream
   * Should fix Home/End keys (Closes: #117149, #100878, #107071, #114312)
@@ -3798,36 +3798,36 @@ kdebase (4:2.2.1.0-6) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 26 Oct 2001 11:20:00 -0700
 
-kdebase (4:2.2.1.0-5) unstable; urgency=low
+tdebase (4:2.2.1.0-5) unstable; urgency=low
 
   * Sync with upstream
   * build with newer binutils
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 24 Oct 2001 10:11:00 -0700
 
-kdebase (4:2.2.1.0-4) unstable; urgency=low
+tdebase (4:2.2.1.0-4) unstable; urgency=low
 
   * more upstream fixes
   * Get rid of automake hacks
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 19 Oct 2001 12:46:00 -0700
 
-kdebase (4:2.2.1.0-3) unstable; urgency=low
+tdebase (4:2.2.1.0-3) unstable; urgency=low
 
   * More konsole/transparancy fixes
-  * build against newer kdelibs with fixed shlibs.  this'll fix several problems
+  * build against newer tdelibs with fixed shlibs.  this'll fix several problems
     with users running incompatable versions.
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 15 Oct 2001 00:30:00 -0700
 
-kdebase (4:2.2.1.0-2) unstable; urgency=low
+tdebase (4:2.2.1.0-2) unstable; urgency=low
 
   * hopefully fix kicker/aa problems
   * Fix Xpdf.ad (Closes: #115293)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 11 Oct 2001 13:26:00 -0700
 
-kdebase (4:2.2.1.0-1) unstable; urgency=low
+tdebase (4:2.2.1.0-1) unstable; urgency=low
 
   * remove auto* bits from configure so it doesn't try to run them after
     configure runs and thus re-introducing the whole automake problem with 1.5
@@ -3837,13 +3837,13 @@ kdebase (4:2.2.1.0-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 08 Oct 2001 20:54:00 -0700
 
-kdebase (4:2.2.1-6) unstable; urgency=low
+tdebase (4:2.2.1-6) unstable; urgency=low
  
   * Fix configure
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 05 Oct 2001 14:21:00 -0700
 
-kdebase (4:2.2.1-5) unstable; urgency=low
+tdebase (4:2.2.1-5) unstable; urgency=low
  
   * build with automake 1.5..well a way around it at least for now
   * undocumented man page (Closes: #114144)
@@ -3852,20 +3852,20 @@ kdebase (4:2.2.1-5) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 02 Oct 2001 00:01:00 -0700
 
-kdebase (4:2.2.1-4) unstable; urgency=low
+tdebase (4:2.2.1-4) unstable; urgency=low
 
   * More upstream fixes
   * don't set background in startkde script by default.  
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 27 Sep 2001 12:13:00 -0700
 
-kdebase (4:2.2.1-3) unstable; urgency=low
+tdebase (4:2.2.1-3) unstable; urgency=low
  
   * Build-Conflicts for nas-lib so we can build properly
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 24 Sep 2001 19:28:00 -0700
 
-kdebase (4:2.2.1-2) unstable; urgency=low
+tdebase (4:2.2.1-2) unstable; urgency=low
 
   * fix kdm preinst (Closes: #112900)
   * fix overwrite (Closes: #112903)
@@ -3875,7 +3875,7 @@ kdebase (4:2.2.1-2) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 23 Sep 2001 18:05:00 -0700
 
-kdebase (4:2.2.1-1) unstable; urgency=low
+tdebase (4:2.2.1-1) unstable; urgency=low
  
   * New upstream version 2.2.1
   * Fix init script (Closes: #110474)
@@ -3898,7 +3898,7 @@ kdebase (4:2.2.1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 07 Sep 2001 00:01:00 -0700
 
-kdebase (4:2.2.0.20010822-1) unstable; urgency=low
+tdebase (4:2.2.0.20010822-1) unstable; urgency=low
  
   * Apply GL patch for Bug #109270
   * Font/Schema/Session Management fixes for konsole
@@ -3911,7 +3911,7 @@ kdebase (4:2.2.0.20010822-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 22 Aug 2001 00:01:00 -0700
 
-kdebase (4:2.2.0-final-3) unstable; urgency=low
+tdebase (4:2.2.0-final-3) unstable; urgency=low
  
   * Fix Typo (Closes: #109115)
   * Fix GL bits (Closes: #109136)
@@ -3919,7 +3919,7 @@ kdebase (4:2.2.0-final-3) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 19 Aug 2001 00:01:00 -0700
 
-kdebase (4:2.2.0-final-2) unstable; urgency=low
+tdebase (4:2.2.0-final-2) unstable; urgency=low
 
   * Re-Add the *proper* Xsession script that will use the one provided
     by Debian's X rather than the one provided by kdm which is broken.
@@ -3930,12 +3930,12 @@ kdebase (4:2.2.0-final-2) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 14 Aug 2001 16:53:00 -0700
 
-kdebase (4:2.2.0-final-1) unstable; urgency=low
+tdebase (4:2.2.0-final-1) unstable; urgency=low
  
   * New upstream version
   * Fix debconf template (Closes: #107021)
   * fix mime (Closes: #107145)
-  * Fix kdebase compile issues (Closes: #107010, #104045)
+  * Fix tdebase compile issues (Closes: #107010, #104045)
   * Provide x-display-manager as well as all the new bells and whistles
     that Branden Robinson hacked together to allow *dm's to play nice
   * Move around EBS's for bug: stuff (Closes: #107832)
@@ -3944,20 +3944,20 @@ kdebase (4:2.2.0-final-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 12 Aug 2001 01:52:00 -0700
 
-kdebase (4:2.2.0-0.3beta1-1) unstable; urgency=low
+tdebase (4:2.2.0-0.3beta1-1) unstable; urgency=low
  
   * Sync with upstream
   * Fix http connection problems (Closes: 106909)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 28 Jul 2001 14:08:00 -0700
 
-kdebase (4:2.2.0-0.2beta1-2) unstable; urgency=low
+tdebase (4:2.2.0-0.2beta1-2) unstable; urgency=low
  
   * konsole bits are fixed (Closes: #100878)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 27 Jul 2001 02:14:00 -0700
 
-kdebase (4:2.2.0-0.2beta1-1) unstable; urgency=low
+tdebase (4:2.2.0-0.2beta1-1) unstable; urgency=low
  
   * add GL_LDFLAGS="-lpthread" to build process for building with X4.1
   * Fix htdig pathing for htdig.gif (Closes: #103977)
@@ -3972,7 +3972,7 @@ kdebase (4:2.2.0-0.2beta1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 25 Jul 2001 03:40:00 -0700
 
-kdebase (4:2.2.0-0.1beta1-2) unstable; urgency=low
+tdebase (4:2.2.0-0.1beta1-2) unstable; urgency=low
  
   * Sync with upstream
   * Update README (Closes: #103680)
@@ -3980,7 +3980,7 @@ kdebase (4:2.2.0-0.1beta1-2) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 07 Jul 2001 01:13:00 -0700
 
-kdebase (4:2.2.0-0.1beta1-1) unstable; urgency=low
+tdebase (4:2.2.0-0.1beta1-1) unstable; urgency=low
  
   * Sync with upstream
   * Spanish template (Closes: #103065, #103232)
@@ -3993,7 +3993,7 @@ kdebase (4:2.2.0-0.1beta1-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 04 Jul 2001 01:45:00 -0700
 
-kdebase (4:2.2.0-0beta1-3) unstable; urgency=low
+tdebase (4:2.2.0-0beta1-3) unstable; urgency=low
  
   * Fix konsole mappings maybe?
   * Fix overwrites (Closes: #102852, #102856)
@@ -4001,13 +4001,13 @@ kdebase (4:2.2.0-0beta1-3) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 29 Jun 2001 22:00:00 -0700
 
-kdebase (4:2.2.0-0beta1-2) unstable; urgency=low
+tdebase (4:2.2.0-0beta1-2) unstable; urgency=low
  
   * Fix kdm preinst
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 29 Jun 2001 09:51:00 -0700
 
-kdebase (4:2.2.0-0beta1-1) unstable; urgency=low
+tdebase (4:2.2.0-0beta1-1) unstable; urgency=low
 
   * Update path info in kdm files...these were in the comments so
     it wasn't a big deal
@@ -4059,11 +4059,11 @@ kdebase (4:2.2.0-0beta1-1) unstable; urgency=low
   * Remove custom startkde
   * Revert old overrides so we can start from scratch
   * Add in new python-base dependency
-  * New packages: kate, kdebase-audiolibs (so that those without sound do
+  * New packages: kate, tdebase-audiolibs (so that those without sound do
     not have to install sound libs.  Your welcome.)
-  * Lots of files moving around...out of kdebase-libs into the new 
-    kdebase-audiolibs and to konqueror.  This should drastically reduce
-    the size of kdebase-libs which is required by alot of non-kdebase packages
+  * Lots of files moving around...out of tdebase-libs into the new 
+    tdebase-audiolibs and to konqueror.  This should drastically reduce
+    the size of tdebase-libs which is required by alot of non-tdebase packages
     in order to provide things like smtp, bug reporting, etc...
   * And let's list the bugs fixed...
        ctrl-u problems with location bar fixed (Closes: #81425)
@@ -4103,7 +4103,7 @@ kdebase (4:2.2.0-0beta1-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
 
-kdebase (4:2.1.1-5) unstable; urgency=low
+tdebase (4:2.1.1-5) unstable; urgency=low
  
   * Overhaul menu-method bits.  
     kderemove="y"  in a menu entry will cause that menu item to not show
@@ -4112,7 +4112,7 @@ kdebase (4:2.1.1-5) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Apr 2001 17:21:00 -0700
 
-kdebase (4:2.1.1-4) unstable; urgency=low
+tdebase (4:2.1.1-4) unstable; urgency=low
  
   * Fix a couple debconf problems
   * Couple more lintain errors down the tubes
@@ -4121,7 +4121,7 @@ kdebase (4:2.1.1-4) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 07 Apr 2001 04:11:00 -0700
 
-kdebase (4:2.1.1-3) unstable; urgency=low
+tdebase (4:2.1.1-3) unstable; urgency=low
  
   * Fix kdmrc file (Closes: #92415)
   * Update XftConfig example
@@ -4132,7 +4132,7 @@ kdebase (4:2.1.1-3) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 03 Apr 2001 10:26:00 -0700
 
-kdebase (4:2.1.1-2) unstable; urgency=low
+tdebase (4:2.1.1-2) unstable; urgency=low
  
   * Move startkde script into /etc/kde2 so that it will be a conffile and
     link it back to /usr/bin/kde2.  (Closes: #91787)
@@ -4141,20 +4141,20 @@ kdebase (4:2.1.1-2) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 26 Mar 2001 10:59:00 -0700
 
-kdebase (4:2.1.1-1) unstable; urgency=low
+tdebase (4:2.1.1-1) unstable; urgency=low
  
   * New upstream version
   * Remove manpage alternative for x-terminal-emulator (Closes: #91357)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Mar 2001 20:49:00 -0700
 
-kdebase (4:2.1.0.1-5) unstable; urgency=low
+tdebase (4:2.1.0.1-5) unstable; urgency=low
  
   * One more shot the AA settings fix
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 15 Mar 2001 20:49:00 -0700
 
-kdebase (4:2.1.0.1-4) unstable; urgency=low
+tdebase (4:2.1.0.1-4) unstable; urgency=low
  
   * pam_env fixes for kdm as well as a ton of other updates to kdm
   * Fixing a problem with the default AA settings.  It looks like I "fixed" 
@@ -4162,7 +4162,7 @@ kdebase (4:2.1.0.1-4) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 15 Mar 2001 10:41:00 -0700
 
-kdebase (4:2.1.0.1-3) unstable; urgency=low
+tdebase (4:2.1.0.1-3) unstable; urgency=low
  
   * Adding in debconf note for systems that have a /.kde directory
   * Adding debconf dependency to kdm
@@ -4170,7 +4170,7 @@ kdebase (4:2.1.0.1-3) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 13 Mar 2001 18:20:00 -0700
 
-kdebase (4:2.1.0.1-2) unstable; urgency=low
+tdebase (4:2.1.0.1-2) unstable; urgency=low
  
   * Fix kdm init script. actually stop when we tell you to stop (Closes: #89235)
   * More documentation added to the QT AA Font Howto
@@ -4179,7 +4179,7 @@ kdebase (4:2.1.0.1-2) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 11 Mar 2001 05:23:00 -0700
 
-kdebase (4:2.1.0.1-1) unstable; urgency=low
+tdebase (4:2.1.0.1-1) unstable; urgency=low
  
   * More upstream fixes
   * Adding a QT AA Font HOWTO written by Lars Knoll <lars@trolltech.com> with
@@ -4188,21 +4188,21 @@ kdebase (4:2.1.0.1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 10 Mar 2001 00:17:00 -0700
 
-kdebase (4:2.1.0-4) unstable; urgency=low
+tdebase (4:2.1.0-4) unstable; urgency=low
  
   * More upstream fixes
    konqueror - minimum size for history is 1
    konqueror - check config key for minimum size of 1
    KSysGuardApplet - use correct catalog for translations
    KSysGuardApplet - save settings on exit
-  * Adding in "Replaces" for faulty kde-i18n package
+  * Adding in "Replaces" for faulty tde-i18n package
   * Removing link to non-existant man page for x-session-manager
   * Adding xserver to build-depends as the configure scripts look for it to
     determine pathing and whatnot
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Mar 2001 02:32:00 -0700
 
-kdebase (4:2.1.0-3) unstable; urgency=low
+tdebase (4:2.1.0-3) unstable; urgency=low
  
   * Grrr...let's try this konsole thing again
   * Add in Mozilla plugin paths for nspluginscan
@@ -4211,7 +4211,7 @@ kdebase (4:2.1.0-3) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 03 Mar 2001 00:01:00 -0700
 
-kdebase (4:2.1.0-2) unstable; urgency=low
+tdebase (4:2.1.0-2) unstable; urgency=low
  
   * Re-Enable AA support in konsole as it's brokt if you enable AA either
     way...but if AA support is enabled at least you can change the font. 
@@ -4221,7 +4221,7 @@ kdebase (4:2.1.0-2) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 03 Mar 2001 00:01:00 -0700
 
-kdebase (4:2.1.0-1) unstable; urgency=low
+tdebase (4:2.1.0-1) unstable; urgency=low
  
   * Changing version number so that I can re-upload the source.  This is a
     CVS sync with the 2.1 branch which will eventually become 2.1.1
@@ -4237,7 +4237,7 @@ kdebase (4:2.1.0-1) unstable; urgency=low
     AA is turned on and there are no type1 fonts it seems to be very unhappy.
   * Includes fix for QT 2.3.0 so that the url entry problems go away
   * Adding in Suggests for fttools (creates the fonts.dir for truetype fonts
-  * More information added to kdebase's README.debian on truetype font 
+  * More information added to tdebase's README.debian on truetype font 
     setup
   * Make the XFree 3.x.x keytab for konsole the default one to fit policy
   * Fix for stylesheet application (Closes: #87188)
@@ -4250,7 +4250,7 @@ kdebase (4:2.1.0-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 01 Mar 2001 00:15:00 -0700
 
-kdebase (4:2.1-final-1) unstable; urgency=low
+tdebase (4:2.1-final-1) unstable; urgency=low
  
   * New upstream version
   * Fix kdm init.d script
@@ -4260,7 +4260,7 @@ kdebase (4:2.1-final-1) unstable; urgency=low
   * Fix bg clear issue (Closes: #77649)
   * Fix kdm and expiring passwords
   * Fix for konq crash on startup and other crashes (Closes: 84472, #77151, #80102)
-  * Moving task-kde* packages out of kdebase source
+  * Moving task-kde* packages out of tdebase source
   * Fixes for khelpcenter hangs (Closes: #81683)
   * konq provides ftp-client as well
   * Update /usr/bin/kde2 script
@@ -4270,7 +4270,7 @@ kdebase (4:2.1-final-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
 
-kdebase (4:2.1-beta2-0128-1) unstable; urgency=low
+tdebase (4:2.1-beta2-0128-1) unstable; urgency=low
  
   * More work on nspluginscan to avoid problems with faulty plugins
   * Several small bug fixes from upstream
@@ -4278,7 +4278,7 @@ kdebase (4:2.1-beta2-0128-1) unstable; urgency=low
   * Fixing conflict with kfind (Closes: #83709)
   * Fixing default bs for konsole for those not using "linux" or "vt100" 
     (Closes: #83705)
-  * Adding notation to konqueror about page about kdelibs3-crypto
+  * Adding notation to konqueror about page about tdelibs3-crypto
   * Applying German debconf template (Closes: #83871)
   * Should also handle upgrade cleanup better.  This is across the board but
     affects base more than any other package. (Closes: #83543)
@@ -4286,17 +4286,17 @@ kdebase (4:2.1-beta2-0128-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 28 Jan 2001 01:30:00 -0700
 
-kdebase (4:2.1-beta2-3) unstable; urgency=low
+tdebase (4:2.1-beta2-3) unstable; urgency=low
  
   * Don't crash when trying to load/read faulty plugins (Closes: #82983)
-  * Moving kdesu to kdebase-libs so that we can use it without needing
-    kdebase installed
+  * Moving kdesu to tdebase-libs so that we can use it without needing
+    tdebase installed
   * Adding autoconf and gettext to build-deps
   * Several small bug fixes from upstream
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 25 Jan 2001 02:10:00 -0700
 
-kdebase (4:2.1-beta2-2) unstable; urgency=low
+tdebase (4:2.1-beta2-2) unstable; urgency=low
  
   * Updating menu entries (Closes: #83216)
   * Fixes form content memory in konq (Closes: #77317)
@@ -4306,7 +4306,7 @@ kdebase (4:2.1-beta2-2) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 23 Jan 2001 12:36:00 -0700
 
-kdebase (4:2.1-beta2-1) unstable; urgency=low
+tdebase (4:2.1-beta2-1) unstable; urgency=low
  
   * New upstream beta
   * No Response header fixing (Closes: #77398)
@@ -4314,7 +4314,7 @@ kdebase (4:2.1-beta2-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 22 Jan 2001 00:10:00 -0700
 
-kdebase (4:2.1-20010118-1) unstable; urgency=low
+tdebase (4:2.1-20010118-1) unstable; urgency=low
  
   * More upstream fixes
     Fix JS crashes with onmouseover
@@ -4327,7 +4327,7 @@ kdebase (4:2.1-20010118-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 18 Jan 2001 12:45:00 -0700
 
-kdebase (4:2.1-20010115-1) unstable; urgency=low
+tdebase (4:2.1-20010115-1) unstable; urgency=low
  
   * More upstream fixes
   * ask where the mozilla bookmarks are (Closes: #81710)
@@ -4342,29 +4342,29 @@ kdebase (4:2.1-20010115-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
 
-kdebase (4:2.1-20010109-1) unstable; urgency=low
+tdebase (4:2.1-20010109-1) unstable; urgency=low
  
   * More upstream fixes
   * Fixing some more task- related issues
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 09 Jan 2001 10:05:00 -0700
 
-kdebase (4:2.1-20010106-1) unstable; urgency=low
+tdebase (4:2.1-20010106-1) unstable; urgency=low
  
   * More upstream fixes
-  * Moving task- conflicts/replaces into kdebase so as to keep dist-upgrade
+  * Moving task- conflicts/replaces into tdebase so as to keep dist-upgrade
     from being unhappy.  (Closes: #81365)
   * Adding in a debconf note about SSL support
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 06 Jan 2001 20:54:00 -0700
 
-kdebase (4:2.1-20010101-2) unstable; urgency=low
+tdebase (4:2.1-20010101-2) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 04 Jan 2001 03:30:00 -0700
 
-kdebase (4:2.1-20010101-1) unstable; urgency=low
+tdebase (4:2.1-20010101-1) unstable; urgency=low
  
   * More upstream fixes
   * Fixing development task
@@ -4372,7 +4372,7 @@ kdebase (4:2.1-20010101-1) unstable; urgency=low
         
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Jan 2001 05:15:00 -0700
 
-kdebase (4:2.1-20001218-2) unstable; urgency=low
+tdebase (4:2.1-20001218-2) unstable; urgency=low
  
   * More upstream fixes
   * Adding in a undocumented manpage for /usr/bin/kde2
@@ -4380,7 +4380,7 @@ kdebase (4:2.1-20001218-2) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Dec 2000 15:15:00 -0700
 
-kdebase (4:2.1-20001218-1) unstable; urgency=low
+tdebase (4:2.1-20001218-1) unstable; urgency=low
  
   * More upstream fixes
   * Fix for GDM Session (Closes: #79987)
@@ -4392,7 +4392,7 @@ kdebase (4:2.1-20001218-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Dec 2000 11:16:00 -0700
 
-kdebase (4:2.1-20001216-1) unstable; urgency=low
+tdebase (4:2.1-20001216-1) unstable; urgency=low
  
   * More upstream fixes
   * Removing x-window-alternative as it's causing more problems than 
@@ -4401,7 +4401,7 @@ kdebase (4:2.1-20001216-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 16 Dec 2000 23:13:00 -0700
 
-kdebase (4:2.1-20001213-1) unstable; urgency=low
+tdebase (4:2.1-20001213-1) unstable; urgency=low
  
   * New upstream beta
   * Fixing alternative priority for konsole
@@ -4418,7 +4418,7 @@ kdebase (4:2.1-20001213-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 13 Dec 2000 14:41:00 -0700
 
-kdebase (4:2.0-final-5) unstable; urgency=low
+tdebase (4:2.0-final-5) unstable; urgency=low
  
   * More upstream fixes
   * Fixing suid bits and ownerships - security fixes
@@ -4427,7 +4427,7 @@ kdebase (4:2.0-final-5) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 14 Nov 2000 14:10:00 -0700
 
-kdebase (4:2.0-final-4.3) unstable; urgency=low
+tdebase (4:2.0-final-4.3) unstable; urgency=low
  
   * New i18n patch for krdb kcontrol module
   * More dependency work
@@ -4435,7 +4435,7 @@ kdebase (4:2.0-final-4.3) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 12 Nov 2000 20:00:00 -0700
 
-kdebase (4:2.0-final-4.2) unstable; urgency=low
+tdebase (4:2.0-final-4.2) unstable; urgency=low
  
   * More upstream fixes
   * Setting konsole as a x-terminal-emulator alternative
@@ -4444,31 +4444,31 @@ kdebase (4:2.0-final-4.2) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 10 Nov 2000 13:30:00 -0700
 
-kdebase (4:2.0-final-4.1) unstable; urgency=low
+tdebase (4:2.0-final-4.1) unstable; urgency=low
  
   * Adding in menu hints
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
                                                                                 
-kdebase (4:2.0-final-4) unstable; urgency=low
+tdebase (4:2.0-final-4) unstable; urgency=low
  
   * Minor upstream documentation updates
-  * more kdebase-libs work
+  * more tdebase-libs work
     now properly handles pop3 and other services correctly
-    now allows for email configuration without kdebase installed
+    now allows for email configuration without tdebase installed
   * more dependency work with kdm (Closes: #76565)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 08 Nov 2000 17:30:00 -0700
                                                                                 
-kdebase (4:2.0-final-3.1) unstable; urgency=low
+tdebase (4:2.0-final-3.1) unstable; urgency=low
  
   * applying i18n patch (Closes: #75831)
   * more kdmrc default setting updates
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 05 Nov 2000 23:00:00 -0700
 
-kdebase (4:2.0-final-3) unstable; urgency=low
+tdebase (4:2.0-final-3) unstable; urgency=low
  
   * more upstream fixes
   * more kdmrc default setting updates
@@ -4476,7 +4476,7 @@ kdebase (4:2.0-final-3) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 04 Nov 2000 01:00:00 -0700
                                                                                 
-kdebase (4:2.0-final-2) unstable; urgency=low
+tdebase (4:2.0-final-2) unstable; urgency=low
 
   * more upstream fixes
   * klipper should be happy again
@@ -4486,7 +4486,7 @@ kdebase (4:2.0-final-2) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
 
-kdebase (4:2.0-final-0) unstable; urgency=low
+tdebase (4:2.0-final-0) unstable; urgency=low
  
   * KDE 2.0
   * Updating nsplugin search paths
@@ -4494,42 +4494,42 @@ kdebase (4:2.0-final-0) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Oct 2000 00:00:00 -0700
                                                                                 
-kdebase (4:2.0-20001016-0) unstable; urgency=low
+tdebase (4:2.0-20001016-0) unstable; urgency=low
 
   * more upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 16 Oct 2000 15:00:00 -0700
 
-kdebase (4:2.0-20001015-0) unstable; urgency=low
+tdebase (4:2.0-20001015-0) unstable; urgency=low
  
   * More upstream fixes
   * More konqueror fixes for seperate package
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 15 Oct 2000 20:05:00 -0700      
 
-kdebase (4:2.0-20001013-0) unstable; urgency=low
+tdebase (4:2.0-20001013-0) unstable; urgency=low
  
   * kdmdesktop fixes from upstream
   * more i18n work
   * applying i18n patche
   * more fixes for konqueror
-  * Creating a kdebase-libs package
+  * Creating a tdebase-libs package
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 13 Oct 2000 07:13:00 -0700
 
-kdebase (4:2.0-20001011-0) unstable; urgency=low
+tdebase (4:2.0-20001011-0) unstable; urgency=low
  
   * Lintian error cleanup
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 12 Oct 2000 05:30:00 -0700
                                                                                 
-kdebase (4:2.0-20001010-0) unstable; urgency=low
+tdebase (4:2.0-20001010-0) unstable; urgency=low
  
   * more upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 10 Oct 2000 17:00:00 -0700
                                                                                 
-kdebase (4:2.0-20001009-0) unstable; urgency=low
+tdebase (4:2.0-20001009-0) unstable; urgency=low
  
   * KDE 2.0 RC2
   * more upstream fixes
@@ -4537,62 +4537,62 @@ kdebase (4:2.0-20001009-0) unstable; urgency=low
   
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 09 Oct 2000 08:00:00 -0700
                                                                                 
-kdebase (4:2.0-20001008-0) unstable; urgency=low
+tdebase (4:2.0-20001008-0) unstable; urgency=low
  
   * Breaking out konqueror, konsole, libkonq3 (and -dev) into seperate packages
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Oct 2000 08:30:00 -0700
                                                                                 
-kdebase (4:2.0-20001006-1) unstable; urgency=low
+tdebase (4:2.0-20001006-1) unstable; urgency=low
  
   * More upstream fixes
-  * Applying kdebase-1.94-kwin-nofreeze-20000924.diff patch (Closes: #74051)
+  * Applying tdebase-1.94-kwin-nofreeze-20000924.diff patch (Closes: #74051)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Oct 2000 03:30:00 -0700
                                                                                 
-kdebase (4:2.0-20001006-0) unstable; urgency=low
+tdebase (4:2.0-20001006-0) unstable; urgency=low
  
   * More upstream fixes
   * Breaking out crypto modules into a seperate package
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 06 Oct 2000 01:30:00 -0700
                                                                                 
-kdebase (4:2.0-20001004-0) unstable; urgency=low
+tdebase (4:2.0-20001004-0) unstable; urgency=low
  
   * More upstream fixes
-  * No longer depend on versioned kdelibs
+  * No longer depend on versioned tdelibs
   * Fixing up kdm's postinst to better handle kdmrc
   * More spice for kdm
   * Fixes the following:  (Closes: #73057, #73015, #73002, #72921, #72989, #72919, #72638) 
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Oct 2000 01:00:00 -0700
                                                                                 
-kdebase (4:2.0-20001002-0) unstable; urgency=low
+tdebase (4:2.0-20001002-0) unstable; urgency=low
  
   * KDE 2.0 RC1
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Oct 2000 01:00:00 -0700
                                                                                 
-kdebase (4:2.0-20000927-2) unstable; urgency=low
+tdebase (4:2.0-20000927-2) unstable; urgency=low
  
-  * Fixing up dependencies forcing versioned kdelibs
+  * Fixing up dependencies forcing versioned tdelibs
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 28 Sep 2000 05:00:00 -0700
 
-kdebase (4:2.0-20000927-1) unstable; urgency=low
+tdebase (4:2.0-20000927-1) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 27 Sep 2000 22:00:00 -0700
  
-kdebase (4:2.0-20000925-3) unstable; urgency=low
+tdebase (4:2.0-20000925-3) unstable; urgency=low
  
   * More upstream fixes
   * Fixing crypto support
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 27 Sep 2000 18:00:00 -0700
 
-kdebase (4:2.0-20000925-2) unstable; urgency=low
+tdebase (4:2.0-20000925-2) unstable; urgency=low
 
   * More upstream fixes
   * More build-depend cleanup
@@ -4600,40 +4600,40 @@ kdebase (4:2.0-20000925-2) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 26 Sep 2000 22:30:00 -0700
 
-kdebase (4:2.0-20000925-0) unstable; urgency=low
+tdebase (4:2.0-20000925-0) unstable; urgency=low
  
   * More upstream fixes
   * More build-depend cleanup
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
 
-kdebase (4:2.0-20000923-0) unstable; urgency=low
+tdebase (4:2.0-20000923-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 23 Sep 2000 00:30:00 -0700
 
-kdebase (4:2.0-20000920-2) unstable; urgency=low
+tdebase (4:2.0-20000920-2) unstable; urgency=low
  
   * Trying some build tweaks
   * Fixing build-depends some more
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 22 Sep 2000 15:00:00 -0700
 
-kdebase (4:2.0-20000920-0) unstable; urgency=low
+tdebase (4:2.0-20000920-0) unstable; urgency=low
  
   * More upstream fixes 
-  * Rebuild on kdelibs3-nossl
+  * Rebuild on tdelibs3-nossl
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Sep 2000 23:00:00 -0700
 
-kdebase (4:2.0-20000918-0) unstable; urgency=low
+tdebase (4:2.0-20000918-0) unstable; urgency=low
  
   * More upstream fixes (-beta5)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Sep 2000 17:30:00 -0700
 
-kdebase (4:2.0-20000912-0) unstable; urgency=low
+tdebase (4:2.0-20000912-0) unstable; urgency=low
  
   * More upstream fixes
   * Fixing typo in menu for kde window manager (Closes: #71395)
@@ -4644,7 +4644,7 @@ kdebase (4:2.0-20000912-0) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 12 Sep 2000 09:00:00 -0700
 
-kdebase (4:2.0-20000910-2) unstable; urgency=low
+tdebase (4:2.0-20000910-2) unstable; urgency=low
 
   * Fixing Debian menu graphic problem
   * More cleanup of kdm settings
@@ -4652,7 +4652,7 @@ kdebase (4:2.0-20000910-2) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 10 Sep 2000 23:00:00 -0700
 
-kdebase (4:2.0-20000910-0) unstable; urgency=low
+tdebase (4:2.0-20000910-0) unstable; urgency=low
 
   * Changing kdm banner graphic to be the Debian swirl
   * Fixing start script so that kde actually starts with the desktop 
@@ -4660,7 +4660,7 @@ kdebase (4:2.0-20000910-0) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 10 Sep 2000 11:45:00 -0700
 
-kdebase (4:2.0-20000909-0) unstable; urgency=low
+tdebase (4:2.0-20000909-0) unstable; urgency=low
 
   * More upstream updates
   * More kdm cleanup (star'd password option added)
@@ -4668,21 +4668,21 @@ kdebase (4:2.0-20000909-0) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 09 Sep 2000 01:00:00 -0700
 
-kdebase (4:2.0-20000907-1) unstable; urgency=low
+tdebase (4:2.0-20000907-1) unstable; urgency=low
 
   * New upstream cvs pull
   * Built against qt 2.2 final (GPL'd version)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 07 Sep 2000 01:00:00 -0700
 
-kdebase (4:2.0-20000905-0) unstable; urgency=low
+tdebase (4:2.0-20000905-0) unstable; urgency=low
 
   * New upstream fixes
   * Fixing up sections
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 05 Sep 2000 00:30:00 -0700
 
-kdebase (4:2.0-20000901-0) unstable; urgency=low
+tdebase (4:2.0-20000901-0) unstable; urgency=low
  
   * New upstream fixes
   * Fixing menu entries for konqueror
@@ -4690,7 +4690,7 @@ kdebase (4:2.0-20000901-0) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Sep 2000 00:02:00 -0700
                                                                                 
-kdebase (4:2.0-20000825-0) unstable; urgency=low
+tdebase (4:2.0-20000825-0) unstable; urgency=low
  
   * New upstream fixes
   * Updating kdm init script to match current xdm one
@@ -4700,7 +4700,7 @@ kdebase (4:2.0-20000825-0) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 25 Aug 2000 21:30:00 -0700
                                                                                 
-kdebase (4:2.0-20000821-1.0) experimental; urgency=low
+tdebase (4:2.0-20000821-1.0) experimental; urgency=low
  
   * New upstream fixes
   * changed xdm.options to kdm.options to seperate from xdm
@@ -4710,49 +4710,49 @@ kdebase (4:2.0-20000821-1.0) experimental; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 21 Aug 2000 22:45:00 -0700
                                                                                 
-kdebase (4:2.0-20000816-1.0) experimental; urgency=low
+tdebase (4:2.0-20000816-1.0) experimental; urgency=low
 
   * New upstream beta version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 16 Aug 2000 22:30:00 -0700
 
-kdebase (4:2.0-20000810-1.0) experimental; urgency=low
+tdebase (4:2.0-20000810-1.0) experimental; urgency=low
  
   * New upstream version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 10 Aug 2000 02:30:00 -0700
 
-kdebase-cvs (4:2.0-20000521-1.0) experimental; urgency=low
+tdebase-cvs (4:2.0-20000521-1.0) experimental; urgency=low
  
   * Adding in a conflict for man2html since we provide it
   * Fixing ln issues with documentation
   * Fixing file permissions in CVS tree
   * Fixing some kdm issues
-  * Changing suggest to depend for kde-i18n since some documentation, etc
+  * Changing suggest to depend for tde-i18n since some documentation, etc
     resides in that package now.  (including english)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 21 May 2000 02:30:00 -0700
 
-kdebase-cvs (4:2.0-20000512-1.0) experimental; urgency=low
+tdebase-cvs (4:2.0-20000512-1.0) experimental; urgency=low
 
   * New upstream beta version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 12 May 2000 22:30:00 -0700
 
-kdebase-cvs (4:2.0-20000314-1.0) experimental; urgency=low
+tdebase-cvs (4:2.0-20000314-1.0) experimental; urgency=low
  
   * New upstream CVS fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 14 Mar 2000 22:30:00 -0700
 
-kdebase-cvs (4:2.0-20000306-1.1) experimental; urgency=low
+tdebase-cvs (4:2.0-20000306-1.1) experimental; urgency=low
  
   * New upstream CVS fixes
   * More shlibs fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 06 Mar 2000 22:30:00 -0700
 
-kdebase-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+tdebase-cvs (4:2.0-20000302-1.0) experimental; urgency=low
  
   * New upstream CVS fixes
   * Migrating chooser over to kdm-cvs package
@@ -4762,14 +4762,14 @@ kdebase-cvs (4:2.0-20000302-1.0) experimental; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Mar 2000 22:00:00 -0700
 
-kdebase-cvs (4:2.0-20000229-1.0) experimental; urgency=low
+tdebase-cvs (4:2.0-20000229-1.0) experimental; urgency=low
 
   * New upstream CVS fixes 
   * Adding in build-depends
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 29 Feb 2000 22:00:00 -0700
 
-kdebase-cvs (4:2.0-20000223-1.0) experimental; urgency=low
+tdebase-cvs (4:2.0-20000223-1.0) experimental; urgency=low
 
   * New upstream CVS fixes
   * Fixing pathing for kde help files
@@ -4777,7 +4777,7 @@ kdebase-cvs (4:2.0-20000223-1.0) experimental; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 23 Feb 2000 22:00:36 -0700
 
-kdebase-cvs (4:2.0-19991130-1.0) experimental; urgency=low
+tdebase-cvs (4:2.0-19991130-1.0) experimental; urgency=low
 
   * New upstream CVS fixes
   * Removing old update-window-managers piece in leu of new udpate-alternatives
@@ -4785,25 +4785,25 @@ kdebase-cvs (4:2.0-19991130-1.0) experimental; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 30 Nov 1999 00:30:36 -0400
 
-kdebase-cvs (4:2.0-19991128-1.0) experimental; urgency=low
+tdebase-cvs (4:2.0-19991128-1.0) experimental; urgency=low
 
   * New upstream CVS fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 28 Nov 1999 03:30:36 -0400
 
-kdebase-cvs (4:2.0-19991020-1.0) experimental; urgency=low
+tdebase-cvs (4:2.0-19991020-1.0) experimental; urgency=low
 
   * New upstream CVS fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Oct 1999 08:30:36 -0400
 
-kdebase-cvs (4:2.0-19991001-0.1) experimental; urgency=low
+tdebase-cvs (4:2.0-19991001-0.1) experimental; urgency=low
 
   * new upstream version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Oct 1999 14:30:36 -0400
 
-kdebase-cvs (4:2.0-19990912-1.0) experimental; urgency=low
+tdebase-cvs (4:2.0-19990912-1.0) experimental; urgency=low
 
   * new upstream version
   * Cleaning up debian subtree: removing old window-managers file
@@ -4811,51 +4811,51 @@ kdebase-cvs (4:2.0-19990912-1.0) experimental; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 12 Sep 1999 15:00:36 -0400
 
-kdebase-cvs (4:2.0-19990903-1.0) experimental; urgency=low
+tdebase-cvs (4:2.0-19990903-1.0) experimental; urgency=low
 
   * new upstream version
 
  -- Stephan Kulow <coolo@kde.org>  Fri,  3 Sep 1999 21:51:36 +0200
 
-kdebase-cvs (4:2.0-19990825-1.0) experimental; urgency=low
+tdebase-cvs (4:2.0-19990825-1.0) experimental; urgency=low
 
   * New upstream CVS changes
   * Fixes problem with /usr/bin/kde2 (missing a / )
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 25 Aug 1999 13:00:56 -0400
 
-kdebase-cvs (4:2.0-19990825-1) experimental; urgency=low
+tdebase-cvs (4:2.0-19990825-1) experimental; urgency=low
 
   * New upstream CVS changes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 25 Aug 1999 07:00:56 -0400
 
-kdebase-cvs (4:2.0-19990823-1) experimental; urgency=low
+tdebase-cvs (4:2.0-19990823-1) experimental; urgency=low
  
   * New upstream CVS changes
   * Fixes bug with init.d script for kdm2
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Aug 1999 07:00:56 -0400
                                                         
-kdebase-cvs (4:2.0-19990820-1.1) experimental; urgency=low
+tdebase-cvs (4:2.0-19990820-1.1) experimental; urgency=low
 
   * several small package fixes mainly with pathing
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 21 Aug 1999 00:30:56 -0400
 
-kdebase-cvs (4:2.0-19990820-1) experimental; urgency=low
+tdebase-cvs (4:2.0-19990820-1) experimental; urgency=low
 
   * new CVS version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 20 Aug 1999 13:30:56 -0400
 
-kdebase-cvs (4:2.0-19990626-2) experimental; urgency=low
+tdebase-cvs (4:2.0-19990626-2) experimental; urgency=low
 
   * new version
 
  -- Stephan Kulow <coolo@kde.org>  Sat, 26 Jun 1999 22:37:56 +0200
 
-kdebase-cvs (4:2.0-19990626-1) experimental; urgency=low
+tdebase-cvs (4:2.0-19990626-1) experimental; urgency=low
 
   * New upstream CVS version
   * Brought in sync with -stable tree
@@ -4863,19 +4863,19 @@ kdebase-cvs (4:2.0-19990626-1) experimental; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 26 Jun 1999 06:00:29 -0400
 
-kdebase-cvs (4:2.0-19990620-1) experimental; urgency=low
+tdebase-cvs (4:2.0-19990620-1) experimental; urgency=low
 
   * New upstream CVS version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 20 Jun 1999 11:00:29 -0400
 
-kdebase-cvs (4:2.0-19990601-1) experimental; urgency=low
+tdebase-cvs (4:2.0-19990601-1) experimental; urgency=low
 
   * New upstream CVS version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 01 Jun 1999 01:00:29 -0400
 
-kdebase-cvs (4:2.0-19990531-1) experimental; urgency=low 
+tdebase-cvs (4:2.0-19990531-1) experimental; urgency=low 
 
   * Making kdm not require xdm
   * Fixing some pam stuff which includes a /etc/pam.d/kde file, making
@@ -4886,7 +4886,7 @@ kdebase-cvs (4:2.0-19990531-1) experimental; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 31 May 1999 19:30:29 -0400
 
-kdebase-cvs (4:2.0-19990524-1) experimental; urgency=low
+tdebase-cvs (4:2.0-19990524-1) experimental; urgency=low
 
   * migrating back to / from /opt
   * working in new build changes to bring package more in line with
@@ -4894,108 +4894,108 @@ kdebase-cvs (4:2.0-19990524-1) experimental; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 24 May 1999 07:00:29 -0400
 
-kdebase-cvs (4:2.0-19990314-3) experimental; urgency=low
+tdebase-cvs (4:2.0-19990314-3) experimental; urgency=low
 
   * fixing some lintian problems
 
  -- Stephan Kulow <coolo@kde.org>  Mon, 15 Mar 1999 17:17:29 +0100
 
-kdebase-cvs (4:2.0-19990314-2) experimental; urgency=low
+tdebase-cvs (4:2.0-19990314-2) experimental; urgency=low
 
   * taking out the undocumented call
 
  -- Stephan Kulow <coolo@kde.org>  Mon, 15 Mar 1999 16:42:47 +0100
 
-kdebase-cvs (4:2.0-19990314-1) experimental; urgency=low
+tdebase-cvs (4:2.0-19990314-1) experimental; urgency=low
 
   * moving the -cvs from version to package name
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 14 Mar 1999 21:01:10 +0100
 
-kdebase-cvs (4:2.0-19990314-cvs-1) experimental; urgency=low
+tdebase-cvs (4:2.0-19990314-cvs-1) experimental; urgency=low
 
-  * using newest kdelibs
+  * using newest tdelibs
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 14 Mar 1999 00:16:36 +0100
 
-kdebase (4:2.0-19990309-1) experimental; urgency=low
+tdebase (4:2.0-19990309-1) experimental; urgency=low
 
   * new upstream version with Qt 2.0
 
  -- Stephan Kulow <coolo@kde.org>  Tue,  9 Mar 1999 23:56:08 +0100
 
-kdebase (4:1.1-19990306-1) unstable; urgency=low
+tdebase (4:1.1-19990306-1) unstable; urgency=low
 
   * new upstream version out of CVS (many translation updates and some
     security fixes
 
  -- Stephan Kulow <coolo@kde.org>  Sat,  6 Mar 1999 18:03:04 +0100
 
-kdebase (4:1.1-19990217-1) unstable; urgency=low
+tdebase (4:1.1-19990217-1) unstable; urgency=low
 
   * new upstream version
 
  -- Stephan Kulow <coolo@kde.org>  Wed, 17 Feb 1999 19:09:41 +0100
 
-kdebase (4:1.1-19990214-2) unstable; urgency=low
+tdebase (4:1.1-19990214-2) unstable; urgency=low
 
   * move the link from /var/ to /usr, since /usr may be read only
   * patch Xserver_0 to run kdmgreeter if kdm runs
 
  -- Stephan Kulow <coolo@kde.org>  Tue, 16 Feb 1999 18:52:03 +0100
 
-kdebase (4:1.1-19990214-1) unstable; urgency=low
+tdebase (4:1.1-19990214-1) unstable; urgency=low
 
   * fix some bugs (krdb & menu)
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 14 Feb 1999 21:29:34 +0100
 
-kdebase (4:1.1-19990207-3) unstable; urgency=low
+tdebase (4:1.1-19990207-3) unstable; urgency=low
 
   * new kdmrc handling
 
  -- Stephan Kulow <coolo@kde.org>  Fri, 12 Feb 1999 11:03:56 +0100
 
-kdebase (4:1.1-19990207-2) unstable; urgency=low
+tdebase (4:1.1-19990207-2) unstable; urgency=low
 
-  * followed the suggestion of Russel Cooker and splited kdebase
+  * followed the suggestion of Russel Cooker and splited tdebase
   * fixed a bug with the jpeglib version
 
  -- Stephan Kulow <coolo@kde.org>  Tue,  9 Feb 1999 09:59:11 +0100
 
-kdebase (4:1.1-19990207-1) unstable; urgency=low
+tdebase (4:1.1-19990207-1) unstable; urgency=low
 
   * new upstream version 1.1 and new epoche
 
  -- Stephan Kulow <coolo@kde.org>  Sun,  7 Feb 1999 12:12:58 +0100
 
-kdebase (2:980710-1.0-1) unstable; urgency=low
+tdebase (2:980710-1.0-1) unstable; urgency=low
 
   * new upstream version 1.0
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 12 Jul 1998 14:44:00 +0200
 
-kdebase (2:980419-b4-1) unstable; urgency=low
+tdebase (2:980419-b4-1) unstable; urgency=low
 
   * new upstream version Beta4
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 19 Apr 1998 15:04:38 +0200
 
-kdebase (2:980312-5) unstable; urgency=low
+tdebase (2:980312-5) unstable; urgency=low
 
   * remove kwm from /etc/X11/window-managers in postrm
 
  -- Stephan Kulow <coolo@kde.org>  Fri,  3 Apr 1998 18:42:12 +0200
 
-kdebase (2:980312-4) frozen; urgency=low
+tdebase (2:980312-4) frozen; urgency=low
 
   * added undocumented man page
   * renamed kdmconfig to switchdm. This name existed twice
-  * new compile with latest kdelibs shlibs
+  * new compile with latest tdelibs shlibs
 
  -- Stephan Kulow <coolo@kde.org>  Tue, 31 Mar 1998 20:26:23 +0200
 
-kdebase (2:980312-3) unstable; urgency=low
+tdebase (2:980312-3) unstable; urgency=low
 
   * use debhelper tools now
   * changed the directory for debian apps to /var/spool/applnk
@@ -5005,20 +5005,20 @@ kdebase (2:980312-3) unstable; urgency=low
 
  -- Stephan Kulow <coolo@kde.org>  Fri, 27 Mar 1998 16:07:37 +0100
 
-kdebase (2:980312-2) frozen; urgency=low
+tdebase (2:980312-2) frozen; urgency=low
 
   * new compile cycle with qt-1.33 and libstd++-2.8
 
  -- Stephan Kulow <coolo@kde.org>  Tue, 24 Mar 1998 19:07:00 +0100
 
-kdebase (2:980312-1) experimental; urgency=low
+tdebase (2:980312-1) experimental; urgency=low
 
   * added -O2 to CXXFLAGS
   * New upstream release
 
  -- Stephan Kulow <coolo@kde.org>  Thu, 12 Mar 1998 23:05:14 +0100
 
-kdebase (2:980310-1) experimental; urgency=low
+tdebase (2:980310-1) experimental; urgency=low
 
   * disable the run of kappfinder to not create a non-KDE apps like menu twice
   * changed the README.debian file to reflect the new state of this package
@@ -5026,13 +5026,13 @@ kdebase (2:980310-1) experimental; urgency=low
 
  -- Stephan Kulow <coolo@kde.org>  Mon,  9 Mar 1998 23:12:46 +0100
 
-kdebase (980228-1) experimental; urgency=low
+tdebase (980228-1) experimental; urgency=low
 
   * New upstream release
 
  -- Stephan Kulow <coolo@kde.org>  Sat, 28 Feb 1998 21:21:55 +0100
 
-kdebase (980227-1) experimental; urgency=low
+tdebase (980227-1) experimental; urgency=low
 
   * added *.moc to the clean target
   * added po/no/Makefile to configure.in
@@ -5043,19 +5043,19 @@ kdebase (980227-1) experimental; urgency=low
 
  -- Stephan Kulow <coolo@kde.org>  Fri, 27 Feb 1998 20:06:44 +0100
 
-kdebase (1:980225-1) experimental; urgency=low
+tdebase (1:980225-1) experimental; urgency=low
 
   * New upstream release
 
  -- Stephan Kulow <coolo@kde.org>  Wed, 25 Dec 1998 21:48:23 +0100
 
-kdebase (1:Beta2-2.1) experimental; urgency=low
+tdebase (1:Beta2-2.1) experimental; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Fri,  5 Dec 1997 21:18:40 +0100
 
-kdebase (1:Beta2-2) unstable; urgency=low
+tdebase (1:Beta2-2) unstable; urgency=low
 
   * fixed kde / startkde script. added minimal documentation.
   * fixed klock permissions.
@@ -5065,32 +5065,32 @@ kdebase (1:Beta2-2) unstable; urgency=low
 
  -- Andreas Jellinghaus <aj@debian.org>  Sat, 29 Nov 1997 12:53:41 +0100
 
-kdebase (1:Beta2-1) unstable; urgency=low
+tdebase (1:Beta2-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun, 23 Nov 1997 22:27:46 +0100
 
-kdebase (1:Beta1.2-2) unstable; urgency=low
+tdebase (1:Beta1.2-2) unstable; urgency=low
 
   * start kdepanel only once.
   * fixed kfm bug.
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun,  9 Nov 1997 17:37:38 +0100
 
-kdebase (1:Beta1.2-1) unstable; urgency=low
+tdebase (1:Beta1.2-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 27 Oct 1997 11:49:11 +0100
 
-kdebase (1:Beta1.1-1) unstable; urgency=low
+tdebase (1:Beta1.1-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 20 Oct 1997 11:44:11 +0200
 
-kdebase (971019-1) unstable; urgency=low
+tdebase (971019-1) unstable; urgency=low
 
   * added module support to kde menu-method (untested)
   * dependency on new menu version with extensions for kde
@@ -5101,116 +5101,116 @@ kdebase (971019-1) unstable; urgency=low
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun, 19 Oct 1997 12:53:44 +0200
 
-kdebase (971013-1) unstable; urgency=low
+tdebase (971013-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 13 Oct 1997 08:23:08 +0200
 
-kdebase (971011-1) unstable; urgency=low
+tdebase (971011-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun, 12 Oct 1997 12:13:25 +0200
 
-kdebase (971009-1) unstable; urgency=low
+tdebase (971009-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Thu,  9 Oct 1997 10:51:49 +0200
 
-kdebase (971008-1) unstable; urgency=low
+tdebase (971008-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Wed,  8 Oct 1997 10:07:59 +0200
 
-kdebase (971006-2) unstable; urgency=low
+tdebase (971006-2) unstable; urgency=low
 
   * daily recompile of everything.
 
  -- Andreas Jellinghaus <aj@debian.org>  Tue,  7 Oct 1997 10:56:23 +0200
 
-kdebase (971006-1) unstable; urgency=low
+tdebase (971006-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon,  6 Oct 1997 09:24:17 +0200
 
-kdebase (971005-1) unstable; urgency=low
+tdebase (971005-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun,  5 Oct 1997 17:32:13 +0200
 
-kdebase (971003-1) unstable; urgency=low
+tdebase (971003-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Fri,  3 Oct 1997 08:23:44 +0200
 
-kdebase (971002-1) unstable; urgency=low
+tdebase (971002-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Thu,  2 Oct 1997 08:52:11 +0200
 
-kdebase (970930-1) unstable; urgency=low
+tdebase (970930-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Tue, 30 Sep 1997 11:56:08 +0200
 
-kdebase (970929-1) unstable; urgency=low
+tdebase (970929-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 29 Sep 1997 09:40:07 +0200
 
-kdebase (970925-2) unstable; urgency=low
+tdebase (970925-2) unstable; urgency=low
 
   * daily recompile of everything.
 
  -- Andreas Jellinghaus <aj@debian.org>  Fri, 26 Sep 1997 08:55:56 +0200
 
-kdebase (970925-1) unstable; urgency=low
+tdebase (970925-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Thu, 25 Sep 1997 08:08:36 +0200
 
-kdebase (970924-2) unstable; urgency=low
+tdebase (970924-2) unstable; urgency=low
 
   * now use kderules.
   * daily recompile of everything.
 
  -- Andreas Jellinghaus <aj@debian.org>  Wed, 24 Sep 1997 10:36:09 +0200
 
-kdebase (970924-1) unstable; urgency=low
+tdebase (970924-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Wed, 24 Sep 1997 08:32:38 +0200
 
-kdebase (970923-1) unstable; urgency=low
+tdebase (970923-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Tue, 23 Sep 1997 08:40:36 +0200
 
-kdebase (970922-1) unstable; urgency=low
+tdebase (970922-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 22 Sep 1997 09:30:58 +0200
 
-kdebase (970921-1) unstable; urgency=low
+tdebase (970921-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun, 21 Sep 1997 13:50:08 +0200
 
-kdebase (970920-1) unstable; urgency=low
+tdebase (970920-1) unstable; urgency=low
 
   * Initial Release.
 
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control
index f596d7587..5718cf914 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/tdebase/debian/control
@@ -1,22 +1,22 @@
-Source: kdebase-trinity
+Source: tdebase-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, kdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libtool, libltdl-dev, cmake
-Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, kdelibs4-trinity-doc
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libtool, libltdl-dev, cmake
+Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
 
-Package: kdebase-trinity
+Package: tdebase-trinity
 Section: kde
 Architecture: all
-Replaces: kdebase-kde3 (<< 4:3.5.13)
-Breaks: kdebase-kde3 (<< 4:3.5.13)
-Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), kdebase-trinity-bin (>= ${Source-Version}), kdebase-data-trinity (>= ${Source-Version}), kdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), kdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), kwin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
-Recommends: kdm-trinity (>= ${Source-Version}), kdebase-runtime-data-common-trinity, libtqt3-integration-trinity
-Suggests: kdebase-trinity-doc-html (>= ${Source-Version})
+Replaces: tdebase-kde3 (<< 4:3.5.13)
+Breaks: tdebase-kde3 (<< 4:3.5.13)
+Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), kdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), kwin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
+Recommends: kdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
+Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
 Description: base components 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,
@@ -28,12 +28,12 @@ Description: base components from the official KDE release
  window manager, taskbar, control center, a text editor, file manager,
  web browser, X terminal emulator, and many other programs and components.
 
-Package: kdebase-runtime-data-common-trinity
+Package: tdebase-runtime-data-common-trinity
 Section: kde
 Architecture: all
-Replaces: kdebase-runtime-data-common-kde3 (<< 4:3.5.13)
-Breaks: kdebase-runtime-data-common-kde3 (<< 4:3.5.13)
-Depends: kdebase-trinity
+Replaces: tdebase-runtime-data-common-kde3 (<< 4:3.5.13)
+Breaks: tdebase-runtime-data-common-kde3 (<< 4:3.5.13)
+Depends: tdebase-trinity
 Description: Shared common files for Trinity and KDE4
  .
  Shared common files for both Trinity and KDE4
@@ -50,7 +50,7 @@ Description: non-KDE application finder for KDE
  creates menu entries for them.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kate-trinity
 Section: editors
@@ -81,17 +81,17 @@ Description: advanced text editor for KDE
   * Global grep dialog
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kcontrol-trinity
 Section: kde
 Architecture: any
 Replaces: kcontrol-kde3 (<< 4:3.5.13)
 Breaks: kcontrol-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdebase-data-trinity (>> ${KDE-Version3}), kdebase-data-trinity (<< ${KDE-Next-Version3}), usbutils
+Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), usbutils
 Recommends: udev
 Suggests: khelpcenter-trinity, ntpdate | ntp-simple
-Conflicts: kdebase-libs-trinity (<< 4:3.0.0)
+Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
 Description: control center for KDE
  The KDE Control Center provides you with a centralized and convenient
  way to configure all of your KDE settings.
@@ -105,67 +105,67 @@ Description: control center for KDE
  plugdev group.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: kdebase-trinity-bin
+Package: tdebase-trinity-bin
 Section: kde
 Architecture: any
-Replaces: kdebase-kde3-bin (<< 4:3.5.13)
-Breaks: kdebase-kde3-bin (<< 4:3.5.13)
+Replaces: tdebase-kde3-bin (<< 4:3.5.13)
+Breaks: tdebase-kde3-bin (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
 Suggests: khelpcenter-trinity, gdb
-Conflicts: kdebase-libs-trinity (<< 4:3.0.0), kdm-trinity (<< 4:3.4.1-2), kdebase-workspace-data-trinity (<< 7:3.5.0)
+Conflicts: tdebase-libs-trinity (<< 4:3.0.0), kdm-trinity (<< 4:3.4.1-2), tdebase-workspace-data-trinity (<< 7:3.5.0)
 Description: core binaries for the KDE base module
  This package contains miscellaneous programs needed by other
  KDE applications, particularly those in the KDE base module.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: kdebase-data-trinity
+Package: tdebase-data-trinity
 Section: kde
 Architecture: all
-Replaces: kdebase-data-kde3 (<< 4:3.5.13)
-Breaks: kdebase-data-kde3 (<< 4:3.5.13)
+Replaces: tdebase-data-kde3 (<< 4:3.5.13)
+Breaks: tdebase-data-kde3 (<< 4:3.5.13)
 Conflicts: kcontrol-trinity (<< 4:3.4.2-1), kwin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1)
 Description: shared data files for the KDE base module
  This package contains the architecture-independent shared data files
  needed for a basic KDE desktop installation.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: kdebase-trinity-dev
+Package: tdebase-trinity-dev
 Section: devel
 Architecture: any
-Replaces: kdebase-kde3-dev (<< 4:3.5.13)
-Breaks: kdebase-kde3-dev (<< 4:3.5.13)
-Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), kdebase-trinity-bin (= ${Source-Version}), kdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), kwin-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
+Replaces: tdebase-kde3-dev (<< 4:3.5.13)
+Breaks: tdebase-kde3-dev (<< 4:3.5.13)
+Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), kdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), kwin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
 Description: development files for the KDE base module
  This package contains headers and other development files needed to
  compile software based on the KDE base module.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: kdebase-trinity-doc
+Package: tdebase-trinity-doc
 Section: doc
 Architecture: all
-Replaces: kdebase-kde3-doc (<< 4:3.5.13)
-Breaks: kdebase-kde3-doc (<< 4:3.5.13)
+Replaces: tdebase-kde3-doc (<< 4:3.5.13)
+Breaks: tdebase-kde3-doc (<< 4:3.5.13)
 Description: developer documentation for the KDE base module
  This package contains documentation for the KDE base module, of
  use more for developers creating applications than regular users.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: kdebase-trinity-doc-html
+Package: tdebase-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: kdebase-kde3-doc-html (<< 4:3.5.13)
-Breaks: kdebase-kde3-doc-html (<< 4:3.5.13)
-Suggests: konqueror-trinity | www-browser, kdebase-trinity
+Replaces: tdebase-kde3-doc-html (<< 4:3.5.13)
+Breaks: tdebase-kde3-doc-html (<< 4:3.5.13)
+Suggests: konqueror-trinity | www-browser, tdebase-trinity
 Description: KDE base documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -178,17 +178,17 @@ Description: KDE base documentation in HTML format
  KDE base packages.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: kdebase-kio-plugins-trinity
+Package: tdebase-kio-plugins-trinity
 Section: kde
 Architecture: any
-Replaces: kdebase-kio-plugins-kde3 (<< 4:3.5.13)
-Breaks: kdebase-kio-plugins-kde3 (<< 4:3.5.13)
+Replaces: tdebase-kio-plugins-kde3 (<< 4:3.5.13)
+Breaks: tdebase-kio-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, cryptsetup, man-db (>= 2.5.1-1)
-Recommends: hal-trinity, pmount, kamera-trinity, kdemultimedia-kio-plugins-trinity
+Recommends: hal-trinity, pmount, kamera-trinity, tdemultimedia-kio-plugins-trinity
 Suggests: khelpcenter-trinity, mtools
-Conflicts: kdebase-libs-trinity (<< 4:3.0.0), mediamanager
+Conflicts: tdebase-libs-trinity (<< 4:3.0.0), mediamanager
 Description: core I/O slaves for KDE
  This package includes the base kioslaves. They include, amongst many
  others, file, http, ftp, smtp, pop and imap.
@@ -200,7 +200,7 @@ Description: core I/O slaves for KDE
  group.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kdepasswd-trinity
 Section: utils
@@ -213,7 +213,7 @@ Description: password changer for KDE
  system passwords.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kdeprint-trinity
 Section: utils
@@ -231,7 +231,7 @@ Description: print system for KDE
  Installation of smbclient will make you able to use smb shared printers.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
  .
  Homepage: http://printing.kde.org
 
@@ -240,20 +240,20 @@ Section: kde
 Architecture: any
 Replaces: kdesktop-kde3 (<< 4:3.5.13)
 Breaks: kdesktop-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdebase-trinity-bin (= ${Source-Version}), eject, xdg-user-dirs
+Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), eject, xdg-user-dirs
 Description: miscellaneous binaries and files for the KDE desktop
  This package contains miscellaneous binaries and files integral to
  the KDE desktop.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kdm-trinity
 Section: kde
 Architecture: any
 Replaces: kdm-kde3 (<< 4:3.5.13)
 Breaks: kdm-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdebase-trinity-bin (= ${Source-Version}), kdebase-data-trinity (>> ${KDE-Version3}), kdebase-data-trinity (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
+Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
 Recommends: logrotate, xserver-xorg
 Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), kdepasswd-trinity (= ${Source-Version}), menu
 Provides: x-display-manager
@@ -274,7 +274,7 @@ Description: X display manager for KDE
  already. Most users won't need this.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kfind-trinity
 Section: utils
@@ -283,13 +283,13 @@ Replaces: kfind-kde3 (<< 4:3.5.13)
 Breaks: kfind-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Conflicts: kdebase-libs-trinity (<< 4:3.0.0)
+Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
 Description: file-find utility for KDE 
  kfind can be used to find files and directories on your
  workstations.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: khelpcenter-trinity
 Section: kde
@@ -305,23 +305,23 @@ Description: help center for KDE
  documentation.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kicker-trinity
 Section: kde
 Architecture: any
 Replaces: kicker-kde3 (<< 4:3.5.13)
 Breaks: kicker-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdebase-data-trinity (>> ${KDE-Version3}), kdebase-data-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-trinity, kicker-applets-trinity, menu
-Conflicts: kdebase-libs-trinity (<< 4:3.0.0)
+Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
 Description: desktop panel for KDE
  Kicker provides the KDE panel on you desktop. It can be used as a
  program launcher and can load plugins to provide additional
  functionality.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: klipper-trinity
 Section: kde
@@ -337,7 +337,7 @@ Description: clipboard utility for Trinity
  web browser if the clipboard contains a URL.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kmenuedit-trinity
 Section: kde
@@ -351,7 +351,7 @@ Description: menu editor for KDE
  structure.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: konqueror-trinity
 Section: web
@@ -359,9 +359,9 @@ Architecture: any
 Replaces: konqueror-kde3 (<< 4:3.5.13)
 Breaks: konqueror-kde3 (<< 4:3.5.13)
 Provides: info-browser, man-browser, www-browser, konqueror
-Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), kdebase-kio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}), konqueror-nsplugins-trinity
+Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-kio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}), konqueror-nsplugins-trinity
 Suggests: khelpcenter-trinity, konq-plugins-trinity, ksvg-trinity, gij-4.1, libgcj7-awt, libjessie-java
-Conflicts: kdebase-audiolibs-trinity (<< 4:3.0.0), kdebase-libs-trinity (<< 4:3.0.0)
+Conflicts: tdebase-audiolibs-trinity (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0)
 Description: KDE's advanced file manager, web browser and document viewer
  Konqueror is the file manager for the K Desktop Environment.
  It supports basic file management on local UNIX filesystems,
@@ -382,7 +382,7 @@ Description: KDE's advanced file manager, web browser and document viewer
  ever launching another application.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
  .
  Homepage: http://konqueror.kde.org
 
@@ -396,7 +396,7 @@ Description: Netscape plugin support for Konqueror
  This package includes support for Netscape plugins in Konqueror.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: konsole-trinity
 Section: kde
@@ -423,7 +423,7 @@ Description: X terminal emulator for KDE
   Root consoles sessions
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kpager-trinity
 Section: kde
@@ -438,14 +438,14 @@ Description: desktop pager for KDE
  applications. It is used to switch between applications or desktops.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kpersonalizer-trinity
 Section: kde
 Architecture: any
 Replaces: kpersonalizer-kde3 (<< 4:3.5.13)
 Breaks: kpersonalizer-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdebase-data-trinity (>> ${KDE-Version3}), kdebase-data-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3})
 Description: installation personalizer for KDE
  KDE Personalizer is the application that configures the KDE desktop for you.
  It's a very useful wizard that allows you to quickly change the KDE desktop to
@@ -453,7 +453,7 @@ Description: installation personalizer for KDE
  automatically started. KPersonalizer can also be called later.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: ksmserver-trinity
 Section: kde
@@ -461,7 +461,7 @@ Architecture: any
 Replaces: ksmserver-kde3 (<< 4:3.5.13)
 Breaks: ksmserver-kde3 (<< 4:3.5.13)
 Provides: x-session-manager
-Depends: ${shlibs:Depends}, kdebase-runtime-data-common-trinity, kwin-trinity (= ${Source-Version}) | x-window-manager
+Depends: ${shlibs:Depends}, tdebase-runtime-data-common-trinity, kwin-trinity (= ${Source-Version}) | x-window-manager
 Recommends: kpersonalizer-trinity (= ${Source-Version}), tde-ubuntu-integration
 Description: session manager for KDE
  This package contains the KDE session manager. It is responsible for
@@ -475,21 +475,21 @@ Description: session manager for KDE
  KDE will start, but many good defaults will not be set.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: ksplash-trinity
 Section: kde
 Architecture: any
 Replaces: ksplash-kde3 (<< 4:3.5.13)
 Breaks: ksplash-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdebase-data-trinity (>> ${KDE-Version3}), kdebase-data-trinity (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3})
 Suggests: khelpcenter-trinity
 Description: the KDE splash screen
  This package includes the KDE Splash screen, which is seen when
  a KDE session is launched.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: ksysguard-trinity
 Section: utils
@@ -504,7 +504,7 @@ Description: system guard for KDE
  computer.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: ksysguardd-trinity
 Section: utils
@@ -518,7 +518,7 @@ Description: system guard daemon for KDE
  to monitor it through the daemon running there.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: ktip-trinity
 Section: kde
@@ -530,7 +530,7 @@ Description: useful tips for KDE
  ktip provides many useful tips on using KDE when you log in.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: kwin-trinity
 Section: kde
@@ -539,13 +539,13 @@ Replaces: kwin-kde3 (<< 4:3.5.13)
 Breaks: kwin-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Provides: x-window-manager
-Suggests: kdebase-trinity-bin (= ${Source-Version}), kdebase-data-trinity (>> ${KDE-Version3}), kdebase-data-trinity (<< ${KDE-Next-Version3}), kdesktop-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), kpager-trinity (= ${Source-Version}), kpersonalizer-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version})
+Suggests: tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), kdesktop-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), kpager-trinity (= ${Source-Version}), kpersonalizer-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version})
 Conflicts: kde-window-manager-trinity (<< 7:3.5.0)
 Description: the KDE window manager
  This package contains the default X window manager for KDE.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: libkonq4-trinity
 Section: libs
@@ -553,13 +553,13 @@ Architecture: any
 Replaces: libkonq4-kde3 (<< 4:3.5.13)
 Breaks: libkonq4-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
-Conflicts: kdebase-libs-trinity (<< 4:3.0.0)
+Conflicts: tdebase-libs-trinity (<< 4:3.0.0)
 Description: core libraries for Konqueror
  These libraries are used by several KDE applications, most notably
  Konqueror and the kdesktop package.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: libtqt3-integration-trinity
 Section: libs
@@ -569,30 +569,30 @@ Description: Integration library between TQt3 and TDE
  These libraries allow you to use TDE dialogs in native TQt3 applications.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
 Package: libkonq4-trinity-dev
 Section: libdevel
 Architecture: any
 Replaces: libkonq4-kde3-dev (<< 4:3.5.13)
 Breaks: libkonq4-kde3-dev (<< 4:3.5.13)
-Depends: libkonq4-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libkonq4-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
 Conflicts: libkonq-trinity-dev (<< 4:3.0.0), libkonq3-trinity (<< 4:3.0.0)
 Description: development files for Konqueror's core libraries
  This package contains headers and other development files for the core
  Konqueror libraries.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: kdebase-trinity-dbg
+Package: tdebase-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: kdebase-kde3-dbg (<< 4:3.5.13)
-Breaks: kdebase-kde3-dbg (<< 4:3.5.13)
+Replaces: tdebase-kde3-dbg (<< 4:3.5.13)
+Breaks: tdebase-kde3-dbg (<< 4:3.5.13)
 Priority: extra
-Depends: libkonq4-trinity (= ${Source-Version}), kdelibs-trinity-dbg
-Description: debugging symbols for kdebase
- This package contains the debugging symbols associated with kdebase.
- They will automatically be used by gdb for debugging kdebase-related
+Depends: libkonq4-trinity (= ${Source-Version}), tdelibs-trinity-dbg
+Description: debugging symbols for tdebase
+ This package contains the debugging symbols associated with tdebase.
+ They will automatically be used by gdb for debugging tdebase-related
  issues.
diff --git a/ubuntu/maverick/tdebase/debian/control.in b/ubuntu/maverick/tdebase/debian/control.in
index 561ec765c..c23253584 100644
--- a/ubuntu/maverick/tdebase/debian/control.in
+++ b/ubuntu/maverick/tdebase/debian/control.in
@@ -1,21 +1,21 @@
-Source: kdebase
+Source: tdebase
 Section: kde
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf
-Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf
+Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, tdelibs4-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.7.3
-XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/kdebase/debian
+XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/tdebase/debian
 
-Package: kdebase
+Package: tdebase
 Section: kde
 Architecture: all
-Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), kdebase-bin (>= ${Source-Version}), kdebase-data (>= ${Source-Version}), kdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), kdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
+Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), kdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
 Recommends: kdm (>= ${Source-Version})
-Suggests: kdebase-doc-html (>= ${Source-Version})
+Suggests: tdebase-doc-html (>= ${Source-Version})
 Description: base components 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,
@@ -31,13 +31,13 @@ Package: kappfinder
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kdebase (<< 4:3.0.0)
+Replaces: tdebase (<< 4:3.0.0)
 Description: non-KDE application finder for KDE
  kappfinder searches your workstation for many common applications and
  creates menu entries for them.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: kate
 Section: editors
@@ -45,7 +45,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: kregexpeditor
 Suggests: aspell | ispell | hspell, kate-plugins, khelpcenter, konsole
-Replaces: kdebase-doc (<< 4:3.0.0)
+Replaces: tdebase-doc (<< 4:3.0.0)
 Description: advanced text editor for KDE
  Kate is a multi document editor, based on a rewritten version of the kwrite
  editing widget of KDE.
@@ -67,16 +67,16 @@ Description: advanced text editor for KDE
   * Global grep dialog
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: kcontrol
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), usbutils
+Depends: ${shlibs:Depends}, tdebase-data (>> ${KDE-Version3}), tdebase-data (<< ${KDE-Next-Version3}), usbutils
 Recommends: udev
 Suggests: khelpcenter, ntpdate | ntp-simple
-Conflicts: kdebase-libs (<< 4:3.0.0)
-Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0)
+Conflicts: tdebase-libs (<< 4:3.0.0)
+Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0)
 Description: control center for KDE
  The KDE Control Center provides you with a centralized and convenient
  way to configure all of your KDE settings.
@@ -90,47 +90,47 @@ Description: control center for KDE
  plugdev group.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
-Package: kdebase-bin
+Package: tdebase-bin
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
 Suggests: khelpcenter, gdb
-Conflicts: kdebase-libs (<< 4:3.0.0), kdm (<< 4:3.4.1-2)
-Replaces: kcontrol (<< 4:3.3.0), kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), kdm (= 4:3.3.2-1b)
+Conflicts: tdebase-libs (<< 4:3.0.0), kdm (<< 4:3.4.1-2)
+Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), kdm (= 4:3.3.2-1b)
 Description: core binaries for the KDE base module
  This package contains miscellaneous programs needed by other
  KDE applications, particularly those in the KDE base module.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
-Package: kdebase-data
+Package: tdebase-data
 Section: kde
 Architecture: all
 Conflicts: kcontrol (<< 4:3.4.2-1), kwin (<< 4:3.4.2-1), kicker (<< 4:3.4.2-1)
-Replaces: kdebase (<< 4:3.0.0), kdeedu-data (<< 4:3.4.0), kdelibs-data (<< 4:3.3.0), kdewallpapers (<< 4:3.0.0), kcontrol (<< 4:3.5.5a.dfsg.1-1ubuntu18)
+Replaces: tdebase (<< 4:3.0.0), tdeedu-data (<< 4:3.4.0), tdelibs-data (<< 4:3.3.0), kdewallpapers (<< 4:3.0.0), kcontrol (<< 4:3.5.5a.dfsg.1-1ubuntu18)
 Description: shared data files for the KDE base module
  This package contains the architecture-independent shared data files
  needed for a basic KDE desktop installation.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
-Package: kdebase-dev
+Package: tdebase-dev
 Section: devel
 Architecture: any
-Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), kdebase-bin (= ${Source-Version}), kdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8)
-Replaces: kate (<< 4:3.0.0), kdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
+Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), kdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Replaces: kate (<< 4:3.0.0), tdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
 Description: development files for the KDE base module
  This package contains headers and other development files needed to
  compile software based on the KDE base module.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
-Package: kdebase-doc
+Package: tdebase-doc
 Section: doc
 Architecture: all
 Replaces: libkonq4-dev (<< 4:3.2.0)
@@ -139,12 +139,12 @@ Description: developer documentation for the KDE base module
  use more for developers creating applications than regular users.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
-Package: kdebase-doc-html
+Package: tdebase-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror | www-browser, kdebase
+Suggests: konqueror | www-browser, tdebase
 Description: KDE base documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -157,16 +157,16 @@ Description: KDE base documentation in HTML format
  KDE base packages.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
-Package: kdebase-kio-plugins
+Package: tdebase-kio-plugins
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, kdesktop, libsasl2-modules, psmisc, cryptsetup, man-db (>= 2.5.1-1)
-Recommends: hal, pmount, kamera, kdemultimedia-kio-plugins
+Recommends: hal, pmount, kamera, tdemultimedia-kio-plugins
 Suggests: khelpcenter, mtools
-Conflicts: kdebase-libs (<< 4:3.0.0)
-Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0), kdebase-bin (<< 4:3.5.5a.dfsg.1-1ubuntu18)
+Conflicts: tdebase-libs (<< 4:3.0.0)
+Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0), tdebase-bin (<< 4:3.5.5a.dfsg.1-1ubuntu18)
 Description: core I/O slaves for KDE
  This package includes the base kioslaves. They include, amongst many
  others, file, http, ftp, smtp, pop and imap.
@@ -178,7 +178,7 @@ Description: core I/O slaves for KDE
  group.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: kdepasswd
 Section: utils
@@ -189,7 +189,7 @@ Description: password changer for KDE
  system passwords.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: kdeprint
 Section: utils
@@ -197,7 +197,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, enscript, poster, psutils
 Recommends: kghostview | postscript-viewer
 Suggests: khelpcenter, efax | hylafax-client | mgetty-fax, smbclient
-Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0)
+Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0)
 Description: print system for KDE
  This package contains the KDE printing subsystem. It can use CUPS,
  lpd-ng or the traditional lpd. It also includes support for fax and
@@ -206,26 +206,26 @@ Description: print system for KDE
  Installation of smbclient will make you able to use smb shared printers.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
  .
  Homepage: http://printing.kde.org
 
 Package: kdesktop
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}, kdebase-bin (= ${Source-Version}), eject
-Replaces: kdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
+Depends: ${shlibs:Depends}, tdebase-bin (= ${Source-Version}), eject
+Replaces: tdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
 Description: miscellaneous binaries and files for the KDE desktop
  This package contains miscellaneous binaries and files integral to
  the KDE desktop.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: kdm
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}, kdebase-bin (= ${Source-Version}), kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
+Depends: ${shlibs:Depends}, tdebase-bin (= ${Source-Version}), tdebase-data (>> ${KDE-Version3}), tdebase-data (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
 Recommends: logrotate, xserver-xorg
 Suggests: khelpcenter, ksmserver (= ${Source-Version}), kdepasswd (= ${Source-Version}), menu
 Provides: x-display-manager
@@ -246,28 +246,28 @@ Description: X display manager for KDE
  already. Most users won't need this.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: kfind
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Conflicts: kdebase-libs (<< 4:3.0.0)
-Replaces: kdebase (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0)
+Conflicts: tdebase-libs (<< 4:3.0.0)
+Replaces: tdebase (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0)
 Description: file-find utility for KDE 
  kfind can be used to find files and directories on your
  workstations.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: khelpcenter
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: htdig
-Replaces: kdebase-doc (<< 4:3.0.0), konqueror (<< 4:3.0.0)
+Replaces: tdebase-doc (<< 4:3.0.0), konqueror (<< 4:3.0.0)
 Description: help center for KDE
  The KDE Help Center provides documentation on how to use the KDE desktop.
  .
@@ -275,29 +275,29 @@ Description: help center for KDE
  documentation.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: kicker
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdebase-data (>> ${KDE-Version3}), tdebase-data (<< ${KDE-Next-Version3})
 Suggests: khelpcenter, kicker-applets, menu
-Conflicts: kdebase-libs (<< 4:3.0.0)
-Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0)
+Conflicts: tdebase-libs (<< 4:3.0.0)
+Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0)
 Description: desktop panel for KDE
  Kicker provides the KDE panel on you desktop. It can be used as a
  program launcher and can load plugins to provide additional
  functionality.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: klipper
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0)
+Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0)
 Description: clipboard utility for KDE
  klipper provides standard clipboard functions (cut and paste, history
  saving) plus additional features, like the ability to offer actions to 
@@ -305,29 +305,29 @@ Description: clipboard utility for KDE
  web browser if the clipboard contains a URL.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: kmenuedit
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0)
+Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0)
 Description: menu editor for KDE
  The KDE menu editor allows you to make customisations to the KDE menu
  structure.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: konqueror
 Section: web
 Architecture: any
 Provides: info-browser, man-browser, www-browser
-Depends: ${shlibs:Depends}, kcontrol (= ${Source-Version}), kdebase-kio-plugins (= ${Source-Version}), kdesktop (= ${Source-Version}), kfind (= ${Source-Version})
+Depends: ${shlibs:Depends}, kcontrol (= ${Source-Version}), tdebase-kio-plugins (= ${Source-Version}), kdesktop (= ${Source-Version}), kfind (= ${Source-Version})
 Suggests: khelpcenter, konq-plugins, ksvg, gij-4.1, libgcj7-awt, libjessie-java
-Conflicts: kdebase-audiolibs (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0)
-Replaces: kdebase (<< 4:3.0.0), kdebase-audiolibs (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0)
+Conflicts: tdebase-audiolibs (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0)
+Replaces: tdebase (<< 4:3.0.0), tdebase-audiolibs (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0)
 Description: KDE's advanced file manager, web browser and document viewer
  Konqueror is the file manager for the K Desktop Environment.
  It supports basic file management on local UNIX filesystems,
@@ -348,7 +348,7 @@ Description: KDE's advanced file manager, web browser and document viewer
  ever launching another application.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
  .
  Homepage: http://konqueror.kde.org
 
@@ -361,13 +361,13 @@ Description: Netscape plugin support for Konqueror
  This package includes support for Netscape plugins in Konqueror.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: konsole
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kdebase (<< 4:3.0.0)
+Replaces: tdebase (<< 4:3.0.0)
 Suggests: khelpcenter
 Provides: x-terminal-emulator
 Description: X terminal emulator for KDE
@@ -387,27 +387,27 @@ Description: X terminal emulator for KDE
   Root consoles sessions
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: kpager
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0)
+Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0)
 Description: desktop pager for KDE
  This package contains KDE's desktop pager, which displays your virtual
  desktops iconically in a window, along with icons of any running
  applications. It is used to switch between applications or desktops.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: kpersonalizer
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3})
-Replaces: kdebase (<< 4:3.0.0)
+Depends: ${shlibs:Depends}, tdebase-data (>> ${KDE-Version3}), tdebase-data (<< ${KDE-Next-Version3})
+Replaces: tdebase (<< 4:3.0.0)
 Description: installation personalizer for KDE
  KDE Personalizer is the application that configures the KDE desktop for you.
  It's a very useful wizard that allows you to quickly change the KDE desktop to
@@ -415,7 +415,7 @@ Description: installation personalizer for KDE
  automatically started. KPersonalizer can also be called later.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: ksmserver
 Section: kde
@@ -423,7 +423,7 @@ Architecture: any
 Provides: x-session-manager
 Depends: ${shlibs:Depends}, kwin (= ${Source-Version}) | x-window-manager
 Recommends: kpersonalizer (= ${Source-Version})
-Replaces: kdebase (<< 4:3.0.0)
+Replaces: tdebase (<< 4:3.0.0)
 Description: session manager for KDE
  This package contains the KDE session manager. It is responsible for
  restoring your KDE session on login. It is also needed to properly
@@ -436,20 +436,20 @@ Description: session manager for KDE
  KDE will start, but many good defaults will not be set.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: ksplash
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, tdebase-data (>> ${KDE-Version3}), tdebase-data (<< ${KDE-Next-Version3})
 Suggests: khelpcenter
-Replaces: kdebase (<< 4:3.0.0)
+Replaces: tdebase (<< 4:3.0.0)
 Description: the KDE splash screen
  This package includes the KDE Splash screen, which is seen when
  a KDE session is launched.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: ksysguard
 Section: utils
@@ -457,83 +457,83 @@ Architecture: any
 Depends: ${shlibs:Depends}, ksysguardd (= ${Source-Version})
 Suggests: khelpcenter
 Conflicts: kpm (<< 4:3.0.0)
-Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kpm (<< 4:3.0.0)
+Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), kpm (<< 4:3.0.0)
 Description: system guard for KDE
  KDE System Guard allows you to monitor various statistics about your
  computer.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: ksysguardd
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kdebase (<< 4:3.0.0)
+Replaces: tdebase (<< 4:3.0.0)
 Description: system guard daemon for KDE
  KDE System Guard Daemon is the daemon part of ksysguard. The daemon can
  be installed on a remote machine to enable ksysguard on another machine
  to monitor it through the daemon running there.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: ktip
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kdebase (<< 4:3.0.0)
+Replaces: tdebase (<< 4:3.0.0)
 Description: useful tips for KDE
  ktip provides many useful tips on using KDE when you log in.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: kwin
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
 Provides: x-window-manager
-Suggests: kdebase-bin (= ${Source-Version}), kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), kdesktop (= ${Source-Version}), kicker (= ${Source-Version}), kpager (= ${Source-Version}), kpersonalizer (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version})
-Replaces: kdeartwork-theme-window (<< 4:3.4.0), kdebase (<< 4:3.0.0)
+Suggests: tdebase-bin (= ${Source-Version}), tdebase-data (>> ${KDE-Version3}), tdebase-data (<< ${KDE-Next-Version3}), kdesktop (= ${Source-Version}), kicker (= ${Source-Version}), kpager (= ${Source-Version}), kpersonalizer (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version})
+Replaces: tdeartwork-theme-window (<< 4:3.4.0), tdebase (<< 4:3.0.0)
 Description: the KDE window manager
  This package contains the default X window manager for KDE.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: libkonq4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: kdebase-libs (<< 4:3.0.0)
-Replaces: kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0)
+Conflicts: tdebase-libs (<< 4:3.0.0)
+Replaces: tdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0)
 Description: core libraries for Konqueror
  These libraries are used by several KDE applications, most notably
  Konqueror and the kdesktop package.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
 Package: libkonq4-dev
 Section: libdevel
 Architecture: any
-Depends: libkonq4 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: libkonq4 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
 Conflicts: libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
-Replaces: kdebase-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
+Replaces: tdebase-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
 Description: development files for Konqueror's core libraries
  This package contains headers and other development files for the core
  Konqueror libraries.
  .
  This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
+ See the 'kde' and 'tdebase' packages for more information.
 
-Package: kdebase-dbg
+Package: tdebase-dbg
 Section: libdevel
 Architecture: any
 Priority: extra
-Depends: libkonq4 (= ${Source-Version}), kdelibs-dbg
-Description: debugging symbols for kdebase
- This package contains the debugging symbols associated with kdebase.
- They will automatically be used by gdb for debugging kdebase-related
+Depends: libkonq4 (= ${Source-Version}), tdelibs-dbg
+Description: debugging symbols for tdebase
+ This package contains the debugging symbols associated with tdebase.
+ They will automatically be used by gdb for debugging tdebase-related
  issues.
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-trinity-bin.lintian b/ubuntu/maverick/tdebase/debian/kdebase-trinity-bin.lintian
deleted file mode 100644
index 82e1b9846..000000000
--- a/ubuntu/maverick/tdebase/debian/kdebase-trinity-bin.lintian
+++ /dev/null
@@ -1,6 +0,0 @@
-kdebase-bin: setgid-binary usr/bin/kdesud 2755 root/nogroup
-kdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kcminit.so
-kdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_khotkeys.so
-kdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kxkb.so
-kdebase-bin: postinst-must-call-ldconfig usr/lib/libkdeinit_khotkeys.so
-kdebase-bin: postrm-should-call-ldconfig usr/lib/libkdeinit_khotkeys.so
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-trinity-doc.install b/ubuntu/maverick/tdebase/debian/kdebase-trinity-doc.install
deleted file mode 100644
index 97134583f..000000000
--- a/ubuntu/maverick/tdebase/debian/kdebase-trinity-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebase-apidocs/*
diff --git a/ubuntu/maverick/tdebase/debian/kicker-trinity.preinst b/ubuntu/maverick/tdebase/debian/kicker-trinity.preinst
index 12c94f171..598e46d22 100644
--- a/ubuntu/maverick/tdebase/debian/kicker-trinity.preinst
+++ b/ubuntu/maverick/tdebase/debian/kicker-trinity.preinst
@@ -3,7 +3,7 @@
 case "$1" in
 
     upgrade)
-	rm -f /etc/menu-methods/kdebase
+	rm -f /etc/menu-methods/tdebase
 	rm -f /etc/trinity/debian/kde-update-menu.sh
 	rm -f /etc/menu-methods/kicker
     ;;
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.presubj b/ubuntu/maverick/tdebase/debian/konqueror-trinity.presubj
index c82cdcb71..9abd9e6d1 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.presubj
+++ b/ubuntu/maverick/tdebase/debian/konqueror-trinity.presubj
@@ -6,8 +6,8 @@ When you report a konqueror crash, it is important to provide:
    actions you performed...)
  * a useful backtrace of the crash
 
-To produce a useful backtrace, you must have qt-x11-free-dbg, kdelibs-dbg,
-and kdebase-dbg installed. A backtrace full of "(no debugging symbols
+To produce a useful backtrace, you must have qt-x11-free-dbg, tdelibs-dbg,
+and tdebase-dbg installed. A backtrace full of "(no debugging symbols
 found)" is useless.
 
 A bug that is not reproducible, or that lacks the necessary backtrace, will
diff --git a/ubuntu/maverick/tdebase/debian/not-installed.list b/ubuntu/maverick/tdebase/debian/not-installed.list
index 75f0d641a..dad970345 100644
--- a/ubuntu/maverick/tdebase/debian/not-installed.list
+++ b/ubuntu/maverick/tdebase/debian/not-installed.list
@@ -42,7 +42,7 @@ This is deliberate.
  - useless comments, not intended for the end user.
 
 /usr/share/fonts/override/fonts.dir
- - cruft, as kdebase no longer installs any system fonts.
+ - cruft, as tdebase no longer installs any system fonts.
 
 /usr/share/apps/kappfinder/apps/Office/lyx.desktop
  - a lyx.desktop that works in KDE is provided by lyx-qt, so this just
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
index 5fca9c324..3ddb504e2 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
@@ -1,5 +1,5 @@
---- kdebase/kate/data/kwrite.desktop	2005-03-17 02:30:43.361137168 +0000
-+++ kdebase/kate/data/kwrite.desktop	2005-03-17 02:30:51.972827992 +0000
+--- tdebase/kate/data/kwrite.desktop	2005-03-17 02:30:43.361137168 +0000
++++ tdebase/kate/data/kwrite.desktop	2005-03-17 02:30:51.972827992 +0000
 @@ -103,3 +103,4 @@
  InitialPreference=8
  X-DCOP-ServiceType=Multi
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
index b9fe3609a..59d8b8988 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
@@ -1,5 +1,5 @@
---- kdebase/konqueror/Home.desktop-orig	2005-03-17 02:27:51.835213072 +0000
-+++ kdebase/konqueror/Home.desktop	2005-03-17 02:27:58.766159408 +0000
+--- tdebase/konqueror/Home.desktop-orig	2005-03-17 02:27:51.835213072 +0000
++++ tdebase/konqueror/Home.desktop	2005-03-17 02:27:58.766159408 +0000
 @@ -151,3 +151,4 @@
  GenericName[zu]=Amafayela Omuntu siqu
  Categories=Qt;KDE;Core;
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
index 6768121dd..96fa06ef9 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
@@ -1,5 +1,5 @@
---- kdebase/knetattach/knetattach.desktop	2005-03-17 02:33:16.506855480 +0000
-+++ kdebase/knetattach/knetattach.desktop	2005-03-17 02:33:22.186991968 +0000
+--- tdebase/knetattach/knetattach.desktop	2005-03-17 02:33:16.506855480 +0000
++++ tdebase/knetattach/knetattach.desktop	2005-03-17 02:33:22.186991968 +0000
 @@ -45,3 +45,4 @@
  X-KDE-StartupNotify=true
  Categories=Qt;KDE;Network;
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
index d5e944949..06c51211c 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
@@ -1,5 +1,5 @@
---- kdebase/kicker/kicker/kcmkicker.desktop	2005-03-17 01:03:22.645846992 +0000
-+++ kdebase/kicker/kicker/kcmkicker.desktop	2005-03-17 01:03:30.907591016 +0000
+--- tdebase/kicker/kicker/kcmkicker.desktop	2005-03-17 01:03:22.645846992 +0000
++++ tdebase/kicker/kicker/kcmkicker.desktop	2005-03-17 01:03:30.907591016 +0000
 @@ -67,3 +67,4 @@
  X-KDE-StartupNotify=true
  OnlyShowIn=KDE;
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
index 0bba8642d..1ddb4bb54 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
@@ -1,5 +1,5 @@
---- kdebase/kpersonalizer/kpersonalizer.desktop-orig	2005-03-17 01:05:16.091600616 +0000
-+++ kdebase/kpersonalizer/kpersonalizer.desktop	2005-03-17 01:05:23.678447240 +0000
+--- tdebase/kpersonalizer/kpersonalizer.desktop-orig	2005-03-17 01:05:16.091600616 +0000
++++ tdebase/kpersonalizer/kpersonalizer.desktop	2005-03-17 01:05:23.678447240 +0000
 @@ -77,3 +77,4 @@
  X-DCOP-ServiceType=Multi
  Categories=Qt;KDE;Settings;
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
index 317ad4913..d3e2b8405 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
@@ -1,5 +1,5 @@
---- kdebase/kmenuedit/kmenuedit.desktop-orig	2005-03-17 01:06:56.707304704 +0000
-+++ kdebase/kmenuedit/kmenuedit.desktop	2005-03-17 01:07:22.785340240 +0000
+--- tdebase/kmenuedit/kmenuedit.desktop-orig	2005-03-17 01:06:56.707304704 +0000
++++ tdebase/kmenuedit/kmenuedit.desktop	2005-03-17 01:07:22.785340240 +0000
 @@ -82,3 +82,4 @@
  
  X-DCOP-ServiceType=Unique
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
index 6b6d4e047..07bd9a252 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
@@ -1,5 +1,5 @@
---- kdebase/kappfinder/kappfinder.desktop	2005-03-17 01:08:26.659629872 +0000
-+++ kdebase/kappfinder/kappfinder.desktop	2005-03-17 01:08:34.189485160 +0000
+--- tdebase/kappfinder/kappfinder.desktop	2005-03-17 01:08:26.659629872 +0000
++++ tdebase/kappfinder/kappfinder.desktop	2005-03-17 01:08:34.189485160 +0000
 @@ -64,3 +64,4 @@
  Name[zh_CN]=��更新工具
  X-DCOP-ServiceType=Multi
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
index 723aec0d2..0a6787674 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
@@ -1,5 +1,5 @@
---- kdebase/konsole/konsolesu.desktop
-+++ kdebase/konsole/konsolesu.desktop
+--- tdebase/konsole/konsolesu.desktop
++++ tdebase/konsole/konsolesu.desktop
 @@ -64,3 +64,4 @@
  Name[zh_CN]=终端程� - 超级用户模�
  X-KDE-AuthorizeAction=shell_access
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
index 1559f0f95..cb691a893 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
@@ -1,5 +1,5 @@
---- kdebase/konqueror/konquerorsu.desktop
-+++ kdebase/konqueror/konquerorsu.desktop
+--- tdebase/konqueror/konquerorsu.desktop
++++ tdebase/konqueror/konquerorsu.desktop
 @@ -82,3 +82,4 @@
  
  Categories=Qt;KDE;X-KDE-System-su;
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff
index cce526122..aac458db7 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff
@@ -1,5 +1,5 @@
---- kdebase/kcontrol/kfontinst/viewpart/kfontview.desktop
-+++ kdebase/kcontrol/kfontinst/viewpart/kfontview.desktop
+--- tdebase/kcontrol/kfontinst/viewpart/kfontview.desktop
++++ tdebase/kcontrol/kfontinst/viewpart/kfontview.desktop
 @@ -71,3 +71,4 @@
  Terminal=false
  InitialPreference=1
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
index 53f517879..f32f56670 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
@@ -1,5 +1,5 @@
---- kdebase/kpager/kpager.desktop
-+++ kdebase/kpager/kpager.desktop
+--- tdebase/kpager/kpager.desktop
++++ tdebase/kpager/kpager.desktop
 @@ -96,3 +96,4 @@
  X-KDE-StartupNotify=false
  X-DCOP-ServiceType=Unique
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
index 5b28ee4df..bfd5fd2af 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
@@ -1,5 +1,5 @@
---- kdebase/klipper/klipper.desktop
-+++ kdebase/klipper/klipper.desktop
+--- tdebase/klipper/klipper.desktop
++++ tdebase/klipper/klipper.desktop
 @@ -143,3 +143,4 @@
  Comment[zh_CN]=剪贴历�工具
  Comment[zh_TW]=剪貼紀錄公用程�
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff
index b959582bb..b647fd41d 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff
@@ -1,5 +1,5 @@
---- kdebase/kdeprint/kdeprintfax/kdeprintfax.desktop
-+++ kdebase/kdeprint/kdeprintfax/kdeprintfax.desktop
+--- tdebase/kdeprint/kdeprintfax/kdeprintfax.desktop
++++ tdebase/kdeprint/kdeprintfax/kdeprintfax.desktop
 @@ -90,3 +90,4 @@
  Terminal=false
  X-DCOP-ServiceType=Multi
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_48_hide_display.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_48_hide_display.diff
index 2de447630..0eddef8fd 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_48_hide_display.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_48_hide_display.diff
@@ -1,5 +1,5 @@
---- kdebase/kcontrol/display/display.desktop
-+++ kdebase/kcontrol/display/display.desktop
+--- tdebase/kcontrol/display/display.desktop
++++ tdebase/kcontrol/display/display.desktop
 @@ -135,3 +135,4 @@
  Comment[zh_CN]=显示设置
  Comment[zh_TW]=顯示設定
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
index 88081e51e..c2e139f99 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
@@ -1,6 +1,6 @@
-diff -Nur kdebase-3.5.4/kdeprint/printmgr/printers.desktop kdebase-3.5.4.new/kdeprint/printmgr/printers.desktop
---- kdebase-3.5.4/kdeprint/printmgr/printers.desktop	2006-07-22 10:15:47.000000000 +0200
-+++ kdebase-3.5.4.new/kdeprint/printmgr/printers.desktop	2006-08-21 22:20:40.000000000 +0200
+diff -Nur tdebase-3.5.4/kdeprint/printmgr/printers.desktop tdebase-3.5.4.new/kdeprint/printmgr/printers.desktop
+--- tdebase-3.5.4/kdeprint/printmgr/printers.desktop	2006-07-22 10:15:47.000000000 +0200
++++ tdebase-3.5.4.new/kdeprint/printmgr/printers.desktop	2006-08-21 22:20:40.000000000 +0200
 @@ -219,4 +219,4 @@
  Keywords[zh_TW]=print,printer,printing management,列�,�表機,列�管�
  Keywords[zu]=shicilela,umshicileli,abaphathi boshicilelo
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
index 8fc8abb28..2e4d2e6ec 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
@@ -1,6 +1,6 @@
-diff -Nur kdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop kdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop
---- kdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop	2006-07-22 10:15:23.000000000 +0200
-+++ kdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop	2006-09-08 13:42:48.000000000 +0200
+diff -Nur tdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop tdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop
+--- tdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop	2006-07-22 10:15:23.000000000 +0200
++++ tdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop	2006-09-08 13:42:48.000000000 +0200
 @@ -214,3 +214,4 @@
  Keywords[zu]=amalunga,umkhethi welunga,amathuluzi okusebenza,umxhasi weposi lekhomputha,umlingisi wethuluzi langaphandle
  
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
index 72ecfb55f..39aed9fb0 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
@@ -1,5 +1,5 @@
---- kdebase-3.5.7/kfind/Kfind.desktop
-+++ kdebase-3.5.7/kfind/Kfind.desktop
+--- tdebase-3.5.7/kfind/Kfind.desktop
++++ tdebase-3.5.7/kfind/Kfind.desktop
 @@ -73,3 +73,4 @@
  X-KDE-StartupNotify=true
  OnlyShowIn=KDE;
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff
index 4aad9f8e3..781faa9fc 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff
@@ -1,5 +1,5 @@
---- kdebase-3.5.8/kdm/backend/dm.c	2008-02-13 23:59:17.000000000 +0200
-+++ kdebase-3.5.8/kdm/backend/dm.c	2008-02-14 11:22:41.000000000 +0200
+--- tdebase-3.5.8/kdm/backend/dm.c	2008-02-13 23:59:17.000000000 +0200
++++ tdebase-3.5.8/kdm/backend/dm.c	2008-02-14 11:22:41.000000000 +0200
 @@ -996,9 +996,14 @@ ReapChildren( void )
  				/* don't kill again */
  				break;
@@ -18,8 +18,8 @@
  					StartServerFailed();
  					break;
  				}
---- kdebase-3.5.8/kdm/backend/server.c	2008-02-13 23:59:17.000000000 +0200
-+++ kdebase-3.5.8/kdm/backend/server.c	2008-02-14 11:41:20.000000000 +0200
+--- tdebase-3.5.8/kdm/backend/server.c	2008-02-13 23:59:17.000000000 +0200
++++ tdebase-3.5.8/kdm/backend/server.c	2008-02-14 11:41:20.000000000 +0200
 @@ -48,6 +48,10 @@ from the copyright holder.
  struct display *startingServer;
  time_t serverTimeout = TO_INF;
diff --git a/ubuntu/maverick/tdebase/debian/po/de.po b/ubuntu/maverick/tdebase/debian/po/de.po
index 71630e59d..aecfcd91c 100644
--- a/ubuntu/maverick/tdebase/debian/po/de.po
+++ b/ubuntu/maverick/tdebase/debian/po/de.po
@@ -1,4 +1,4 @@
-# translation of kdebase to german
+# translation of tdebase to german
 #
 # $Id: de.po 1042 2006-01-09 07:55:08Z ender $
 #
diff --git a/ubuntu/maverick/tdebase/debian/po/es.po b/ubuntu/maverick/tdebase/debian/po/es.po
index 2219af271..5956f734f 100644
--- a/ubuntu/maverick/tdebase/debian/po/es.po
+++ b/ubuntu/maverick/tdebase/debian/po/es.po
@@ -1,5 +1,5 @@
-# Translation of kdebase to Spanish
-# This file is distributed under the same license as the kdebase package.
+# Translation of tdebase to Spanish
+# This file is distributed under the same license as the tdebase package.
 #
 #  Traductores, si no conocen el formato PO, merece la pena leer la
 #  documentación de gettext, especialmente las secciones dedicadas a este
diff --git a/ubuntu/maverick/tdebase/debian/po/eu.po b/ubuntu/maverick/tdebase/debian/po/eu.po
index 976ce1556..eec7f49fb 100644
--- a/ubuntu/maverick/tdebase/debian/po/eu.po
+++ b/ubuntu/maverick/tdebase/debian/po/eu.po
@@ -1,4 +1,4 @@
-# translation of kdebase-eu.po to librezale
+# translation of tdebase-eu.po to librezale
 # debconf templates for xorg-x11 package
 # Euskara translation
 #
@@ -25,7 +25,7 @@
 # Piarres Beobide <pi@beobide.net>, 2005, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: kdebase-eu\n"
+"Project-Id-Version: tdebase-eu\n"
 "Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
 "POT-Creation-Date: 2007-03-23 07:15+0100\n"
 "PO-Revision-Date: 2007-04-06 00:38+0200\n"
diff --git a/ubuntu/maverick/tdebase/debian/po/fi.po b/ubuntu/maverick/tdebase/debian/po/fi.po
index 3fbbd16d4..9c318dc35 100644
--- a/ubuntu/maverick/tdebase/debian/po/fi.po
+++ b/ubuntu/maverick/tdebase/debian/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: kdebase\n"
+"Project-Id-Version: tdebase\n"
 "Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
 "POT-Creation-Date: 2007-04-09 19:07+0200\n"
 "PO-Revision-Date: 2007-10-17 21:50+0200\n"
diff --git a/ubuntu/maverick/tdebase/debian/po/gl.po b/ubuntu/maverick/tdebase/debian/po/gl.po
index 896b37aae..3fa731c4b 100644
--- a/ubuntu/maverick/tdebase/debian/po/gl.po
+++ b/ubuntu/maverick/tdebase/debian/po/gl.po
@@ -1,12 +1,12 @@
-# debconf templates for the kdebase package
+# debconf templates for the tdebase package
 # Galician translation
 #
-# This file is distributed under the same license as the kdebase package.
+# This file is distributed under the same license as the tdebase package.
 # Please see debian/copyright.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kdebase\n"
+"Project-Id-Version: tdebase\n"
 "Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
 "POT-Creation-Date: 2007-03-23 07:15+0100\n"
 "PO-Revision-Date: 2007-04-07 20:11+0200\n"
diff --git a/ubuntu/maverick/tdebase/debian/po/ja.po b/ubuntu/maverick/tdebase/debian/po/ja.po
index d9f8d9f15..10cfb98c4 100644
--- a/ubuntu/maverick/tdebase/debian/po/ja.po
+++ b/ubuntu/maverick/tdebase/debian/po/ja.po
@@ -27,7 +27,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kdebase 4:3.5.5a\n"
+"Project-Id-Version: tdebase 4:3.5.5a\n"
 "Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
 "POT-Creation-Date: 2007-03-23 07:15+0100\n"
 "PO-Revision-Date: 2007-04-05 19:02+0900\n"
diff --git a/ubuntu/maverick/tdebase/debian/po/nb.po b/ubuntu/maverick/tdebase/debian/po/nb.po
index f770838af..c0b33f89c 100644
--- a/ubuntu/maverick/tdebase/debian/po/nb.po
+++ b/ubuntu/maverick/tdebase/debian/po/nb.po
@@ -1,6 +1,6 @@
 # translation of nb.po_[ME3X8a].po to Norwegian Bokmål
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the kdebase package.
+# This file is distributed under the same license as the tdebase package.
 #
 # Bjørn Steensrud <bjornst@powertech.no>, 2007.
 msgid ""
diff --git a/ubuntu/maverick/tdebase/debian/po/pt_BR.po b/ubuntu/maverick/tdebase/debian/po/pt_BR.po
index 8cf324e24..b8ce278ee 100644
--- a/ubuntu/maverick/tdebase/debian/po/pt_BR.po
+++ b/ubuntu/maverick/tdebase/debian/po/pt_BR.po
@@ -1,6 +1,6 @@
-# kdebase Brazilian Portuguese translation
-# Copyright (C) 2007 THE kdebase'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the kdebase package.
+# tdebase Brazilian Portuguese translation
+# Copyright (C) 2007 THE tdebase'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the tdebase package.
 # Please see debian/copyright.
 #
 # Branden Robinson, 2000-2004.
@@ -10,7 +10,7 @@
 # Eder L. Marques <frolic@debian-ce.org>, 2007.
 msgid ""
 msgstr "pt_BR utf-8\n"
-"Project-Id-Version: kdebase 4:3.5.5a.dfsg.1-6\n"
+"Project-Id-Version: tdebase 4:3.5.5a.dfsg.1-6\n"
 "Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
 "POT-Creation-Date: 2007-03-23 07:15+0100\n"
 "PO-Revision-Date: 2007-04-24 15:28-0300\n"
diff --git a/ubuntu/maverick/tdebase/debian/po/ro.po b/ubuntu/maverick/tdebase/debian/po/ro.po
index 13bc24c72..2f619d326 100644
--- a/ubuntu/maverick/tdebase/debian/po/ro.po
+++ b/ubuntu/maverick/tdebase/debian/po/ro.po
@@ -1,6 +1,6 @@
-# Romanian translation of kdebase_4.
-# Copyright (C) 2006 THE kdebase_4'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the kdebase_4 package.
+# Romanian translation of tdebase_4.
+# Copyright (C) 2006 THE tdebase_4'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the tdebase_4 package.
 # mutulica <stan.ieugen@gmail.com>, 2006.
 # , fuzzy
 # mutulica <stan.ieugen@gmail.com>, 2006.
@@ -8,7 +8,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: kdebase_4 3.5.4-2\n"
+"Project-Id-Version: tdebase_4 3.5.4-2\n"
 "Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
 "POT-Creation-Date: 2007-04-09 19:07+0200\n"
 "PO-Revision-Date: 2006-09-15 01:01+0300\n"
diff --git a/ubuntu/maverick/tdebase/debian/po/tr.po b/ubuntu/maverick/tdebase/debian/po/tr.po
index bc0e664d2..c59be129c 100644
--- a/ubuntu/maverick/tdebase/debian/po/tr.po
+++ b/ubuntu/maverick/tdebase/debian/po/tr.po
@@ -1,10 +1,10 @@
-# Turkish translation of kdebase.
-# This file is distributed under the same license as the kdebase package.
+# Turkish translation of tdebase.
+# This file is distributed under the same license as the tdebase package.
 # Recai OktaÅŸ <roktas@omu.edu.tr>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kdebase\n"
+"Project-Id-Version: tdebase\n"
 "Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
 "POT-Creation-Date: 2007-04-09 19:07+0200\n"
 "PO-Revision-Date: 2004-05-10 18:07+0300\n"
diff --git a/ubuntu/maverick/tdebase/debian/po/vi.po b/ubuntu/maverick/tdebase/debian/po/vi.po
index 0875e65e8..db44f6290 100644
--- a/ubuntu/maverick/tdebase/debian/po/vi.po
+++ b/ubuntu/maverick/tdebase/debian/po/vi.po
@@ -1,10 +1,10 @@
-# Vietnamese Translation for kdebase.
+# Vietnamese Translation for tdebase.
 # Copyright © 2007 Free Software Foundation, Inc.
 # Clytie Siddall <clytie@riverland.net.au>, 2007.
 # 
 msgid ""
 ""
-msgstr "Project-Id-Version: kdebase_4-3.5.7-1\n"
+msgstr "Project-Id-Version: tdebase_4-3.5.7-1\n"
 "Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
 "POT-Creation-Date: 2007-04-09 19:07+0200\n"
 "PO-Revision-Date: 2007-05-31 15:16+0930\n"
diff --git a/ubuntu/maverick/tdebase/debian/po/zh_CN.po b/ubuntu/maverick/tdebase/debian/po/zh_CN.po
index 9d085dde5..86f2299b5 100644
--- a/ubuntu/maverick/tdebase/debian/po/zh_CN.po
+++ b/ubuntu/maverick/tdebase/debian/po/zh_CN.po
@@ -1,4 +1,4 @@
-# debconf templates for kdebase package
+# debconf templates for tdebase package
 # simplified Chinese translation
 #
 # Copyrights:
diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules
index 1140cd013..036d8f469 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/maverick/tdebase/debian/rules
@@ -31,16 +31,16 @@ DEB_FIXPERMS_EXCLUDE := \
 	opt/trinity/bin/kdesud    \
 	opt/trinity/bin/kdmtsak
 
-DEB_DH_STRIP_ARGS  := --dbg-package=kdebase-trinity-dbg
+DEB_DH_STRIP_ARGS  := --dbg-package=tdebase-trinity-dbg
 
 DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter kdesu knetattach kioslave kxkb kdebugdialog kdcop
 
-PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity kdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
+PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
 			ksysguard-trinity kwin-trinity libkonq4-trinity
 
 DEB_DH_MAKESHLIBS_ARGS_kate-trinity		:= -V'kate-trinity (>= 4:3.5.8-1)'
 DEB_DH_MAKESHLIBS_ARGS_kcontrol-trinity		:= -V'kcontrol-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kdebase-trinity-bin		:= -V'kdebase-trinity-bin (>= 4:3.5.8-1)'
+DEB_DH_MAKESHLIBS_ARGS_tdebase-trinity-bin		:= -V'tdebase-trinity-bin (>= 4:3.5.8-1)'
 DEB_DH_MAKESHLIBS_ARGS_kicker-trinity		:= -V'kicker-trinity (>= 4:3.5.8-1)'
 DEB_DH_MAKESHLIBS_ARGS_konqueror-trinity		:= -V'konqueror-trinity (>= 4:3.5.8-1)'
 DEB_DH_MAKESHLIBS_ARGS_ksplash-trinity		:= -V'ksplash-trinity (>= 4:3.5.8-1)'
@@ -209,11 +209,11 @@ makebuilddir::
 common-install-prehook-arch::
 	grep -v -e joystick -e view1394  debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-i386
 	grep -v -e joystick -e view1394  debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-amd64
-	grep -v -e media_propsdlgplugin  debian/kdebase-kio-plugins-trinity.install > debian/kdebase-kio-plugins-trinity.install.kfreebsd-i386
-	grep -v -e media_propsdlgplugin  debian/kdebase-kio-plugins-trinity.install > debian/kdebase-kio-plugins-trinity.install.kfreebsd-amd64
+	grep -v -e media_propsdlgplugin  debian/tdebase-kio-plugins-trinity.install > debian/tdebase-kio-plugins-trinity.install.kfreebsd-i386
+	grep -v -e media_propsdlgplugin  debian/tdebase-kio-plugins-trinity.install > debian/tdebase-kio-plugins-trinity.install.kfreebsd-amd64
 
 clean::
-	rm -f debian/kcontrol-trinity.install.kfreebsd* debian/kdebase-kio-plugins-trinity.install.kfreebs*
+	rm -f debian/kcontrol-trinity.install.kfreebsd* debian/tdebase-kio-plugins-trinity.install.kfreebs*
 	rm -f kcontrol/pics/cr*-app-energy_star.png kcontrol/energy/pics/energybig.png kcontrol/energy/pics/lo-energy.png
 	# KIO Media LUKS Icons
 	rm -f pics/crystalsvg/cr*decrypt.png pics/crystalsvg/cr*encrypt.png
@@ -222,16 +222,16 @@ binary-install/kate-trinity::
 	cp -Rp debian/kate-trinity/usr/* debian/kate-trinity/opt/trinity/
 	rm -rf debian/kate-trinity/usr
 
-binary-install/kdebase-data-trinity::
+binary-install/tdebase-data-trinity::
 	# hack the oui.db install, as under kfreebsd it does not get installed and then breaks at dh_install time
 	# it's in fact a linux specific file...
-	install -p -D -m644 kcontrol/view1394/oui.db debian/kdebase-data-trinity/opt/trinity/share/apps/kcmview1394/oui.db
-	install -p -D -m644 debian/tmp/etc/xdg/menus/applications-merged/kde-essential.menu debian/kdebase-data-trinity/opt/trinity/etc/xdg/menus/applications-merged/kde-essential.menu
-	install -p -D -m644 debian/tmp/etc/xdg/menus/kde-information.menu debian/kdebase-data-trinity/opt/trinity/etc/xdg/menus/kde-information.menu
-	install -p -D -m644 debian/tmp/etc/xdg/menus/kde-screensavers.menu debian/kdebase-data-trinity/opt/trinity/etc/xdg/menus/kde-screensavers.menu
-	install -p -D -m644 debian/tmp/etc/xdg/menus/kde-settings.menu debian/kdebase-data-trinity/opt/trinity/etc/xdg/menus/kde-settings.menu
+	install -p -D -m644 kcontrol/view1394/oui.db debian/tdebase-data-trinity/opt/trinity/share/apps/kcmview1394/oui.db
+	install -p -D -m644 debian/tmp/etc/xdg/menus/applications-merged/kde-essential.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/applications-merged/kde-essential.menu
+	install -p -D -m644 debian/tmp/etc/xdg/menus/kde-information.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/kde-information.menu
+	install -p -D -m644 debian/tmp/etc/xdg/menus/kde-screensavers.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/kde-screensavers.menu
+	install -p -D -m644 debian/tmp/etc/xdg/menus/kde-settings.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/kde-settings.menu
 	rm -rf debian/tmp/etc/xdg/*
-	rm -rf debian/kdebase-data-trinity/etc/xdg/*
+	rm -rf debian/tdebase-data-trinity/etc/xdg/*
 
 install/kdm-trinity::
 	sed -i 's/#UseTheme=true/UseTheme=true/g' debian/tmp/etc/trinity/kdm/kdmrc
@@ -260,14 +260,14 @@ binary-install/klipper-trinity::
 	cp -Rp debian/klipper-trinity/usr/* debian/klipper-trinity/opt/trinity/
 	rm -rf debian/klipper-trinity/usr
 
-binary-install/kdebase-trinity-bin::
-	install -p -D -m644 debian/kcheckpass-trinity.pam debian/kdebase-trinity-bin/etc/pam.d/kcheckpass-trinity
-	install -p -D -m644 debian/kscreensaver-trinity.pam debian/kdebase-trinity-bin/etc/pam.d/kscreensaver-trinity
-	mkdir -p debian/kdebase-trinity-bin/opt/trinity/share/apps/kxkb/
-	install -p -D -m644 debian/ubuntu.xmodmap debian/kdebase-trinity-bin/opt/trinity/share/apps/kxkb/system.xmodmap
-	install -p -D -m644 debian/80ubuntu-xmodmap debian/kdebase-trinity-bin/etc/X11/Xsession.d/80ubuntu-trinity-xmodmap
-	mkdir -p debian/kdebase-trinity-bin/opt/trinity/share/autostart/
-	chmod +s debian/kdebase-trinity-bin/opt/trinity/bin/kcheckpass
+binary-install/tdebase-trinity-bin::
+	install -p -D -m644 debian/kcheckpass-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kcheckpass-trinity
+	install -p -D -m644 debian/kscreensaver-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kscreensaver-trinity
+	mkdir -p debian/tdebase-trinity-bin/opt/trinity/share/apps/kxkb/
+	install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-trinity-bin/opt/trinity/share/apps/kxkb/system.xmodmap
+	install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-trinity-bin/etc/X11/Xsession.d/80ubuntu-trinity-xmodmap
+	mkdir -p debian/tdebase-trinity-bin/opt/trinity/share/autostart/
+	chmod +s debian/tdebase-trinity-bin/opt/trinity/bin/kcheckpass
 
 binary-install/ksmserver-trinity::
 	install -p -D -m644 debian/tmp/opt/trinity/share/apps/kdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop
diff --git a/ubuntu/maverick/tdebase/debian/source.lintian-overrides b/ubuntu/maverick/tdebase/debian/source.lintian-overrides
index 1f13dc534..3aa3a0f59 100644
--- a/ubuntu/maverick/tdebase/debian/source.lintian-overrides
+++ b/ubuntu/maverick/tdebase/debian/source.lintian-overrides
@@ -1,2 +1,2 @@
-kdebase source: maintainer-script-lacks-debhelper-token debian/kdm-trinity.postinst
-kdebase source: maintainer-script-lacks-debhelper-token debian/kdm-trinity.prerm
+tdebase source: maintainer-script-lacks-debhelper-token debian/kdm-trinity.postinst
+tdebase source: maintainer-script-lacks-debhelper-token debian/kdm-trinity.prerm
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
index 843b55228..843b55228 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-data-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-data-trinity.preinst b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.preinst
index 87dc6edc8..87dc6edc8 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-data-trinity.preinst
+++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.preinst
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.kate b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kate
index e5949161c..d860c2a6b 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.kate
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kate
@@ -1,4 +1,4 @@
-Document: kdebase-doc-html-kate
+Document: tdebase-doc-html-kate
 Title: Kate Handbook
 Author: Anders Lund, Seth Rothberg, Dominik Haumann
 Abstract: Kate is a programmer's text editor for KDE.
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.kdeprint b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
index 612e76f9c..f43d9196b 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.kdeprint
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
@@ -1,4 +1,4 @@
-Document: kdebase-doc-html-kdeprint
+Document: tdebase-doc-html-kdeprint
 Title: KDEPrint Handbook
 Author: Kurt Pfeifle
 Abstract: KDEPrint is the official printing system of KDE. 
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.kdm b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdm
index 2407b7fd9..8012c2f85 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.kdm
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdm
@@ -1,4 +1,4 @@
-Document: kdebase-doc-html-kdm
+Document: tdebase-doc-html-kdm
 Title: KDM Handbook
 Author: Oswald Buddenhagen 
 Abstract: This document describes KDM, the KDE Display Manager, an X session manager.
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.kfind b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kfind
index f995c300f..4c200abb0 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.kfind
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kfind
@@ -1,4 +1,4 @@
-Document: kdebase-doc-html-kfind
+Document: tdebase-doc-html-kfind
 Title: KFind Handbook
 Author: Dirk Doerflinger
 Abstract: This Handbook describes KFind, KDE's file find utility.
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.kicker b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kicker
index 8e4a35041..1ea4077e1 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.kicker
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kicker
@@ -1,4 +1,4 @@
-Document: kdebase-doc-html-kicker
+Document: tdebase-doc-html-kicker
 Title: Kicker Handbook
 Author: Orville Bennett, Dirk Doerflinger
 Abstract: Kicker is the KDE application starter panel and is also capable of
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.klipper b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.klipper
index 59dcb1ed8..7c47c1b94 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.klipper
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.klipper
@@ -1,4 +1,4 @@
-Document: kdebase-doc-html-klipper
+Document: tdebase-doc-html-klipper
 Title: Klipper Handbook
 Author: Philip.Rodrigues
 Abstract: Klipper is the KDE clipboard cut and paste utility.
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.kmenuedit b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kmenuedit
index 8534fc7a3..d7687a116 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.kmenuedit
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kmenuedit
@@ -1,4 +1,4 @@
-Document: kdebase-doc-html-kmenuedit
+Document: tdebase-doc-html-kmenuedit
 Title: KMenuEdit Handbook
 Author: Milos Prudek, Lauri Watts
 Abstract: KMenuEdit allows the editing of the KDE main menu.
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.konqueror b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.konqueror
index 0d9e54ab6..96659a805 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.konqueror
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.konqueror
@@ -1,4 +1,4 @@
-Document: kdebase-doc-html-konqueror
+Document: tdebase-doc-html-konqueror
 Title: Konqueror Handbook
 Author: Pamela Roberts
 Abstract: Konqueror is KDE's advanced File Manager, Web Browser and
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.konsole b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.konsole
index 546d587a5..705cf549c 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.konsole
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.konsole
@@ -1,4 +1,4 @@
-Document: kdebase-doc-html-konsole
+Document: tdebase-doc-html-konsole
 Title: Konsole Handbook
 Author: Jonathan Singer, Kurt Hindenburg
 Abstract: Konsole is an X terminal emulator for KDE.
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.kpager b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kpager
index 525993b15..5b245384e 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.kpager
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kpager
@@ -1,4 +1,4 @@
-Document: kdebase-doc-html-kpager
+Document: tdebase-doc-html-kpager
 Title: KPager Handbook
 Author: Dirk Doerflinger
 Abstract: KPager gives you a thumbnail sketch of all your desktops. It is a handy
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.ksysguard b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.ksysguard
index 60ea3723a..fb1ba8487 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-doc-html.doc-base.ksysguard
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.ksysguard
@@ -1,4 +1,4 @@
-Document: kdebase-doc-html-ksysguard
+Document: tdebase-doc-html-ksysguard
 Title: KSysGuard Handbook
 Author: Chris Schlaeger
 Abstract: KSysGuard is a network enabled task manager and system monitor
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-kio-plugins-trinity.README.Debian b/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian
index b0b6e7322..711a00289 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-kio-plugins-trinity.README.Debian
+++ b/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian
@@ -8,7 +8,7 @@ cameras, and many other types of equipment.
 While some functionality is available without the use of HAL, media works
 best with HAL (and therefore udev), in combination with pmount. Media
 also extends the functionality of many other kioslaves. Check which
-packages are recommended by the kdebase-kio-plugins package, and install
+packages are recommended by the tdebase-kio-plugins package, and install
 accordingly.
 
 Note that for regular users to use media in conjunction with HAL, they must
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-kio-plugins-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.install
index 962755e39..962755e39 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-kio-plugins-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-kio-plugins-trinity.manpages b/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.manpages
index 41ee5f29a..41ee5f29a 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-kio-plugins-trinity.manpages
+++ b/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.manpages
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-runtime-data-common-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-runtime-data-common-trinity.install
index e906f3a3f..e906f3a3f 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-runtime-data-common-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-runtime-data-common-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-trinity-bin.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
index 2322b0008..2322b0008 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-trinity-bin.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-trinity-bin.links b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.links
index ae21842e4..ae21842e4 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-trinity-bin.links
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.links
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian
new file mode 100644
index 000000000..1b1985b6d
--- /dev/null
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian
@@ -0,0 +1,6 @@
+tdebase-bin: setgid-binary usr/bin/kdesud 2755 root/nogroup
+tdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kcminit.so
+tdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_khotkeys.so
+tdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kxkb.so
+tdebase-bin: postinst-must-call-ldconfig usr/lib/libkdeinit_khotkeys.so
+tdebase-bin: postrm-should-call-ldconfig usr/lib/libkdeinit_khotkeys.so
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-trinity-bin.manpages b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages
index b801c202a..b801c202a 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-trinity-bin.manpages
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-trinity-bin.menu b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.menu
index 071468466..1f1176e14 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-trinity-bin.menu
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.menu
@@ -1,11 +1,11 @@
-?package(kdebase-bin):\
+?package(tdebase-bin):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="KDE"\
 	title="KDebugDialog"\
 	command="/opt/trinity/bin/kdebugdialog"
 
-?package(kdebase-bin):\
+?package(tdebase-bin):\
 	needs="X11"\
 	section="Applications/System/Monitoring"\
 	hints="KDE"\
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-trinity-bin.postinst b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.postinst
index e385c4f34..8e0bf94c8 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-trinity-bin.postinst
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.postinst
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kdebase-trinity-bin
+package_name=tdebase-trinity-bin
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-trinity-dev.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install
index d9759729d..d9759729d 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-trinity-dev.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-doc.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-doc.install
new file mode 100644
index 000000000..60f6072d3
--- /dev/null
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-doc.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdebase-apidocs/*
diff --git a/ubuntu/maverick/tdebase/debian/kdebase-trinity.README.Debian b/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian
index dcdf16ecc..a275a318f 100644
--- a/ubuntu/maverick/tdebase/debian/kdebase-trinity.README.Debian
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian
@@ -14,7 +14,7 @@ cameras, and many other types of equipment.
 While some functionality is available without the use of HAL, media works
 best with HAL (and therefore udev), in combination with pmount. Media
 also extends the functionality of many other kioslaves. Check which
-packages are recommended by the kdebase-kio-plugins package, and install
+packages are recommended by the tdebase-kio-plugins package, and install
 accordingly.
 
 Note that for regular users to use media in conjunction with HAL, they must
diff --git a/ubuntu/maverick/tdebindings/debian/changelog b/ubuntu/maverick/tdebindings/debian/changelog
index e1fe10439..6d5413584 100644
--- a/ubuntu/maverick/tdebindings/debian/changelog
+++ b/ubuntu/maverick/tdebindings/debian/changelog
@@ -1,37 +1,37 @@
-kdebindings-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
+tdebindings-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdebindings-trinity (4:3.5.10-0ubuntu1~intrepid8) intrepid; urgency=low
+tdebindings-trinity (4:3.5.10-0ubuntu1~intrepid8) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
 
-kdebindings-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
+tdebindings-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
 
   * Added -trinity prefix
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 02 Dec 2008 14:02:00 -0600
 
-kdebindings (4:3.5.10-0ubuntu1) intrepid; urgency=low
+tdebindings (4:3.5.10-0ubuntu1) intrepid; urgency=low
 
   * New upstream release.
   * Update Standards-Version to 3.8.0.
 
  -- Devid Antonio Filoni <d.filoni@ubuntu.com>  Sat, 23 Aug 2008 12:35:35 +0200
 
-kdebindings (4:3.5.9-3ubuntu1) intrepid; urgency=low
+tdebindings (4:3.5.9-3ubuntu1) intrepid; urgency=low
 
   * Merge with Debian, remaining change, don't build-dep on libgtk1.2
   * Build-depend on default-jdk.
 
  -- Matthias Klose <doko@ubuntu.com>  Thu, 31 Jul 2008 11:49:46 +0000
 
-kdebindings (4:3.5.9-3) unstable; urgency=high
+tdebindings (4:3.5.9-3) unstable; urgency=high
 
   * No java in alpha:
     - Do not build depend on java-gcj-compat-dev.
@@ -41,7 +41,7 @@ kdebindings (4:3.5.9-3) unstable; urgency=high
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 27 Jul 2008 06:17:52 +0200
 
-kdebindings (4:3.5.9-2) unstable; urgency=low
+tdebindings (4:3.5.9-2) unstable; urgency=low
 
   * Fix FTBFS with gcc 4.3. Thanks a lot to peter green <plugwash@p10link.net>
     for the patch. (Closes: #484191). Patch 032_ruby_fix_const.diff
@@ -51,13 +51,13 @@ kdebindings (4:3.5.9-2) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 12 Jun 2008 18:30:33 +0200
 
-kdebindings (4:3.5.9-1ubuntu1) intrepid; urgency=low
+tdebindings (4:3.5.9-1ubuntu1) intrepid; urgency=low
 
   * Merge with Debian, remaining change, don't build-dep on libgtk1.2
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 10 Jun 2008 16:05:23 +0000
 
-kdebindings (4:3.5.9-1) unstable; urgency=low
+tdebindings (4:3.5.9-1) unstable; urgency=low
 
   * New upstream release: no code changes.
   * Update to Standards-Version 3.7.3:
@@ -66,32 +66,32 @@ kdebindings (4:3.5.9-1) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 06 Mar 2008 21:00:02 +0100
 
-kdebindings (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdebindings (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:06 +0000
 
-kdebindings (4:3.5.8-1ubuntu3) hardy; urgency=low
+tdebindings (4:3.5.8-1ubuntu3) hardy; urgency=low
 
   * Remove build-dep on libgtk1.2-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 26 Nov 2007 23:13:51 +0000
 
-kdebindings (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdebindings (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 11:11:59 +0000
 
-kdebindings (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdebindings (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining change:
    - don't build-dep on libgtk
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 22:37:55 +0000
 
-kdebindings (4:3.5.8-1) unstable; urgency=low
+tdebindings (4:3.5.8-1) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -99,19 +99,19 @@ kdebindings (4:3.5.8-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 16 May 2007 22:54:19 +0200
 
-kdebindings (4:3.5.7-1ubuntu4) gutsy; urgency=low
+tdebindings (4:3.5.7-1ubuntu4) gutsy; urgency=low
 
   * Build java packages for lpia.
 
  -- Matthias Klose <doko@ubuntu.com>  Tue, 07 Aug 2007 17:55:02 +0000
 
-kdebindings (4:3.5.7-1ubuntu3) gutsy; urgency=low
+tdebindings (4:3.5.7-1ubuntu3) gutsy; urgency=low
 
   * Remove gtk1.2 from build-depends, it's needed for xparts which we don't package
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 13 Jul 2007 14:27:49 +0100
 
-kdebindings (4:3.5.7-1ubuntu2) gutsy; urgency=low
+tdebindings (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
   * kjsembed/kjscmd.1: Fixed typo on command usage summary line
     (LP: #26493)
@@ -119,13 +119,13 @@ kdebindings (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
  -- Joseph Jackson IV <jjacksoniv@fluxbuntu.org>  Fri, 25 May 2007 12:02:16 -0400
 
-kdebindings (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdebindings (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * Merge with Debian for new upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 May 2007 19:01:27 +0100
 
-kdebindings (4:3.5.7-1) unstable; urgency=low
+tdebindings (4:3.5.7-1) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -139,29 +139,29 @@ kdebindings (4:3.5.7-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 16 May 2007 22:54:19 +0200
 
-kdebindings (4:3.5.6-2ubuntu2) gutsy; urgency=low
+tdebindings (4:3.5.6-2ubuntu2) gutsy; urgency=low
 
   * Remove non-existant 98_buildprep patch from debian/patches/series
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 02 May 2007 18:05:50 +0100
 
-kdebindings (4:3.5.6-2ubuntu1) gutsy; urgency=low
+tdebindings (4:3.5.6-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 02 May 2007 10:17:28 +0100
 
-kdebindings (4:3.5.6-2) unstable; urgency=low
+tdebindings (4:3.5.6-2) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
-  * Add patch kdebindings-3.5.6-build-against-python-before-2.5.diff provided
+  * Add patch tdebindings-3.5.6-build-against-python-before-2.5.diff provided
     by upstream. It is supposed to fix problems building in 64 bits archs.
     (Closes: #420665)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 24 Apr 2007 12:25:57 +0100
 
-kdebindings (4:3.5.6-1) unstable; urgency=low
+tdebindings (4:3.5.6-1) unstable; urgency=low
 
   [ Debian Qt/KDE Maintainers ]
   * New upstream release.
@@ -175,31 +175,31 @@ kdebindings (4:3.5.6-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  1 Feb 2007 18:26:59 +0000
 
-kdebindings (4:3.5.5-1ubuntu4) feisty; urgency=low
+tdebindings (4:3.5.5-1ubuntu4) feisty; urgency=low
 
   * Clean up build system before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 13 Jan 2007 16:46:24 +0000
 
-kdebindings (4:3.5.5-1ubuntu3) feisty; urgency=low
+tdebindings (4:3.5.5-1ubuntu3) feisty; urgency=low
 
   * Fix FTBFS on 64bit archs.
 
  -- Matthias Klose <doko@ubuntu.com>  Sat, 13 Jan 2007 11:47:57 +0100
 
-kdebindings (4:3.5.5-1ubuntu2) feisty; urgency=low
+tdebindings (4:3.5.5-1ubuntu2) feisty; urgency=low
 
   * Rebuild for python2.5 as the default python version.
 
  -- Matthias Klose <doko@ubuntu.com>  Fri, 12 Jan 2007 13:21:15 +0000
 
-kdebindings (4:3.5.5-1ubuntu1) feisty; urgency=low
+tdebindings (4:3.5.5-1ubuntu1) feisty; urgency=low
 
   * Merge with debian.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 04 Dec 2006 23:28:56 +0200
 
-kdebindings (4:3.5.5-1) unstable; urgency=low
+tdebindings (4:3.5.5-1) unstable; urgency=low
 
   [ Debian Qt/KDE Maintainers ]
   * New upstream release.
@@ -210,7 +210,7 @@ kdebindings (4:3.5.5-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun,  8 Oct 2006 22:11:28 +0200
 
-kdebindings (4:3.5.3-1) unstable; urgency=low
+tdebindings (4:3.5.3-1) unstable; urgency=low
 
   [ Debian Qt/KDE Maintainers ]
   * New upstream release.
@@ -226,7 +226,7 @@ kdebindings (4:3.5.3-1) unstable; urgency=low
 
  -- Pierre Habouzit <madcoder@debian.org>  Tue, 11 Jul 2006 02:45:20 +0200
 
-kdebindings (4:3.5.1-1) unstable; urgency=low
+tdebindings (4:3.5.1-1) unstable; urgency=low
 
   * The "Greetings from Barcelona, aKademy-ES; P.S.: I wonder why I'm
     uploading this two weeks later" release.
@@ -247,7 +247,7 @@ kdebindings (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 19 Mar 2006 21:36:27 +0100
 
-kdebindings (4:3.4.3-2) unstable; urgency=low
+tdebindings (4:3.4.3-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -258,7 +258,7 @@ kdebindings (4:3.4.3-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun,  4 Dec 2005 09:56:22 -0500
 
-kdebindings (4:3.4.3-1) unstable; urgency=low
+tdebindings (4:3.4.3-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -271,7 +271,7 @@ kdebindings (4:3.4.3-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri,  2 Dec 2005 09:22:27 +0100
 
-kdebindings (4:3.4.2-2) unstable; urgency=low
+tdebindings (4:3.4.2-2) unstable; urgency=low
 
   * The "I love the smell of 6 FTBFS first thing in the morning" release.
 
@@ -299,7 +299,7 @@ kdebindings (4:3.4.2-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 21 Oct 2005 19:53:18 +0200
 
-kdebindings (4:3.4.2-1) unstable; urgency=low
+tdebindings (4:3.4.2-1) unstable; urgency=low
 
   +++ Changes by Adeodato Simó:
 
@@ -363,7 +363,7 @@ kdebindings (4:3.4.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 21 Oct 2005 05:01:59 +0200
 
-kdebindings (4:3.3.2-1) unstable; urgency=low
+tdebindings (4:3.3.2-1) unstable; urgency=low
 
   +++ Changes by Adeodato Simó:
 
@@ -374,7 +374,7 @@ kdebindings (4:3.3.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  3 Feb 2005 21:41:17 +0100
 
-kdebindings (4:3.3.1-2) unstable; urgency=low
+tdebindings (4:3.3.1-2) unstable; urgency=low
 
   * Don't build java packages on mipsen, since gcj is not available there (and
     gcj-3.4 will be removed soon). Changes needed:
@@ -400,7 +400,7 @@ kdebindings (4:3.3.1-2) unstable; urgency=low
 
  -- Adeodato Simó <asp16@alu.ua.es>  Sun, 14 Nov 2004 03:38:05 +0100
 
-kdebindings (4:3.3.1-1) unstable; urgency=low
+tdebindings (4:3.3.1-1) unstable; urgency=low
 
   * New upstream release plus KDE_3_3_BRANCH update.
 
@@ -422,13 +422,13 @@ kdebindings (4:3.3.1-1) unstable; urgency=low
 
  -- Adeodato Simó <asp16@alu.ua.es>  Sun, 07 Nov 2004 07:24:56 +0100
 
-kdebindings (4:3.3.0-2) unstable; urgency=low
+tdebindings (4:3.3.0-2) unstable; urgency=low
 
   * Clean Version Number
 
  -- Riku Voipio <riku.voipio@iki.fi>  Fri,  8 Oct 2004 08:20:25 +0000
 
-kdebindings (4:3.3.0-1~kalyxo2) unstable; urgency=low
+tdebindings (4:3.3.0-1~kalyxo2) unstable; urgency=low
 
   * New upstream version packaged. (Closes: #274709)
 
@@ -450,7 +450,7 @@ kdebindings (4:3.3.0-1~kalyxo2) unstable; urgency=low
     - added to some packages' description a paragraph noting that it includes
       examples and/or documentation.
     - added libqt0-ruby1.8 as a Dependency: of libkorundum0-ruby1.8.
-    - bump Build-Depends to kdelibs4-dev (>= 4:3.3.0-1) and libqt3-compat-headers
+    - bump Build-Depends to tdelibs4-dev (>= 4:3.3.0-1) and libqt3-compat-headers
       (>= 3:3.3.3).
 
   * debian/rules:
@@ -470,7 +470,7 @@ kdebindings (4:3.3.0-1~kalyxo2) unstable; urgency=low
 
  -- Adeodato Simó <asp16@alu.ua.es>  Thu, 07 Oct 2004 20:37:00 +0200
 
-kdebindings (4:3.2.92-1) unstable; urgency=low
+tdebindings (4:3.2.92-1) unstable; urgency=low
 
   * New upstream version.
   * debian/patches/013-qtc_clib_qtc_Makefile.am-noqaccessible.diff,
@@ -492,7 +492,7 @@ kdebindings (4:3.2.92-1) unstable; urgency=low
 
  -- Dominique Devriese <devriese@kde.org>  Thu,  5 Aug 2004 21:08:08 +0200
 
-kdebindings (4:3.2.3-1) unstable; urgency=low
+tdebindings (4:3.2.3-1) unstable; urgency=low
 
   * New upstream version.
   * Change maintainer address to "Debian Qt/KDE Maintainers
@@ -502,21 +502,21 @@ kdebindings (4:3.2.3-1) unstable; urgency=low
 
  -- Dominique Devriese <devriese@kde.org>  Thu, 17 Jun 2004 23:05:27 +0200
 
-kdebindings (4:3.2.2-5) unstable; urgency=low
+tdebindings (4:3.2.2-5) unstable; urgency=low
 
   * qtjava/designer/juic/lib: remove the two xml parsers, so they don't bloat the package and the diff.gz
   * debian/rules: make it clean properly by using builddir!=srcdir
 
  -- Dominique Devriese <devriese@kde.org>  Sat, 22 May 2004 20:39:58 +0200
 
-kdebindings (4:3.2.2-4) unstable; urgency=low
+tdebindings (4:3.2.2-4) unstable; urgency=low
 
   * debian/control: Removed Build-Depends on autoconf and automake.
   * debian/control: Added Build-Depends on sharutils for uudecode.
 
  -- Dominique Devriese <devriese@kde.org>  Wed,  5 May 2004 23:04:44 +0200
 
-kdebindings (4:3.2.2-3) unstable; urgency=low
+tdebindings (4:3.2.2-3) unstable; urgency=low
 
   * debian/dirs: removed, no longer necessary.
   * debian/compat, debian/rules: Replaced DH_COMPAT envvar with the
@@ -528,7 +528,7 @@ kdebindings (4:3.2.2-3) unstable; urgency=low
 
  -- Dominique Devriese <devriese@kde.org>  Tue, 13 Apr 2004 14:45:19 +0200
 
-kdebindings (4:3.2.2-2) unstable; urgency=low
+tdebindings (4:3.2.2-2) unstable; urgency=low
 
   * Added a lot of documentation and examples about the use of the kde and
     qt java bindings.
@@ -536,7 +536,7 @@ kdebindings (4:3.2.2-2) unstable; urgency=low
 
  -- Dominique Devriese <devriese@kde.org>  Fri,  9 Apr 2004 03:15:36 +0200
 
-kdebindings (4:3.2.2-1) unstable; urgency=low
+tdebindings (4:3.2.2-1) unstable; urgency=low
 
   * New upstream release.
   * debian/rules: stopped running make in the disabled dcopperl directory.
@@ -545,7 +545,7 @@ kdebindings (4:3.2.2-1) unstable; urgency=low
 
  -- Dominique Devriese <devriese@kde.org>  Thu,  8 Apr 2004 21:43:08 +0200
 
-kdebindings (4:3.2.1-5) unstable; urgency=low
+tdebindings (4:3.2.1-5) unstable; urgency=low
 
   * Added a patch that makes sure the .jar files are cleaned properly on
     debian/rules clean.
@@ -554,7 +554,7 @@ kdebindings (4:3.2.1-5) unstable; urgency=low
 
  -- Dominique Devriese <devriese@kde.org>  Tue,  6 Apr 2004 22:16:02 +0200
 
-kdebindings (4:3.2.1-4) unstable; urgency=low
+tdebindings (4:3.2.1-4) unstable; urgency=low
 
   * Added a manual page for kjscmd ( from CVS HEAD ).
   * Moved manpages into debian/local.
@@ -573,25 +573,25 @@ kdebindings (4:3.2.1-4) unstable; urgency=low
 
  -- Dominique Devriese <devriese@kde.org>  Tue,  6 Apr 2004 19:59:28 +0200
 
-kdebindings (4:3.2.1-3) unstable; urgency=low
+tdebindings (4:3.2.1-3) unstable; urgency=low
 
   * Package juic, the ui compiler for java.
   * Debug build.
   * Make sure the qtjava and kdejava think they're installed in the
     location they really are installed.
   * debian/rules: update the patch code snippets to the code from recent
-    kdelibs.
+    tdelibs.
   * Remove some patches that have been accepted upstream.
 
  -- Dominique Devriese <devriese@kde.org>  Sun,  4 Apr 2004 21:00:22 +0200
 
-kdebindings (4:3.2.1-2) unstable; urgency=low
+tdebindings (4:3.2.1-2) unstable; urgency=low
 
   * Fix qtjava install locations, and library naming.
 
  -- Dominique Devriese <devriese@kde.org>  Mon, 29 Mar 2004 11:42:59 +0200
 
-kdebindings (4:3.2.1-1) unstable; urgency=low
+tdebindings (4:3.2.1-1) unstable; urgency=low
 
   * New maintainer.
   * Updated packaging for the KDE 3.1.5 upstream release
@@ -612,9 +612,9 @@ kdebindings (4:3.2.1-1) unstable; urgency=low
 
  -- Dominique Devriese <devriese@kde.org>  Wed, 24 Mar 2004 21:46:29 +0100
 
-kdebindings (4:3.0.9+cvs20030112-0woody1) unstable; urgency=low
+tdebindings (4:3.0.9+cvs20030112-0woody1) unstable; urgency=low
 
-  * Major cleanup of kdebindings using Karolina's build sources and merged in 
+  * Major cleanup of tdebindings using Karolina's build sources and merged in 
     standard KDE debian stuff to make things work the same across KDE modules 
   * builddir != srcdir not possible due to kdejava exceeding the possible argument
     list of 32 k on Linux with its target. This happens if builddir != srcdir where
@@ -624,7 +624,7 @@ kdebindings (4:3.0.9+cvs20030112-0woody1) unstable; urgency=low
 
  -- Ralf Nolden (KDE) <nolden@kde.org>  Sun, 12 Jan 2003 17:22:38 +0100 
 
-kdebindings (4:3.1.0+rc5+kl-1) unstable; urgency=low
+tdebindings (4:3.1.0+rc5+kl-1) unstable; urgency=low
 
   * New upstreams versions kde 3.1.0 (rc5)
   * Changed the shlibs handling in the rules file
@@ -632,23 +632,23 @@ kdebindings (4:3.1.0+rc5+kl-1) unstable; urgency=low
 
  -- Karolina Lindqvist <pgd-karolinali@algonet.se>  Sun, 15 Dec 2002 12:29:24 +0100
 
-kdebindings (4:3.0.98-1) experimental; urgency=low
+tdebindings (4:3.0.98-1) experimental; urgency=low
 
   * kde 3.1 rc2
   * Moved common functions from "rules" to debian/debianrules
-  * Changed order so that the "kdebindings" package is the main package
-  * Changed dependencies in "kdebindings" to (>= ${Source-Version}) instead of (= ${Source-Version}) 
+  * Changed order so that the "tdebindings" package is the main package
+  * Changed dependencies in "tdebindings" to (>= ${Source-Version}) instead of (= ${Source-Version}) 
 
  -- Karolina Lindqvist <pgd-karolinali@algonet.se>  Sun, 10 Nov 2002 09:58:10 +0100
 
-kdebindings (4:3.0.9.cvs20021101-1) experimental; urgency=low
+tdebindings (4:3.0.9.cvs20021101-1) experimental; urgency=low
 
   * kde 3.1 rc1, with tag HEAD to get updates
   * bild-dependencies updated
 
  -- Karolina Lindqvist <pgd-karolinali@algonet.se>  Fri,  1 Nov 2002 10:36:22 +0100
 
-kdebindings (4:3.0.8.cvs20021020-1) experimental; urgency=low
+tdebindings (4:3.0.8.cvs20021020-1) experimental; urgency=low
 
   * New version from CVS
   * Removed references to CVS from the build files
@@ -656,7 +656,7 @@ kdebindings (4:3.0.8.cvs20021020-1) experimental; urgency=low
 
  -- Karolina Lindqvist <pgd-karolinali@algonet.se>  Wed, 23 Oct 2002 10:19:33 +0200
 
-kdebindings (4:3.0.8.cvs20020930-1) experimental; urgency=low
+tdebindings (4:3.0.8.cvs20020930-1) experimental; urgency=low
 
   * KDE 3.1 beta 2
   * Fixed conflicts and dependancies with kde-2 and kde-3.0
@@ -664,19 +664,19 @@ kdebindings (4:3.0.8.cvs20020930-1) experimental; urgency=low
 
  -- Karolina Lindqvist <pgd-karolinali@algonet.se>  Thu, 19 Sep 2002 12:49:16 +0200
 
-kdebindings (4:3.0.7-1) unstable; urgency=low
+tdebindings (4:3.0.7-1) unstable; urgency=low
 
   * Version: KDE 3.1 beta 1
 
  -- Karolina Lindqvist <pgd-karolinali@algonet.se>  Tue, 13 Aug 2002 08:16:36 +0200
 
-kdebindings (4:3.0.6-1) unstable; urgency=low
+tdebindings (4:3.0.6-1) unstable; urgency=low
 
   * Bumped the version number
 
  -- Karolina Lindqvist <pgd-karolinali@algonet.se>  Sat,  6 Jul 2002 09:15:39 +0200
 
-kdebindings (2.1-final-1) unstable; urgency=low
+tdebindings (2.1-final-1) unstable; urgency=low
 
   * Initial Release.
 
diff --git a/ubuntu/maverick/tdebindings/debian/control b/ubuntu/maverick/tdebindings/debian/control
index 1322de9c9..aae3c4feb 100644
--- a/ubuntu/maverick/tdebindings/debian/control
+++ b/ubuntu/maverick/tdebindings/debian/control
@@ -1,8 +1,8 @@
-Source: kdebindings-trinity
+Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
  python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk,
  gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
- kdelibs4-trinity-dev (>= 4:3.5.9), libqt3-compat-headers (>= 3:3.3.5),
+ tdelibs4-trinity-dev (>= 4:3.5.9), libqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby1.8-dev, flex, bison,
  automake, autoconf, libtool, libltdl-dev
 Section: devel
@@ -12,11 +12,11 @@ XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.
 Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Ricardo Cardenes <rcardenes@debian.org>, Sune Vuorela <debian@pusling.com>
 Standards-Version: 3.8.4
 
-Package: kdebindings-java-trinity
+Package: tdebindings-java-trinity
 Section: libs
 Architecture: all
-Replaces: kdebindings-java-kde3 (<< 4:3.5.13)
-Breaks: kdebindings-java-kde3 (<< 4:3.5.13)
+Replaces: tdebindings-java-kde3 (<< 4:3.5.13)
+Breaks: tdebindings-java-kde3 (<< 4:3.5.13)
 Depends: libdcop3-java-trinity (= ${source:Version}), libqt3-java-trinity (= ${source:Version}), libtrinity-java-trinity (= ${source:Version})
 Description: TDE Java bindings metapackage [Trinity]
  A metapackage depending on all TDE, Qt and DCOP bindings libraries
@@ -101,9 +101,9 @@ Section: libs
 Replaces: libtrinity-java-kde3 (<< 4:3.5.13)
 Breaks: libtrinity-java-kde3 (<< 4:3.5.13)
 Depends: libtrinity-jni-trinity (>> ${KDE-Version3}), libtrinity-jni-trinity (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime
-Description: kdelibs bindings for Java [Trinity]
+Description: tdelibs bindings for Java [Trinity]
  This package contains the Java classes necessary to run Java programs
- using the Java kdelibs bindings. TDE is the Trinity Desktop Environment, a
+ using the Java tdelibs bindings. TDE is the Trinity Desktop Environment, a
  very popular UNIX Desktop Environment.
  .
  It also includes some example applications that use these Java
@@ -117,9 +117,9 @@ Section: libs
 Replaces: libtrinity-jni-kde3 (<< 4:3.5.13)
 Breaks: libtrinity-jni-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
-Description: kdelibs bindings for java ( Native libraries ) [Trinity]
+Description: tdelibs bindings for java ( Native libraries ) [Trinity]
  This package contains the shared libraries necessary to run Java
- programs using the Java kdelibs bindings. TDE is the Trinity Desktop
+ programs using the Java tdelibs bindings. TDE is the Trinity Desktop
  Environment, a very popular UNIX Desktop Environment.
  .
  This package is part of the official TDE bindings module.
diff --git a/ubuntu/maverick/tdebindings/debian/control.in b/ubuntu/maverick/tdebindings/debian/control.in
index ae8c7220d..b9f3e717a 100644
--- a/ubuntu/maverick/tdebindings/debian/control.in
+++ b/ubuntu/maverick/tdebindings/debian/control.in
@@ -1,18 +1,18 @@
-Source: kdebindings
+Source: tdebindings
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
  python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk,
  gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
- kdelibs4-dev (>= 4:3.5.7), libgtk1.2-dev, libqt3-compat-headers (>= 3:3.3.5),
+ tdelibs4-dev (>= 4:3.5.7), libgtk1.2-dev, libqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby1.8-dev
 Section: devel
 Priority: optional
 Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
 Standards-Version: 3.8.0
-Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/kdebindings
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdebindings
+Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/tdebindings
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/tdebindings
 
-Package: kdebindings-java
+Package: tdebindings-java
 Section: libs
 Architecture: all
 Depends: libdcop3-java (= ${source:Version}), libqt3-java (= ${source:Version}), libtrinity-java (= ${source:Version})
@@ -87,9 +87,9 @@ Package: libtrinity-java
 Architecture: all
 Section: libs
 Depends: libtrinity-jni (>> ${KDE-Version3}), libtrinity-jni (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime
-Description: kdelibs bindings for Java
+Description: tdelibs bindings for Java
  This package contains the Java classes necessary to run Java programs
- using the Java kdelibs bindings. KDE is the K Desktop Environment, a
+ using the Java tdelibs bindings. KDE is the K Desktop Environment, a
  very popular UNIX Desktop Environment.
  .
  It also includes some example applications that use these Java
@@ -101,9 +101,9 @@ Package: libtrinity-jni
 Architecture: amd64 i386 ia64 powerpc s390 sparc
 Section: libs
 Depends: ${shlibs:Depends}
-Description: kdelibs bindings for java ( Native libraries )
+Description: tdelibs bindings for java ( Native libraries )
  This package contains the shared libraries necessary to run Java
- programs using the Java kdelibs bindings. KDE is the K Desktop
+ programs using the Java tdelibs bindings. KDE is the K Desktop
  Environment, a very popular UNIX Desktop Environment.
  .
  This package is part of the official KDE bindings module.
diff --git a/ubuntu/maverick/tdebindings/debian/kdebindings-java-trinity.links b/ubuntu/maverick/tdebindings/debian/kdebindings-java-trinity.links
deleted file mode 100644
index eb432f0b9..000000000
--- a/ubuntu/maverick/tdebindings/debian/kdebindings-java-trinity.links
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/libtrinity-java /opt/trinity/share/doc/kdebindings-java
diff --git a/ubuntu/maverick/tdebindings/debian/rules b/ubuntu/maverick/tdebindings/debian/rules
index ad10f725f..6c5a7ddad 100755
--- a/ubuntu/maverick/tdebindings/debian/rules
+++ b/ubuntu/maverick/tdebindings/debian/rules
@@ -133,7 +133,7 @@ common-binary-post-install-indep::
 	  rm -f debian/$$p/opt/trinity/share/doc/$$p/changelog; \
 	done
 
-PACKAGES_WITH_USD_SYMLINK = kdebindings-java-trinity libtrinity-java-trinity libqt3-java-trinity \
+PACKAGES_WITH_USD_SYMLINK = tdebindings-java-trinity libtrinity-java-trinity libqt3-java-trinity \
 			    libdcop3-java-trinity-dev libdcop3-java-trinity \
 			    libsmokekde-trinity-dev libsmokeqt-trinity-dev \
 			    kjscmd-trinity libkjsembed-trinity-dev
diff --git a/ubuntu/maverick/tdebindings/debian/tdebindings-java-trinity.links b/ubuntu/maverick/tdebindings/debian/tdebindings-java-trinity.links
new file mode 100644
index 000000000..4d4c4e700
--- /dev/null
+++ b/ubuntu/maverick/tdebindings/debian/tdebindings-java-trinity.links
@@ -0,0 +1 @@
+/opt/trinity/share/doc/libtrinity-java /opt/trinity/share/doc/tdebindings-java
diff --git a/ubuntu/maverick/tdeedu/debian/blinken-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/blinken-trinity.README.Debian
index 987b4e48b..2301e6877 100644
--- a/ubuntu/maverick/tdeedu/debian/blinken-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/blinken-trinity.README.Debian
@@ -3,7 +3,7 @@ Blinken for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
 The package recommends kcontrol, which contains a plugin needed to
 install a custom font used by the game the first time a user runs it.
diff --git a/ubuntu/maverick/tdeedu/debian/blinken-trinity.docs b/ubuntu/maverick/tdeedu/debian/blinken-trinity.docs
index e1c76b889..8fce6fbad 100644
--- a/ubuntu/maverick/tdeedu/debian/blinken-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/blinken-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/blinken/AUTHORS
-build-tree/kdeedu-*/blinken/README.packagers
+build-tree/tdeedu-*/blinken/AUTHORS
+build-tree/tdeedu-*/blinken/README.packagers
diff --git a/ubuntu/maverick/tdeedu/debian/changelog b/ubuntu/maverick/tdeedu/debian/changelog
index c2bf5435e..4850c6255 100644
--- a/ubuntu/maverick/tdeedu/debian/changelog
+++ b/ubuntu/maverick/tdeedu/debian/changelog
@@ -1,63 +1,63 @@
-kdeedu-trinity (4:3.5.10-0ubuntu5) karmic; urgency=low
+tdeedu-trinity (4:3.5.10-0ubuntu5) karmic; urgency=low
 
   * Karmic rebuild number 2
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 13 Dec 2009 01:19:00 -0600
 
-kdeedu-trinity (4:3.5.10-0ubuntu4) karmic; urgency=low
+tdeedu-trinity (4:3.5.10-0ubuntu4) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdeedu-trinity (4:3.5.10-0ubuntu1~intrepid4) intrepid; urgency=low
+tdeedu-trinity (4:3.5.10-0ubuntu1~intrepid4) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 17:24:00 -0600
 
-kdeedu-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
+tdeedu-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
   * SVN Import
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 29 Sep 2008 15:17:00 -0600
 
-kdeedu (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdeedu (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
-    - Bump version of kdelibs4-dev build-dep to 3.5.10
+    - Bump version of tdelibs4-dev build-dep to 3.5.10
     - Drop usr/bin/test_extdate and usr/bin/test_extdatepicker from
-      debian/libkdeedu-dev.install
+      debian/libtdeedu-dev.install
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:41:56 -0400
 
-kdeedu (4:3.5.9-0ubuntu2) hardy; urgency=low
+tdeedu (4:3.5.9-0ubuntu2) hardy; urgency=low
 
   * Fix overwrite, kalzium-data conflicts/replaces old kalzium
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 18 Mar 2008 20:41:48 +0000
 
-kdeedu (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdeedu (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:06 +0000
 
-kdeedu (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdeedu (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 10:45:18 +0000
 
-kdeedu (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdeedu (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining change:
    - No omcal build-dep
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:43 +0000
 
-kdeedu (4:3.5.8-1) unstable; urgency=low
+tdeedu (4:3.5.8-1) unstable; urgency=low
 
   * New upstream release.
     + Patches: remove 11_kig+boost_autoconf_check, merged upstream.
@@ -68,19 +68,19 @@ kdeedu (4:3.5.8-1) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 16 Oct 2007 16:19:11 +0200
 
-kdeedu (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdeedu (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:25 +0100
 
-kdeedu (4:3.5.7-1ubuntu2) gutsy; urgency=low
+tdeedu (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
   * Rebuild for boost 1.34.0 -> 1.34.1 transistion.
 
  -- Steve Kowalik <stevenk@ubuntu.com>  Thu, 13 Sep 2007 11:06:00 +1000
 
-kdeedu (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdeedu (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * New Upstream Version
   * Modify Maintainer value to match Debian-Maintainer-Field Spec
@@ -88,7 +88,7 @@ kdeedu (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 23 May 2007 12:49:14 +1000
 
-kdeedu (4:3.5.7-1) unstable; urgency=low
+tdeedu (4:3.5.7-1) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -101,35 +101,35 @@ kdeedu (4:3.5.7-1) unstable; urgency=low
 
   +++ Changes by Daniel Schepler:
 
-  * debian/control: Add kgeography to the kdeedu metapackage.
+  * debian/control: Add kgeography to the tdeedu metapackage.
 
  -- Sune Vuorela <debian@pusling.com>  Wed, 16 May 2007 12:29:33 +0200
 
-kdeedu (4:3.5.6-3ubuntu1) gutsy; urgency=low
+tdeedu (4:3.5.6-3ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 20:32:54 +0100
 
-kdeedu (4:3.5.6-3) unstable; urgency=low
+tdeedu (4:3.5.6-3) unstable; urgency=low
 
   +++ Changes by Daniel Schepler:
 
-  * debian/control: Add kgeography to the kdeedu metapackage.
+  * debian/control: Add kgeography to the tdeedu metapackage.
 
  -- Daniel Schepler <schepler@debian.org>  Tue, 24 Apr 2007 22:37:43 -0400
 
-kdeedu (4:3.5.6-2) unstable; urgency=low
+tdeedu (4:3.5.6-2) unstable; urgency=low
 
   * Upload to unstable after Etch release.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 18 Apr 2007 17:06:10 +0100
 
-kdeedu (4:3.5.6-1) experimental; urgency=low
+tdeedu (4:3.5.6-1) experimental; urgency=low
 
   * New upstream version.
     - fixes typo in Hercules constellation in kstars. (Closes: #395849)
-  * Make kdeedu-dbg depend on kdelibs-dbg to get useful backtraces when
+  * Make tdeedu-dbg depend on tdelibs-dbg to get useful backtraces when
     debugging.
 
   +++ Changes by Sune Vuorela:
@@ -144,7 +144,7 @@ kdeedu (4:3.5.6-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 20 Jan 2007 16:55:45 +0100
 
-kdeedu (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdeedu (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
   * Remove 12_fr_keyboard.diff
@@ -152,27 +152,27 @@ kdeedu (4:3.5.6-0ubuntu1) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:30 +0000
 
-kdeedu (4:3.5.5-1ubuntu3) feisty; urgency=low
+tdeedu (4:3.5.5-1ubuntu3) feisty; urgency=low
 
   * Rebuild for python2.5.
   * Teach kig about python2.5.
 
  -- Matthias Klose <doko@ubuntu.com>  Mon, 15 Jan 2007 00:57:51 +0000
 
-kdeedu (4:3.5.5-1ubuntu2) feisty; urgency=low
+tdeedu (4:3.5.5-1ubuntu2) feisty; urgency=low
 
   * Up the replaces on indi of kstars to fix https://launchpad.net/bugs/78964
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 14 Jan 2007 12:49:44 +0000
 
-kdeedu (4:3.5.5-1ubuntu1) feisty; urgency=low
+tdeedu (4:3.5.5-1ubuntu1) feisty; urgency=low
 
   * Merge with Debian
   * Compile with --enable-gcc-hidden-visibility
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 20:14:40 +0000
 
-kdeedu (4:3.5.5-1) unstable; urgency=low
+tdeedu (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
   * Remove obsolete Recommends: kcontrol, along with the accompanying
@@ -181,7 +181,7 @@ kdeedu (4:3.5.5-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sun,  8 Oct 2006 14:26:21 +0200
 
-kdeedu (4:3.5.4-2) unstable; urgency=low
+tdeedu (4:3.5.4-2) unstable; urgency=low
 
   * KDE_3_5_BRANCH update (up to r577498).
 
@@ -191,7 +191,7 @@ kdeedu (4:3.5.4-2) unstable; urgency=low
     package descriptions, sync debian-qt-kde.mk and other CDBS
     stuff (should help building on slow architectures).
 
-  * Rather than having packages recommend kdeedu-data, just depend
+  * Rather than having packages recommend tdeedu-data, just depend
     on it.
 
   * Apply the still-relevant kstars/indi part of the kFreeBSD build
@@ -209,7 +209,7 @@ kdeedu (4:3.5.4-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 26 Aug 2006 17:07:38 -0400
 
-kdeedu (4:3.5.4-1) unstable; urgency=low
+tdeedu (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
     + Fixes detection of autoconf 2.60.  Closes: #379817.
@@ -217,47 +217,47 @@ kdeedu (4:3.5.4-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sat, 29 Jul 2006 13:21:27 -0400
 
-kdeedu (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdeedu (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:07 +0000
 
-kdeedu (4:3.5.4-0ubuntu4) edgy; urgency=low
+tdeedu (4:3.5.4-0ubuntu4) edgy; urgency=low
 
   * Rebuild with latest cdbs to add gettext domain to .desktop files for
     langpacks-desktopfiles-kde, no source changes
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Sep 2006 22:53:10 +0000
 
-kdeedu (4:3.5.4-0ubuntu3) edgy; urgency=low
+tdeedu (4:3.5.4-0ubuntu3) edgy; urgency=low
 
   * Add kalzium-data Replaces: kalzium (<< 4:3.5.4)
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  1 Aug 2006 15:15:09 +0000
 
-kdeedu (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdeedu (4:3.5.4-0ubuntu2) edgy; urgency=low
 
   * Remove 30_libtool.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 30 Jul 2006 16:15:24 +0100
 
-kdeedu (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdeedu (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:18 +0000
 
-kdeedu (4:3.5.3-0ubuntu1) edgy; urgency=low
+tdeedu (4:3.5.3-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Oliver Grawert <ogra@ubuntu.com>  Mon, 03 Jul 2006 19:57:21 +0100
 
-kdeedu (4:3.5.2-1) unstable; urgency=low
+tdeedu (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
-  * Add blinken to kdeedu dependencies.
+  * Add blinken to tdeedu dependencies.
   * Remove copy of steve.ttf from blinken, and instead depend on
     the new ttf-sjfonts package.  Closes: #344377.
   * Do the same for khangman: remove the copies of Domestic_Manners.ttf
@@ -265,64 +265,64 @@ kdeedu (4:3.5.2-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Wed, 29 Mar 2006 21:31:41 +0200
 
-kdeedu (4:3.5.2-0ubuntu9) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu9) dapper; urgency=low
 
   * debian/rules:
     - added dh_iconcache.
 
  -- Daniel Holbach <daniel.holbach@ubuntu.com>  Thu, 18 May 2006 15:16:34 +0200
 
-kdeedu (4:3.5.2-0ubuntu8) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu8) dapper; urgency=low
 
   * Add EXTRACTATTR to .pot generation rule
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  9 May 2006 18:31:07 +0300
 
-kdeedu (4:3.5.2-0ubuntu7) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu7) dapper; urgency=low
 
   * Add build-dep on gawk so that kstars.pot gets generated
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  9 May 2006 17:42:58 +0300
 
-kdeedu (4:3.5.2-0ubuntu6) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu6) dapper; urgency=low
 
-  * Remove html docs in kanagram, they are in kdeedu-doc-html.
-  * Move kgeography html docs to kdeedu-doc-html. 
+  * Remove html docs in kanagram, they are in tdeedu-doc-html.
+  * Move kgeography html docs to tdeedu-doc-html. 
 
  -- Frode M. Doeving <frode@lnix.net>  Tue,  2 May 2006 18:41:09 +0200
 
-kdeedu (4:3.5.2-0ubuntu5) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu5) dapper; urgency=low
 
   * Make kgeorgraphy Replaces kgeography-data, closes Malone #42192
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  1 May 2006 17:20:59 +0100
 
-kdeedu (4:3.5.2-0ubuntu4) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu4) dapper; urgency=low
 
-  * Remove references in debian/kdeedu-doc-html* to KMessedwords,
+  * Remove references in debian/tdeedu-doc-html* to KMessedwords,
     now Kanagram, Closes Malone #30732
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 28 Apr 2006 16:25:37 +0100
 
-kdeedu (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Updated debian/rules to install docs for the correct list of packages
 
  -- Frode M. Doeving <frode@lnix.net>  Wed, 26 Apr 2006 19:11:21 +0200
 
-kdeedu (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu2) dapper; urgency=low
 
   * Edit debian/rules to mark .po files as UTF-8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Apr 2006 19:11:11 +0100
 
-kdeedu (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdeedu (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:28 +0000
 
-kdeedu (4:3.5.1-1) unstable; urgency=low
+tdeedu (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
   * Adjust dependencies on *-data to be binNMU-safe.
@@ -334,41 +334,41 @@ kdeedu (4:3.5.1-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Thu,  2 Feb 2006 09:49:13 +0100
 
-kdeedu (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdeedu (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:06 +0000
 
-kdeedu (4:3.5.0-4) unstable; urgency=low
+tdeedu (4:3.5.0-4) unstable; urgency=low
 
-  * New package: kdeedu-dbg, to make debugging symbols available.
+  * New package: tdeedu-dbg, to make debugging symbols available.
   * Include uuencoded tar file of binary files changed on branch.
   * Rebuild against boost 1.33.1.
 
  -- Daniel Schepler <schepler@debian.org>  Tue, 17 Jan 2006 09:44:35 +0100
 
-kdeedu (4:3.5.0-3) unstable; urgency=low
+tdeedu (4:3.5.0-3) unstable; urgency=low
 
   * Upload to unstable.
   * No longer build with g++-3.4 on any architecture, since g++-4.0
     should be fixed.
   * Update to SVN branches/KDE/3.5, up to revision 496050.
-  * Tighten versioning of Build-Depends on kdelibs4-dev.  Closes: #344765.
+  * Tighten versioning of Build-Depends on tdelibs4-dev.  Closes: #344765.
 
  -- Daniel Schepler <schepler@debian.org>  Mon,  9 Jan 2006 22:39:22 +0100
 
-kdeedu (4:3.5.0-2) experimental; urgency=low
+tdeedu (4:3.5.0-2) experimental; urgency=low
 
   * Upload to experimental.
 
  -- Daniel Schepler <schepler@debian.org>  Tue, 20 Dec 2005 10:47:44 +0100
 
-kdeedu (4:3.5.0-1) alioth; urgency=low
+tdeedu (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
   * Rename package kmessedwords to kanagram.
-  * Rename libkdeedu1 to libkdeedu3 due to SONAME change of libkdeeduui.
+  * Rename libtdeedu1 to libtdeedu3 due to SONAME change of libtdeeduui.
   * New packages: blinken, kgeography, kgeography-data.
   * New split-off data package: kalzium-data.
   * Regenerate all Debian menu icons, since several of the upstream icons
@@ -376,20 +376,20 @@ kdeedu (4:3.5.0-1) alioth; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Wed, 14 Dec 2005 00:31:49 +0100
 
-kdeedu (4:3.5.0-0ubuntu2) dapper; urgency=low
+tdeedu (4:3.5.0-0ubuntu2) dapper; urgency=low
 
   * rebuild for new libboost 
 
  -- Oliver Grawert <ogra@ubuntu.com>  Fri, 13 Jan 2006 15:31:57 +0100
 
-kdeedu (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdeedu (4:3.5.0-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Remove GCC 3.4 on hppa
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Dec 2005 12:27:39 +0000
 
-kdeedu (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdeedu (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Generate .pot files
@@ -397,27 +397,27 @@ kdeedu (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 19:43:59 +0000
 
-kdeedu (4:3.5-rc1-0ubuntu1) dapper; urgency=low
+tdeedu (4:3.5-rc1-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * kmessedwords replaced with kanagram
-  * libkdeedu1 becomes libkdeedu3
+  * libtdeedu1 becomes libtdeedu3
   * New packages kgeography, blinken
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 13 Nov 2005 20:53:20 +0000
 
-kdeedu (4:3.4.3-2) unstable; urgency=low
+tdeedu (4:3.4.3-2) unstable; urgency=low
 
   * New maintainer: I'll be the primary maintainer although I'm listing
     the Debian QT/KDE group as the official maintainer.  Thanks to
     Ben Burton for maintaining the package up until now.
   * Switch to CDBS.
   * Update Build-Depends to ensure getting c2a-transitioned versions of
-    kdelibs and boost-python.
+    tdelibs and boost-python.
 
  -- Daniel Schepler <schepler@debian.org>  Mon,  5 Dec 2005 21:25:51 +0100
 
-kdeedu (4:3.4.3-1) unstable; urgency=low
+tdeedu (4:3.4.3-1) unstable; urgency=low
 
   * New upstream release.
   * Changed Maintainer to Debian Qt/KDE Maintainers
@@ -425,25 +425,25 @@ kdeedu (4:3.4.3-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  3 Dec 2005 16:17:55 +0100
 
-kdeedu (4:3.4.2-2.1) unstable; urgency=low
+tdeedu (4:3.4.2-2.1) unstable; urgency=low
 
   * NMU
   * Use gcc-3.4 to build in arm, m68k and hppa, closes: #334986
 
  -- Isaac Clerencia <isaac@debian.org>  Fri, 21 Oct 2005 13:14:31 +0200
 
-kdeedu (4:3.4.2-2) unstable; urgency=low
+tdeedu (4:3.4.2-2) unstable; urgency=low
 
   * Built against libfam-dev, not libgamin-dev.
 
  -- Ben Burton <bab@debian.org>  Sun,  4 Sep 2005 10:58:17 +1000
 
-kdeedu (4:3.4.2-1) unstable; urgency=low
+tdeedu (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
   * First g++-4 upload to sid.
   * Adjusted build-dependencies and shlibs files for the C++ ABI transition.
-    Note that the libkdeedu1 and libkiten1 package names do not need to change.
+    Note that the libtdeedu1 and libkiten1 package names do not need to change.
   * Fixed tempfile handling in langen2kvtml, which is shipped in the kvoctrain
     package.  See the following URL for further information:
     - http://www.kde.org/info/security/advisory-20050815-1.txt
@@ -459,20 +459,20 @@ kdeedu (4:3.4.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Thu,  1 Sep 2005 09:04:24 +1000
 
-kdeedu (4:3.4.3-0ubuntu2) breezy; urgency=low
+tdeedu (4:3.4.3-0ubuntu2) breezy; urgency=low
 
   * Do not try to install missing man pages
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun,  9 Oct 2005 13:12:42 +0100
 
-kdeedu (4:3.4.3-0ubuntu1) breezy; urgency=low
+tdeedu (4:3.4.3-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Build with GCC 3.4 on hppa etc
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  7 Oct 2005 18:35:59 +0000
 
-kdeedu (4:3.4.2-0ubuntu4) breezy; urgency=low
+tdeedu (4:3.4.2-0ubuntu4) breezy; urgency=low
 
   * SECURITY UPDATE: fix insecure temporary file creation
   * The script uses known filenames in /tmp which allow an
@@ -486,40 +486,40 @@ kdeedu (4:3.4.2-0ubuntu4) breezy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 13 Aug 2005 12:35:52 +0000
 
-kdeedu (4:3.4.2-0ubuntu3) breezy; urgency=low
+tdeedu (4:3.4.2-0ubuntu3) breezy; urgency=low
 
   * last rebuild didnt work it seems...
     rebuild for new boost again to make kig installable in edubuntu
 
  -- Oliver Grawert <ogra@ubuntu.com>  Mon,  8 Aug 2005 12:08:34 +0200
 
-kdeedu (4:3.4.2-0ubuntu2) breezy; urgency=low
+tdeedu (4:3.4.2-0ubuntu2) breezy; urgency=low
 
   * Rebuild for new boost upload.
 
  -- Matthias Klose <doko@ubuntu.com>  Wed,  3 Aug 2005 23:24:48 +0200
 
-kdeedu (4:3.4.2-0ubuntu1) breezy; urgency=low
+tdeedu (4:3.4.2-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Build using unsermake
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 16:24:24 +0000
 
-kdeedu (4:3.4.1-0ubuntu1) breezy; urgency=low
+tdeedu (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number following KDE 3.4.1 release
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed,  1 Jun 2005 00:32:27 +0000
 
-kdeedu (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+tdeedu (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
 
   * New upstream release.
   * Sync with Debian.
 
  -- Jonathan Riddell <jr@jriddell.org>  Sat, 28 May 2005 19:08:44 +0000
 
-kdeedu (4:3.4.0-0pre2) unstable; urgency=low
+tdeedu (4:3.4.0-0pre2) unstable; urgency=low
 
   * Merge in recent packaging changes from the 3.3 branch.
   * Now that KDE has moved to subversion, disable cvs-clean in debian/rules
@@ -527,7 +527,7 @@ kdeedu (4:3.4.0-0pre2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 14 May 2005 19:20:58 +1000
 
-kdeedu (4:3.4.0-0pre1) unstable; urgency=low
+tdeedu (4:3.4.0-0pre1) unstable; urgency=low
 
   * New major upstream release.
   * New binary packages libkiten1 and libkiten-dev.
@@ -535,7 +535,7 @@ kdeedu (4:3.4.0-0pre1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Tue,  8 Mar 2005 07:43:35 +1100
 
-kdeedu (4:3.3.2-3) unstable; urgency=low
+tdeedu (4:3.3.2-3) unstable; urgency=low
 
   * Included the full GFDL text in debian/copyright, since all of the docbook
     documentation is under this license.
@@ -543,7 +543,7 @@ kdeedu (4:3.3.2-3) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 26 Mar 2005 10:15:48 +1100
 
-kdeedu (4:3.3.2-2) unstable; urgency=high
+tdeedu (4:3.3.2-2) unstable; urgency=high
 
   * Fixed buffer overflows in fliccd, one of the INDI drivers shipped with
     kstars (closes: #295499).  See the following URL for further information:
@@ -555,7 +555,7 @@ kdeedu (4:3.3.2-2) unstable; urgency=high
 
  -- Ben Burton <bab@debian.org>  Thu, 17 Feb 2005 07:53:09 +1100
 
-kdeedu (4:3.3.2-1) unstable; urgency=low
+tdeedu (4:3.3.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
   * The moon images are now licensed under the GPL (closes: #266404).
@@ -567,23 +567,23 @@ kdeedu (4:3.3.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun, 16 Jan 2005 20:45:11 +1100
 
-kdeedu (4:3.4.0-0ubuntu1) hoary; urgency=low
+tdeedu (4:3.4.0-0ubuntu1) hoary; urgency=low
 
-  * Add directory /opt/trinity/share/doc/kde/HTML/en/flashkard to kdeedu-doc-html
+  * Add directory /opt/trinity/share/doc/kde/HTML/en/flashkard to tdeedu-doc-html
     to prevent .dhelp problem.
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 18:35:25 +0000
 
-kdeedu (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+tdeedu (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
 
   * New upstream release
   * cleanup debian/patches dir
 
  -- Andreas Mueller <amu@ubuntu.com>  Wed,  9 Mar 2005 18:09:17 +0000
 
-kdeedu (4:3.3.2-1ubuntu2) hoary; urgency=low
+tdeedu (4:3.3.2-1ubuntu2) hoary; urgency=low
 
-  * SECURITY UPDATE: Buffer overflow in fliccd of kdeedu/kstars/indi
+  * SECURITY UPDATE: Buffer overflow in fliccd of tdeedu/kstars/indi
   * added 01-kstars-indi-fliccd-overflows.diff which fixes buffer overflows
   * References:
     CAN-2005-0011
@@ -591,26 +591,26 @@ kdeedu (4:3.3.2-1ubuntu2) hoary; urgency=low
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 17 Feb 2005 02:44:19 +0000
 
-kdeedu (4:3.3.2-1ubuntu1) hoary; urgency=low
+tdeedu (4:3.3.2-1ubuntu1) hoary; urgency=low
 
   * New upstream release.
 
  -- Andreas Mueller <amu@canonical.com>  Sun, 16 Jan 2005 03:38:05 +0100
 
-kdeedu (4:3.3.1-3) unstable; urgency=medium
+tdeedu (4:3.3.1-3) unstable; urgency=medium
 
   * Sigh.  Patched kstars platform tests for m68k.  This _really_ is
     every arch dealt with.
 
  -- Ben Burton <bab@debian.org>  Fri, 12 Nov 2004 07:39:04 +1100
 
-kdeedu (4:3.3.1-2) unstable; urgency=medium
+tdeedu (4:3.3.1-2) unstable; urgency=medium
 
   * Patched platform tests in kstars to include mips and mipsel.
 
  -- Ben Burton <bab@debian.org>  Wed, 10 Nov 2004 07:45:35 +1100
 
-kdeedu (4:3.3.1-1) unstable; urgency=medium
+tdeedu (4:3.3.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.
   * Platform tests in kstars code now expanded to include s390 and powerpc
@@ -626,40 +626,40 @@ kdeedu (4:3.3.1-1) unstable; urgency=medium
 
  -- Ben Burton <bab@debian.org>  Thu, 28 Oct 2004 08:35:18 +1000
 
-kdeedu (4:3.3.0-1) unstable; urgency=low
+tdeedu (4:3.3.0-1) unstable; urgency=low
 
   * New upstream release.
   * New binary packages klatin, kturtle and kwordquiz.
-  * Package flashkard is no longer shipped with kdeedu.
+  * Package flashkard is no longer shipped with tdeedu.
   * There is no longer a need to pull data out of the upstream tarball,
     since upstream no longer ships with the (non-free) Messier images.
-  * Made libkdeedu-dev depend on kdelibs4-dev.
+  * Made libtdeedu-dev depend on tdelibs4-dev.
   * KStars now shows borders between constellations (closes: #241930) and
     supports full-screen mode (closes: #219649).
   * KTouch now waits for a keypress before starting and also provides a
     pause button (closes: #129523).
-  * A little more documentation is now installed for libkdeedu-dev.
+  * A little more documentation is now installed for libtdeedu-dev.
 
  -- Ben Burton <bab@debian.org>  Sat, 16 Oct 2004 15:32:36 +1000
 
-kdeedu (4:3.2.3-2) unstable; urgency=low
+tdeedu (4:3.2.3-2) unstable; urgency=low
 
   * Disable kig scripting on arm while boost.python remains broken on
     that architecture.
 
  -- Ben Burton <bab@debian.org>  Sat, 17 Jul 2004 11:19:00 +1000
 
-kdeedu (4:3.2.3-1) unstable; urgency=low
+tdeedu (4:3.2.3-1) unstable; urgency=low
 
   * New upstream bugfix release.
   * Added manpages for KStars INDI server and device drivers.
-  * Suggests (konqueror | www-browser) for kdeedu-doc-html instead of
+  * Suggests (konqueror | www-browser) for tdeedu-doc-html instead of
     just www-browser.
   * Added debian/clean-sources to simplify removal of non-DFSG-free material.
 
  -- Ben Burton <bab@debian.org>  Sun, 20 Jun 2004 09:48:28 +1000
 
-kdeedu (4:3.2.2-1) unstable; urgency=low
+tdeedu (4:3.2.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
   * Built against Boost.Python 1.31.0, which in turn is built against
@@ -667,30 +667,30 @@ kdeedu (4:3.2.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Thu, 22 Apr 2004 18:15:48 +1000
 
-kdeedu (4:3.2.1-2) unstable; urgency=low
+tdeedu (4:3.2.1-2) unstable; urgency=low
 
   * Don't use Conflicts/Replaces where we should just use Replaces.
 
  -- Ben Burton <bab@debian.org>  Tue, 16 Mar 2004 09:15:01 +1100
 
-kdeedu (4:3.2.1-1) unstable; urgency=low
+tdeedu (4:3.2.1-1) unstable; urgency=low
 
   * First KDE 3.2 upload to sid.
 
  -- Ben Burton <bab@debian.org>  Sun,  7 Mar 2004 17:42:59 +1100
 
-kdeedu (4:3.2.0.1-1) experimental; urgency=low
+tdeedu (4:3.2.0.1-1) experimental; urgency=low
 
   * First KDE 3.2 upload to experimental.
   * Sync from KDE_3_2_BRANCH for recent bugfixes (this requires an upstream
     version change since some binary files have been updated).
   * Split kstars into kstars / kstars-data.
   * Split klettres into klettres / klettres-data.
-  * Using versioned dependencies for the kdeedu metapackage.
+  * Using versioned dependencies for the tdeedu metapackage.
 
  -- Ben Burton <bab@debian.org>  Mon, 23 Feb 2004 08:14:22 +1100
 
-kdeedu (4:3.2.0-1) unstable; urgency=low
+tdeedu (4:3.2.0-1) unstable; urgency=low
 
   * New upstream release.
   * Many thanks to Ralf Nolden for all his help with packaging KDE 3.2.
@@ -698,19 +698,19 @@ kdeedu (4:3.2.0-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
 
-kdeedu (4:3.1.5-2) unstable; urgency=low
+tdeedu (4:3.1.5-2) unstable; urgency=low
 
   * Building with -mieee on alpha to avoid kstars SIGFPE (closes: #226966).
 
  -- Ben Burton <bab@debian.org>  Tue, 20 Jan 2004 09:52:13 +1100
 
-kdeedu (4:3.1.5-1) unstable; urgency=low
+tdeedu (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <bab@debian.org>  Sun, 18 Jan 2004 12:55:12 +1100
 
-kdeedu (4:3.1.4-3) unstable; urgency=low
+tdeedu (4:3.1.4-3) unstable; urgency=low
 
   * Kiten recommends Japanese fonts (closes: #216440).
   * Kiten depends on edict and kanjidic instead of supplying its own
@@ -718,7 +718,7 @@ kdeedu (4:3.1.4-3) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun, 21 Dec 2003 20:03:28 +1100
 
-kdeedu (4:3.1.4-2) unstable; urgency=low
+tdeedu (4:3.1.4-2) unstable; urgency=low
 
   * New pull from BRANCH; includes bugfixes for kstars.
   * Fixed Saskatchewan time zones (closes: #206642).
@@ -726,7 +726,7 @@ kdeedu (4:3.1.4-2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Fri, 12 Dec 2003 11:02:33 +1100
 
-kdeedu (4:3.1.4-1) unstable; urgency=low
+tdeedu (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
   * Using the new debian_branch for kstars, which now uses the Hipparcos
@@ -741,7 +741,7 @@ kdeedu (4:3.1.4-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Mon, 13 Oct 2003 11:29:44 +1000
 
-kdeedu (4:3.1.2-1) unstable; urgency=low
+tdeedu (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
   * Libtool updated (closes: #194479).
@@ -752,20 +752,20 @@ kdeedu (4:3.1.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun,  1 Jun 2003 14:15:47 +1000
 
-kdeedu (4:3.1.1-1) unstable; urgency=low
+tdeedu (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release.
   * Removed alpha compile flags.
 
  -- Ben Burton <bab@debian.org>  Sun, 23 Mar 2003 15:23:23 +1100
 
-kdeedu (4:3.1.0-3) unstable; urgency=low
+tdeedu (4:3.1.0-3) unstable; urgency=low
 
   * Uses full paths in doc-base files instead of symlinks (closes: #180332).
 
  -- Ben Burton <bab@debian.org>  Tue, 11 Feb 2003 14:45:59 +1100
 
-kdeedu (4:3.1.0-2) unstable; urgency=low
+tdeedu (4:3.1.0-2) unstable; urgency=low
 
   * First Trinity upload to debian (closes: #119019).
   * Rolled the epoch to aid upgrades from the unofficial repository on
@@ -773,13 +773,13 @@ kdeedu (4:3.1.0-2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun,  2 Feb 2003 19:40:16 +1100
 
-kdeedu (3.1.0-1) unstable; urgency=low
+tdeedu (3.1.0-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <bab@debian.org>  Mon, 18 Nov 2002 14:15:59 +1100
 
-kdeedu (3.0.9-1) unstable; urgency=low
+tdeedu (3.0.9-1) unstable; urgency=low
 
   * New upstream release.
   * Built with g++-3.2.
@@ -787,7 +787,7 @@ kdeedu (3.0.9-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Tue, 22 Oct 2002 11:57:39 +1000
 
-kdeedu (3.0.8-1) unstable; urgency=low
+tdeedu (3.0.8-1) unstable; urgency=low
 
   * New upstream release.
   * Moved to Chris Cheney's style of debian/rules.
@@ -795,20 +795,20 @@ kdeedu (3.0.8-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sun, 22 Sep 2002 17:57:55 +1000
 
-kdeedu (3.0.3-1) unstable; urgency=low
+tdeedu (3.0.3-1) unstable; urgency=low
 
   * New upstream release.
   * Build-depends on automake1.5.
 
  -- Ben Burton <benb@acm.org>  Thu, 15 Aug 2002 13:22:22 +1000
 
-kdeedu (3.0.2-1) unstable; urgency=low
+tdeedu (3.0.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Thu,  4 Jul 2002 19:36:49 +1000
 
-kdeedu (3.0.1-1) unstable; urgency=low
+tdeedu (3.0.1-1) unstable; urgency=low
 
   * Initial Debian release (closes: Bug#119019).
 
diff --git a/ubuntu/maverick/tdeedu/debian/control b/ubuntu/maverick/tdeedu/debian/control
index 8cb6eb54f..78e9659f4 100644
--- a/ubuntu/maverick/tdeedu/debian/control
+++ b/ubuntu/maverick/tdeedu/debian/control
@@ -1,19 +1,19 @@
-Source: kdeedu-trinity
+Source: tdeedu-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: ocaml-nox, libfacile-ocaml-dev, libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libboost-python-dev (>= 1.33.1), libusb-dev, sharutils, doxygen, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: ocaml-nox, libfacile-ocaml-dev, libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libboost-python-dev (>= 1.33.1), libusb-dev, sharutils, doxygen, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kdeedu-trinity
+Package: tdeedu-trinity
 Architecture: all
 Section: kde
-Replaces: kdeedu-kde3 (<< 4:3.5.13)
-Breaks: kdeedu-kde3 (<< 4:3.5.13)
-Depends: blinken-trinity (>= ${Source-Version}), kalzium-trinity (>= ${Source-Version}), kanagram-trinity (>= ${Source-Version}), kbruch-trinity (>= ${Source-Version}), kdeedu-data-trinity (>= ${Source-Version}), keduca-trinity (>= ${Source-Version}), kgeography-trinity (>= ${Source-Version}), khangman-trinity (>= ${Source-Version}), kig-trinity (>= ${Source-Version}), kiten-trinity (>= ${Source-Version}), klatin-trinity (>= ${Source-Version}), klettres-trinity (>= ${Source-Version}), kmplot-trinity (>= ${Source-Version}), kpercentage-trinity (>= ${Source-Version}), kstars-trinity (>= ${Source-Version}), ktouch-trinity (>= ${Source-Version}), kturtle-trinity (>= ${Source-Version}), kverbos-trinity (>= ${Source-Version}), kvoctrain-trinity (>= ${Source-Version}), kwordquiz-trinity (>= ${Source-Version}), indi-trinity (>= ${Source-Version})
-Suggests: kdeedu-trinity-doc-html
+Replaces: tdeedu-kde3 (<< 4:3.5.13)
+Breaks: tdeedu-kde3 (<< 4:3.5.13)
+Depends: blinken-trinity (>= ${Source-Version}), kalzium-trinity (>= ${Source-Version}), kanagram-trinity (>= ${Source-Version}), kbruch-trinity (>= ${Source-Version}), tdeedu-data-trinity (>= ${Source-Version}), keduca-trinity (>= ${Source-Version}), kgeography-trinity (>= ${Source-Version}), khangman-trinity (>= ${Source-Version}), kig-trinity (>= ${Source-Version}), kiten-trinity (>= ${Source-Version}), klatin-trinity (>= ${Source-Version}), klettres-trinity (>= ${Source-Version}), kmplot-trinity (>= ${Source-Version}), kpercentage-trinity (>= ${Source-Version}), kstars-trinity (>= ${Source-Version}), ktouch-trinity (>= ${Source-Version}), kturtle-trinity (>= ${Source-Version}), kverbos-trinity (>= ${Source-Version}), kvoctrain-trinity (>= ${Source-Version}), kwordquiz-trinity (>= ${Source-Version}), indi-trinity (>= ${Source-Version})
+Suggests: tdeedu-trinity-doc-html
 Description: educational apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -23,37 +23,37 @@ Description: educational apps from the official Trinity release
  This metapackage includes educational applications provided with the
  official release of Trinity.
 
-Package: kdeedu-data-trinity
+Package: tdeedu-data-trinity
 Architecture: all
 Section: kde
-Replaces: kdeedu-data-kde3 (<< 4:3.5.13)
-Breaks: kdeedu-data-kde3 (<< 4:3.5.13)
+Replaces: tdeedu-data-kde3 (<< 4:3.5.13)
+Breaks: tdeedu-data-kde3 (<< 4:3.5.13)
 Description: shared data for Trinity educational applications
  This package contains shared data necessary for running the
  educational applications provided with KDE (the K Desktop
  Environment).
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
-Package: kdeedu-trinity-dbg
+Package: tdeedu-trinity-dbg
 Architecture: any
 Priority: extra
-Replaces: kdeedu-kde3-dbg (<< 4:3.5.13)
-Breaks: kdeedu-kde3-dbg (<< 4:3.5.13)
-Depends: kdelibs-trinity-dbg
+Replaces: tdeedu-kde3-dbg (<< 4:3.5.13)
+Breaks: tdeedu-kde3-dbg (<< 4:3.5.13)
+Depends: tdelibs-trinity-dbg
 Section: libdevel
-Description: debugging symbols for kdeedu-trinity
- This package contains the debugging symbols associated with kdeedu-trinity.
- They will automatically be used by gdb for debugging kdeedu-related
+Description: debugging symbols for tdeedu-trinity
+ This package contains the debugging symbols associated with tdeedu-trinity.
+ They will automatically be used by gdb for debugging tdeedu-related
  issues.
 
-Package: kdeedu-trinity-doc-html
+Package: tdeedu-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: kdeedu-kde3-doc-html (<< 4:3.5.13)
-Breaks: kdeedu-kde3-doc-html (<< 4:3.5.13)
-Suggests: konqueror-trinity | www-browser, kdeedu-trinity
+Replaces: tdeedu-kde3-doc-html (<< 4:3.5.13)
+Breaks: tdeedu-kde3-doc-html (<< 4:3.5.13)
+Suggests: konqueror-trinity | www-browser, tdeedu-trinity
 Description: Trinity edutainment documentation in HTML format
  By default the educational applications provided with KDE (the K
  Desktop Environment) only provide their documentation in KDE docbook
@@ -67,15 +67,15 @@ Description: Trinity edutainment documentation in HTML format
  most KDE educational packages.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: blinken-trinity
 Architecture: any
 Section: games
 Replaces: blinken-kde3 (<< 4:3.5.13)
 Breaks: blinken-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, ttf-sjfonts, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, ttf-sjfonts, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: Trinity version of the Simon Says electronic memory game
  Blinken is based on an electronic game released in 1978, which
  challenges players to remember sequences of increasing length.  On
@@ -87,15 +87,15 @@ Description: Trinity version of the Simon Says electronic memory game
  sequence with one extra step is presented.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kalzium-trinity
 Architecture: any
 Section: science
 Replaces: kalzium-kde3 (<< 4:3.5.13)
 Breaks: kalzium-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kalzium-data-trinity (>> ${KDE-Version3}), kalzium-data-trinity (<< ${KDE-Next-Version3}), kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, kalzium-data-trinity (>> ${KDE-Version3}), kalzium-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: chemistry teaching tool for Trinity
  Kalzium is a program which shows you the Periodic System of Elements
  (PSE).  You can use Kalzium to search for information about the
@@ -114,7 +114,7 @@ Description: chemistry teaching tool for Trinity
  equation solver.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kalzium-data-trinity
 Architecture: all
@@ -130,15 +130,15 @@ Description: data files for Kalzium
  See the kalzium package for further information.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kanagram-trinity
 Architecture: any
 Section: games
 Replaces: kanagram-kde3 (<< 4:3.5.13)
 Breaks: kanagram-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: letter order game for Trinity
  KAnagram is a game that is based on the word/letter puzzles that the
  author played as a child.  A word is picked at random and displayed
@@ -153,44 +153,44 @@ Description: letter order game for Trinity
  is welcome to try.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kbruch-trinity
 Architecture: any
 Section: math
 Replaces: kbruch-kde3 (<< 4:3.5.13)
 Breaks: kbruch-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: fraction calculation teaching tool for Trinity
  KBruch is a small program to practice calculating with fractions.
  Different exercises are provided for this purpose.  The program
  checks the user's input and gives feedback.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: keduca-trinity
 Architecture: any
 Section: kde
 Replaces: keduca-kde3 (<< 4:3.5.13)
 Breaks: keduca-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: interactive form-based tests for Trinity
  KEduca is a flash-card application which allows you to make
  interactive form-based tests.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kgeography-trinity
 Architecture: any
 Section: kde
 Replaces: kgeography-kde3 (<< 4:3.5.13)
 Breaks: kgeography-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kgeography-data-trinity (>> ${KDE-Version3}), kgeography-data-trinity (<< ${KDE-Next-Version3}), kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, kgeography-data-trinity (>> ${KDE-Version3}), kgeography-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: Geography learning tool for Trinity
  KGeography contains maps allowing you to learn various countries or
  the political divisions of several countries.  It has several modes,
@@ -198,7 +198,7 @@ Description: Geography learning tool for Trinity
  flags of the map divisions.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kgeography-data-trinity
 Architecture: all
@@ -213,15 +213,15 @@ Description: data files for KGeography
  See the kgeography package for further information.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: khangman-trinity
 Architecture: any
 Section: games
 Replaces: khangman-kde3 (<< 4:3.5.13)
 Breaks: khangman-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, ttf-dustin, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: the classical hangman game for Trinity
  KHangMan is a game based on the well known hangman game.  It is aimed
  for children aged 6 and above.  It has four levels of difficulty:
@@ -233,15 +233,15 @@ Description: the classical hangman game for Trinity
  guess the word before getting hanged!  You have 10 tries.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kig-trinity
 Architecture: any
 Section: math
 Replaces: kig-kde3 (<< 4:3.5.13)
 Breaks: kig-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: interactive geometry program for KDE
  Kig is an application for interactive geometry.  It is intended to
  serve two purposes:
@@ -261,15 +261,15 @@ Description: interactive geometry program for KDE
  KGeo, KSeg and XFig.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kiten-trinity
 Architecture: any
 Section: kde
 Replaces: kiten-kde3 (<< 4:3.5.13)
 Breaks: kiten-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3}), ttf-kochi-gothic | ttf-kochi-mincho
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}), ttf-kochi-gothic | ttf-kochi-mincho
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: Japanese reference/study tool for Trinity
  Kiten is a Japanese reference and study tool for KDE.  It is an
  application with multiple functions.  Firstly, it is a convenient
@@ -278,15 +278,15 @@ Description: Japanese reference/study tool for Trinity
  characters.  Thirdly, it is a tool to help you learn Kanji.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: klatin-trinity
 Architecture: any
 Section: kde
 Replaces: klatin-kde3 (<< 4:3.5.13)
 Breaks: klatin-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: application to help revise/teach Latin
  KLatin is a program to help revise Latin.  There are three "sections"
  in which different aspects of the language can be revised.  These are
@@ -303,15 +303,15 @@ Description: application to help revise/teach Latin
  indicative passive plural", and is not multiple choice.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: klettres-trinity
 Architecture: any
 Section: kde
 Replaces: klettres-kde3 (<< 4:3.5.13)
 Breaks: klettres-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, klettres-data-trinity (>> ${KDE-Version3}), klettres-data-trinity (<< ${KDE-Next-Version3}), kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, klettres-data-trinity (>> ${KDE-Version3}), klettres-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: foreign alphabet tutor for Trinity
  KLettres is an application specially designed to help the user to
  learn the alphabet in a new language and then to learn to read simple
@@ -322,7 +322,7 @@ Description: foreign alphabet tutor for Trinity
  English, French, Italian and Slovak.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: klettres-data-trinity
 Architecture: all
@@ -337,15 +337,15 @@ Description: data files for KLettres foreign alphabet tutor
  See the klettres package for further information.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kmplot-trinity
 Architecture: any
 Section: math
 Replaces: kmplot-kde3 (<< 4:3.5.13)
 Breaks: kmplot-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: mathematical function plotter for Trinity
  KmPlot is a mathematical function plotter for KDE.  It has a powerful
  built-in parser.  You can plot different functions simultaneously and
@@ -361,15 +361,15 @@ Description: mathematical function plotter for Trinity
  and plotting derivatives and integral functions.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kpercentage-trinity
 Architecture: any
 Section: math
 Replaces: kpercentage-kde3 (<< 4:3.5.13)
 Breaks: kpercentage-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: percentage calculation teaching tool for Trinity
  KPercentage is a small math application that will help pupils to
  improve their skills in calculating percentages.
@@ -379,15 +379,15 @@ Description: percentage calculation teaching tool for Trinity
  are mixed randomly.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kstars-trinity
 Architecture: any
 Section: science
 Replaces: kstars-kde3 (<< 4:3.5.13)
 Breaks: kstars-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kstars-data-trinity (>> ${KDE-Version3}), kstars-data-trinity (<< ${KDE-Next-Version3}), kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3}), indi-trinity (= ${Source-Version})
-Suggests: konqueror-trinity, khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, kstars-data-trinity (>> ${KDE-Version3}), kstars-data-trinity (<< ${KDE-Next-Version3}), tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3}), indi-trinity (= ${Source-Version})
+Suggests: konqueror-trinity, khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: desktop planetarium for Trinity
  KStars is a graphical desktop planetarium for KDE.  It depicts an
  accurate simulation of the night sky, including stars,
@@ -402,7 +402,7 @@ Description: desktop planetarium for Trinity
  use.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kstars-data-trinity
 Architecture: all
@@ -417,15 +417,15 @@ Description: data files for KStars desktop planetarium
  See the kstars package for further information.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: ktouch-trinity
 Architecture: any
 Section: kde
 Replaces: ktouch-kde3 (<< 4:3.5.13)
 Breaks: ktouch-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: touch typing tutor for Trinity
  KTouch is a program for learning touch typing - it helps you learn to
  type on a keyboard quickly and correctly.  Every finger has its place
@@ -437,15 +437,15 @@ Description: touch typing tutor for Trinity
  to use.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kturtle-trinity
 Architecture: any
 Section: devel
 Replaces: kturtle-kde3 (<< 4:3.5.13)
 Breaks: kturtle-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: educational Logo programming environment
  KTurtle is an educational programming environment using the Logo
  programming language.  It tries to make programming as easy and
@@ -465,15 +465,15 @@ Description: educational Logo programming environment
  professional programmers' needs.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kverbos-trinity
 Architecture: any
 Section: kde
 Replaces: kverbos-kde3 (<< 4:3.5.13)
 Breaks: kverbos-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: Spanish verb form study application for Trinity
  Kverbos allows the user to learn the forms of Spanish verbs.  The
  program suggests a verb and a time and the user enters the different
@@ -484,15 +484,15 @@ Description: Spanish verb form study application for Trinity
  have to be entered by the user.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kvoctrain-trinity
 Architecture: any
 Section: kde
 Replaces: kvoctrain-kde3 (<< 4:3.5.13)
 Breaks: kvoctrain-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: vocabulary trainer for Trinity
  KVocTrain is a little utility to help you train your vocabulary when
  you are trying to learn a foreign language.  You can create your own
@@ -510,15 +510,15 @@ Description: vocabulary trainer for Trinity
  application.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: kwordquiz-trinity
 Architecture: any
 Section: kde
 Replaces: kwordquiz-kde3 (<< 4:3.5.13)
 Breaks: kwordquiz-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdeedu-data-trinity (>> ${KDE-Version3}), kdeedu-data-trinity (<< ${KDE-Next-Version3})
-Suggests: khelpcenter-trinity, kdeedu-trinity-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${KDE-Version3}), tdeedu-data-trinity (<< ${KDE-Next-Version3})
+Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: flashcard and vocabulary learning program for Trinity
  KWordQuiz is a flashcard-based tool that helps you to master new
  vocabularies. It may be a language or any other kind of terminology.
@@ -529,37 +529,37 @@ Description: flashcard and vocabulary learning program for Trinity
  and xml.gz files created by Pauker (http://pauker.sourceforge.net).
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
-Package: libkdeedu3-trinity
+Package: libtdeedu3-trinity
 Architecture: any
 Section: libs
-Replaces: libkdeedu3-kde3 (<< 4:3.5.13)
-Breaks: libkdeedu3-kde3 (<< 4:3.5.13)
+Replaces: libtdeedu3-kde3 (<< 4:3.5.13)
+Breaks: libtdeedu3-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Description: library for use with Trinity educational apps
- The KDE-based library libkdeedu is used with educational
+ The KDE-based library libtdeedu is used with educational
  applications.  It currently provides support for data plotting and
  vocabulary items (including a parser for kvtml vocabulary files).
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
-Package: libkdeedu-trinity-dev
+Package: libtdeedu-trinity-dev
 Architecture: any
 Section: libdevel
-Replaces: libkdeedu-kde3-dev (<< 4:3.5.13)
-Breaks: libkdeedu-kde3-dev (<< 4:3.5.13)
-Depends: libkdeedu3-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
+Replaces: libtdeedu-kde3-dev (<< 4:3.5.13)
+Breaks: libtdeedu-kde3-dev (<< 4:3.5.13)
+Depends: libtdeedu3-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
 Description: development files for Trinity educational library
- The KDE-based library libkdeedu is used with educational
+ The KDE-based library libtdeedu is used with educational
  applications.  It currently provides support for data plotting and
  vocabulary items (including a parser for kvtml vocabulary files).
  .
- Development files for libkdeedu are included in this package.
+ Development files for libtdeedu are included in this package.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: libkiten1-trinity
 Architecture: any
@@ -579,14 +579,14 @@ Description: library for Kiten Japanese reference/study tool
  For further information, see the kiten package.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: libkiten-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: libkiten-kde3-dev (<< 4:3.5.13)
 Breaks: libkiten-kde3-dev (<< 4:3.5.13)
-Depends: libkiten1-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libkiten1-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
 Description: development files for Kiten library
  Kiten is a Japanese reference/study tool for KDE.  The library
  libkiten contains portions of Kiten that may be useful for other
@@ -597,7 +597,7 @@ Description: development files for Kiten library
  further information, see the kiten package.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
 
 Package: indi-trinity
 Architecture: any
@@ -614,4 +614,4 @@ Description: Instrument Neutral Distributed Interface for astronomical devices
  based on the services provided by the device.
  .
  This package is part of Trinity, as a component of the KDE education module.
- See the 'kde-trinity' and 'kdeedu-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeedu-trinity' packages for more information.
diff --git a/ubuntu/maverick/tdeedu/debian/control.in b/ubuntu/maverick/tdeedu/debian/control.in
index 00ddf325b..020c34ea1 100644
--- a/ubuntu/maverick/tdeedu/debian/control.in
+++ b/ubuntu/maverick/tdeedu/debian/control.in
@@ -1,17 +1,17 @@
-Source: kdeedu
+Source: tdeedu
 Section: kde
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), libboost-python-dev (>= 1.33.1), libfacile-ocaml-dev [alpha amd64 arm hppa i386 ia64 powerpc sparc], libusb-dev, sharutils, doxygen
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libboost-python-dev (>= 1.33.1), libfacile-ocaml-dev [alpha amd64 arm hppa i386 ia64 powerpc sparc], libusb-dev, sharutils, doxygen
 Standards-Version: 3.7.2
 
-Package: kdeedu
+Package: tdeedu
 Architecture: all
 Section: kde
-Depends: blinken (>= ${Source-Version}), kalzium (>= ${Source-Version}), kanagram (>= ${Source-Version}), kbruch (>= ${Source-Version}), kdeedu-data (>= ${Source-Version}), keduca (>= ${Source-Version}), kgeography (>= ${Source-Version}), khangman (>= ${Source-Version}), kig (>= ${Source-Version}), kiten (>= ${Source-Version}), klatin (>= ${Source-Version}), klettres (>= ${Source-Version}), kmplot (>= ${Source-Version}), kpercentage (>= ${Source-Version}), kstars (>= ${Source-Version}), ktouch (>= ${Source-Version}), kturtle (>= ${Source-Version}), kverbos (>= ${Source-Version}), kvoctrain (>= ${Source-Version}), kwordquiz (>= ${Source-Version}), indi (>= ${Source-Version})
-Suggests: kdeedu-doc-html
+Depends: blinken (>= ${Source-Version}), kalzium (>= ${Source-Version}), kanagram (>= ${Source-Version}), kbruch (>= ${Source-Version}), tdeedu-data (>= ${Source-Version}), keduca (>= ${Source-Version}), kgeography (>= ${Source-Version}), khangman (>= ${Source-Version}), kig (>= ${Source-Version}), kiten (>= ${Source-Version}), klatin (>= ${Source-Version}), klettres (>= ${Source-Version}), kmplot (>= ${Source-Version}), kpercentage (>= ${Source-Version}), kstars (>= ${Source-Version}), ktouch (>= ${Source-Version}), kturtle (>= ${Source-Version}), kverbos (>= ${Source-Version}), kvoctrain (>= ${Source-Version}), kwordquiz (>= ${Source-Version}), indi (>= ${Source-Version})
+Suggests: tdeedu-doc-html
 Description: educational apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -21,7 +21,7 @@ Description: educational apps from the official KDE release
  This metapackage includes educational applications provided with the
  official release of KDE.
 
-Package: kdeedu-data
+Package: tdeedu-data
 Architecture: all
 Section: kde
 Description: shared data for KDE educational applications
@@ -30,22 +30,22 @@ Description: shared data for KDE educational applications
  Environment).
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
-Package: kdeedu-dbg
+Package: tdeedu-dbg
 Architecture: any
 Priority: extra
-Depends: kdelibs-dbg
+Depends: tdelibs-dbg
 Section: libdevel
-Description: debugging symbols for kdeedu
- This package contains the debugging symbols associated with kdeedu.
- They will automatically be used by gdb for debugging kdeedu-related
+Description: debugging symbols for tdeedu
+ This package contains the debugging symbols associated with tdeedu.
+ They will automatically be used by gdb for debugging tdeedu-related
  issues.
 
-Package: kdeedu-doc-html
+Package: tdeedu-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror | www-browser, kdeedu
+Suggests: konqueror | www-browser, tdeedu
 Description: KDE edutainment documentation in HTML format
  By default the educational applications provided with KDE (the K
  Desktop Environment) only provide their documentation in KDE docbook
@@ -59,13 +59,13 @@ Description: KDE edutainment documentation in HTML format
  most KDE educational packages.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: blinken
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, ttf-sjfonts, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, ttf-sjfonts, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: KDE version of the Simon Says electronic memory game
  Blinken is based on an electronic game released in 1978, which
  challenges players to remember sequences of increasing length.  On
@@ -77,13 +77,13 @@ Description: KDE version of the Simon Says electronic memory game
  sequence with one extra step is presented.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kalzium
 Architecture: any
 Section: science
-Depends: ${shlibs:Depends}, kalzium-data (>> ${KDE-Version3}), kalzium-data (<< ${KDE-Next-Version3}), kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, kalzium-data (>> ${KDE-Version3}), kalzium-data (<< ${KDE-Next-Version3}), tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: chemistry teaching tool for KDE
  Kalzium is a program which shows you the Periodic System of Elements
  (PSE).  You can use Kalzium to search for information about the
@@ -102,7 +102,7 @@ Description: chemistry teaching tool for KDE
  equation solver.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kalzium-data
 Architecture: all
@@ -117,13 +117,13 @@ Description: data files for Kalzium
  See the kalzium package for further information.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kanagram
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: letter order game for KDE
  KAnagram is a game that is based on the word/letter puzzles that the
  author played as a child.  A word is picked at random and displayed
@@ -138,38 +138,38 @@ Description: letter order game for KDE
  is welcome to try.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kbruch
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: fraction calculation teaching tool for KDE
  KBruch is a small program to practice calculating with fractions.
  Different exercises are provided for this purpose.  The program
  checks the user's input and gives feedback.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: keduca
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: interactive form-based tests for KDE
  KEduca is a flash-card application which allows you to make
  interactive form-based tests.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kgeography
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kgeography-data (>> ${KDE-Version3}), kgeography-data (<< ${KDE-Next-Version3}), kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, kgeography-data (>> ${KDE-Version3}), kgeography-data (<< ${KDE-Next-Version3}), tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: Geography learning tool for KDE
  KGeography contains maps allowing you to learn various countries or
  the political divisions of several countries.  It has several modes,
@@ -177,7 +177,7 @@ Description: Geography learning tool for KDE
  flags of the map divisions.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kgeography-data
 Architecture: all
@@ -190,13 +190,13 @@ Description: data files for KGeography
  See the kgeography package for further information.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: khangman
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, ttf-dustin, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, ttf-dustin, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: the classical hangman game for KDE
  KHangMan is a game based on the well known hangman game.  It is aimed
  for children aged 6 and above.  It has four levels of difficulty:
@@ -208,13 +208,13 @@ Description: the classical hangman game for KDE
  guess the word before getting hanged!  You have 10 tries.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kig
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: interactive geometry program for KDE
  Kig is an application for interactive geometry.  It is intended to
  serve two purposes:
@@ -234,13 +234,13 @@ Description: interactive geometry program for KDE
  KGeo, KSeg and XFig.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kiten
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3}), ttf-kochi-gothic | ttf-kochi-mincho
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3}), ttf-kochi-gothic | ttf-kochi-mincho
+Suggests: khelpcenter, tdeedu-doc-html
 Description: Japanese reference/study tool for KDE
  Kiten is a Japanese reference and study tool for KDE.  It is an
  application with multiple functions.  Firstly, it is a convenient
@@ -249,13 +249,13 @@ Description: Japanese reference/study tool for KDE
  characters.  Thirdly, it is a tool to help you learn Kanji.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: klatin
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: application to help revise/teach Latin
  KLatin is a program to help revise Latin.  There are three "sections"
  in which different aspects of the language can be revised.  These are
@@ -272,13 +272,13 @@ Description: application to help revise/teach Latin
  indicative passive plural", and is not multiple choice.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: klettres
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, klettres-data (>> ${KDE-Version3}), klettres-data (<< ${KDE-Next-Version3}), kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, klettres-data (>> ${KDE-Version3}), klettres-data (<< ${KDE-Next-Version3}), tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: foreign alphabet tutor for KDE
  KLettres is an application specially designed to help the user to
  learn the alphabet in a new language and then to learn to read simple
@@ -289,7 +289,7 @@ Description: foreign alphabet tutor for KDE
  English, French, Italian and Slovak.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: klettres-data
 Architecture: all
@@ -303,13 +303,13 @@ Description: data files for KLettres foreign alphabet tutor
  See the klettres package for further information.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kmplot
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: mathematical function plotter for KDE
  KmPlot is a mathematical function plotter for KDE.  It has a powerful
  built-in parser.  You can plot different functions simultaneously and
@@ -325,13 +325,13 @@ Description: mathematical function plotter for KDE
  and plotting derivatives and integral functions.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kpercentage
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: percentage calculation teaching tool for KDE
  KPercentage is a small math application that will help pupils to
  improve their skills in calculating percentages.
@@ -341,13 +341,13 @@ Description: percentage calculation teaching tool for KDE
  are mixed randomly.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kstars
 Architecture: any
 Section: science
-Depends: ${shlibs:Depends}, kstars-data (>> ${KDE-Version3}), kstars-data (<< ${KDE-Next-Version3}), kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3}), indi (= ${Source-Version})
-Suggests: konqueror, khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, kstars-data (>> ${KDE-Version3}), kstars-data (<< ${KDE-Next-Version3}), tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3}), indi (= ${Source-Version})
+Suggests: konqueror, khelpcenter, tdeedu-doc-html
 Description: desktop planetarium for KDE
  KStars is a graphical desktop planetarium for KDE.  It depicts an
  accurate simulation of the night sky, including stars,
@@ -362,7 +362,7 @@ Description: desktop planetarium for KDE
  use.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kstars-data
 Architecture: all
@@ -376,13 +376,13 @@ Description: data files for KStars desktop planetarium
  See the kstars package for further information.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: ktouch
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: touch typing tutor for KDE
  KTouch is a program for learning touch typing - it helps you learn to
  type on a keyboard quickly and correctly.  Every finger has its place
@@ -394,13 +394,13 @@ Description: touch typing tutor for KDE
  to use.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kturtle
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: educational Logo programming environment
  KTurtle is an educational programming environment using the Logo
  programming language.  It tries to make programming as easy and
@@ -420,13 +420,13 @@ Description: educational Logo programming environment
  professional programmers' needs.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kverbos
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: Spanish verb form study application for KDE
  Kverbos allows the user to learn the forms of Spanish verbs.  The
  program suggests a verb and a time and the user enters the different
@@ -437,13 +437,13 @@ Description: Spanish verb form study application for KDE
  have to be entered by the user.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kvoctrain
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: vocabulary trainer for KDE
  KVocTrain is a little utility to help you train your vocabulary when
  you are trying to learn a foreign language.  You can create your own
@@ -461,13 +461,13 @@ Description: vocabulary trainer for KDE
  application.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: kwordquiz
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdeedu-data (>> ${KDE-Version3}), kdeedu-data (<< ${KDE-Next-Version3})
-Suggests: khelpcenter, kdeedu-doc-html
+Depends: ${shlibs:Depends}, tdeedu-data (>> ${KDE-Version3}), tdeedu-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, tdeedu-doc-html
 Description: flashcard and vocabulary learning program for KDE
  KWordQuiz is a flashcard-based tool that helps you to master new
  vocabularies. It may be a language or any other kind of terminology.
@@ -478,35 +478,35 @@ Description: flashcard and vocabulary learning program for KDE
  and xml.gz files created by Pauker (http://pauker.sourceforge.net).
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
-Package: libkdeedu3
+Package: libtdeedu3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Conflicts: libkdeedu1
-Replaces: libkdeedu1
+Conflicts: libtdeedu1
+Replaces: libtdeedu1
 Description: library for use with KDE educational apps
- The KDE-based library libkdeedu is used with educational
+ The KDE-based library libtdeedu is used with educational
  applications.  It currently provides support for data plotting and
  vocabulary items (including a parser for kvtml vocabulary files).
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
-Package: libkdeedu-dev
+Package: libtdeedu-dev
 Architecture: any
 Section: libdevel
-Depends: libkdeedu3 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: libtdeedu3 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
 Description: development files for KDE educational library
- The KDE-based library libkdeedu is used with educational
+ The KDE-based library libtdeedu is used with educational
  applications.  It currently provides support for data plotting and
  vocabulary items (including a parser for kvtml vocabulary files).
  .
- Development files for libkdeedu are included in this package.
+ Development files for libtdeedu are included in this package.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: libkiten1
 Architecture: any
@@ -525,12 +525,12 @@ Description: library for Kiten Japanese reference/study tool
  For further information, see the kiten package.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: libkiten-dev
 Architecture: any
 Section: libdevel
-Depends: libkiten1 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: libkiten1 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
 Description: development files for Kiten library
  Kiten is a Japanese reference/study tool for KDE.  The library
  libkiten contains portions of Kiten that may be useful for other
@@ -541,7 +541,7 @@ Description: development files for Kiten library
  further information, see the kiten package.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
 
 Package: indi
 Architecture: any
@@ -557,4 +557,4 @@ Description: Instrument Neutral Distributed Interface for astronomical devices
  based on the services provided by the device.
  .
  This package is part of KDE, as a component of the KDE education module.
- See the 'kde' and 'kdeedu' packages for more information.
+ See the 'kde' and 'tdeedu' packages for more information.
diff --git a/ubuntu/maverick/tdeedu/debian/copyright b/ubuntu/maverick/tdeedu/debian/copyright
index 272e4f376..7d67a2bfe 100644
--- a/ubuntu/maverick/tdeedu/debian/copyright
+++ b/ubuntu/maverick/tdeedu/debian/copyright
@@ -51,7 +51,7 @@ Upstream Authors:
   KVocTrain: Ewald Arnold <kvoctrain@ewald-arnold.de>,
       Peter Hedlund <peter@peterandlinda.com>
   KWordQuiz: Peter Hedlund <peter@peterandlinda.com>
-  libkdeedu: Scott Wheeler <wheeler@kde.org>,
+  libtdeedu: Scott Wheeler <wheeler@kde.org>,
       Jason Harris <jharris@30doradus.org>
 
 Copyright:
@@ -66,7 +66,7 @@ Copyright:
     KWordQuiz: GPL, though many source files are under the LGPL
     Libraries:
       libextdate.so: Sources under a mixture of GPL and LGPL
-      libkdeeducore.so: LGPL
+      libtdeeducore.so: LGPL
     DocBook documentation: (see below)
 
   On Debian GNU/Linux systems, the complete texts of the GPL and the LGPL
diff --git a/ubuntu/maverick/tdeedu/debian/indi-trinity.docs b/ubuntu/maverick/tdeedu/debian/indi-trinity.docs
index 4972ae664..352a6403d 100644
--- a/ubuntu/maverick/tdeedu/debian/indi-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/indi-trinity.docs
@@ -1 +1 @@
-build-tree/kdeedu-*/kstars/kstars/indi/README
+build-tree/tdeedu-*/kstars/kstars/indi/README
diff --git a/ubuntu/maverick/tdeedu/debian/kalzium-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/kalzium-trinity.README.Debian
index ab3aedfb9..d65c1bcb3 100644
--- a/ubuntu/maverick/tdeedu/debian/kalzium-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/kalzium-trinity.README.Debian
@@ -3,6 +3,6 @@ Kalzium for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeedu/debian/kalzium-trinity.docs b/ubuntu/maverick/tdeedu/debian/kalzium-trinity.docs
index a7127e507..d4bedeb0c 100644
--- a/ubuntu/maverick/tdeedu/debian/kalzium-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/kalzium-trinity.docs
@@ -1 +1 @@
-build-tree/kdeedu-*/kalzium/TODO
+build-tree/tdeedu-*/kalzium/TODO
diff --git a/ubuntu/maverick/tdeedu/debian/kanagram-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/kanagram-trinity.README.Debian
index 5c94d6832..1af240471 100644
--- a/ubuntu/maverick/tdeedu/debian/kanagram-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/kanagram-trinity.README.Debian
@@ -3,6 +3,6 @@ KMessedWords for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeedu/debian/kanagram-trinity.docs b/ubuntu/maverick/tdeedu/debian/kanagram-trinity.docs
index 99ffc3dc2..1557c8035 100644
--- a/ubuntu/maverick/tdeedu/debian/kanagram-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/kanagram-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/kanagram/DATA_FILE_TRANSLATION.readme
-build-tree/kdeedu-*/kanagram/TODO
+build-tree/tdeedu-*/kanagram/DATA_FILE_TRANSLATION.readme
+build-tree/tdeedu-*/kanagram/TODO
diff --git a/ubuntu/maverick/tdeedu/debian/kbruch-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/kbruch-trinity.README.Debian
index 3c67ecb17..424617cfe 100644
--- a/ubuntu/maverick/tdeedu/debian/kbruch-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/kbruch-trinity.README.Debian
@@ -3,6 +3,6 @@ KBruch for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sat, 31 Jan 2004 12:08:48 +1100
diff --git a/ubuntu/maverick/tdeedu/debian/kbruch-trinity.docs b/ubuntu/maverick/tdeedu/debian/kbruch-trinity.docs
index 9affc1576..336e1abbb 100644
--- a/ubuntu/maverick/tdeedu/debian/kbruch-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/kbruch-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/kbruch/AUTHORS
-build-tree/kdeedu-*/kbruch/TODO
+build-tree/tdeedu-*/kbruch/AUTHORS
+build-tree/tdeedu-*/kbruch/TODO
diff --git a/ubuntu/maverick/tdeedu/debian/keduca-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/keduca-trinity.README.Debian
index 042f785f1..b061f1f0a 100644
--- a/ubuntu/maverick/tdeedu/debian/keduca-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/keduca-trinity.README.Debian
@@ -3,6 +3,6 @@ KEduca for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeedu/debian/keduca-trinity.docs b/ubuntu/maverick/tdeedu/debian/keduca-trinity.docs
index 8999d5487..7741881ce 100644
--- a/ubuntu/maverick/tdeedu/debian/keduca-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/keduca-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/keduca/AUTHORS
-build-tree/kdeedu-*/keduca/TODO
+build-tree/tdeedu-*/keduca/AUTHORS
+build-tree/tdeedu-*/keduca/TODO
diff --git a/ubuntu/maverick/tdeedu/debian/kgeography-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/kgeography-trinity.README.Debian
index 90b3dd1a4..69c1e534f 100644
--- a/ubuntu/maverick/tdeedu/debian/kgeography-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/kgeography-trinity.README.Debian
@@ -3,6 +3,6 @@ KGeography for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Daniel Schepler <schepler@debian.org>, Tue Dec 13 23:02:33 2005
diff --git a/ubuntu/maverick/tdeedu/debian/kgeography-trinity.docs b/ubuntu/maverick/tdeedu/debian/kgeography-trinity.docs
index 1e7ef4e27..aebb229cb 100644
--- a/ubuntu/maverick/tdeedu/debian/kgeography-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/kgeography-trinity.docs
@@ -1,3 +1,3 @@
-build-tree/kdeedu-*/kgeography/AUTHORS
-build-tree/kdeedu-*/kgeography/README
-build-tree/kdeedu-*/kgeography/TODO
+build-tree/tdeedu-*/kgeography/AUTHORS
+build-tree/tdeedu-*/kgeography/README
+build-tree/tdeedu-*/kgeography/TODO
diff --git a/ubuntu/maverick/tdeedu/debian/khangman-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/khangman-trinity.README.Debian
index 3f9ecc785..da2935ff1 100644
--- a/ubuntu/maverick/tdeedu/debian/khangman-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/khangman-trinity.README.Debian
@@ -3,6 +3,6 @@ KHangMan for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeedu/debian/khangman-trinity.docs b/ubuntu/maverick/tdeedu/debian/khangman-trinity.docs
index 9b12a19b3..af4ab50be 100644
--- a/ubuntu/maverick/tdeedu/debian/khangman-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/khangman-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/khangman/AUTHORS
-build-tree/kdeedu-*/khangman/TODO
+build-tree/tdeedu-*/khangman/AUTHORS
+build-tree/tdeedu-*/khangman/TODO
diff --git a/ubuntu/maverick/tdeedu/debian/kig-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/kig-trinity.README.Debian
index 567300de0..00bf214c7 100644
--- a/ubuntu/maverick/tdeedu/debian/kig-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/kig-trinity.README.Debian
@@ -3,6 +3,6 @@ Kig for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sat, 31 Jan 2004 12:08:48 +1100
diff --git a/ubuntu/maverick/tdeedu/debian/kig-trinity.docs b/ubuntu/maverick/tdeedu/debian/kig-trinity.docs
index 0226b94bb..940a47920 100644
--- a/ubuntu/maverick/tdeedu/debian/kig-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/kig-trinity.docs
@@ -1,3 +1,3 @@
-build-tree/kdeedu-*/kig/AUTHORS
-build-tree/kdeedu-*/kig/FEATURES
-build-tree/kdeedu-*/kig/TODO
+build-tree/tdeedu-*/kig/AUTHORS
+build-tree/tdeedu-*/kig/FEATURES
+build-tree/tdeedu-*/kig/TODO
diff --git a/ubuntu/maverick/tdeedu/debian/kiten-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/kiten-trinity.README.Debian
index e860870ca..4efd3659b 100644
--- a/ubuntu/maverick/tdeedu/debian/kiten-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/kiten-trinity.README.Debian
@@ -3,6 +3,6 @@ Kiten for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeedu/debian/kiten-trinity.docs b/ubuntu/maverick/tdeedu/debian/kiten-trinity.docs
index 92cb85823..3c9f2f3bf 100644
--- a/ubuntu/maverick/tdeedu/debian/kiten-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/kiten-trinity.docs
@@ -1,3 +1,3 @@
-build-tree/kdeedu-*/kiten/AUTHORS
-build-tree/kdeedu-*/kiten/README
-build-tree/kdeedu-*/kiten/TODO
+build-tree/tdeedu-*/kiten/AUTHORS
+build-tree/tdeedu-*/kiten/README
+build-tree/tdeedu-*/kiten/TODO
diff --git a/ubuntu/maverick/tdeedu/debian/klatin-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/klatin-trinity.README.Debian
index 30c214675..f03b75aef 100644
--- a/ubuntu/maverick/tdeedu/debian/klatin-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/klatin-trinity.README.Debian
@@ -3,6 +3,6 @@ KLatin for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sat, 16 Oct 2004 15:32:36 +1000
diff --git a/ubuntu/maverick/tdeedu/debian/klatin-trinity.docs b/ubuntu/maverick/tdeedu/debian/klatin-trinity.docs
index df25d33f1..22306e756 100644
--- a/ubuntu/maverick/tdeedu/debian/klatin-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/klatin-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/klatin/AUTHORS
-build-tree/kdeedu-*/klatin/TODO
+build-tree/tdeedu-*/klatin/AUTHORS
+build-tree/tdeedu-*/klatin/TODO
diff --git a/ubuntu/maverick/tdeedu/debian/klettres-data-trinity.docs b/ubuntu/maverick/tdeedu/debian/klettres-data-trinity.docs
index 3f3b2d265..865db67c0 100644
--- a/ubuntu/maverick/tdeedu/debian/klettres-data-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/klettres-data-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/klettres/AUTHORS
-build-tree/kdeedu-*/klettres/TODO
+build-tree/tdeedu-*/klettres/AUTHORS
+build-tree/tdeedu-*/klettres/TODO
diff --git a/ubuntu/maverick/tdeedu/debian/klettres-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/klettres-trinity.README.Debian
index 2b3b8944e..0208d8dff 100644
--- a/ubuntu/maverick/tdeedu/debian/klettres-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/klettres-trinity.README.Debian
@@ -3,6 +3,6 @@ KLettres for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeedu/debian/klettres-trinity.docs b/ubuntu/maverick/tdeedu/debian/klettres-trinity.docs
index 3f3b2d265..865db67c0 100644
--- a/ubuntu/maverick/tdeedu/debian/klettres-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/klettres-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/klettres/AUTHORS
-build-tree/kdeedu-*/klettres/TODO
+build-tree/tdeedu-*/klettres/AUTHORS
+build-tree/tdeedu-*/klettres/TODO
diff --git a/ubuntu/maverick/tdeedu/debian/kmplot-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/kmplot-trinity.README.Debian
index f1e947ca3..85a642d3a 100644
--- a/ubuntu/maverick/tdeedu/debian/kmplot-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/kmplot-trinity.README.Debian
@@ -3,6 +3,6 @@ KmPlot for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeedu/debian/kmplot-trinity.docs b/ubuntu/maverick/tdeedu/debian/kmplot-trinity.docs
index 3c0de4f5d..f4e45eafe 100644
--- a/ubuntu/maverick/tdeedu/debian/kmplot-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/kmplot-trinity.docs
@@ -1 +1 @@
-build-tree/kdeedu-*/kmplot/TODO
+build-tree/tdeedu-*/kmplot/TODO
diff --git a/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.README.Debian
index 2864356e4..60cbe6af6 100644
--- a/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.README.Debian
@@ -3,6 +3,6 @@ KPercentage for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.docs b/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.docs
index 4c4a6a22e..33cdf33c0 100644
--- a/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.docs
@@ -1 +1 @@
-build-tree/kdeedu-*/kpercentage/TODO
+build-tree/tdeedu-*/kpercentage/TODO
diff --git a/ubuntu/maverick/tdeedu/debian/kstars-data-trinity.docs b/ubuntu/maverick/tdeedu/debian/kstars-data-trinity.docs
index 498ca09be..1666af4b8 100644
--- a/ubuntu/maverick/tdeedu/debian/kstars-data-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/kstars-data-trinity.docs
@@ -1,7 +1,7 @@
-build-tree/kdeedu-*/kstars/AUTHORS
-build-tree/kdeedu-*/kstars/README
-build-tree/kdeedu-*/kstars/README.customize
-build-tree/kdeedu-*/kstars/README.ephemerides
-build-tree/kdeedu-*/kstars/README.planetmath
-build-tree/kdeedu-*/kstars/README.timekeeping
-build-tree/kdeedu-*/kstars/TODO
+build-tree/tdeedu-*/kstars/AUTHORS
+build-tree/tdeedu-*/kstars/README
+build-tree/tdeedu-*/kstars/README.customize
+build-tree/tdeedu-*/kstars/README.ephemerides
+build-tree/tdeedu-*/kstars/README.planetmath
+build-tree/tdeedu-*/kstars/README.timekeeping
+build-tree/tdeedu-*/kstars/TODO
diff --git a/ubuntu/maverick/tdeedu/debian/kstars-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/kstars-trinity.README.Debian
index f709389fa..5969718d5 100644
--- a/ubuntu/maverick/tdeedu/debian/kstars-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/kstars-trinity.README.Debian
@@ -3,6 +3,6 @@ KStars for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeedu/debian/kstars-trinity.docs b/ubuntu/maverick/tdeedu/debian/kstars-trinity.docs
index 498ca09be..1666af4b8 100644
--- a/ubuntu/maverick/tdeedu/debian/kstars-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/kstars-trinity.docs
@@ -1,7 +1,7 @@
-build-tree/kdeedu-*/kstars/AUTHORS
-build-tree/kdeedu-*/kstars/README
-build-tree/kdeedu-*/kstars/README.customize
-build-tree/kdeedu-*/kstars/README.ephemerides
-build-tree/kdeedu-*/kstars/README.planetmath
-build-tree/kdeedu-*/kstars/README.timekeeping
-build-tree/kdeedu-*/kstars/TODO
+build-tree/tdeedu-*/kstars/AUTHORS
+build-tree/tdeedu-*/kstars/README
+build-tree/tdeedu-*/kstars/README.customize
+build-tree/tdeedu-*/kstars/README.ephemerides
+build-tree/tdeedu-*/kstars/README.planetmath
+build-tree/tdeedu-*/kstars/README.timekeeping
+build-tree/tdeedu-*/kstars/TODO
diff --git a/ubuntu/maverick/tdeedu/debian/ktouch-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/ktouch-trinity.README.Debian
index 7f42f52c0..1e9011ebd 100644
--- a/ubuntu/maverick/tdeedu/debian/ktouch-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/ktouch-trinity.README.Debian
@@ -3,6 +3,6 @@ KTouch for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeedu/debian/ktouch-trinity.docs b/ubuntu/maverick/tdeedu/debian/ktouch-trinity.docs
index b24780ab4..f62a18074 100644
--- a/ubuntu/maverick/tdeedu/debian/ktouch-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/ktouch-trinity.docs
@@ -1 +1 @@
-build-tree/kdeedu-*/ktouch/AUTHORS
+build-tree/tdeedu-*/ktouch/AUTHORS
diff --git a/ubuntu/maverick/tdeedu/debian/kturtle-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/kturtle-trinity.README.Debian
index 122150a00..6cfc8dbac 100644
--- a/ubuntu/maverick/tdeedu/debian/kturtle-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/kturtle-trinity.README.Debian
@@ -3,6 +3,6 @@ KTurtle for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sat, 16 Oct 2004 15:32:36 +1000
diff --git a/ubuntu/maverick/tdeedu/debian/kturtle-trinity.docs b/ubuntu/maverick/tdeedu/debian/kturtle-trinity.docs
index ef5b58bc9..b66109b8a 100644
--- a/ubuntu/maverick/tdeedu/debian/kturtle-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/kturtle-trinity.docs
@@ -1,2 +1,2 @@
-build-tree/kdeedu-*/kturtle/AUTHORS
-build-tree/kdeedu-*/kturtle/TODO
+build-tree/tdeedu-*/kturtle/AUTHORS
+build-tree/tdeedu-*/kturtle/TODO
diff --git a/ubuntu/maverick/tdeedu/debian/kverbos-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/kverbos-trinity.README.Debian
index a2a469e40..197071f05 100644
--- a/ubuntu/maverick/tdeedu/debian/kverbos-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/kverbos-trinity.README.Debian
@@ -3,6 +3,6 @@ Kverbos for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeedu/debian/kverbos-trinity.docs b/ubuntu/maverick/tdeedu/debian/kverbos-trinity.docs
index 950e6d59f..52c3fa74e 100644
--- a/ubuntu/maverick/tdeedu/debian/kverbos-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/kverbos-trinity.docs
@@ -1 +1 @@
-build-tree/kdeedu-*/kverbos/AUTHORS
+build-tree/tdeedu-*/kverbos/AUTHORS
diff --git a/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.README.Debian
index 6dcfee0ed..d9f42d1fe 100644
--- a/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.README.Debian
@@ -3,6 +3,6 @@ KVocTrain for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.docs b/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.docs
index a6f1a9161..4a4aa3f2d 100644
--- a/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.docs
@@ -1 +1 @@
-build-tree/kdeedu-*/kvoctrain/AUTHORS
+build-tree/tdeedu-*/kvoctrain/AUTHORS
diff --git a/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.README.Debian
index cf3009383..681ee1b28 100644
--- a/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.README.Debian
@@ -3,6 +3,6 @@ KWordQuiz for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sat, 16 Oct 2004 15:32:36 +1000
diff --git a/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.docs b/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.docs
index cb0875fed..124d517c7 100644
--- a/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.docs
+++ b/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.docs
@@ -1 +1 @@
-build-tree/kdeedu-*/kwordquiz/AUTHORS
+build-tree/tdeedu-*/kwordquiz/AUTHORS
diff --git a/ubuntu/maverick/tdeedu/debian/libkdeedu-dev-trinity.docs b/ubuntu/maverick/tdeedu/debian/libkdeedu-dev-trinity.docs
deleted file mode 100644
index 16da301c1..000000000
--- a/ubuntu/maverick/tdeedu/debian/libkdeedu-dev-trinity.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-build-tree/kdeedu-*/libkdeedu/AUTHORS
-build-tree/kdeedu-*/libkdeedu/README
diff --git a/ubuntu/maverick/tdeedu/debian/libkdeedu-dev-trinity.install b/ubuntu/maverick/tdeedu/debian/libkdeedu-dev-trinity.install
deleted file mode 100644
index 50fcf50ea..000000000
--- a/ubuntu/maverick/tdeedu/debian/libkdeedu-dev-trinity.install
+++ /dev/null
@@ -1,9 +0,0 @@
-/opt/trinity/include/kde/libkdeedu
-opt/trinity/lib/libextdate.la
-opt/trinity/lib/libextdate.so
-opt/trinity/lib/libkdeeducore.la
-opt/trinity/lib/libkdeeducore.so
-opt/trinity/lib/libkdeeduui.la
-opt/trinity/lib/libkdeeduui.so
-opt/trinity/lib/libkdeeduplot.la
-opt/trinity/lib/libkdeeduplot.so
diff --git a/ubuntu/maverick/tdeedu/debian/libkdeedu3-trinity.docs b/ubuntu/maverick/tdeedu/debian/libkdeedu3-trinity.docs
deleted file mode 100644
index 16da301c1..000000000
--- a/ubuntu/maverick/tdeedu/debian/libkdeedu3-trinity.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-build-tree/kdeedu-*/libkdeedu/AUTHORS
-build-tree/kdeedu-*/libkdeedu/README
diff --git a/ubuntu/maverick/tdeedu/debian/libkdeedu3-trinity.install b/ubuntu/maverick/tdeedu/debian/libkdeedu3-trinity.install
deleted file mode 100644
index 13f432e0e..000000000
--- a/ubuntu/maverick/tdeedu/debian/libkdeedu3-trinity.install
+++ /dev/null
@@ -1,8 +0,0 @@
-opt/trinity/lib/libextdate.so.1
-opt/trinity/lib/libextdate.so.1.2.0
-opt/trinity/lib/libkdeeducore.so.1
-opt/trinity/lib/libkdeeducore.so.1.2.0
-opt/trinity/lib/libkdeeduplot.so.1
-opt/trinity/lib/libkdeeduplot.so.1.2.0
-opt/trinity/lib/libkdeeduui.so.3
-opt/trinity/lib/libkdeeduui.so.3.0.5
diff --git a/ubuntu/maverick/tdeedu/debian/libkdeedu3-trinity.override b/ubuntu/maverick/tdeedu/debian/libkdeedu3-trinity.override
deleted file mode 100644
index 348d4ae74..000000000
--- a/ubuntu/maverick/tdeedu/debian/libkdeedu3-trinity.override
+++ /dev/null
@@ -1,2 +0,0 @@
-# This package contains several libraries.
-libkdeedu3-trinity: package-name-doesnt-match-sonames libkdeeduplot1-trinity libkdeeducore1-trinity libextdate1-trinity libkdeeduui3-trinity
diff --git a/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.docs b/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.docs
new file mode 100644
index 000000000..81fca1df6
--- /dev/null
+++ b/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.docs
@@ -0,0 +1,2 @@
+build-tree/tdeedu-*/libtdeedu/AUTHORS
+build-tree/tdeedu-*/libtdeedu/README
diff --git a/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.install b/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.install
new file mode 100644
index 000000000..be3af1e7b
--- /dev/null
+++ b/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.install
@@ -0,0 +1,9 @@
+/opt/trinity/include/kde/libtdeedu
+opt/trinity/lib/libextdate.la
+opt/trinity/lib/libextdate.so
+opt/trinity/lib/libtdeeducore.la
+opt/trinity/lib/libtdeeducore.so
+opt/trinity/lib/libtdeeduui.la
+opt/trinity/lib/libtdeeduui.so
+opt/trinity/lib/libtdeeduplot.la
+opt/trinity/lib/libtdeeduplot.so
diff --git a/ubuntu/maverick/tdeedu/debian/libkdeedu-dev-trinity.manpages b/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.manpages
index b1292516f..b1292516f 100644
--- a/ubuntu/maverick/tdeedu/debian/libkdeedu-dev-trinity.manpages
+++ b/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/libtdeedu3-trinity.docs b/ubuntu/maverick/tdeedu/debian/libtdeedu3-trinity.docs
new file mode 100644
index 000000000..81fca1df6
--- /dev/null
+++ b/ubuntu/maverick/tdeedu/debian/libtdeedu3-trinity.docs
@@ -0,0 +1,2 @@
+build-tree/tdeedu-*/libtdeedu/AUTHORS
+build-tree/tdeedu-*/libtdeedu/README
diff --git a/ubuntu/maverick/tdeedu/debian/libtdeedu3-trinity.install b/ubuntu/maverick/tdeedu/debian/libtdeedu3-trinity.install
new file mode 100644
index 000000000..0d3dced21
--- /dev/null
+++ b/ubuntu/maverick/tdeedu/debian/libtdeedu3-trinity.install
@@ -0,0 +1,8 @@
+opt/trinity/lib/libextdate.so.1
+opt/trinity/lib/libextdate.so.1.2.0
+opt/trinity/lib/libtdeeducore.so.1
+opt/trinity/lib/libtdeeducore.so.1.2.0
+opt/trinity/lib/libtdeeduplot.so.1
+opt/trinity/lib/libtdeeduplot.so.1.2.0
+opt/trinity/lib/libtdeeduui.so.3
+opt/trinity/lib/libtdeeduui.so.3.0.5
diff --git a/ubuntu/maverick/tdeedu/debian/libtdeedu3-trinity.override b/ubuntu/maverick/tdeedu/debian/libtdeedu3-trinity.override
new file mode 100644
index 000000000..0c60daec8
--- /dev/null
+++ b/ubuntu/maverick/tdeedu/debian/libtdeedu3-trinity.override
@@ -0,0 +1,2 @@
+# This package contains several libraries.
+libtdeedu3-trinity: package-name-doesnt-match-sonames libtdeeduplot1-trinity libtdeeducore1-trinity libextdate1-trinity libtdeeduui3-trinity
diff --git a/ubuntu/maverick/tdeedu/debian/man/blinken-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/blinken-trinity.1
index 2709e95d1..fb910889e 100644
--- a/ubuntu/maverick/tdeedu/debian/man/blinken-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/blinken-trinity.1
@@ -42,7 +42,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/blinken/\fP.
 .SH AUTHOR
 Blinken was written by Albert Astals Cid <tsdgeos@terra.es> and
diff --git a/ubuntu/maverick/tdeedu/debian/man/celestrongps-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/celestrongps-trinity.1
index 74dbb9a9a..97c930e5b 100644
--- a/ubuntu/maverick/tdeedu/debian/man/celestrongps-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/celestrongps-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/fliccd-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/fliccd-trinity.1
index 68ccee902..bddac3b61 100644
--- a/ubuntu/maverick/tdeedu/debian/man/fliccd-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/fliccd-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/indiserver-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/indiserver-trinity.1
index 8177f5464..35ecd6952 100644
--- a/ubuntu/maverick/tdeedu/debian/man/indiserver-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/indiserver-trinity.1
@@ -109,7 +109,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/kalzium-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kalzium-trinity.1
index 76cb8ab42..2f1fa5a44 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kalzium-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kalzium-trinity.1
@@ -46,7 +46,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kalzium/\fP.
 .SH AUTHOR
 Kalzium was written by Carsten Niehaus <cniehaus@kde.org>.
diff --git a/ubuntu/maverick/tdeedu/debian/man/kanagram-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kanagram-trinity.1
index 69416a922..3990c7e98 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kanagram-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kanagram-trinity.1
@@ -43,7 +43,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kanagram/\fP.
 .SH AUTHOR
 KAnagram was written by Joshua Keel <joshuakeel@gmail.com> and
diff --git a/ubuntu/maverick/tdeedu/debian/man/kbruch-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kbruch-trinity.1
index 78feef9cb..c57370906 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kbruch-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kbruch-trinity.1
@@ -37,7 +37,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kbruch/\fP.
 .SH AUTHOR
 KBruch was written by Sebastian Stein <seb.kde@hpfsc.de>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/keduca-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/keduca-trinity.1
index 60e31066d..4f265e43b 100644
--- a/ubuntu/maverick/tdeedu/debian/man/keduca-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/keduca-trinity.1
@@ -42,7 +42,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/keduca/\fP.
 .SH AUTHOR
 KEduca was written by Javier Campos <javi@asyris.org>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/keducabuilder-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/keducabuilder-trinity.1
index 39c9a04d6..8ebe53045 100644
--- a/ubuntu/maverick/tdeedu/debian/man/keducabuilder-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/keducabuilder-trinity.1
@@ -42,7 +42,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/keduca/\fP.
 .SH AUTHOR
 KEduca was written by Javier Campos <javi@asyris.org>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/kgeography-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kgeography-trinity.1
index 45ee113fe..4f340d39f 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kgeography-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kgeography-trinity.1
@@ -38,7 +38,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kgeography/\fP.
 .SH AUTHOR
 KGeography was written by Albert Astals Cid <tsdgeos@terra.es>.
diff --git a/ubuntu/maverick/tdeedu/debian/man/khangman-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/khangman-trinity.1
index 8b0ad5df2..be0f29cbf 100644
--- a/ubuntu/maverick/tdeedu/debian/man/khangman-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/khangman-trinity.1
@@ -42,7 +42,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/khangman/\fP.
 .SH AUTHOR
 KHangMan was written by Primoz Anzur <zerokode@gmx.net> and
diff --git a/ubuntu/maverick/tdeedu/debian/man/kig-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kig-trinity.1
index aa1916852..1c9089adb 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kig-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kig-trinity.1
@@ -69,7 +69,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kig/\fP.
 .SH AUTHOR
 Kig was written by Dominique Devriese <devriese@kde.org>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/kiten-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kiten-trinity.1
index f3802f2f7..51942642e 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kiten-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kiten-trinity.1
@@ -41,7 +41,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kiten/\fP.
 .SH AUTHOR
 Kiten was written by Jason Katz-Brown <jason@katzbrown.com>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/kitengen-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kitengen-trinity.1
index 8614e64a4..b3926aec9 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kitengen-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kitengen-trinity.1
@@ -44,7 +44,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kiten/\fP.
 .SH AUTHOR
 Kiten was written by Jason Katz-Brown <jason@katzbrown.com>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/klatin-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/klatin-trinity.1
index 1df356b85..7ce6d33a0 100644
--- a/ubuntu/maverick/tdeedu/debian/man/klatin-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/klatin-trinity.1
@@ -47,7 +47,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/klatin/\fP.
 .SH AUTHOR
 KLatin was written by George Wright <gwright@kde.org> and others.
diff --git a/ubuntu/maverick/tdeedu/debian/man/klettres-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/klettres-trinity.1
index 957860b1e..a241fa4f0 100644
--- a/ubuntu/maverick/tdeedu/debian/man/klettres-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/klettres-trinity.1
@@ -41,7 +41,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/klettres/\fP.
 .SH AUTHOR
 KLettres was written by Anne-Marie Mahfouf <annma@kde.org> and many others.
diff --git a/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1
index 9c6ece5df..427e97137 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1
@@ -48,7 +48,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kmplot/\fP.
 .SH AUTHOR
 KmPlot was written by Klaus-Dieter Moeller <kdmoeller@foni.net>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/kpercentage-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kpercentage-trinity.1
index 9d1fd916c..00eead897 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kpercentage-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kpercentage-trinity.1
@@ -40,7 +40,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kpercentage/\fP.
 .SH AUTHOR
 KPercentage was written by Matthias Messmer <bmlmessmer@web.de>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/kstars-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kstars-trinity.1
index 2049ba113..28e2769a6 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kstars-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kstars-trinity.1
@@ -103,7 +103,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/ktouch-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/ktouch-trinity.1
index 52735f459..f16100d86 100644
--- a/ubuntu/maverick/tdeedu/debian/man/ktouch-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/ktouch-trinity.1
@@ -46,7 +46,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/ktouch/\fP.
 .SH AUTHOR
 KTouch was written by Haavard Froeiland <haavard@users.sourceforge.net>
diff --git a/ubuntu/maverick/tdeedu/debian/man/kturtle-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kturtle-trinity.1
index 1131b08b3..87142fc2d 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kturtle-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kturtle-trinity.1
@@ -50,7 +50,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kturtle/\fP.
 .SH AUTHOR
 KTurtle was written by Cies Breijs <cies # kde.nl>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/kverbos-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kverbos-trinity.1
index 607896ac6..3dc070868 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kverbos-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kverbos-trinity.1
@@ -45,7 +45,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kverbos/\fP.
 .SH AUTHOR
 Kverbos was written by Arnold Kraschinski <arnold.k67@gmx.de>.
diff --git a/ubuntu/maverick/tdeedu/debian/man/kvoctrain-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kvoctrain-trinity.1
index 0c6556b8d..9a738f419 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kvoctrain-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kvoctrain-trinity.1
@@ -50,7 +50,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kvoctrain/\fP.
 .SH AUTHOR
 KVocTrain was written by Ewald Arnold <kvoctrain@ewald-arnold.de>
diff --git a/ubuntu/maverick/tdeedu/debian/man/kwordquiz-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kwordquiz-trinity.1
index fb5a8f6db..dd2d9d1c6 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kwordquiz-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kwordquiz-trinity.1
@@ -60,7 +60,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kwordquiz/\fP.
 .SH AUTHOR
 KWordQuiz was written by Peter Hedlund <peter@peterandlinda.com>.
diff --git a/ubuntu/maverick/tdeedu/debian/man/lx200_16-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/lx200_16-trinity.1
index 81e31dce1..a15ba93f1 100644
--- a/ubuntu/maverick/tdeedu/debian/man/lx200_16-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/lx200_16-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/lx200autostar-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/lx200autostar-trinity.1
index e95529bf9..2067b14a5 100644
--- a/ubuntu/maverick/tdeedu/debian/man/lx200autostar-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/lx200autostar-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/lx200classic-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/lx200classic-trinity.1
index dc49b1cdd..1adef37dd 100644
--- a/ubuntu/maverick/tdeedu/debian/man/lx200classic-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/lx200classic-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/lx200generic-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/lx200generic-trinity.1
index 20271620f..d1a78b97e 100644
--- a/ubuntu/maverick/tdeedu/debian/man/lx200generic-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/lx200generic-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/lx200gps-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/lx200gps-trinity.1
index 0a9543b2d..edd53b5de 100644
--- a/ubuntu/maverick/tdeedu/debian/man/lx200gps-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/lx200gps-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/temma-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/temma-trinity.1
index 6b48dba6b..6bdcc633a 100644
--- a/ubuntu/maverick/tdeedu/debian/man/temma-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/temma-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/test_extdate-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/test_extdate-trinity.1
index f515e0d87..cf2006585 100644
--- a/ubuntu/maverick/tdeedu/debian/man/test_extdate-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/test_extdate-trinity.1
@@ -37,7 +37,7 @@ This library is part of the official KDE edutainment module.
 .SH SEE ALSO
 .BR test_extdatepicker (1).
 .PP
-See \fI/opt/trinity/share/doc/libkdeedu-dev/README.extdate\fP for further
+See \fI/opt/trinity/share/doc/libtdeedu-dev/README.extdate\fP for further
 information on this library.
 .SH AUTHOR
 The ExtDate library was written by Jason Harris <jharris@30doradus.org>
diff --git a/ubuntu/maverick/tdeedu/debian/man/test_extdatepicker-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/test_extdatepicker-trinity.1
index c207c51d8..f2112913e 100644
--- a/ubuntu/maverick/tdeedu/debian/man/test_extdatepicker-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/test_extdatepicker-trinity.1
@@ -40,7 +40,7 @@ For a full summary of options, run \fItest_extdatepicker \-\-help\fP.
 .SH SEE ALSO
 .BR test_extdate (1).
 .PP
-See \fI/opt/trinity/share/doc/libkdeedu-dev/README.extdate\fP for further
+See \fI/opt/trinity/share/doc/libtdeedu-dev/README.extdate\fP for further
 information on this library.
 .SH AUTHOR
 The ExtDate library was written by Jason Harris <jharris@30doradus.org>
diff --git a/ubuntu/maverick/tdeedu/debian/man/v4ldriver-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/v4ldriver-trinity.1
index 8a2ae5136..b53755563 100644
--- a/ubuntu/maverick/tdeedu/debian/man/v4ldriver-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/v4ldriver-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/v4lphilips-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/v4lphilips-trinity.1
index 222a3ee9e..b56ca96cf 100644
--- a/ubuntu/maverick/tdeedu/debian/man/v4lphilips-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/v4lphilips-trinity.1
@@ -55,7 +55,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fItdeedu-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
diff --git a/ubuntu/maverick/tdeedu/debian/rules b/ubuntu/maverick/tdeedu/debian/rules
index 9cdc7b73e..b19d3d32f 100755
--- a/ubuntu/maverick/tdeedu/debian/rules
+++ b/ubuntu/maverick/tdeedu/debian/rules
@@ -49,7 +49,7 @@ DEB_INSTALL_DOCS_ALL :=
 
 DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done)
 
-DEB_DH_MAKESHLIBS_ARGS_libkdeedu3-trinity := -V'libkdeedu3-trinity (>= 4:3.5.8)'
+DEB_DH_MAKESHLIBS_ARGS_libtdeedu3-trinity := -V'libtdeedu3-trinity (>= 4:3.5.8)'
 DEB_DH_MAKESHLIBS_ARGS_libkiten1-trinity := -V'libkiten1-trinity (>= 4:3.5.8)'
 
-PACKAGES_WITH_LIBS := libkdeedu3-trinity libkiten1-trinity kvoctrain-trinity
+PACKAGES_WITH_LIBS := libtdeedu3-trinity libkiten1-trinity kvoctrain-trinity
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-data-trinity.install b/ubuntu/maverick/tdeedu/debian/tdeedu-data-trinity.install
index 021e2b38d..021e2b38d 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-data-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-data-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.blinken b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.blinken
index 4391fbe96..4391fbe96 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.blinken
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.blinken
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kalzium b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kalzium
index c7a3e23a3..c7a3e23a3 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kalzium
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kalzium
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kbruch b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kbruch
index 3a2ca7ed2..3a2ca7ed2 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kbruch
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kbruch
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.keduca b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.keduca
index f8ef86fbb..f8ef86fbb 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.keduca
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.keduca
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kgeography b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kgeography
index 5f263705b..5f263705b 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kgeography
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kgeography
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.khangman b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.khangman
index f01c66ba2..f01c66ba2 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.khangman
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.khangman
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kig b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kig
index f7f63bac4..f7f63bac4 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kig
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kig
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kiten b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kiten
index 9339500ee..9339500ee 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kiten
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kiten
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.klatin b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.klatin
index ba3750a70..ba3750a70 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.klatin
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.klatin
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.klettres b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.klettres
index 504bd1cca..504bd1cca 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.klettres
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.klettres
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kmplot b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kmplot
index 8e8350ba8..8e8350ba8 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kmplot
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kmplot
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kpercentage b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kpercentage
index 1f8972434..1f8972434 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kpercentage
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kpercentage
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kstars b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kstars
index 2c0544de6..2c0544de6 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kstars
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kstars
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.ktouch b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.ktouch
index 9908362ca..9908362ca 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.ktouch
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.ktouch
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kturtle b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kturtle
index cde120379..cde120379 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kturtle
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kturtle
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kverbos b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kverbos
index 49faf645e..49faf645e 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kverbos
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kverbos
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kvoctrain b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kvoctrain
index af4dca29e..af4dca29e 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kvoctrain
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kvoctrain
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kwordquiz b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kwordquiz
index 290adbc1f..290adbc1f 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-doc-html.doc-base.kwordquiz
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kwordquiz
diff --git a/ubuntu/maverick/tdeedu/debian/kdeedu-trinity.README.Debian b/ubuntu/maverick/tdeedu/debian/tdeedu-trinity.README.Debian
index f608d0cfb..0e0c0b0a5 100644
--- a/ubuntu/maverick/tdeedu/debian/kdeedu-trinity.README.Debian
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-trinity.README.Debian
@@ -1,11 +1,11 @@
 KDE Educational Applications for Debian
 ---------------------------------------
 
-Package kdeedu is a metapackage that depends on the full set of
+Package tdeedu is a metapackage that depends on the full set of
 edutainment applications provided with the official release of KDE.
 
 Each application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdeedu-doc-html.
+web browser, see the package tdeedu-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick/tdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES
index e51f03050..80da007ae 100644
--- a/ubuntu/maverick/tdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/maverick/tdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -2,5 +2,5 @@ not DEB_KDE_CVS_MAKE
 remove from rules clean:: rm -f patches and .tar.bz2
 don't build-dep on automake1.9
 remove stamp-libtool rules (3 of them) from debian/rules
-kdegames suggests khelpcentre
+tdegames suggests khelpcentre
 remove clean rule
diff --git a/ubuntu/maverick/tdegames/debian/changelog b/ubuntu/maverick/tdegames/debian/changelog
index 87bf8d4cb..4a2687c2a 100644
--- a/ubuntu/maverick/tdegames/debian/changelog
+++ b/ubuntu/maverick/tdegames/debian/changelog
@@ -1,49 +1,49 @@
-kdegames-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
+tdegames-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdegames-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
+tdegames-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 28 Feb 2009 16:19:00 -0600
 
-kdegames-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
+tdegames-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
   * SVN import
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 26 Sep 2008 20:33:00 -0600
 
-kdegames (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdegames (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
-    - Bump version of kdelibs4-dev build dep to 3.5.10
+    - Bump version of tdelibs4-dev build dep to 3.5.10
     - Drop 11_include_kapplication.diff - applied upstream 
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:42:38 -0400
 
-kdegames (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdegames (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:06 +0000
 
-kdegames (4:3.5.8-1ubuntu3) hardy; urgency=low
+tdegames (4:3.5.8-1ubuntu3) hardy; urgency=low
 
   * Remove clean: rule, redundant since we do not use tar inside .orig.tar
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 19:19:49 +0000
 
-kdegames (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdegames (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 10:25:56 +0000
 
-kdegames (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdegames (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining changes:
    - not DEB_KDE_CVS_MAKE
@@ -53,48 +53,48 @@ kdegames (4:3.5.8-1ubuntu1) hardy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:41 +0000
 
-kdegames (4:3.5.8-1) unstable; urgency=low
+tdegames (4:3.5.8-1) unstable; urgency=low
 
   * New upstream release.
   * Implement use of uploades.mk and update uploaders.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 14 Oct 2007 17:35:09 +0200
 
-kdegames (4:3.5.7-2) unstable; urgency=low
+tdegames (4:3.5.7-2) unstable; urgency=low
 
   * Add patch to include kapplication.h in katomic. Fixes build failure on
     alpha. Thanks to Steve Langasek for the fix.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 22 Jan 2007 05:59:42 +0100
 
-kdegames (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdegames (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:24 +0100
 
-kdegames (4:3.5.7-1ubuntu2) gutsy; urgency=low
+tdegames (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
   * Fix build failures with g++-4.3. LP: #138593.
 
  -- Matthias Klose <doko@ubuntu.com>  Thu, 13 Sep 2007 00:43:42 +0000
 
-kdegames (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdegames (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   [ Sarah Hobbs ]
   * Merge with Debian for new upstream version, remaining
     changes in KUBUNTU-DEBIAN-DIFFERENCES
   * Closes bug 
-    https://bugs.launchpad.net/ubuntu/+source/kdegames/+bug/70264
+    https://bugs.launchpad.net/ubuntu/+source/tdegames/+bug/70264
     "knetwalk does not have a .desktop file"
-  * Add Suggests: khelpcenter to kdegames.  Closes bug #115523
+  * Add Suggests: khelpcenter to tdegames.  Closes bug #115523
 
   [ Jonathan Riddell ]
-  * Build-dep on kdelibs 3.5.7
+  * Build-dep on tdelibs 3.5.7
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Tue, 22 May 2007 11:07:00 +1000
 
-kdegames (4:3.5.7-1) unstable; urgency=low
+tdegames (4:3.5.7-1) unstable; urgency=low
 
   * New upstream release.
   * Switch away from tarball.mk.
@@ -103,25 +103,25 @@ kdegames (4:3.5.7-1) unstable; urgency=low
 
  -- Sune Vuorela <debian@pusling.com>  Tue, 15 May 2007 12:40:00 +0200
 
-kdegames (4:3.5.6-2ubuntu2) gutsy; urgency=low
+tdegames (4:3.5.6-2ubuntu2) gutsy; urgency=low
 
   * Remove stamp libtool rules from debian/rules, fixes compile
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 02 May 2007 17:13:48 +0100
 
-kdegames (4:3.5.6-2ubuntu1) gutsy; urgency=low
+tdegames (4:3.5.6-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 20:32:54 +0100
 
-kdegames (4:3.5.6-2) unstable; urgency=low
+tdegames (4:3.5.6-2) unstable; urgency=low
 
   * Upload to unstable after Etch release.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 19 Apr 2007 13:03:44 +0200
 
-kdegames (4:3.5.6-1) experimental; urgency=low
+tdegames (4:3.5.6-1) experimental; urgency=low
 
   [ Daniel Schepler ]
   * Fix override disparity in debian/control.
@@ -130,7 +130,7 @@ kdegames (4:3.5.6-1) experimental; urgency=low
   * Add 10_fix_highscores_display.diff to read the correct high scores config
     key and copy over high scores from the old config key if it exists and the
     new one doesn't. Closes: #396563.
-  * Make kdegames-dbg depend on kdelibs-dbg to get useful backtraces when
+  * Make tdegames-dbg depend on tdelibs-dbg to get useful backtraces when
     debugging. 
     
   [Ana Beatriz Guerrero Lopez]
@@ -139,37 +139,37 @@ kdegames (4:3.5.6-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 22 Jan 2007 05:59:42 +0100
 
-kdegames (4:3.5.6-0ubuntu2) feisty; urgency=low
+tdegames (4:3.5.6-0ubuntu2) feisty; urgency=low
 
   * Re-run buildprep to fix build failure
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 13 Mar 2007 00:20:14 +0000
 
-kdegames (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdegames (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:30 +0000
 
-kdegames (4:3.5.5-1ubuntu2) feisty; urgency=low
+tdegames (4:3.5.5-1ubuntu2) feisty; urgency=low
 
   * rebuild with --enable-gcc-hidden-visibility
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 19:39:16 +0000
 
-kdegames (4:3.5.5-1ubuntu1) feisty; urgency=low
+tdegames (4:3.5.5-1ubuntu1) feisty; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Nov 2006 23:07:26 +0000
 
-kdegames (4:3.5.5-1) unstable; urgency=low
+tdegames (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Daniel Schepler <schepler@debian.org>  Sun,  8 Oct 2006 10:34:10 +0200
 
-kdegames (4:3.5.4-2) unstable; urgency=low
+tdegames (4:3.5.4-2) unstable; urgency=low
 
   * KDE_3_5_BRANCH update (up to r577498).
 
@@ -181,7 +181,7 @@ kdegames (4:3.5.4-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 26 Aug 2006 17:00:43 -0400
 
-kdegames (4:3.5.4-1) unstable; urgency=low
+tdegames (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
     + Fixes detection of autoconf version 2.60.  Closes: #379816.
@@ -189,69 +189,69 @@ kdegames (4:3.5.4-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sat, 29 Jul 2006 07:01:47 -0400
 
-kdegames (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdegames (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:05 +0000
 
-kdegames (4:3.5.4-0ubuntu4) edgy; urgency=low
+tdegames (4:3.5.4-0ubuntu4) edgy; urgency=low
 
   * Rebuild with latest cdbs to add gettext domain to .desktop files for
     langpacks-desktopfiles-kde, no source changes
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Sep 2006 22:53:12 +0000
 
-kdegames (4:3.5.4-0ubuntu3) edgy; urgency=low
+tdegames (4:3.5.4-0ubuntu3) edgy; urgency=low
 
-  * Build-dep on kdelibs 0ubuntu8, fixes fail to build
+  * Build-dep on tdelibs 0ubuntu8, fixes fail to build
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 30 Aug 2006 16:19:15 +0000
 
-kdegames (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdegames (4:3.5.4-0ubuntu2) edgy; urgency=low
 
   * Rebuild against dbus 0.90
 
  -- Sebastian Dröge <slomo@ubuntu.com>  Thu, 24 Aug 2006 17:54:20 +0200
 
-kdegames (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdegames (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:18 +0000
 
-kdegames (4:3.5.3-0ubuntu1) edgy; urgency=low
+tdegames (4:3.5.3-0ubuntu1) edgy; urgency=low
 
   * New upstream Release
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Jul 2006 10:45:54 +0000
 
-kdegames (4:3.5.2-1) unstable; urgency=low
+tdegames (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Daniel Schepler <schepler@debian.org>  Wed,  5 Apr 2006 10:07:11 +0200
 
-kdegames (4:3.5.1-1) unstable; urgency=low
+tdegames (4:3.5.1-1) unstable; urgency=low
 
   * New upstream version.
-  * New package: kdegames-dbg, to make debugging symbols available.
+  * New package: tdegames-dbg, to make debugging symbols available.
   * Make new kmahjongg docs available to doc-base.
   * Update kmahjongg man page to point to new docs.
-  * Distribute _kbattleship._tcp now that kdelibs is avahi-enabled.
+  * Distribute _kbattleship._tcp now that tdelibs is avahi-enabled.
 
  -- Daniel Schepler <schepler@debian.org>  Sun,  5 Feb 2006 01:31:20 +0100
 
-kdegames (4:3.5.0-3) unstable; urgency=low
+tdegames (4:3.5.0-3) unstable; urgency=low
 
   * Upload to unstable.
   * Update to SVN branches/KDE/3.5, up to revision 496050.
-  * Tighten versioning of Build-Depends on kdelibs4-dev.
+  * Tighten versioning of Build-Depends on tdelibs4-dev.
 
  -- Daniel Schepler <schepler@debian.org>  Mon,  9 Jan 2006 23:00:32 +0100
 
-kdegames (4:3.5.0-2) experimental; urgency=low
+tdegames (4:3.5.0-2) experimental; urgency=low
 
   * Upload to experimental.
   * Bump debian/compat to 5.
@@ -259,7 +259,7 @@ kdegames (4:3.5.0-2) experimental; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Tue, 20 Dec 2005 10:11:14 +0100
 
-kdegames (4:3.5.0-1) alioth; urgency=low
+tdegames (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
   * New package: knetwalk.
@@ -268,7 +268,7 @@ kdegames (4:3.5.0-1) alioth; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Thu,  8 Dec 2005 16:49:13 +0100
 
-kdegames (4:3.4.3-2) unstable; urgency=low
+tdegames (4:3.4.3-2) unstable; urgency=low
 
   * Upload to unstable.
   * Apply updates from the SVN 3.4 branch.
@@ -276,44 +276,44 @@ kdegames (4:3.4.3-2) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Thu,  1 Dec 2005 13:29:15 +0100
 
-kdegames (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdegames (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * debian/cdbs/kde.mk:
     - added dh_iconcache.
 
  -- Daniel Holbach <daniel.holbach@ubuntu.com>  Sun, 21 May 2006 16:29:24 +0200
 
-kdegames (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdegames (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:29 +0100
 
-kdegames (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdegames (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:30 +0000
 
-kdegames (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdegames (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:06 +0000
 
-kdegames (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdegames (4:3.5.0-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Dec 2005 12:27:52 +0000
 
-kdegames (4:3.5-rc2-0ubuntu2) dapper; urgency=low
+tdegames (4:3.5-rc2-0ubuntu2) dapper; urgency=low
 
-  * Include correct path in debian/libkdegames-doc.install
+  * Include correct path in debian/libtdegames-doc.install
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 26 Nov 2005 16:40:53 +0000
 
-kdegames (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdegames (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Generate .pot files
@@ -321,7 +321,7 @@ kdegames (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 22 Nov 2005 16:57:38 +0000
 
-kdegames (4:3.5-rc1-0ubuntu1) dapper; urgency=low
+tdegames (4:3.5-rc1-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Sync with Debian
@@ -329,80 +329,80 @@ kdegames (4:3.5-rc1-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 13 Nov 2005 23:48:35 +0000
 
-kdegames (4:3.4.3-1) experimental; urgency=low
+tdegames (4:3.4.3-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Daniel Schepler <schepler@debian.org>  Tue, 18 Oct 2005 11:15:22 +0200
 
-kdegames (4:3.4.2-1) unstable; urgency=low
+tdegames (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
   * GCC 4.0 transition: Tighten Build-Depends on libarts1-dev and
-    kdelibs4-dev to ensure we get g++-4.0 compiled versions.
+    tdelibs4-dev to ensure we get g++-4.0 compiled versions.
   * Remove obsolete Conflicts/Replaces/Provides against packages not in
     sarge.
 
  -- Daniel Schepler <schepler@debian.org>  Fri, 26 Aug 2005 02:25:46 -0700
 
-kdegames (4:3.4.1-1) experimental; urgency=low
+tdegames (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Daniel Schepler <schepler@debian.org>  Thu,  2 Jun 2005 05:59:32 -0700
 
-kdegames (4:3.4.3-0ubuntu2) dapper; urgency=low
+tdegames (4:3.4.3-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_02_gcc_403_fix.diff to fix GCC 4.0.3 compile fail
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 29 Oct 2005 15:19:59 +0000
 
-kdegames (4:3.4.3-0ubuntu1) breezy; urgency=low
+tdegames (4:3.4.3-0ubuntu1) breezy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  7 Oct 2005 19:56:00 +0000
 
-kdegames (4:3.4.2-0ubuntu1) breezy; urgency=low
+tdegames (4:3.4.2-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Build using unsermake
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 16:24:46 +0000
 
-kdegames (4:3.4.1-0ubuntu1) breezy; urgency=low
+tdegames (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number following KDE release
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed,  1 Jun 2005 00:34:15 +0000
 
-kdegames (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+tdegames (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 26 May 2005 18:43:53 +0000
 
-kdegames (4:3.4.0-0ubuntu2) hoary; urgency=low
+tdegames (4:3.4.0-0ubuntu2) hoary; urgency=low
 
   * Replace 02_disable_no_undefined.diff with blank file. Since it is
     in the .orig it can not be deleted.
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 13:40:26 +0000
 
-kdegames (4:3.4.0-0ubuntu1) hoary; urgency=low
+tdegames (4:3.4.0-0ubuntu1) hoary; urgency=low
 
   * Remove duplicate patch 02_disable_no_undefined.diff
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 03:07:55 +0000
 
-kdegames (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+tdegames (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
 
   * Sync with Debian
   * Remove usage of tarball.mk from rules
 
  -- Chris Halls <chris.halls@credativ.co.uk>  Tue,  8 Mar 2005 16:00:48 +0000
 
-kdegames (4:3.4.0-0pre1) alioth; urgency=low
+tdegames (4:3.4.0-0pre1) alioth; urgency=low
 
   * New upstream release.
   * Change to using upstream tar.bz2.
@@ -411,30 +411,30 @@ kdegames (4:3.4.0-0pre1) alioth; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sat,  5 Mar 2005 14:54:17 -0800
 
-kdegames (4:3.3.2-1) unstable; urgency=low
+tdegames (4:3.3.2-1) unstable; urgency=low
 
   * Uploading to unstable.
   * Includes updates from KDE_3_3_BRANCH (mostly translation updates).
 
  -- Daniel Schepler <schepler@debian.org>  Wed, 19 Jan 2005 19:48:32 -0800
 
-kdegames (4:3.3.2-1ubuntu1) hoary; urgency=low
+tdegames (4:3.3.2-1ubuntu1) hoary; urgency=low
 
   * New upstream release.
 
  -- Andreas Mueller <amu@canonical.com>  Fri, 31 Dec 2004 16:55:41 +0100 
 
-kdegames (4:3.3.2-0pre1) experimental; urgency=low
+tdegames (4:3.3.2-0pre1) experimental; urgency=low
 
   * New upstream release.
   * Drop useless static libs.
 
  -- Daniel Schepler <schepler@debian.org>  Fri, 17 Dec 2004 21:55:40 -0800
 
-kdegames (4:3.3.1-1) unstable; urgency=low
+tdegames (4:3.3.1-1) unstable; urgency=low
 
   * New upstream release.
-  * Rename 01_kdegames_branch.diff to 10_kdegames_branch.diff.
+  * Rename 01_tdegames_branch.diff to 10_tdegames_branch.diff.
   * New patch 04_disable_static_la_final.diff, to keep --enable-final
     from messing up the static libraries.
     + debian/rules: Reenable --enable-final.
@@ -444,13 +444,13 @@ kdegames (4:3.3.1-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sun, 31 Oct 2004 12:29:16 -0800
 
-kdegames (4:3.3.0-1) unstable; urgency=low
+tdegames (4:3.3.0-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Daniel Schepler <schepler@debian.org>  Wed, 25 Aug 2004 22:33:05 -0400
 
-kdegames (4:3.2.92-1) experimental; urgency=low
+tdegames (4:3.2.92-1) experimental; urgency=low
 
   * New upstream release.
   * Remove debian/patches/03_lib_link.diff; replace with
@@ -461,7 +461,7 @@ kdegames (4:3.2.92-1) experimental; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sun,  1 Aug 2004 18:11:08 -0700
 
-kdegames (4:3.2.3-1) unstable; urgency=low
+tdegames (4:3.2.3-1) unstable; urgency=low
 
   * New upstream release.
   * Remove --enable-final argument to configure, in order to make
@@ -469,12 +469,12 @@ kdegames (4:3.2.3-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Wed,  9 Jun 2004 15:54:41 -0700
 
-kdegames (4:3.2.2-2) unstable; urgency=low
+tdegames (4:3.2.2-2) unstable; urgency=low
 
   * Remove obsolete kderemove tag from menu files.
   * CVS updates from KDE_3_2_BRANCH.
   * Reorganization of debian/ directory:
-    + Create debian/patches/01_kdegames_branch.diff (not to be committed
+    + Create debian/patches/01_tdegames_branch.diff (not to be committed
       to KDE CVS), and rename other patches.
     + Move manpages to debian/man.
     + Make debian/rules determine automatically the upstream changelog
@@ -484,7 +484,7 @@ kdegames (4:3.2.2-2) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Thu, 29 Apr 2004 22:19:32 -0700
 
-kdegames (4:3.2.2-1) unstable; urgency=low
+tdegames (4:3.2.2-1) unstable; urgency=low
 
   * New upstream release.
   * Forcibly update libtool files to current Debian versions, in order
@@ -494,18 +494,18 @@ kdegames (4:3.2.2-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sat, 17 Apr 2004 21:39:24 -0700
 
-kdegames (4:3.2.1-2) unstable; urgency=low
+tdegames (4:3.2.1-2) unstable; urgency=low
 
   * Supply correct filename for old patch to be removed.
     Closes: #237650.
 
  -- Daniel Schepler <schepler@debian.org>  Fri, 12 Mar 2004 13:17:51 -0800
 
-kdegames (4:3.2.1-1) unstable; urgency=low
+tdegames (4:3.2.1-1) unstable; urgency=low
 
   * New upstream release.
   * First upload of 3.2 to unstable.
-  * Remove megami references from kdegames-doc-html.  Closes: #235428.
+  * Remove megami references from tdegames-doc-html.  Closes: #235428.
   * Drop kmines_complete_vs_solver.diff, since the issue has been
     resolved upstream.
   * Drop mask_pngs.tar.gz.uu, which is no longer needed with the new
@@ -515,7 +515,7 @@ kdegames (4:3.2.1-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Fri, 12 Mar 2004 00:09:30 -0800
 
-kdegames (4:3.2.0-0pre1v1) experimental; urgency=low
+tdegames (4:3.2.0-0pre1v1) experimental; urgency=low
 
   * New upstream release.
     + Fixes kreversi startup at non-default size.  Closes: #198431.
@@ -524,11 +524,11 @@ kdegames (4:3.2.0-0pre1v1) experimental; urgency=low
       Closes: #165966.
     + Added option to kbounce to disable sound.  Closes: #181545.
   * Convert to cdbs, using an updated version of kde.mk.
-  * New packages: kgoldrunner, libkdegames-doc, kolf-dev.
+  * New packages: kgoldrunner, libtdegames-doc, kolf-dev.
 
  -- Daniel Schepler <schepler@debian.org>  Sat, 21 Feb 2004 10:01:10 -0800
 
-kdegames (4:3.1.5-1) unstable; urgency=low
+tdegames (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
   * Apply revised version of patch from Danilo Piazzalunga
@@ -537,7 +537,7 @@ kdegames (4:3.1.5-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Wed, 14 Jan 2004 11:13:40 -0800
 
-kdegames (4:3.1.4-1) unstable; urgency=low
+tdegames (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
     + Fixes compilation with Qt3.2.  Closes: #211478.
@@ -545,10 +545,10 @@ kdegames (4:3.1.4-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sat, 27 Sep 2003 19:38:23 -0700
 
-kdegames (4:3.1.3-1) unstable; urgency=low
+tdegames (4:3.1.3-1) unstable; urgency=low
 
   * New upstream release.
-  * Build-Depend on kdelibs4-dev new enough to Depend on libxml2-utils,
+  * Build-Depend on tdelibs4-dev new enough to Depend on libxml2-utils,
     and remove the temporary Build-Depends from debian/control.
   * Move to Standards-Version 3.6.0, after checking that all shared
     libraries have all needed binary dependencies.
@@ -558,57 +558,57 @@ kdegames (4:3.1.3-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Wed, 30 Jul 2003 15:35:25 -0700
 
-kdegames (4:3.1.2-2) unstable; urgency=low
+tdegames (4:3.1.2-2) unstable; urgency=low
 
   * Apply updates from KDE_3_1_BRANCH.  (Fixes atlantik crashes
     with newer monopd servers.)
-  * Temporarily Build-Depend on libxml2-utils until kdelibs4-dev
+  * Temporarily Build-Depend on libxml2-utils until tdelibs4-dev
     gets fixed.
 
  -- Daniel Schepler <schepler@debian.org>  Sat, 21 Jun 2003 17:23:50 -0700
 
-kdegames (4:3.1.2-1) unstable; urgency=low
+tdegames (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
   * Update a couple package descriptions.  Closes: #181608, #188999.
-  * Update sections of kdegames and libkdegames-dev.
+  * Update sections of tdegames and libtdegames-dev.
   * Bump to Standards-Version 3.5.10 (no changes needed).
 
  -- Daniel Schepler <schepler@debian.org>  Mon, 19 May 2003 17:34:19 -0700
 
-kdegames (4:3.1.1-1) unstable; urgency=low
+tdegames (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release.  (Closes: #125991, #182088.)
     Makes running autoconf and automake no longer necessary.
   * Removed now-obsolete --with-xinerama from debian/rules.
-  * atlantik-dev Depends: libkdegames-dev.
+  * atlantik-dev Depends: libtdegames-dev.
 
  -- Daniel Schepler <schepler@debian.org>  Fri, 14 Mar 2003 04:43:19 -0800
 
-kdegames (4:3.1.0-2) unstable; urgency=low
+tdegames (4:3.1.0-2) unstable; urgency=low
 
-  * Finally, a sid upload of kdegames >= 3!
+  * Finally, a sid upload of tdegames >= 3!
     Fixes: #143624, #169737, #169739.
-  * Rename kdecarddecks to kdegames-card-data, to parallel
-    kdewallpapers => kdebase-data, etc.
+  * Rename kdecarddecks to tdegames-card-data, to parallel
+    kdewallpapers => tdebase-data, etc.
   * Remove libksirtet packages, since libksirtet is no longer installed.
   * Create atlantik-dev package, in order to allow atlantikdesigner
-    from kdeaddons to compile.
+    from tdeaddons to compile.
   * Update short description of katomic -- "atomic entertainment handbook"
     seems to have been taken from the title of the docs and is probably
     fairly inaccurate.
 
  -- Daniel Schepler <schepler@debian.org>  Sat,  8 Feb 2003 15:26:46 -0800
 
-kdegames (4:3.1.0-1) unstable; urgency=low
+tdegames (4:3.1.0-1) unstable; urgency=low
 
   * New upstream version.
   * Add new games: atlantik, klickety, kolf, megami.
   * Split libksirtet into its own packages.
   * Split kfouleggs into its own package.
-  * Create new kdegames-doc-html package.
+  * Create new tdegames-doc-html package.
   * Remove cruft no longer necessary when upgrading from Woody
-    or later, as well as obsolete Depends and Enhances on kdebase.
+    or later, as well as obsolete Depends and Enhances on tdebase.
   * Downgrade gnubg to suggests of kbackgammon.
   * Wrote short manual pages for kwin4proc and lskatproc, simply
     telling users not to run them directly.
@@ -616,13 +616,13 @@ kdegames (4:3.1.0-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sun,  1 Dec 2002 05:34:24 -0800
 
-kdegames (4:3.0.8-1) unstable; urgency=low
+tdegames (4:3.0.8-1) unstable; urgency=low
 
   * New upstream
 
  -- Ralf Nolden <nolden@kde.org>  Sun, 22 Sep 2002 09:36:44 +0200
  
-kdegames (4:3.0.3-2) experimental; urgency=low
+tdegames (4:3.0.3-2) experimental; urgency=low
 
   * Build using g++-3.2.
   * Move icons to /usr/share/pixmaps.
@@ -631,48 +631,48 @@ kdegames (4:3.0.3-2) experimental; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sun, 15 Sep 2002 17:08:59 -0700
 
-kdegames (4:3.0.3-1) experimental; urgency=low
+tdegames (4:3.0.3-1) experimental; urgency=low
 
   * New upstream release. 
 
  -- Daniel Stone <dstone@kde.org>  Thu, 15 Aug 2002 23:31:30 +1000
 
-kdegames (4:3.0.2-0) experimental; urgency=low
+tdegames (4:3.0.2-0) experimental; urgency=low
 
   * New upstream version.
 
  -- Daniel Schepler <schepler@debian.org>  Thu,  4 Jul 2002 20:49:17 -0700
 
-kdegames (4:3.0.1-0.1) experimental; urgency=low
+tdegames (4:3.0.1-0.1) experimental; urgency=low
 
   * Ktuberling isn't an arcade game...
-  * Change kpat's dependency from kdebase4-data to kdebase-data.
+  * Change kpat's dependency from tdebase4-data to tdebase-data.
 
  -- Daniel Schepler <schepler@debian.org>  Wed, 29 May 2002 02:39:49 -0700
 
-kdegames (4:3.0.1-0) experimental; urgency=low
+tdegames (4:3.0.1-0) experimental; urgency=low
 
-  * Add new kdegames metapackage; adjust other packages' replaces
+  * Add new tdegames metapackage; adjust other packages' replaces
     and conflicts accordingly.
-  * Remove dependencies on kdebase-libs.
+  * Remove dependencies on tdebase-libs.
   * Update for debhelper 4.
   * Added menu icons.
 
  -- Daniel Schepler <schepler@debian.org>  Thu, 25 Apr 2002 02:17:54 -0700
 
-kdegames (4:3.0.0-0rc4-1) experimental; urgency=low
+tdegames (4:3.0.0-0rc4-1) experimental; urgency=low
 
   * Updated packaging for KDE 3.0.
   * Updated and reformatted package descriptions.
   * Renamed packages: kabalone to kenolaba, kjezz to kbounce.
-  * Moved libkdegames to libkdegames1, created libkdegames-dev.
-  * Compile a static version of libkdegames for the dev package.
+  * Moved libtdegames to libtdegames1, created libtdegames-dev.
+  * Compile a static version of libtdegames for the dev package.
   * Patch the .desktop files to point to /usr/games in place, instead
     of with each release.
 
  -- Daniel Schepler <schepler@debian.org>  Sun, 24 Mar 2002 16:24:53 -0800
 
-kdegames (4:2.2.2-2) unstable; urgency=low
+tdegames (4:2.2.2-2) unstable; urgency=low
 
   * Fixed spelling errors in descriptions.
     (Closes: #124843, #124844, #124852, #124853)
@@ -682,7 +682,7 @@ kdegames (4:2.2.2-2) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sat, 16 Feb 2002 21:50:34 -0800
 
-kdegames (4:2.2.2-1) unstable; urgency=low
+tdegames (4:2.2.2-1) unstable; urgency=low
 
   * New upstream version.
   * Remove .cvsignore file as well from katomic.  (Closes: #120793)
@@ -690,13 +690,13 @@ kdegames (4:2.2.2-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sat, 24 Nov 2001 23:42:35 -0800
 
-kdegames (4:2.2.0-final-2) unstable; urgency=low
+tdegames (4:2.2.0-final-2) unstable; urgency=low
 
   * Remove CVS directory from installed katomic data.  (Closes: #109367)
 
  -- Daniel Schepler <schepler@debian.org>  Mon, 20 Aug 2001 21:01:01 -0700
 
-kdegames (4:2.2.0-final-1) unstable; urgency=low
+tdegames (4:2.2.0-final-1) unstable; urgency=low
 
   * Updated to official 2.2 release.
   * Updated rules and control for building on alpha, prelinking on i386.
@@ -705,16 +705,16 @@ kdegames (4:2.2.0-final-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Mon, 20 Aug 2001 00:33:45 -0700
 
-kdegames (4:2.2-cvs20010630-1) unstable; urgency=low
+tdegames (4:2.2-cvs20010630-1) unstable; urgency=low
 
   * First upload of 2.2 packages.
   * Bumped Standards-Version again.
   * Added real description for ksmiletris.
-  * Use Enhances: kdebase.
+  * Use Enhances: tdebase.
 
  -- Daniel Schepler <schepler@debian.org>  Sat, 30 Jun 2001 10:45:57 -0700
 
-kdegames (4:2.1.2-1) unstable; urgency=low
+tdegames (4:2.1.2-1) unstable; urgency=low
 
   * Fixed menu entries.  Closes: #96452, #99055
   * Some minor fixes to packaging.
@@ -723,7 +723,7 @@ kdegames (4:2.1.2-1) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Wed, 30 May 2001 14:38:05 -0700
 
-kdegames (4:2.2-cvs20010529-1) experimental; urgency=low
+tdegames (4:2.2-cvs20010529-1) experimental; urgency=low
 
   * Disabling shared KHighscore files until it actually works without
     world writable files...
@@ -732,9 +732,9 @@ kdegames (4:2.2-cvs20010529-1) experimental; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Tue, 29 May 2001 21:59:55 -0700
 
-kdegames (4:2.2-cvs20010518-1) experimental; urgency=low
+tdegames (4:2.2-cvs20010518-1) experimental; urgency=low
 
-  * Removed unnecessary libkdegames.postinst script, ldconfig call
+  * Removed unnecessary libtdegames.postinst script, ldconfig call
     is now generated by debhelper.
   * Wrote skeletal man pages for all the games.
   * Made binaries using KHighscore setgid games, added code to create
@@ -742,7 +742,7 @@ kdegames (4:2.2-cvs20010518-1) experimental; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Fri, 18 May 2001 11:54:37 -0700
 
-kdegames (4:2.2-alpha1-1) experimental; urgency=low
+tdegames (4:2.2-alpha1-1) experimental; urgency=low
 
   * Tracking 2.2 CVS.
   * New kbattleship package.
@@ -750,13 +750,13 @@ kdegames (4:2.2-alpha1-1) experimental; urgency=low
     gnubg back in.
   * Started using debhelper v3.
   * Updated build depends.
-  * Split carddecks from libkdegames package, added dependencies on
+  * Split carddecks from libtdegames package, added dependencies on
     the new package.
-  * Fixed a bug with shlibs generation for libkdegames.
+  * Fixed a bug with shlibs generation for libtdegames.
 
  -- Daniel Schepler <schepler@debian.org>  Sat, 28 Apr 2001 06:28:56 -0700
 
-kdegames (4:2.1.1-4) unstable; urgency=low
+tdegames (4:2.1.1-4) unstable; urgency=low
 
   * Added description for katomic package.  Closes: #93822
   * On closer inspection, kbackgammon's support for gnubg hasn't been
@@ -764,7 +764,7 @@ kdegames (4:2.1.1-4) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Mon, 16 Apr 2001 17:25:28 -0700
 
-kdegames (4:2.1.1-3) unstable; urgency=low
+tdegames (4:2.1.1-3) unstable; urgency=low
 
   * Try the upload once again.  It seems using the official upstream
     tarball will have to wait for the next release.
@@ -772,7 +772,7 @@ kdegames (4:2.1.1-3) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Wed,  4 Apr 2001 00:33:30 -0700
 
-kdegames (4:2.1.1-2) unstable; urgency=low
+tdegames (4:2.1.1-2) unstable; urgency=low
 
   * New maintainer (closes: #89595).
   * Upstream tarball is now the officially distributed version.  This
@@ -781,19 +781,19 @@ kdegames (4:2.1.1-2) unstable; urgency=low
 
  -- Daniel Schepler <schepler@debian.org>  Sun,  1 Apr 2001 01:10:26 -0800
 
-kdegames (4:2.1.1-1.0.1) unstable; urgency=low
+tdegames (4:2.1.1-1.0.1) unstable; urgency=low
  
   * Build with older libc
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 26 Mar 2001 02:31:00 -0700
 
-kdegames (4:2.1.1-1) unstable; urgency=low
+tdegames (4:2.1.1-1) unstable; urgency=low
  
   * New upstream version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Mar 2001 02:31:00 -0700
 
-kdegames (4:2.1-final-1) unstable; urgency=low
+tdegames (4:2.1-final-1) unstable; urgency=low
  
   * New upstream version
   * Adding kdewallpapers to kpat's depends
@@ -801,28 +801,28 @@ kdegames (4:2.1-final-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
 
-kdegames (4:2.1-beta2-1) unstable; urgency=low
+tdegames (4:2.1-beta2-1) unstable; urgency=low
  
   * New upstream beta
   * New kbackgammon game
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 22 Jan 2001 06:00:00 -0700
 
-kdegames (4:2.1-20010115-1) unstable; urgency=low
+tdegames (4:2.1-20010115-1) unstable; urgency=low
  
   * More upstream fixes
   * Fix high score problem (Closes: #74663)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
 
-kdegames (4:2.1-20010106-1) unstable; urgency=low
+tdegames (4:2.1-20010106-1) unstable; urgency=low
  
   * More upstream fixes
   * More depends/build-depends fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 06 Jan 2001 23:30:00 -0700
 
-kdegames (4:2.1-20010101-1) unstable; urgency=low
+tdegames (4:2.1-20010101-1) unstable; urgency=low
  
   * More upstream fixes
   * Fixing descriptions and typos (Closes: #80608, 80606)
@@ -830,28 +830,28 @@ kdegames (4:2.1-20010101-1) unstable; urgency=low
   
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Jan 2001 03:20:00 -0700
 
-kdegames (4:2.1-20001218-1) unstable; urgency=low
+tdegames (4:2.1-20001218-1) unstable; urgency=low
  
   * More upstream fixes
-  * Adding in missing conflicts for kdegames
+  * Adding in missing conflicts for tdegames
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Dec 2000 23:50:00 -0700
 
-kdegames (4:2.1-20001213-1) unstable; urgency=low
+tdegames (4:2.1-20001213-1) unstable; urgency=low
   
   * New upstream cvs version
   * removing task
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 13 Dec 2000 15:00:00 -0700
 
-kdegames (4:2.0-final-8) unstable; urgency=low
+tdegames (4:2.0-final-8) unstable; urgency=low
  
   * More upstream fixes
   * documentation cleanup
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 25 Nov 2000 07:07:00 -0700
 
-kdegames (4:2.0-final-7) unstable; urgency=low
+tdegames (4:2.0-final-7) unstable; urgency=low
  
   * shlibs cleanup
   * reworkinb build rules
@@ -860,78 +860,78 @@ kdegames (4:2.0-final-7) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 21 Nov 2000 09:48:00 -0700
 
-kdegames (4:2.0-final-6) unstable; urgency=low
+tdegames (4:2.0-final-6) unstable; urgency=low
   
   * Upstream fixes to ksnake
   * fixing build-depends for non-x4 systems
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 18 Nov 2000 19:40:00 -0700
 
-kdegames (4:2.0-final-5) unstable; urgency=low
+tdegames (4:2.0-final-5) unstable; urgency=low
  
   * more upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 18 Nov 2000 08:30:00 -0700
 
-kdegames (4:2.0-final-4) unstable; urgency=low
+tdegames (4:2.0-final-4) unstable; urgency=low
  
   * more upstream fixes
   * adding in menu hints
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
                                                                                 
-kdegames (4:2.0-final-3) unstable; urgency=low
+tdegames (4:2.0-final-3) unstable; urgency=low
  
   * more upstream fixes
   * build against new xlibs
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 04 Nov 2000 23:00:00 -0700
                                                                                 
-kdegames (4:2.0-final-0) unstable; urgency=low
+tdegames (4:2.0-final-0) unstable; urgency=low
 
   * KDE 2.0
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Oct 2000 00:00:00 -0700
 
-kdegames (4:2.0-20001011-0) unstable; urgency=low
+tdegames (4:2.0-20001011-0) unstable; urgency=low
   
   * KDE 2.0 RC2
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 12 Oct 2000 06:00:00 -0700
                                                                                 
-kdegames (4:2.0-20001006-0) unstable; urgency=low
+tdegames (4:2.0-20001006-0) unstable; urgency=low
  
   * New updateam fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 06 Oct 2000 22:00:00 -0700
                                                                                 
-kdegames (4:2.0-20001005-0) unstable; urgency=low
+tdegames (4:2.0-20001005-0) unstable; urgency=low
  
   * New updateam fixes
-  * Compiling against non-versioned kdelibs once again
+  * Compiling against non-versioned tdelibs once again
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 05 Oct 2000 15:00:00 -0700
                                                                                 
-kdegames (4:2.0-20001002-0) unstable; urgency=low
+tdegames (4:2.0-20001002-0) unstable; urgency=low
  
   * KDE 2.0 RC1
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Oct 2000 01:30:00 -0700
                                                                                 
-kdegames (4:2.0-20000925-0) unstable; urgency=low
+tdegames (4:2.0-20000925-0) unstable; urgency=low
  
   * More upstream fixes
   * Updating build-depends
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
 
-kdegames (4:2.0-20000920-0) unstable; urgency=low
+tdegames (4: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
 
-kdegames (4:2.0-20000918-0) unstable; urgency=low
+tdegames (4:2.0-20000918-0) unstable; urgency=low
  
   * More upstream fixes (-beta5)
   * Fixing missing menu items when individually installed (Closes: #71922)
@@ -944,103 +944,103 @@ kdegames (4:2.0-20000918-0) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Sep 2000 18:00:00 -0700
 
-kdegames (4:2.0-20000909-0) unstable; urgency=low
+tdegames (4:2.0-20000909-0) unstable; urgency=low
 
   * More upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 09 Sep 2000 22:00:00 -0700
 
-kdegames (4:2.0-20000905-0) unstable; urgency=low
+tdegames (4:2.0-20000905-0) unstable; urgency=low
 
   * More upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 05 Sep 2000 17:00:00 -0700
 
-kdegames (4:2.0-20000901-0) unstable; urgency=low
+tdegames (4:2.0-20000901-0) unstable; urgency=low
  
   * More upstream fixes
   * Merging package fixes into upstream CVS
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Sep 2000 17:00:00 -0700
  
-kdegames (4:2.0-20000825-1.0) experimental; urgency=low
+tdegames (4:2.0-20000825-1.0) experimental; urgency=low
  
   * KDE 2.0 beta 4
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 25 Aug 2000 22:30:00 -0700
 
-kdegames (4:2.0-20000820-1.0) experimental; urgency=low
+tdegames (4:2.0-20000820-1.0) experimental; urgency=low
  
   * New upstream beta version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 20 Aug 2000 22:30:00 -0700
 
-kdegames (4:2.0-20000524-1.0) experimental; urgency=low
+tdegames (4:2.0-20000524-1.0) experimental; urgency=low
  
   * New upstream CVS version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 24 May 2000 04:15:00 -0700
 
-kdegames-cvs (4:2.0-20000521-1.0) experimental; urgency=low
+tdegames-cvs (4:2.0-20000521-1.0) experimental; urgency=low
  
   * New upstream CVS version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 21 May 2000 18:15:00 -0700
 
-kdegames-cvs (4:2.0-20000512-1.1) experimental; urgency=low
+tdegames-cvs (4:2.0-20000512-1.1) experimental; urgency=low
 
   * New upstream CVS version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 12 May 2000 22:30:00 -0700
 
-kdegames-cvs (4:2.0-20000308-1.0) experimental; urgency=low
+tdegames-cvs (4:2.0-20000308-1.0) experimental; urgency=low
  
   * more upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 08 Mar 2000 22:30:00 -0700
 
-kdegames-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+tdegames-cvs (4:2.0-20000302-1.0) experimental; urgency=low
 
   * Adding in build-depends
   * more upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 29 Feb 2000 22:00:00 -0700
 
-kdegames-cvs (4:2.0-20000223-1.0) experimental; urgency=low
+tdegames-cvs (4:2.0-20000223-1.0) experimental; urgency=low
 
   * new version from CVS
   * Migrating game binaries to /usr/games and chowning to games.games
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 23 Feb 2000 22:00:37 -0700
 
-kdegames-cvs (4:2.0-19991001-1) experimental; urgency=low
+tdegames-cvs (4:2.0-19991001-1) experimental; urgency=low
 
   * new version from CVS
   * Fixing up dependencies
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Oct 1999 14:25:37 -0400
 
-kdegames-cvs (4:2.0-19990912-1) experimental; urgency=low
+tdegames-cvs (4:2.0-19990912-1) experimental; urgency=low
 
   * new version from CVS
   * Updating the pre/post scripts to come in line with debian policy
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 12 Sep 1999 23:25:37 -0400
 
-kdegames-cvs (4:2.0-19990820-1) experimental; urgency=low
+tdegames-cvs (4:2.0-19990820-1) experimental; urgency=low
 
   * new version from CVS
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 20 Aug 1999 20:08:37 -0400
 
-kdegames-cvs (4:2.0-19990626-1) experimental; urgency=low
+tdegames-cvs (4:2.0-19990626-1) experimental; urgency=low
 
   * new version from CVS
   * migrated back into /opt/kde (leaving it an option in debianrules)
 
  -- Stephan Kulow <coolo@kde.org>  Sat, 26 Jun 1999 20:08:37 +0200
 
-kdegames-cvs (4:2.0-19990524-1) experimental; urgency=low
+tdegames-cvs (4:2.0-19990524-1) experimental; urgency=low
 
   * migrating from /opt to /
   * working in new build items to bring package more in line with
@@ -1048,77 +1048,77 @@ kdegames-cvs (4:2.0-19990524-1) experimental; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 24 May 1999 07:00:09 -0400
 
-kdegames (4:2.0-19990309-1) experimental; urgency=low
+tdegames (4:2.0-19990309-1) experimental; urgency=low
 
   * new upstream version with Qt 2.0
 
  -- Stephan Kulow <coolo@kde.org>  Tue,  9 Mar 1999 23:30:09 +0100
 
-kdegames (4:1.1-19990306-1) unstable; urgency=low
+tdegames (4:1.1-19990306-1) unstable; urgency=low
 
   * new upstream version out of CVS (many translation updates and some
     security fixes
 
  -- Stephan Kulow <coolo@kde.org>  Sat,  6 Mar 1999 18:03:04 +0100
 
-kdegames (4:1.1-19990217-1) unstable; urgency=low
+tdegames (4:1.1-19990217-1) unstable; urgency=low
 
   * new upstream version
 
  -- Stephan Kulow <coolo@kde.org>  Wed, 17 Feb 1999 19:09:41 +0100
 
-kdegames (4:1.1-19990207-2) unstable; urgency=low
+tdegames (4:1.1-19990207-2) unstable; urgency=low
 
   * fixed a bug with the wrong libjpeg version
 
  -- Stephan Kulow <coolo@kde.org>  Tue,  9 Feb 1999 10:43:43 +0100
 
-kdegames (4:1.1-19990207-1) unstable; urgency=low
+tdegames (4:1.1-19990207-1) unstable; urgency=low
 
   * new upstream version 1.1 and new epoche
 
  -- Stephan Kulow <coolo@kde.org>  Sun,  7 Feb 1999 12:12:58 +0100
 
-kdegames (2:980710-1.0-1) unstable; urgency=low
+tdegames (2:980710-1.0-1) unstable; urgency=low
 
   * New upstream release 1.0
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 12 Jul 1998 19:41:57 +0200
 
-kdegames (2:980419-b4-1) unstable; urgency=low
+tdegames (2:980419-b4-1) unstable; urgency=low
 
   * new upstream version Beta4
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 19 Apr 1998 15:49:10 +0200
 
-kdegames (2:980310-3) frozen; urgency=low
+tdegames (2:980310-3) frozen; urgency=low
 
-  * removed this ugly dependency on a specific kdebase version
-  * new compile cycle with fixed kdelibs. This time from CVS
+  * removed this ugly dependency on a specific tdebase version
+  * new compile cycle with fixed tdelibs. This time from CVS
   * add undocumented man page
 
  -- Stephan Kulow <coolo@kde.org>  Fri,  3 Apr 1998 17:08:37 +0200
 
-kdegames (2:980310-2) frozen; urgency=low
+tdegames (2:980310-2) frozen; urgency=low
 
   * new compile cycle with qt-1.33 and libstc++-2.8
 
  -- Stephan Kulow <coolo@kde.org>  Tue, 24 Mar 1998 20:28:34 +0100
 
-kdegames (2:980310-1) experimental; urgency=low
+tdegames (2:980310-1) experimental; urgency=low
 
   * increased epoche
 
  -- Stephan Kulow <coolo@kde.org>  Tue, 10 Mar 1998 20:37:20 +0100
 
-kdegames (980310-1) experimental; urgency=low
+tdegames (980310-1) experimental; urgency=low
 
   * changed README notice
   * New upstream release
 
  -- Stephan Kulow <coolo@kde.org>  Tue, 10 Mar 1998 20:29:22 +0100
 
-kdegames (980228-1) experimental; urgency=low
+tdegames (980228-1) experimental; urgency=low
 
   * made bindir to kde_bindir
   * changed bindir to /usr/games
@@ -1127,7 +1127,7 @@ kdegames (980228-1) experimental; urgency=low
 
  -- Stephan Kulow <coolo@kde.org>  Sat, 28 Feb 1998 22:36:27 +0100
 
-kdegames (980227-1) experimental; urgency=low
+tdegames (980227-1) experimental; urgency=low
 
   * fixed rules file
   * changed maintainer field
@@ -1135,146 +1135,146 @@ kdegames (980227-1) experimental; urgency=low
 
  -- Stephan Kulow <coolo@kde.org>  Sat, 28 Feb 1998 02:03:54 +0100
 
-kdegames (1:Beta2-2.1) experimental; urgency=low
+tdegames (1:Beta2-2.1) experimental; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Fri,  5 Dec 1997 21:18:16 +0100
 
-kdegames (1:Beta2-2) unstable; urgency=low
+tdegames (1:Beta2-2) unstable; urgency=low
 
   * removed virtual package names.
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun, 30 Nov 1997 17:05:03 +0100
 
-kdegames (1:Beta2-1) unstable; urgency=low
+tdegames (1:Beta2-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun, 23 Nov 1997 18:59:30 +0100
 
-kdegames (1:Beta1.2-2) unstable; urgency=low
+tdegames (1:Beta1.2-2) unstable; urgency=low
 
   * new compile cycle with bugfixes
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun,  9 Nov 1997 19:46:23 +0100
 
-kdegames (1:Beta1.2-1) unstable; urgency=low
+tdegames (1:Beta1.2-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Mon, 27 Oct 1997 11:43:21 +0100
 
-kdegames (1:Beta1.1-1) unstable; urgency=low
+tdegames (1:Beta1.1-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Mon, 20 Oct 1997 11:46:00 +0200
 
-kdegames (971019-1) unstable; urgency=low
+tdegames (971019-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Sun, 19 Oct 1997 16:08:30 +0200
 
-kdegames (971013-1) unstable; urgency=low
+tdegames (971013-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Mon, 13 Oct 1997 08:26:28 +0200
 
-kdegames (971009-1) unstable; urgency=low
+tdegames (971009-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Thu,  9 Oct 1997 10:55:21 +0200
 
-kdegames (971008-1) unstable; urgency=low
+tdegames (971008-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Wed,  8 Oct 1997 10:11:29 +0200
 
-kdegames (971006-2) unstable; urgency=low
+tdegames (971006-2) unstable; urgency=low
 
   * daily recompile of everything.
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Tue,  7 Oct 1997 12:09:00 +0200
 
-kdegames (971006-1) unstable; urgency=low
+tdegames (971006-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Mon,  6 Oct 1997 09:27:43 +0200
 
-kdegames (971005-1) unstable; urgency=low
+tdegames (971005-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Sun,  5 Oct 1997 17:35:44 +0200
 
-kdegames (971003-1) unstable; urgency=low
+tdegames (971003-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Fri,  3 Oct 1997 08:28:31 +0200
 
-kdegames (971002-1) unstable; urgency=low
+tdegames (971002-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Thu,  2 Oct 1997 08:55:37 +0200
 
-kdegames (970930-1) unstable; urgency=low
+tdegames (970930-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Tue, 30 Sep 1997 11:42:58 +0200
 
-kdegames (970929-1) unstable; urgency=low
+tdegames (970929-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Mon, 29 Sep 1997 09:43:07 +0200
 
-kdegames (970926-1) unstable; urgency=low
+tdegames (970926-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Fri, 26 Sep 1997 08:11:13 +0200
 
-kdegames (970923-4) unstable; urgency=low
+tdegames (970923-4) unstable; urgency=low
 
   * daily recompile of everything.
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Thu, 25 Sep 1997 09:05:39 +0200
 
-kdegames (970923-3) unstable; urgency=low
+tdegames (970923-3) unstable; urgency=low
 
   * new use kderules.
   * daily recompile of everything.
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Wed, 24 Sep 1997 11:07:21 +0200
 
-kdegames (970923-2) unstable; urgency=low
+tdegames (970923-2) unstable; urgency=low
 
   * daily recompile of everything.
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Wed, 24 Sep 1997 09:29:54 +0200
 
-kdegames (970923-1) unstable; urgency=low
+tdegames (970923-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Tue, 23 Sep 1997 08:43:44 +0200
 
-kdegames (970921-1) unstable; urgency=low
+tdegames (970921-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@dungeon.inka.de>  Sun, 21 Sep 1997 13:53:35 +0200
 
-kdegames (970920-1) unstable; urgency=low
+tdegames (970920-1) unstable; urgency=low
 
   * Initial Release.
 
diff --git a/ubuntu/maverick/tdegames/debian/control b/ubuntu/maverick/tdegames/debian/control
index a89543d16..8a0e3a68b 100644
--- a/ubuntu/maverick/tdegames/debian/control
+++ b/ubuntu/maverick/tdegames/debian/control
@@ -1,20 +1,20 @@
-Source: kdegames-trinity
+Source: tdegames-trinity
 Section: games
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
-Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, kdelibs4-trinity-doc
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, tdelibs4-trinity-doc
 Standards-Version: 3.8.4
 
-Package: kdegames-trinity
+Package: tdegames-trinity
 Architecture: all
 Section: kde
-Replaces: kdegames-kde3 (<< 4:3.5.13)
-Breaks: kdegames-kde3 (<< 4:3.5.13)
+Replaces: tdegames-kde3 (<< 4:3.5.13)
+Breaks: tdegames-kde3 (<< 4:3.5.13)
 Depends: atlantik-trinity (>= ${Source-Version}), kasteroids-trinity (>= ${Source-Version}), katomic-trinity (>= ${Source-Version}), kbackgammon-trinity (>= ${Source-Version}), kbattleship-trinity (>= ${Source-Version}), kblackbox-trinity (>= ${Source-Version}), kbounce-trinity (>= ${Source-Version}), kenolaba-trinity (>= ${Source-Version}), kfouleggs-trinity (>= ${Source-Version}), kgoldrunner-trinity (>= ${Source-Version}), kjumpingcube-trinity (>= ${Source-Version}), klickety-trinity (>= ${Source-Version}), klines-trinity (>= ${Source-Version}), kmahjongg-trinity (>= ${Source-Version}), kmines-trinity (>= ${Source-Version}), knetwalk-trinity (>= ${Source-Version}), kolf-trinity (>= ${Source-Version}), konquest-trinity (>= ${Source-Version}), kpat-trinity (>= ${Source-Version}), kpoker-trinity (>= ${Source-Version}), kreversi-trinity (>= ${Source-Version}), ksame-trinity (>= ${Source-Version}), kshisen-trinity (>= ${Source-Version}), ksirtet-trinity (>= ${Source-Version}), ksmiletris-trinity (>= ${Source-Version}), ksnake-trinity (>= ${Source-Version}), ksokoban-trinity (>= ${Source-Version}), kspaceduel-trinity (>= ${Source-Version}), ktron-trinity (>= ${Source-Version}), ktuberling-trinity (>= ${Source-Version}), kwin4-trinity (>= ${Source-Version}), lskat-trinity (>= ${Source-Version})
-Suggests: kdegames-trinity-doc-html (>= ${Source-Version}), khelpcenter-trinity
+Suggests: tdegames-trinity-doc-html (>= ${Source-Version}), khelpcenter-trinity
 Description: games from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -24,12 +24,12 @@ Description: games from the official Trinity release
  This metapackage includes a collection of games provided with
  the official release of KDE.
 
-Package: kdegames-trinity-doc-html
+Package: tdegames-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: kdegames-kde3-doc-html (<< 4:3.5.13)
-Breaks: kdegames-kde3-doc-html (<< 4:3.5.13)
-Suggests: konqueror-trinity | www-browser, kdegames-trinity
+Replaces: tdegames-kde3-doc-html (<< 4:3.5.13)
+Breaks: tdegames-kde3-doc-html (<< 4:3.5.13)
+Suggests: konqueror-trinity | www-browser, tdegames-trinity
 Description: KDE games documentation in HTML format
  By default the games provided with KDE (the K Desktop Environment)
  only provide their documentation in KDE docbook format, which can
@@ -42,13 +42,13 @@ Description: KDE games documentation in HTML format
  /usr/share/doc/kde/HTML/en/kasteroids/.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
-Package: libkdegames1-trinity
+Package: libtdegames1-trinity
 Architecture: any
 Section: games
-Replaces: libkdegames1-kde3 (<< 4:3.5.13)
-Breaks: libkdegames1-kde3 (<< 4:3.5.13)
+Replaces: libtdegames1-kde3 (<< 4:3.5.13)
+Breaks: libtdegames1-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Description: Trinity games library and common files
  This library provides a common infrastructure for several of the
@@ -57,57 +57,57 @@ Description: Trinity games library and common files
  including chat capabilities.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
-Package: kdegames-trinity-dbg
+Package: tdegames-trinity-dbg
 Architecture: any
-Depends: kdelibs-trinity-dbg
-Replaces: kdegames-kde3-dbg (<< 4:3.5.13)
-Breaks: kdegames-kde3-dbg (<< 4:3.5.13)
+Depends: tdelibs-trinity-dbg
+Replaces: tdegames-kde3-dbg (<< 4:3.5.13)
+Breaks: tdegames-kde3-dbg (<< 4:3.5.13)
 Priority: extra
 Section: kde
-Description: debugging symbols for kdegames
- This package contains the debugging symbols associated with kdegames.
- They will automatically be used by gdb for debugging kdegames-related
+Description: debugging symbols for tdegames
+ This package contains the debugging symbols associated with tdegames.
+ They will automatically be used by gdb for debugging tdegames-related
  issues.
 
-Package: libkdegames-trinity-dev
+Package: libtdegames-trinity-dev
 Architecture: any
 Section: libdevel
-Replaces: libkdegames-kde3-dev (<< 4:3.5.13)
-Breaks: libkdegames-kde3-dev (<< 4:3.5.13)
-Depends: kdelibs4-trinity-dev (>= 4:3.5.1), libkdegames1-trinity (= ${Source-Version})
+Replaces: libtdegames-kde3-dev (<< 4:3.5.13)
+Breaks: libtdegames-kde3-dev (<< 4:3.5.13)
+Depends: tdelibs4-trinity-dev (>= 4:3.5.1), libtdegames1-trinity (= ${Source-Version})
 Description: Trinity games library headers
  This package is necessary if you want to develop your own games using
  the KDE games library.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
-Package: libkdegames-trinity-doc
+Package: libtdegames-trinity-doc
 Architecture: all
 Section: doc
-Replaces: libkdegames-kde3-doc (<< 4:3.5.13)
-Breaks: libkdegames-kde3-doc (<< 4:3.5.13)
-Recommends: kdelibs4-trinity-doc, qt3-doc
-Suggests: konqueror-trinity | www-browser, libkdegames-trinity-dev
+Replaces: libtdegames-kde3-doc (<< 4:3.5.13)
+Breaks: libtdegames-kde3-doc (<< 4:3.5.13)
+Recommends: tdelibs4-trinity-doc, qt3-doc
+Suggests: konqueror-trinity | www-browser, libtdegames-trinity-dev
 Description: API documentation for the Trinity games library
- This package contains the developers' documentation for libkdegames.
+ This package contains the developers' documentation for libtdegames.
  You may want to install it if you wish to develop games for KDE.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
-Package: kdegames-card-data-trinity
+Package: tdegames-card-data-trinity
 Architecture: all
 Section: games
-Replaces: kdegames-card-data-kde3 (<< 4:3.5.13)
-Breaks: kdegames-card-data-kde3 (<< 4:3.5.13)
+Replaces: tdegames-card-data-kde3 (<< 4:3.5.13)
+Breaks: tdegames-card-data-kde3 (<< 4:3.5.13)
 Description: Card decks for Trinity games
  Several different collections of card images for use by KDE games.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: atlantik-trinity
 Architecture: any
@@ -124,7 +124,7 @@ Description: KDE client for Monopoly-like network games
  America and Europe.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: atlantik-trinity-dev
 Architecture: any
@@ -132,13 +132,13 @@ Section: devel
 Replaces: atlantik-kde3-dev (<< 4:3.5.13)
 Breaks: atlantik-kde3-dev (<< 4:3.5.13)
 Priority: extra
-Depends: ${shlibs:Depends}, atlantik-trinity (= ${Source-Version}), libkdegames-trinity-dev (= ${Source-Version})
+Depends: ${shlibs:Depends}, atlantik-trinity (= ${Source-Version}), libtdegames-trinity-dev (= ${Source-Version})
 Description: Development files for Atlantik
  This package contains header files for compiling programs against the
  libraries which come with Atlantik.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kasteroids-trinity
 Architecture: any
@@ -155,7 +155,7 @@ Description: Asteroids for Trinity
  makes contact with an asteroid.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: katomic-trinity
 Architecture: any
@@ -170,7 +170,7 @@ Description: Atomic Entertainment game for Trinity
  wall or another atom.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kbackgammon-trinity
 Architecture: any
@@ -187,7 +187,7 @@ Description: A Backgammon game for Trinity
  upgrade :-)).
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kbattleship-trinity
 Architecture: any
@@ -202,7 +202,7 @@ Description: Battleship game for Trinity
  against the computer.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kblackbox-trinity
 Architecture: any
@@ -219,7 +219,7 @@ Description: A simple logical game for the Trinity project
  your score.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kbounce-trinity
 Architecture: any
@@ -246,7 +246,7 @@ Description: Jezzball clone for the K Desktop Environment
  This game was previously known as kjezz.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kenolaba-trinity
 Architecture: any
@@ -265,7 +265,7 @@ Description: Enolaba board game for Trinity
  board game Abalone by Abalone SA, France.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kfouleggs-trinity
 Architecture: any
@@ -280,7 +280,7 @@ Description: A KDE clone of the Japanese PuyoPuyo game
  find KFouleggs easy to learn.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kgoldrunner-trinity
 Architecture: any
@@ -305,7 +305,7 @@ Description: A Trinity clone of the Loderunner arcade game
  reappear somewhere else.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kjumpingcube-trinity
 Architecture: any
@@ -322,7 +322,7 @@ Description: Tactical one or two player game
  owns all squares.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: klickety-trinity
 Architecture: any
@@ -335,7 +335,7 @@ Description: A Clickomania-like game for Trinity
  game; it is very similar to the "same" game.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: klines-trinity
 Architecture: any
@@ -357,7 +357,7 @@ Description: Color lines for Trinity
  three more marbles.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kmahjongg-trinity
 Architecture: any
@@ -371,7 +371,7 @@ Description: the classic mahjongg game for Trinity project
  no other tiles block them on the left or right side.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kmines-trinity
 Architecture: any
@@ -390,7 +390,7 @@ Description: Minesweeper for Trinity
  mine.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: knetwalk-trinity
 Architecture: any
@@ -405,7 +405,7 @@ Description: A game for system administrators
  and no wires are left unconnected.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kolf-trinity
 Architecture: any
@@ -418,7 +418,7 @@ Description: Minigolf game for KDE
  golf courses and waste an exorbitant amount of time.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kolf-trinity-dev
 Architecture: any
@@ -426,13 +426,13 @@ Section: devel
 Replaces: kolf-kde3-dev (<< 4:3.5.13)
 Breaks: kolf-kde3-dev (<< 4:3.5.13)
 Priority: extra
-Depends: ${shlibs:Depends}, kolf-trinity (= ${Source-Version}), libkdegames-trinity-dev (= ${Source-Version})
+Depends: ${shlibs:Depends}, kolf-trinity (= ${Source-Version}), libtdegames-trinity-dev (= ${Source-Version})
 Description: Development files for Kolf
  This package contains headers and development libraries for compiling
  Kolf plugins.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: konquest-trinity
 Architecture: any
@@ -446,33 +446,33 @@ Description: KDE based GNU-Lactic Konquest game
  across the galaxy and, of course, crush your rivals in the process.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kpat-trinity
 Architecture: any
 Section: games
 Replaces: kpat-kde3 (<< 4:3.5.13)
 Breaks: kpat-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdebase-data-trinity, kdegames-card-data-trinity
+Depends: ${shlibs:Depends}, tdebase-data-trinity, tdegames-card-data-trinity
 Description: Trinity solitaire patience game
  KPatience is a collection of 14 card games. All the games are single
  player games.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kpoker-trinity
 Architecture: any
 Section: games
 Replaces: kpoker-kde3 (<< 4:3.5.13)
 Breaks: kpoker-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdegames-card-data-trinity
+Depends: ${shlibs:Depends}, tdegames-card-data-trinity
 Description: Trinity based Poker clone
  KPoker is a KDE compliant clone of those highly addictive pocket
  video poker games which are sometimes called "Videopoker" as well.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kreversi-trinity
 Architecture: any
@@ -489,7 +489,7 @@ Description: Reversi for Trinity
  no more moves possible.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: ksame-trinity
 Architecture: any
@@ -504,7 +504,7 @@ Description: SameGame for Trinity
  platform.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kshisen-trinity
 Architecture: any
@@ -519,7 +519,7 @@ Description: Shisen-Sho for Trinity
  The object of the game is to remove all tiles from the field.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: ksirtet-trinity
 Architecture: any
@@ -538,7 +538,7 @@ Description: Tetris and Puyo-Puyo games for Trinity
  1/(1+level) second).
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: ksmiletris-trinity
 Architecture: any
@@ -552,7 +552,7 @@ Description: Tetris like game for Trinity
  blocks so there are two or more of the same symbol vertically.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: ksnake-trinity
 Architecture: any
@@ -565,7 +565,7 @@ Description: Snake Race for Trinity
  are trying to eat all the apples in the room before getting out!
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: ksokoban-trinity
 Architecture: any
@@ -594,7 +594,7 @@ Description: Sokoban game for Trinity
  expose yourself to too much mental strain.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kspaceduel-trinity
 Architecture: any
@@ -611,7 +611,7 @@ Description: Arcade two-player space game for Trinity
  and play each other.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: ktron-trinity
 Architecture: any
@@ -624,7 +624,7 @@ Description: Tron clone for the K Desktop Environment
  and that of your opponent.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: ktuberling-trinity
 Architecture: any
@@ -650,7 +650,7 @@ Description: Potato Guy for Trinity
  include them in the museum if he gets some spare time.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: kwin4-trinity
 Architecture: any
@@ -671,14 +671,14 @@ Description: Connect Four clone for Trinity
  because the board is filled.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
 
 Package: lskat-trinity
 Architecture: any
 Section: games
 Replaces: lskat-kde3 (<< 4:3.5.13)
 Breaks: lskat-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdegames-card-data-trinity
+Depends: ${shlibs:Depends}, tdegames-card-data-trinity
 Description: Lieutnant Skat card game for Trinity
  Lieutnant Skat (from German Offiziersskat) is a card game for two
  players. It is roughly played according to the rules of Skat but with
@@ -690,4 +690,4 @@ Description: Lieutnant Skat card game for Trinity
  the game ends.
  .
  This package is part of Trinity, and a component of the KDE games module.
- See the 'kde-trinity' and 'kdegames-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
diff --git a/ubuntu/maverick/tdegames/debian/control.in b/ubuntu/maverick/tdegames/debian/control.in
index 7cc4ab887..be2a79ba7 100644
--- a/ubuntu/maverick/tdegames/debian/control.in
+++ b/ubuntu/maverick/tdegames/debian/control.in
@@ -1,18 +1,18 @@
-Source: kdegames
+Source: tdegames
 Section: games
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), automake1.9, libtool, groff-base, sharutils, bzip2, sharutils
-Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, kdelibs4-doc
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), automake1.9, libtool, groff-base, sharutils, bzip2, sharutils
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, tdelibs4-doc
 Standards-Version: 3.7.2
 
-Package: kdegames
+Package: tdegames
 Architecture: all
 Section: kde
 Depends: atlantik (>= ${Source-Version}), kasteroids (>= ${Source-Version}), katomic (>= ${Source-Version}), kbackgammon (>= ${Source-Version}), kbattleship (>= ${Source-Version}), kblackbox (>= ${Source-Version}), kbounce (>= ${Source-Version}), kenolaba (>= ${Source-Version}), kfouleggs (>= ${Source-Version}), kgoldrunner (>= ${Source-Version}), kjumpingcube (>= ${Source-Version}), klickety (>= ${Source-Version}), klines (>= ${Source-Version}), kmahjongg (>= ${Source-Version}), kmines (>= ${Source-Version}), knetwalk (>= ${Source-Version}), kolf (>= ${Source-Version}), konquest (>= ${Source-Version}), kpat (>= ${Source-Version}), kpoker (>= ${Source-Version}), kreversi (>= ${Source-Version}), ksame (>= ${Source-Version}), kshisen (>= ${Source-Version}), ksirtet (>= ${Source-Version}), ksmiletris (>= ${Source-Version}), ksnake (>= ${Source-Version}), ksokoban (>= ${Source-Version}), kspaceduel (>= ${Source-Version}), ktron (>= ${Source-Version}), ktuberling (>= ${Source-Version}), kwin4 (>= ${Source-Version}), lskat (>= ${Source-Version})
-Suggests: kdegames-doc-html (>= ${Source-Version})
+Suggests: tdegames-doc-html (>= ${Source-Version})
 Description: games from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -22,10 +22,10 @@ Description: games from the official KDE release
  This metapackage includes a collection of games provided with
  the official release of KDE.
 
-Package: kdegames-doc-html
+Package: tdegames-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror | www-browser, kdegames
+Suggests: konqueror | www-browser, tdegames
 Description: KDE games documentation in HTML format
  By default the games provided with KDE (the K Desktop Environment)
  only provide their documentation in KDE docbook format, which can
@@ -38,9 +38,9 @@ Description: KDE games documentation in HTML format
  /usr/share/doc/kde/HTML/en/kasteroids/.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
-Package: libkdegames1
+Package: libtdegames1
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
@@ -51,49 +51,49 @@ Description: KDE games library and common files
  including chat capabilities.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
-Package: kdegames-dbg
+Package: tdegames-dbg
 Architecture: any
-Depends: kdelibs-dbg
+Depends: tdelibs-dbg
 Priority: extra
 Section: kde
-Description: debugging symbols for kdegames
- This package contains the debugging symbols associated with kdegames.
- They will automatically be used by gdb for debugging kdegames-related
+Description: debugging symbols for tdegames
+ This package contains the debugging symbols associated with tdegames.
+ They will automatically be used by gdb for debugging tdegames-related
  issues.
 
-Package: libkdegames-dev
+Package: libtdegames-dev
 Architecture: any
 Section: libdevel
-Depends: kdelibs4-dev (>= 4:3.5.1), libkdegames1 (= ${Source-Version})
+Depends: tdelibs4-dev (>= 4:3.5.1), libtdegames1 (= ${Source-Version})
 Description: KDE games library headers
  This package is necessary if you want to develop your own games using
  the KDE games library.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
-Package: libkdegames-doc
+Package: libtdegames-doc
 Architecture: all
 Section: doc
-Recommends: kdelibs4-doc, qt3-doc
-Suggests: konqueror | www-browser, libkdegames-dev
+Recommends: tdelibs4-doc, qt3-doc
+Suggests: konqueror | www-browser, libtdegames-dev
 Description: API documentation for the KDE games library
- This package contains the developers' documentation for libkdegames.
+ This package contains the developers' documentation for libtdegames.
  You may want to install it if you wish to develop games for KDE.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
-Package: kdegames-card-data
+Package: tdegames-card-data
 Architecture: all
 Section: games
 Description: Card decks for KDE games
  Several different collections of card images for use by KDE games.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: atlantik
 Architecture: any
@@ -108,19 +108,19 @@ Description: KDE client for Monopoly-like network games
  America and Europe.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: atlantik-dev
 Architecture: any
 Section: devel
 Priority: extra
-Depends: ${shlibs:Depends}, atlantik (= ${Source-Version}), libkdegames-dev (= ${Source-Version})
+Depends: ${shlibs:Depends}, atlantik (= ${Source-Version}), libtdegames-dev (= ${Source-Version})
 Description: Development files for Atlantik
  This package contains header files for compiling programs against the
  libraries which come with Atlantik.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kasteroids
 Architecture: any
@@ -135,7 +135,7 @@ Description: Asteroids for KDE
  makes contact with an asteroid.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: katomic
 Architecture: any
@@ -148,7 +148,7 @@ Description: Atomic Entertainment game for KDE
  wall or another atom.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kbackgammon
 Architecture: any
@@ -163,7 +163,7 @@ Description: A Backgammon game for KDE
  upgrade :-)).
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kbattleship
 Architecture: any
@@ -176,7 +176,7 @@ Description: Battleship game for KDE
  against the computer.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kblackbox
 Architecture: any
@@ -191,7 +191,7 @@ Description: A simple logical game for the KDE project
  your score.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kbounce
 Architecture: any
@@ -216,7 +216,7 @@ Description: Jezzball clone for the K Desktop Environment
  This game was previously known as kjezz.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kenolaba
 Architecture: any
@@ -233,7 +233,7 @@ Description: Enolaba board game for KDE
  board game Abalone by Abalone SA, France.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kfouleggs
 Architecture: any
@@ -246,7 +246,7 @@ Description: A KDE clone of the Japanese PuyoPuyo game
  find KFouleggs easy to learn.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kgoldrunner
 Architecture: any
@@ -269,7 +269,7 @@ Description: A KDE clone of the Loderunner arcade game
  reappear somewhere else.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kjumpingcube
 Architecture: any
@@ -284,7 +284,7 @@ Description: Tactical one or two player game
  owns all squares.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: klickety
 Architecture: any
@@ -295,7 +295,7 @@ Description: A Clickomania-like game for KDE
  game; it is very similar to the "same" game.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: klines
 Architecture: any
@@ -315,7 +315,7 @@ Description: Color lines for KDE
  three more marbles.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kmahjongg
 Architecture: any
@@ -327,7 +327,7 @@ Description: the classic mahjongg game for KDE project
  no other tiles block them on the left or right side.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kmines
 Architecture: any
@@ -344,7 +344,7 @@ Description: Minesweeper for KDE
  mine.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: knetwalk
 Architecture: any
@@ -357,7 +357,7 @@ Description: A game for system administrators
  and no wires are left unconnected.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kolf
 Architecture: any
@@ -368,19 +368,19 @@ Description: Minigolf game for KDE
  golf courses and waste an exorbitant amount of time.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kolf-dev
 Architecture: any
 Section: devel
 Priority: extra
-Depends: ${shlibs:Depends}, kolf (= ${Source-Version}), libkdegames-dev (= ${Source-Version})
+Depends: ${shlibs:Depends}, kolf (= ${Source-Version}), libtdegames-dev (= ${Source-Version})
 Description: Development files for Kolf
  This package contains headers and development libraries for compiling
  Kolf plugins.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: konquest
 Architecture: any
@@ -392,29 +392,29 @@ Description: KDE based GNU-Lactic Konquest game
  across the galaxy and, of course, crush your rivals in the process.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kpat
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, kdebase-data, kdegames-card-data
+Depends: ${shlibs:Depends}, tdebase-data, tdegames-card-data
 Description: KDE solitaire patience game
  KPatience is a collection of 14 card games. All the games are single
  player games.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kpoker
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, kdegames-card-data
+Depends: ${shlibs:Depends}, tdegames-card-data
 Description: KDE based Poker clone
  KPoker is a KDE compliant clone of those highly addictive pocket
  video poker games which are sometimes called "Videopoker" as well.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kreversi
 Architecture: any
@@ -429,7 +429,7 @@ Description: Reversi for KDE
  no more moves possible.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: ksame
 Architecture: any
@@ -442,7 +442,7 @@ Description: SameGame for KDE
  platform.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kshisen
 Architecture: any
@@ -455,7 +455,7 @@ Description: Shisen-Sho for KDE
  The object of the game is to remove all tiles from the field.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: ksirtet
 Architecture: any
@@ -472,7 +472,7 @@ Description: Tetris and Puyo-Puyo games for KDE
  1/(1+level) second).
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: ksmiletris
 Architecture: any
@@ -484,7 +484,7 @@ Description: Tetris like game for KDE
  blocks so there are two or more of the same symbol vertically.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: ksnake
 Architecture: any
@@ -495,7 +495,7 @@ Description: Snake Race for KDE
  are trying to eat all the apples in the room before getting out!
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: ksokoban
 Architecture: any
@@ -522,7 +522,7 @@ Description: Sokoban game for KDE
  expose yourself to too much mental strain.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kspaceduel
 Architecture: any
@@ -537,7 +537,7 @@ Description: Arcade two-player space game for KDE
  and play each other.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: ktron
 Architecture: any
@@ -548,7 +548,7 @@ Description: Tron clone for the K Desktop Environment
  and that of your opponent.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: ktuberling
 Architecture: any
@@ -572,7 +572,7 @@ Description: Potato Guy for KDE
  include them in the museum if he gets some spare time.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: kwin4
 Architecture: any
@@ -591,12 +591,12 @@ Description: Connect Four clone for KDE
  because the board is filled.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
 
 Package: lskat
 Architecture: any
 Section: games
-Depends: ${shlibs:Depends}, kdegames-card-data
+Depends: ${shlibs:Depends}, tdegames-card-data
 Description: Lieutnant Skat card game for KDE
  Lieutnant Skat (from German Offiziersskat) is a card game for two
  players. It is roughly played according to the rules of Skat but with
@@ -608,4 +608,4 @@ Description: Lieutnant Skat card game for KDE
  the game ends.
  .
  This package is part of KDE, and a component of the KDE games module.
- See the 'kde' and 'kdegames' packages for more information.
+ See the 'kde' and 'tdegames' packages for more information.
diff --git a/ubuntu/maverick/tdegames/debian/copyright b/ubuntu/maverick/tdegames/debian/copyright
index 051cacea9..8e365dd48 100644
--- a/ubuntu/maverick/tdegames/debian/copyright
+++ b/ubuntu/maverick/tdegames/debian/copyright
@@ -7,7 +7,7 @@ It was downloaded from: http://www.kde.org/download
 
 Copyright:
 
-Everything in kdegames (unless otherwise stated below) are licensed under the
+Everything in tdegames (unless otherwise stated below) are licensed under the
 GPL or LGPL.  Please see /usr/share/common-licenses/* for full licenses.
 
 The kdocbook documentation for the applications is under the GFDL
diff --git a/ubuntu/maverick/tdegames/debian/libkdegames-trinity-dev.install b/ubuntu/maverick/tdegames/debian/libkdegames-trinity-dev.install
deleted file mode 100644
index 921b88d08..000000000
--- a/ubuntu/maverick/tdegames/debian/libkdegames-trinity-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-/opt/trinity/include/kde/*.h
-/opt/trinity/include/kde/kgame
-/opt/trinity/lib/libkdegames.so
-/opt/trinity/lib/libkdegames.la
diff --git a/ubuntu/maverick/tdegames/debian/libkdegames-trinity-doc.doc-base b/ubuntu/maverick/tdegames/debian/libkdegames-trinity-doc.doc-base
deleted file mode 100644
index 8425e3084..000000000
--- a/ubuntu/maverick/tdegames/debian/libkdegames-trinity-doc.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: libkdegames-trinity-doc
-Title: KDE Games Library API Documentation
-Author: The KDE Developers
-Abstract: This is the developers' API documentation for libkdegames.
-Section: Apps/Programming
-
-Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kdegames-apidocs/index.html
-Files: /usr/share/doc/kde/HTML/en/kdegames-apidocs/*.html
diff --git a/ubuntu/maverick/tdegames/debian/libkdegames-trinity-doc.install b/ubuntu/maverick/tdegames/debian/libkdegames-trinity-doc.install
deleted file mode 100644
index c8b7c3110..000000000
--- a/ubuntu/maverick/tdegames/debian/libkdegames-trinity-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/kde/HTML/en/kdegames-apidocs
diff --git a/ubuntu/maverick/tdegames/debian/libkdegames-trinity-doc.links b/ubuntu/maverick/tdegames/debian/libkdegames-trinity-doc.links
deleted file mode 100644
index c8ccc6102..000000000
--- a/ubuntu/maverick/tdegames/debian/libkdegames-trinity-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/kde/HTML/en/kdegames-apidocs /opt/trinity/share/doc/libkdegames-doc/html
diff --git a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-dev.install b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-dev.install
new file mode 100644
index 000000000..354fa3840
--- /dev/null
+++ b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-dev.install
@@ -0,0 +1,4 @@
+/opt/trinity/include/kde/*.h
+/opt/trinity/include/kde/kgame
+/opt/trinity/lib/libtdegames.so
+/opt/trinity/lib/libtdegames.la
diff --git a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.doc-base b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.doc-base
new file mode 100644
index 000000000..9ccd1a018
--- /dev/null
+++ b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.doc-base
@@ -0,0 +1,9 @@
+Document: libtdegames-trinity-doc
+Title: KDE Games Library API Documentation
+Author: The KDE Developers
+Abstract: This is the developers' API documentation for libtdegames.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/tdegames-apidocs/index.html
+Files: /usr/share/doc/kde/HTML/en/tdegames-apidocs/*.html
diff --git a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.install b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.install
new file mode 100644
index 000000000..1c5324c1c
--- /dev/null
+++ b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.install
@@ -0,0 +1 @@
+/opt/trinity/share/doc/kde/HTML/en/tdegames-apidocs
diff --git a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.links b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.links
new file mode 100644
index 000000000..a935244a6
--- /dev/null
+++ b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.links
@@ -0,0 +1 @@
+/opt/trinity/share/doc/kde/HTML/en/tdegames-apidocs /opt/trinity/share/doc/libtdegames-doc/html
diff --git a/ubuntu/maverick/tdegames/debian/libkdegames1-trinity.install b/ubuntu/maverick/tdegames/debian/libtdegames1-trinity.install
index 8fff1b082..2759a4355 100644
--- a/ubuntu/maverick/tdegames/debian/libkdegames1-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/libtdegames1-trinity.install
@@ -1,5 +1,5 @@
-/opt/trinity/lib/libkdegames.so.*
-/opt/trinity/share/apps/kdegames/pics/star.png
+/opt/trinity/lib/libtdegames.so.*
+/opt/trinity/share/apps/tdegames/pics/star.png
 /opt/trinity/share/icons/crystalsvg/16x16/actions/roll.png
 /opt/trinity/share/icons/crystalsvg/16x16/actions/highscore.png
 /opt/trinity/share/icons/crystalsvg/22x22/actions/roll.png
diff --git a/ubuntu/maverick/tdegames/debian/man/kdeopt.part b/ubuntu/maverick/tdegames/debian/man/kdeopt.part
index e32a1a94d..a4d12fb26 100644
--- a/ubuntu/maverick/tdegames/debian/man/kdeopt.part
+++ b/ubuntu/maverick/tdegames/debian/man/kdeopt.part
@@ -1,5 +1,5 @@
 .\" This portion of the manual page is from kdeopt.man, from the
-.\" kdegames Debian package.
+.\" tdegames Debian package.
 .SH GENERIC OPTIONS
 .TP
 .B \-\-help
diff --git a/ubuntu/maverick/tdegames/debian/rules b/ubuntu/maverick/tdegames/debian/rules
index 92c1bc149..0ba5f21cb 100755
--- a/ubuntu/maverick/tdegames/debian/rules
+++ b/ubuntu/maverick/tdegames/debian/rules
@@ -24,16 +24,16 @@ DEB_INSTALL_DOCS_ALL :=
 
 DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done)
 
-DEB_INSTALL_CHANGELOGS_kdegames := $(DEB_SRCDIR)/ChangeLog
+DEB_INSTALL_CHANGELOGS_tdegames := $(DEB_SRCDIR)/ChangeLog
 
-DEB_DH_MAKESHLIBS_ARGS_libkdegames1-trinity := -V'libkdegames1-trinity (>= 4:3.5.8)'
+DEB_DH_MAKESHLIBS_ARGS_libtdegames1-trinity := -V'libtdegames1-trinity (>= 4:3.5.8)'
 DEB_DH_MAKESHLIBS_ARGS_atlantik-trinity := -V
 DEB_DH_MAKESHLIBS_ARGS_kolf-trinity := -V
 
-PACKAGES_WITH_LIBS := libkdegames1-trinity atlantik-trinity kolf-trinity
+PACKAGES_WITH_LIBS := libtdegames1-trinity atlantik-trinity kolf-trinity
 
 common-binary-indep::
-	if ! test -d debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdegames-apidocs; then mv debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdegames-*apidocs debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdegames-apidocs; fi
+	if ! test -d debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdegames-apidocs; then mv debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdegames-*apidocs debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdegames-apidocs; fi
 
 common-binary-arch::
-	if ! test -d debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdegames-apidocs; then mv debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdegames-*apidocs debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdegames-apidocs; fi
+	if ! test -d debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdegames-apidocs; then mv debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdegames-*apidocs debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdegames-apidocs; fi
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-card-data-trinity.install b/ubuntu/maverick/tdegames/debian/tdegames-card-data-trinity.install
index 32fae70ae..32fae70ae 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-card-data-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/tdegames-card-data-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.atlantik b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.atlantik
index 8b0aa6120..ee45892f2 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.atlantik
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.atlantik
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-atlantik
+Document: tdegames-doc-html-atlantik
 Title: The Atlantik Handbook
 Author: Rob Kaper
 Abstract: Atlantik is a KDE client for playing Monopoly-like
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kasteroids b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kasteroids
index ade9c0216..f93ce8ec9 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kasteroids
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kasteroids
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kasteroids
+Document: tdegames-doc-html-kasteroids
 Title: The KAsteroids Handbook
 Author: Philip Rodrigues
 Abstract: KAsteroids is, as you would expect, the KDE clone of the
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.katomic b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.katomic
index dca71fa88..3e161c90a 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.katomic
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.katomic
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-katomic
+Document: tdegames-doc-html-katomic
 Title: The Atomic Entertainment Handbook
 Author: Dirk Doerflinger
 Abstract: This Handbook describes KAtomic Version 2.0
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kbackgammon b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbackgammon
index af1021ea7..47c2a50e9 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kbackgammon
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbackgammon
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kbackgammon
+Document: tdegames-doc-html-kbackgammon
 Title: The KBackgammon Handbook
 Author: Jens Hoefkens, Bo Thorsen
 Abstract: KBackgammon is a graphical backgammon program for KDE.
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kbattleship b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbattleship
index e967c9506..9437f45e1 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kbattleship
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbattleship
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kbattleship
+Document: tdegames-doc-html-kbattleship
 Title: The KBattleship Handbook
 Author: Daniel Molkentin, Nikolas Zimmermann
 Abstract: KBattleship is a network-enabled implementation of the
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kblackbox b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kblackbox
index 12e167d17..53af51018 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kblackbox
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kblackbox
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kblackbox
+Document: tdegames-doc-html-kblackbox
 Title: KBlackbox Game Manual
 Author: Robert Cimrman, Philip Rodrigues
 Abstract: KBlackbox is a superb graphical logical game, inspired by
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kbounce b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbounce
index b0f4649f1..649eb9013 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kbounce
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbounce
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kbounce
+Document: tdegames-doc-html-kbounce
 Title: The KBounce Handbook
 Author: Aaron J. Seigo
 Abstract: KBounce is a clone of Jezzball for KDE.
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kenolaba b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kenolaba
index b1aaaeba0..92a0ef0a2 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kenolaba
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kenolaba
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kenolaba
+Document: tdegames-doc-html-kenolaba
 Title: The Kenolaba Handbook
 Author: Josef Weidendorfer, Philip Rodrigues
 Abstract: Kenolaba is a simple board strategy game that is played
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kfouleggs b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kfouleggs
index 526d4e0aa..4531d2594 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kfouleggs
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kfouleggs
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kfouleggs
+Document: tdegames-doc-html-kfouleggs
 Title: The KFouleggs Handbook
 Author: Philip Rodrigues
 Abstract: KFouleggs is a clone of the Japanese PuyoPuyo game for
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kgoldrunner b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kgoldrunner
index 1a2392173..877b94649 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kgoldrunner
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kgoldrunner
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kgoldrunner
+Document: tdegames-doc-html-kgoldrunner
 Title: The KGoldrunner Handbook
 Author: Ian Wadham, Marco Krueger
 Abstract: KGoldrunner, a game of action and puzzle solving.  Run through
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kjumpingcube b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kjumpingcube
index 3c78bcca7..defbf2266 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kjumpingcube
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kjumpingcube
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kjumpingcube
+Document: tdegames-doc-html-kjumpingcube
 Title: The KJumpingcube Handbook
 Author: Matthias Kiefer
 Abstract: KJumpingcube is a simple tactical game you can play against
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.klines b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.klines
index 2e40093b1..bed501b5a 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.klines
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.klines
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-klines
+Document: tdegames-doc-html-klines
 Title: The KLines Handbook
 Author: Roman Razilov, Roman Merzlyakov
 Abstract: KLines is a nice little game meant to amuse you for anywhere
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kmahjongg b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kmahjongg
index c27f81ef6..8be9859a7 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kmahjongg
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kmahjongg
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kmahjongg
+Document: tdegames-doc-html-kmahjongg
 Title: The KMahjongg Handbook
 Author: John Hayes
 Abstract: KMahjongg is a KDE version of the famous oriental game Mahjongg.
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kmines b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kmines
index b175ed7ae..dddfb5694 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kmines
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kmines
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kmines
+Document: tdegames-doc-html-kmines
 Title: The KMines Handbook
 Author: Nicolas Hadacek, Michael McBride
 Abstract: KMines is the KDE version of the classic minesweeper game.
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kolf b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kolf
index 78e88ead0..6703197fc 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kolf
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kolf
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kolf
+Document: tdegames-doc-html-kolf
 Title: The Kolf Handbook
 Author: Jason Katz-Brown
 Abstract: Kolf is a miniature golf game for KDE.
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.konquest b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.konquest
index feb398d8c..fd6ce8557 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.konquest
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.konquest
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-konquest
+Document: tdegames-doc-html-konquest
 Title: The Konquest Handbook
 Author: Nicholas Robbins
 Abstract: Konquest is a wonderfully complex game for universal
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kpat b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kpat
index ffbc993a5..72e473ca5 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kpat
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kpat
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kpat
+Document: tdegames-doc-html-kpat
 Title: The KPat Handbook
 Author: Paul Olav Tvete, Maren Pakura, Stephan Kulow
 Abstract: KPat is a highly addictive card game for KDE.
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kpoker b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kpoker
index 861fec94c..8bc400d8f 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kpoker
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kpoker
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kpoker
+Document: tdegames-doc-html-kpoker
 Title: KPoker Handbook
 Author: Jochen Tuchbreiter, Andreas Beckermann
 Abstract: This is the helpfile of KPoker, a little poker game.
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kreversi b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kreversi
index 71d8ccfc1..aba7df6b6 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kreversi
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kreversi
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kreversi
+Document: tdegames-doc-html-kreversi
 Title: The KReversi Handbook
 Author: Clay Pradarits
 Abstract: KReversi is a simple one player strategy game.
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.ksame b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksame
index fc410181f..fc6543a2d 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.ksame
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksame
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-ksame
+Document: tdegames-doc-html-ksame
 Title: The KSame Handbook
 Author: Nicholas Robbins
 Abstract: KSame is a nice little program meant to amuse you for
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kshisen b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kshisen
index fc6219863..872725443 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kshisen
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kshisen
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kshisen
+Document: tdegames-doc-html-kshisen
 Title: The KShisen Handbook
 Author: Dirk Doerflinger
 Abstract: This Handbook describes KShisen Version 1.3.
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.ksirtet b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksirtet
index 5caf67539..efa18f229 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.ksirtet
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksirtet
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-ksirtet
+Document: tdegames-doc-html-ksirtet
 Title: The KSirtet Handbook
 Author: Dirk Doerflinger
 Abstract: This program is a clone of the well known game Tetris. You
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.ksnake b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksnake
index 3ab6dcb8e..475f2e786 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.ksnake
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksnake
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-ksnake
+Document: tdegames-doc-html-ksnake
 Title: The KSnake Handbook
 Author: Michel Filippi
 Abstract: Snake Race is a game of speed and agility. You are a hungry
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.ksokoban b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksokoban
index 4d45497f1..e6e7483f9 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.ksokoban
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksokoban
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-ksokoban
+Document: tdegames-doc-html-ksokoban
 Title: The KSokoban Handbook
 Author: Anders Widell
 Abstract: KSokoban is a KDE implementation of the Japanese warehouse
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kspaceduel b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kspaceduel
index 094c0a636..5018b8fef 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kspaceduel
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kspaceduel
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kspaceduel
+Document: tdegames-doc-html-kspaceduel
 Title: The KSpaceduel Handbook
 Author: Andreas Zehender
 Abstract: KSpaceduel is a space arcade game. Two ships fly around the
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.ktron b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ktron
index db5e26add..51339d525 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.ktron
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ktron
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-ktron
+Document: tdegames-doc-html-ktron
 Title: The KTron Handbook
 Author: Fabian Dal Santo
 Abstract: KTron is a simple Tron close for KDE, which you can play
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.ktuberling b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ktuberling
index b36c43159..7689c3d04 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.ktuberling
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ktuberling
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-ktuberling
+Document: tdegames-doc-html-ktuberling
 Title: The KTuberling Handbook
 Author: Eric Bischoff, Paul E. Ahlquist Jr.
 Abstract: KTuberling is a game intended for small children.
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kwin4 b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kwin4
index a1151b42d..8e9d8c8f2 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.kwin4
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kwin4
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-kwin4
+Document: tdegames-doc-html-kwin4
 Title: KWin4 Manual
 Author: Martin Heni
 Abstract: This documentation describes KWin4 version 1.0.0.
diff --git a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.lskat b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.lskat
index 07e428c17..cc162673e 100644
--- a/ubuntu/maverick/tdegames/debian/kdegames-doc-html.doc-base.lskat
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.lskat
@@ -1,4 +1,4 @@
-Document: kdegames-doc-html-lskat
+Document: tdegames-doc-html-lskat
 Title: Lskat Manual
 Author: Martin Heni
 Abstract: This documentation describes Lskat version 0.9.1.
diff --git a/ubuntu/maverick/tdegraphics/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick/tdegraphics/debian/KUBUNTU-DEBIAN-DIFFERENCES
index b7d2adb39..813e7d6f7 100644
--- a/ubuntu/maverick/tdegraphics/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/maverick/tdegraphics/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -1,5 +1,5 @@
 don't build-dep on imlib or xpdf-common
-don't include kuickshow, edit kdegraphics-dev.install
-remove kuickshow depends from kdegraphics-dev
+don't include kuickshow, edit tdegraphics-dev.install
+remove kuickshow depends from tdegraphics-dev
 kuickshow-tar: rule, and update kuickshow with each new upstream release
 kpdf.mime, raise priority to 6
diff --git a/ubuntu/maverick/tdegraphics/debian/changelog b/ubuntu/maverick/tdegraphics/debian/changelog
index 38be59fe0..37c948bdf 100644
--- a/ubuntu/maverick/tdegraphics/debian/changelog
+++ b/ubuntu/maverick/tdegraphics/debian/changelog
@@ -1,92 +1,92 @@
-kdegraphics-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
+tdegraphics-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
 
   * Karmic rebuild number 2
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 14 Dec 2009 02:41:00 -0600
 
-kdegraphics-trinity (4:3.5.10-0ubuntu1) karmic; urgency=low
+tdegraphics-trinity (4:3.5.10-0ubuntu1) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdegraphics-trinity (4:3.5.10-0ubuntu1~intrepid7) intrepid; urgency=low
+tdegraphics-trinity (4:3.5.10-0ubuntu1~intrepid7) intrepid; urgency=low
 
   * Moved colliding pixmaps and manpages to /opt/trinity (closes Bug 67)
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 10 Apr 2009 09:48:00 -0600
 
-kdegraphics-trinity (4:3.5.10-0ubuntu1~intrepid6) intrepid; urgency=low
+tdegraphics-trinity (4:3.5.10-0ubuntu1~intrepid6) intrepid; urgency=low
 
   * Added rotation feature to KPDF
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 29 Mar 2009 15:41:00 -0600
 
-kdegraphics-trinity (4:3.5.10-0ubuntu1~intrepid5) intrepid; urgency=low
+tdegraphics-trinity (4:3.5.10-0ubuntu1~intrepid5) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 27 Feb 2009 22:49:00 -0600
 
-kdegraphics-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
+tdegraphics-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
   * SVN import
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 24 Nov 2008 14:32:00 -0600
 
-kdegraphics (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdegraphics (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
-    - Bump build-dep of kdelibs4-dev to 3.5.10
+    - Bump build-dep of tdelibs4-dev to 3.5.10
     - Freshen kubuntu_07_kpdf_category.diff 
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:43:37 -0400
 
-kdegraphics (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdegraphics (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:07 +0000
 
-kdegraphics (4:3.5.8-2ubuntu7) hardy; urgency=low
+tdegraphics (4:3.5.8-2ubuntu7) hardy; urgency=low
 
   * patches/kubuntu_07_kpdf_category.diff: Change the category in
     kpdf's .desktop file from "Graphics" to "Office" (LP: #81725).
 
  -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com>  Sat, 05 Jan 2008 13:41:38 +0100
 
-kdegraphics (4:3.5.8-2ubuntu6) hardy; urgency=low
+tdegraphics (4:3.5.8-2ubuntu6) hardy; urgency=low
 
   * Fix build error with g++-4.3.
 
  -- Matthias Klose <doko@ubuntu.com>  Thu, 24 Jan 2008 12:29:58 +0000
 
-kdegraphics (4:3.5.8-2ubuntu5) hardy; urgency=low
+tdegraphics (4:3.5.8-2ubuntu5) hardy; urgency=low
 
   * Rebuild for libopenexr transition
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 11 Dec 2007 17:33:17 +0000
 
-kdegraphics (4:3.5.8-2ubuntu4) hardy; urgency=low
+tdegraphics (4:3.5.8-2ubuntu4) hardy; urgency=low
 
-  * Remove kuickshow depends from kdegraphics-dev
+  * Remove kuickshow depends from tdegraphics-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 27 Nov 2007 10:12:34 +0000
 
-kdegraphics (4:3.5.8-2ubuntu3) hardy; urgency=low
+tdegraphics (4:3.5.8-2ubuntu3) hardy; urgency=low
 
   * Don't build-dep on xpdf-common
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 09:35:05 +0000
 
-kdegraphics (4:3.5.8-2ubuntu2) hardy; urgency=low
+tdegraphics (4:3.5.8-2ubuntu2) hardy; urgency=low
 
   * Merge with Debian, remaining changes in KUBUNTU-DEBIAN-DIFFERENCES
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:32 +0000
 
-kdegraphics (4:3.5.8-2) unstable; urgency=low
+tdegraphics (4:3.5.8-2) unstable; urgency=low
 
   * Patch to multiple xpdf based vulnerabilities. (Closes: #450630)
     CVE-2007-4352, CVE-2007-5392, CVE-2007-5393.
@@ -94,14 +94,14 @@ kdegraphics (4:3.5.8-2) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 11 Nov 2007 19:50:13 +0100
 
-kdegraphics (4:3.5.8-1) unstable; urgency=low
+tdegraphics (4:3.5.8-1) unstable; urgency=low
 
   * New upstream release.
   
   +++ Changes by Francesco Pedrini:
 
   * Added manpage for KFaxview.
-  * Removed 20_post-3.5.7-kdegraphics-CVE-2007-3387.diff which was merged
+  * Removed 20_post-3.5.7-tdegraphics-CVE-2007-3387.diff which was merged
   	upstream.
   * Switched ${Source-Version} to ${source:Version} in debian/control.
   * Added chrpath to Build-Depends for powerpc in order to fix RPATH issue on
@@ -113,7 +113,7 @@ kdegraphics (4:3.5.8-1) unstable; urgency=low
 
  -- Francesco Pedrini <francesco.pedrini@gmail.com>  Wed, 10 Oct 2007 00:53:17 +0200
 
-kdegraphics (4:3.5.7-4) unstable; urgency=high
+tdegraphics (4:3.5.7-4) unstable; urgency=high
 
   * Patch for stack-based buffer overflow in the StreamPredictor::getNextLine
     function in xpd that might allow remote attackers to execute arbitrary code 
@@ -124,7 +124,7 @@ kdegraphics (4:3.5.7-4) unstable; urgency=high
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 26 Sep 2007 11:15:28 +0200
 
-kdegraphics (4:3.5.7-3) unstable; urgency=high
+tdegraphics (4:3.5.7-3) unstable; urgency=high
 
   * Implement use of uploaders.mk and update uploaders.
 
@@ -138,40 +138,40 @@ kdegraphics (4:3.5.7-3) unstable; urgency=high
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 23 Jul 2007 22:56:37 +0200
 
-kdegraphics (4:3.5.7-2) unstable; urgency=low
+tdegraphics (4:3.5.7-2) unstable; urgency=low
 
   * Build against new poppler. (Closes: #425605)
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Fri, 25 May 2007 20:07:32 +0100
 
-kdegraphics (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdegraphics (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:21 +0100
 
-kdegraphics (4:3.5.7-1ubuntu6) gutsy; urgency=low
+tdegraphics (4:3.5.7-1ubuntu6) gutsy; urgency=low
 
   * debian/patches/kubuntu_05_poppler.diff: Resolved the three remaining
     FIXMEs for porting to current poppler API.
 
  -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 12 Sep 2007 17:52:11 +0200
 
-kdegraphics (4:3.5.7-1ubuntu5) gutsy; urgency=low
+tdegraphics (4:3.5.7-1ubuntu5) gutsy; urgency=low
 
   * Add back updated kubuntu_05_poppler.diff to build with poppler
     instead of internal xpdf copy
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 06 Sep 2007 22:52:20 +0100
 
-kdegraphics (4:3.5.7-1ubuntu4) gutsy; urgency=low
+tdegraphics (4:3.5.7-1ubuntu4) gutsy; urgency=low
 
   * Rebuild for the libpoppler1 -> libpopper2 transistion.
   * Munge Maintainer field as per spec.
 
  -- Steve Kowalik <stevenk@ubuntu.com>  Wed,  5 Sep 2007 22:47:49 +1000
 
-kdegraphics (4:3.5.7-1ubuntu3) gutsy; urgency=low
+tdegraphics (4:3.5.7-1ubuntu3) gutsy; urgency=low
 
   * SECURITY UPDATE: xpdf buffer overflow
     kpdf, the KDE pdf viewer, shares code with xpdf. xpdf contains
@@ -186,20 +186,20 @@ kdegraphics (4:3.5.7-1ubuntu3) gutsy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 02 Aug 2007 17:00:06 +0100
 
-kdegraphics (4:3.5.7-1ubuntu2) gutsy; urgency=low
+tdegraphics (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
   * No change upload to pick up new poppler package names
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 29 May 2007 11:58:56 +0100
 
-kdegraphics (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdegraphics (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * Merge with Debian, remaining changes in debian/KUBUNTU-DEBIAN-DIFFERENCES
   * Remove kubuntu_05_poppler.diff, it needs a newer poppler than we have
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 May 2007 14:38:35 +0100
 
-kdegraphics (4:3.5.7-1) unstable; urgency=low
+tdegraphics (4:3.5.7-1) unstable; urgency=low
 
   * New upstream release
 
@@ -214,13 +214,13 @@ kdegraphics (4:3.5.7-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 01 May 2007 19:19:03 +0200
 
-kdegraphics (4:3.5.6-2ubuntu1) gutsy; urgency=low
+tdegraphics (4:3.5.6-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 14:53:24 +0100
 
-kdegraphics (4:3.5.6-2) unstable; urgency=low
+tdegraphics (4:3.5.6-2) unstable; urgency=low
 
   * Upload to unstable after Etch release.
 
@@ -233,13 +233,13 @@ kdegraphics (4:3.5.6-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 20 Apr 2007 12:26:50 +0100
 
-kdegraphics (4:3.5.6-1) experimental; urgency=low
+tdegraphics (4:3.5.6-1) experimental; urgency=low
 
   * New upstream release.
   
   +++ Changes by Josh Metzler:
 
-  * Make kdegraphics-dbg depend on kdelibs-dbg to get useful backtraces when
+  * Make tdegraphics-dbg depend on tdelibs-dbg to get useful backtraces when
     debugging.
   
   +++ Changes by Sune Vuorela:
@@ -252,52 +252,52 @@ kdegraphics (4:3.5.6-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 11 Jan 2007 22:13:49 +0100
 
-kdegraphics (4:3.5.5-2) unstable; urgency=low
+tdegraphics (4:3.5.5-2) unstable; urgency=low
 
   * Change the libglut3-dev build-dep (a transitional package)
     to the proper freeglut3-dev. (Closes: #394497)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 14 Nov 2006 18:00:42 -0500
 
-kdegraphics (4:3.5.6-0ubuntu4) feisty; urgency=low
+tdegraphics (4:3.5.6-0ubuntu4) feisty; urgency=low
 
   * Build-dep on libcairo2-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  6 Apr 2007 23:35:59 +0100
 
-kdegraphics (4:3.5.6-0ubuntu3) feisty; urgency=low
+tdegraphics (4:3.5.6-0ubuntu3) feisty; urgency=low
 
   * Raise priority of kpdf in kpdf.mime
-    closes https://bugs.launchpad.net/ubuntu/+source/kdegraphics/+bug/102544
+    closes https://bugs.launchpad.net/ubuntu/+source/tdegraphics/+bug/102544
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  6 Apr 2007 20:11:56 +0100
 
-kdegraphics (4:3.5.6-0ubuntu2) feisty; urgency=low
+tdegraphics (4:3.5.6-0ubuntu2) feisty; urgency=low
 
   * Add kuickshow-tar: rule, makes packaging separate kuickshow easier
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Feb 2007 16:25:23 +0000
 
-kdegraphics (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdegraphics (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
   * Update kubuntu_05_poppler.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 13:29:08 +0000
 
-kdegraphics (4:3.5.5-1ubuntu2) feisty; urgency=low
+tdegraphics (4:3.5.5-1ubuntu2) feisty; urgency=low
 
   * rebuild with --enable-gcc-hidden-visibility
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 19:39:16 +0000
 
-kdegraphics (4:3.5.5-1ubuntu1) feisty; urgency=low
+tdegraphics (4:3.5.5-1ubuntu1) feisty; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Nov 2006 22:04:45 +0000
 
-kdegraphics (4:3.5.5-1) unstable; urgency=low
+tdegraphics (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
     + Fixes kpdf's failure to display 16-bit TrueType fonts
@@ -311,7 +311,7 @@ kdegraphics (4:3.5.5-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon,  9 Oct 2006 22:30:54 +0200
 
-kdegraphics (4:3.5.4-2) unstable; urgency=low
+tdegraphics (4:3.5.4-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -323,7 +323,7 @@ kdegraphics (4:3.5.4-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun,  6 Aug 2006 15:45:30 -0400
 
-kdegraphics (4:3.5.4-1) unstable; urgency=low
+tdegraphics (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -338,45 +338,45 @@ kdegraphics (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 29 Jul 2006 20:52:44 -0400
 
-kdegraphics (4:3.5.5-0ubuntu2) edgy; urgency=low
+tdegraphics (4:3.5.5-0ubuntu2) edgy; urgency=low
 
   * Build-dep on poppler >= 0.5.4-0ubuntu3 to get previously missing
     header files
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Oct 2006 12:56:18 +0100
 
-kdegraphics (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdegraphics (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:06 +0000
 
-kdegraphics (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdegraphics (4:3.5.4-0ubuntu2) edgy; urgency=low
 
   * Rebuild with latest cdbs to add gettext domain to .desktop files for
     langpacks-desktopfiles-kde, no source changes
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Sep 2006 22:53:11 +0000
 
-kdegraphics (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdegraphics (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:18 +0000
 
-kdegraphics (4:3.5.3-1ubuntu2) edgy; urgency=low
+tdegraphics (4:3.5.3-1ubuntu2) edgy; urgency=low
 
-  * Build-dep on latest kdelibs, fixes Qt binary compatibility break
+  * Build-dep on latest tdelibs, fixes Qt binary compatibility break
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Jun 2006 16:22:09 +0000
 
-kdegraphics (4:3.5.3-1ubuntu1) edgy; urgency=low
+tdegraphics (4:3.5.3-1ubuntu1) edgy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 27 Jun 2006 15:53:14 +0000
 
-kdegraphics (4:3.5.3-1) unstable; urgency=low
+tdegraphics (4:3.5.3-1) unstable; urgency=low
 
   * New upstream release:
     + fixes a problem with kuickshow and tmp files. (Closes: #303097)
@@ -387,7 +387,7 @@ kdegraphics (4:3.5.3-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  1 Jun 2006 11:28:39 +0200
 
-kdegraphics (4:3.5.2-1) unstable; urgency=low
+tdegraphics (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -400,7 +400,7 @@ kdegraphics (4:3.5.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 29 Mar 2006 15:52:32 -0500
 
-kdegraphics (4:3.5.1-2) unstable; urgency=low
+tdegraphics (4:3.5.1-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -409,7 +409,7 @@ kdegraphics (4:3.5.1-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon,  6 Feb 2006 21:02:28 -0500
 
-kdegraphics (4:3.5.1-1) unstable; urgency=low
+tdegraphics (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -419,7 +419,7 @@ kdegraphics (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 27 Jan 2006 12:34:52 -0500
 
-kdegraphics (4:3.5.0-3) unstable; urgency=low
+tdegraphics (4:3.5.0-3) unstable; urgency=low
 
   * Upload to unstable 
 
@@ -427,7 +427,7 @@ kdegraphics (4:3.5.0-3) unstable; urgency=low
 
  -- Isaac Clerencia <isaac@debian.org>  Fri,  6 Jan 2006 18:24:53 +0100
 
-kdegraphics (4:3.5.0-2) experimental; urgency=low
+tdegraphics (4:3.5.0-2) experimental; urgency=low
 
   * Upload to experimental.
 
@@ -435,56 +435,56 @@ kdegraphics (4:3.5.0-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 20 Dec 2005 11:29:37 -0500
 
-kdegraphics (4:3.5.2-0ubuntu6) dapper; urgency=low
+tdegraphics (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:31:32 +0200
 
-kdegraphics (4:3.5.2-0ubuntu5) dapper; urgency=low
+tdegraphics (4:3.5.2-0ubuntu5) dapper; urgency=low
 
   * Remove all references to kuickshow in debian/control
     Closes malone #38573
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 29 Apr 2006 16:49:58 +0100
 
-kdegraphics (4:3.5.2-0ubuntu4) dapper; urgency=low
+tdegraphics (4:3.5.2-0ubuntu4) dapper; urgency=low
 
   * Do not build-dep on imlib
   * Do not create kuickshow package (needs imlib)
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 27 Apr 2006 15:27:21 +0100
 
-kdegraphics (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdegraphics (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Edit debian/cdbs/kde.mk to generate .po files
   * Edit debian/cdbs/kde.mk to mark .po files as UTF-8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Apr 2006 16:22:53 +0100
 
-kdegraphics (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdegraphics (4:3.5.2-0ubuntu2) dapper; urgency=low
 
   * Revert the attempt to move from imlib to imlib2, as this causes
     the package to fail to build, and requires porting to get working.
 
  -- Adam Conrad <adconrad@ubuntu.com>  Wed, 29 Mar 2006 17:25:53 +1100
 
-kdegraphics (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdegraphics (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Remove kubuntu_04_kpdf_dont_overwrite_file.diff, now upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 11:50:21 +0000
 
-kdegraphics (4:3.5.1-0ubuntu3) dapper; urgency=low
+tdegraphics (4:3.5.1-0ubuntu3) dapper; urgency=low
 
   * debian/patches/kubuntu_05_poppler.diff:
     - Port to new poppler 0.5.1 API.
 
  -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 17 Mar 2006 18:33:40 +0100
 
-kdegraphics (4:3.5.1-0ubuntu2) dapper; urgency=low
+tdegraphics (4:3.5.1-0ubuntu2) dapper; urgency=low
 
   * Add debian/patches/kubuntu_05_poppler.diff:
     - Do not use the shipped xpdf copy and build against poppler instead.
@@ -493,14 +493,14 @@ kdegraphics (4:3.5.1-0ubuntu2) dapper; urgency=low
 
  -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 30 Jan 2006 16:11:32 +0000
 
-kdegraphics (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdegraphics (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Add kubuntu_04_kpdf_dont_overwrite_file.diff on advise of upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:06 +0000
 
-kdegraphics (4:3.5.0-0ubuntu4) dapper; urgency=low
+tdegraphics (4:3.5.0-0ubuntu4) dapper; urgency=low
 
   * SECURITY UPDATE: Multiple integer/buffer overflows.
   * Update kubuntu_04_xpdf_vulnerability.diff
@@ -528,7 +528,7 @@ kdegraphics (4:3.5.0-0ubuntu4) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun,  8 Jan 2006 23:15:49 +0000
 
-kdegraphics (4:3.5.0-0ubuntu3) dapper; urgency=low
+tdegraphics (4:3.5.0-0ubuntu3) dapper; urgency=low
 
   * SECURITY UPDATE: Multiple integer/buffer overflows.
   * Update kubuntu_04_xpdf_vulnerability.diff
@@ -550,7 +550,7 @@ kdegraphics (4:3.5.0-0ubuntu3) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  9 Dec 2005 15:52:09 +0000
 
-kdegraphics (4:3.5.0-0ubuntu2) dapper; urgency=low
+tdegraphics (4:3.5.0-0ubuntu2) dapper; urgency=low
 
   * SECURITY UPDATE: kpdf/xpdf multiple integer overflows
   * kpdf, the KDE pdf viewer, shares code with xpdf. xpdf contains
@@ -566,26 +566,26 @@ kdegraphics (4:3.5.0-0ubuntu2) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  8 Dec 2005 00:13:23 +0000
 
-kdegraphics (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdegraphics (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:08 +0000
 
-kdegraphics (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdegraphics (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 20:07:45 +0000
 
-kdegraphics (4:3.5-rc1-1ubuntu1) dapper; urgency=low
+tdegraphics (4:3.5-rc1-1ubuntu1) dapper; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 13 Nov 2005 16:42:18 +0000
 
-kdegraphics (4:3.5.0-1) alioth; urgency=low
+tdegraphics (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
 
@@ -602,7 +602,7 @@ kdegraphics (4:3.5.0-1) alioth; urgency=low
 
   * Bump DH_COMPAT to 5. No changes.
 
-  * Add kdegraphics-dbg, to help track down problems.
+  * Add tdegraphics-dbg, to help track down problems.
 
   * Fix typo in kamera package description. (Closes: #342698)
 
@@ -610,7 +610,7 @@ kdegraphics (4:3.5.0-1) alioth; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 29 Nov 2005 23:58:42 -0500
 
-kdegraphics (4:3.4.3-4) unstable; urgency=high
+tdegraphics (4:3.4.3-4) unstable; urgency=high
 
   +++ Changes by Christopher Martin:
 
@@ -625,7 +625,7 @@ kdegraphics (4:3.4.3-4) unstable; urgency=high
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 20 Dec 2005 11:10:28 -0500
 
-kdegraphics (4:3.4.3-3) unstable; urgency=medium
+tdegraphics (4:3.4.3-3) unstable; urgency=medium
 
   +++ Changes by Christopher Martin:
 
@@ -634,9 +634,9 @@ kdegraphics (4:3.4.3-3) unstable; urgency=medium
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  7 Dec 2005 22:05:43 -0500
 
-kdegraphics (4:3.4.3-2) unstable; urgency=low
+tdegraphics (4:3.4.3-2) unstable; urgency=low
 
-  * Upload to unstable, rebuilding against kdelibs4c2a.
+  * Upload to unstable, rebuilding against tdelibs4c2a.
 
   * KDE_3_4_BRANCH update (up to r483894).
 
@@ -646,7 +646,7 @@ kdegraphics (4:3.4.3-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 28 Nov 2005 17:19:58 +0100
 
-kdegraphics (4:3.4.3-1) experimental; urgency=low
+tdegraphics (4:3.4.3-1) experimental; urgency=low
 
   * New upstream release.
 
@@ -656,7 +656,7 @@ kdegraphics (4:3.4.3-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 16 Oct 2005 13:44:50 -0400
 
-kdegraphics (4:3.4.2-2) unstable; urgency=low
+tdegraphics (4:3.4.2-2) unstable; urgency=low
 
   +++ Changes by Adeodato Simó:
 
@@ -664,7 +664,7 @@ kdegraphics (4:3.4.2-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 16 Sep 2005 15:18:03 +0200
 
-kdegraphics (4:3.4.2-1) unstable; urgency=low
+tdegraphics (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -680,100 +680,100 @@ kdegraphics (4:3.4.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 30 Aug 2005 13:30:37 +0200
 
-kdegraphics (4:3.4.1-1) experimental; urgency=low
+tdegraphics (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
 
-kdegraphics (4:3.4.3-0ubuntu2) breezy; urgency=low
+tdegraphics (4:3.4.3-0ubuntu2) breezy; urgency=low
 
   * Fix kview.install for libphotobook move
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun,  9 Oct 2005 13:21:50 +0100
 
-kdegraphics (4:3.4.3-0ubuntu1) breezy; urgency=low
+tdegraphics (4:3.4.3-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Build with GCC 3.4 on hppa
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  7 Oct 2005 18:13:46 +0000
 
-kdegraphics (4:3.4.2-0ubuntu2) breezy; urgency=low
+tdegraphics (4:3.4.2-0ubuntu2) breezy; urgency=low
 
   * Rebuild to get proper libgl/libglu shlibs dependencies.
 
  -- Adam Conrad <adconrad@ubuntu.com>  Thu, 25 Aug 2005 00:10:12 +1000
 
-kdegraphics (4:3.4.2-0ubuntu1) breezy; urgency=low
+tdegraphics (4:3.4.2-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Build using unsermake
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 16:25:01 +0000
 
-kdegraphics (4:3.4.1-0ubuntu1) breezy; urgency=low
+tdegraphics (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number due to KDE 3.4.1 release
   * Move remove xpdf-utils depend on kpdf, add as 
-    suggests on kdegraphics-kfile-plugins
+    suggests on tdegraphics-kfile-plugins
   * Add all packages back to meta package
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue, 31 May 2005 16:33:00 +0000
 
-kdegraphics (4:3.4.1-0pre1ubuntu2) breezy; urgency=low
+tdegraphics (4:3.4.1-0pre1ubuntu2) breezy; urgency=low
 
   * Remove build-dep on xpdf-utils, add as dependency for kpdf
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 26 May 2005 12:26:34 +0000
 
-kdegraphics (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
+tdegraphics (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
 
   * Sync with Debian
   * Change kubuntu_03_kmenu_tidy_kghostview.diff to use NoDisplay
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 25 May 2005 11:14:53 +0000
 
-kdegraphics (4:3.4.0-0ubuntu3) hoary; urgency=low
+tdegraphics (4:3.4.0-0ubuntu3) hoary; urgency=low
 
   * Add kubuntu_03_kmenu_tidy_kghostview.diff to hide kghostview from menu
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed,  6 Apr 2005 03:14:25 +0100
 
-kdegraphics (4:3.4.0-0ubuntu2) hoary; urgency=low
+tdegraphics (4:3.4.0-0ubuntu2) hoary; urgency=low
 
   * Add kubuntu_02_kmenu_tidy.diff to move ksnapshot up a level.
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 17 Mar 2005 00:54:22 +0000
 
-kdegraphics (4:3.4.0-0ubuntu1) hoary; urgency=low
+tdegraphics (4:3.4.0-0ubuntu1) hoary; urgency=low
 
-  * Remove kcoloredit, kfax, kfaxview, kpovmodeler, kiconedit, kruler depends from kdegraphics.
+  * Remove kcoloredit, kfax, kfaxview, kpovmodeler, kiconedit, kruler depends from tdegraphics.
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 22:12:12 +0000
 
-kdegraphics (4:3.4.0-0pre1ubuntu3) hoary; urgency=low
+tdegraphics (4:3.4.0-0pre1ubuntu3) hoary; urgency=low
 
   * Build-Depend on imlib1-dev, not libimlib2-dev
 
  -- Matt Zimmerman <mdz@ubuntu.com>  Tue,  8 Mar 2005 06:09:32 -0800
 
-kdegraphics (4:3.4.0-0pre1ubuntu2) hoary; urgency=low
+tdegraphics (4:3.4.0-0pre1ubuntu2) hoary; urgency=low
 
   * Add patch kubuntu_01_Xxf86vm.diff to link to libXxf86vm
   * Use imlib2 instead of imlib11
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue,  8 Mar 2005 11:31:15 +0000
 
-kdegraphics (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+tdegraphics (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
 
   * Ubuntu build
-  * Remove kview from kdegraphics dependency
+  * Remove kview from tdegraphics dependency
   * Disable DRM in KPDF
 
  -- Jonathan Riddell <jr@jriddell.org>  Sun,  6 Mar 2005 02:43:48 +0000
 
-kdegraphics (4:3.4.0-0pre1) alioth; urgency=low
+tdegraphics (4:3.4.0-0pre1) alioth; urgency=low
 
   * New upstream release.
 
@@ -795,13 +795,13 @@ kdegraphics (4:3.4.0-0pre1) alioth; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * New kdegraphics-doc-html package, containing doc-base registered HTML
+  * New tdegraphics-doc-html package, containing doc-base registered HTML
     versions of application handbooks, for users without Konqueror or
     KHelpCenter.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  3 Mar 2005 03:33:15 +0100
 
-kdegraphics (4:3.3.2-2) unstable; urgency=medium
+tdegraphics (4:3.3.2-2) unstable; urgency=medium
 
   +++ Changes by Christopher Martin:
 
@@ -814,20 +814,20 @@ kdegraphics (4:3.3.2-2) unstable; urgency=medium
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 14 Apr 2005 22:55:13 +0200
 
-kdegraphics (4:3.3.2-1ubuntu4) hoary; urgency=low
+tdegraphics (4:3.3.2-1ubuntu4) hoary; urgency=low
 
   * removed kuickshow and replaced it with gwenview
   * linian cleanup
 
  -- Andreas Mueller <amu@ubuntu.com>  Wed, 16 Feb 2005 01:21:21 +0100
 
-kdegraphics (4:3.3.2-1ubuntu3) hoary; urgency=low
+tdegraphics (4:3.3.2-1ubuntu3) hoary; urgency=low
 
   * Patched for CAN-2005-0064: kpdf Buffer Overflow Vulnerability
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 19 Jan 2005 16:45:49 +0000
 
-kdegraphics (4:3.3.2-1ubuntu2) hoary; urgency=low
+tdegraphics (4:3.3.2-1ubuntu2) hoary; urgency=low
 
   * Fix build-dep on automake1.9
   * Add --install-missing to dh_install
@@ -835,11 +835,11 @@ kdegraphics (4:3.3.2-1ubuntu2) hoary; urgency=low
 
  -- Andreas Mueller <amu@canonical.com>  Wed, 29 Dec 2004 04:13:02 +0000
 
-kdegraphics (4:3.3.2-0ubuntu1) hoary; urgency=low
+tdegraphics (4:3.3.2-0ubuntu1) hoary; urgency=low
 
   * New upstream release
   * Removed patches:
-    - 01_kdegraphics_branch.diff.uu
+    - 01_tdegraphics_branch.diff.uu
     - 02_autotools_update.diff
     - 05_pedantic-errors.diff
     - 07_xlibs-static-pic.diff
@@ -847,7 +847,7 @@ kdegraphics (4:3.3.2-0ubuntu1) hoary; urgency=low
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue, 28 Dec 2004 20:23:29 +0000
 
-kdegraphics (4:3.3.2-1) unstable; urgency=high
+tdegraphics (4:3.3.2-1) unstable; urgency=high
 
   +++ Changes by Adeodato Simó:
 
@@ -874,7 +874,7 @@ kdegraphics (4:3.3.2-1) unstable; urgency=high
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 19 Jan 2005 19:31:25 +0100
 
-kdegraphics (4:3.3.2-0pre1) experimental; urgency=low
+tdegraphics (4:3.3.2-0pre1) experimental; urgency=low
 
   * New upstream release.
     - kfax prints correctly multipage tiff files. (Closes: #288754)
@@ -903,7 +903,7 @@ kdegraphics (4:3.3.2-0pre1) experimental; urgency=low
 
  -- Christopher Martin <chrsmrtn@freeshell.org>  Sun, 19 Dec 2004 20:14:10 -0500
 
-kdegraphics (4:3.3.1-2) unstable; urgency=high
+tdegraphics (4:3.3.1-2) unstable; urgency=high
 
   * Upload to fix security vulnerability "kpdf Buffer Overflow Vulnerability".
     As per CAN-2004-1125, the xpdf codebase contains a buffer overflow that
@@ -912,7 +912,7 @@ kdegraphics (4:3.3.1-2) unstable; urgency=high
 
  -- Adeodato Simó <asp16@alu.ua.es>  Thu, 23 Dec 2004 08:35:23 +0100
 
-kdegraphics (4:3.3.1-1) unstable; urgency=low
+tdegraphics (4:3.3.1-1) unstable; urgency=low
 
   * New upstream release.
   * KDE_3_3_BRANCH update.
@@ -920,27 +920,27 @@ kdegraphics (4:3.3.1-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri,  5 Nov 2004 01:00:00 -0600
 
-kdegraphics (4:3.3.0-2) unstable; urgency=low
+tdegraphics (4:3.3.0-2) unstable; urgency=low
 
   * KDE_3_3_BRANCH update.
   * kpdf Recommends: kghostview. (Closes: #268479)
 
  -- Christopher L Cheney <ccheney@debian.org>  Sun, 26 Sep 2004 01:00:00 -0500
 
-kdegraphics (4:3.3.0-1.1) unstable; urgency=low
+tdegraphics (4:3.3.0-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
   * Rebuild against new libopenexr2. (Closes: #266505)
 
  -- Andrew Lau <netsnipe@users.sourceforge.net>  Sat, 28 Aug 2004 00:57:16 +1000
 
-kdegraphics (4:3.3.0-1) unstable; urgency=high
+tdegraphics (4:3.3.0-1) unstable; urgency=high
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat, 14 Aug 2004 04:30:00 -0500
 
-kdegraphics (4:3.2.3-1) unstable; urgency=high
+tdegraphics (4:3.2.3-1) unstable; urgency=high
 
   * New upstream release.
   * Update kpovmodeler Debian menu entry. (Closes: #246203)
@@ -952,7 +952,7 @@ kdegraphics (4:3.2.3-1) unstable; urgency=high
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue,  3 Aug 2004 18:00:00 -0500
 
-kdegraphics (4:3.2.2-1) unstable; urgency=low
+tdegraphics (4:3.2.2-1) unstable; urgency=low
 
   * New upstream release.
   * Added dh_compress -X.sty (Closes: #238812)
@@ -960,46 +960,46 @@ kdegraphics (4:3.2.2-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue, 13 Apr 2004 19:00:00 -0500
 
-kdegraphics (4:3.2.1-1) unstable; urgency=low
+tdegraphics (4:3.2.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri,  5 Mar 2004 22:00:00 -0600
 
-kdegraphics (4:3.2.0-0pre1v1) experimental; urgency=low
+tdegraphics (4:3.2.0-0pre1v1) experimental; urgency=low
 
   * New upstrem release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu, 19 Feb 2004 00:00:00 -0600
 
-kdegraphics (4:3.1.95-1) unstable; urgency=low
+tdegraphics (4:3.1.95-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat, 24 Jan 2004 21:00:00 -0600
 
-kdegraphics (4:3.1.5-1) unstable; urgency=low
+tdegraphics (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
   * Added libtool arm patch.
   * Removed kiconedit enum patch, see #225663.
   * Moved libkscan.la from libkscan-dev into libkscan1 since the KDE scan
     service uses it for module loading.
-  * libkscan1-dev Depends kdelibs4-dev.
+  * libkscan1-dev Depends tdelibs4-dev.
   * kdvi lower mime priority. (Closes: #139990)
   * kooka Recommends gocr. (Closes: #146628)
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue, 13 Jan 2004 14:00:00 -0600
 
-kdegraphics (4:3.1.4-2) unstable; urgency=low
+tdegraphics (4:3.1.4-2) unstable; urgency=low
 
-  * Corrected kdegraphics Description indention. (Closes: #226601)
+  * Corrected tdegraphics Description indention. (Closes: #226601)
   * Added patch to work with new freetype version.
   * Added patch from CVS HEAD for kiconedit enum issue with --enable-final.
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed,  7 Jan 2004 17:00:00 -0600
 
-kdegraphics (4:3.1.4-1) unstable; urgency=low
+tdegraphics (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
   * Added patch to update autotools files.
@@ -1009,40 +1009,40 @@ kdegraphics (4:3.1.4-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri, 17 Oct 2003 18:00:00 -0500
 
-kdegraphics (4:3.1.3-1) unstable; urgency=low
+tdegraphics (4:3.1.3-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri,  1 Aug 2003 16:00:00 -0500
 
-kdegraphics (4:3.1.2-1.1) unstable; urgency=low
+tdegraphics (4:3.1.2-1.1) unstable; urgency=low
 
   * NMU.
   * Build-depends on imlib11-dev instead of imlib-dev. (Closes: #196009).
 
  -- Aurelien Jarno <aurel32@debian.org>  Fri, 18 Jul 2003 16:28:56 +0200
 
-kdegraphics (4:3.1.2-1) unstable; urgency=low
+tdegraphics (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri, 23 May 2003 02:00:00 -0500
 
-kdegraphics (4:3.1.1-1) unstable; urgency=low
+tdegraphics (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release.
   * Add 'chmod +x configure' to rules. (Closes: #181352)
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed, 12 Mar 2003 11:00:00 -0600
 
-kdegraphics (4:3.1.0-1) unstable; urgency=low
+tdegraphics (4:3.1.0-1) unstable; urgency=low
 
   * New upstream release.
   * Rebuilt debian dir.
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue, 04 Feb 2003 01:00:00 -0600
 
-kdegraphics (4:2.2.2-6.11) stable-security; urgency=high
+tdegraphics (4:2.2.2-6.11) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Applied upstream patch so ghostscript won't execute arbitrary commands
@@ -1050,7 +1050,7 @@ kdegraphics (4:2.2.2-6.11) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Thu, 10 Apr 2003 11:59:28 +0200
 
-kdegraphics (4:2.2.2-6.10) stable-security; urgency=high
+tdegraphics (4:2.2.2-6.10) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Applied upstream patches to fix several potential vulnerabilities.
@@ -1058,13 +1058,13 @@ kdegraphics (4:2.2.2-6.10) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Mon,  6 Jan 2003 07:41:24 +0100
 
-kdegraphics (4:2.2.2-6.9) unstable; urgency=high
+tdegraphics (4:2.2.2-6.9) unstable; urgency=high
 
   * Rebuilt for unstable
 
  -- Martin Schulze <joey@infodrom.org>  Mon, 21 Oct 2002 17:25:59 +0200
 
-kdegraphics (4:2.2.2-6.8) stable-security; urgency=high
+tdegraphics (4:2.2.2-6.8) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Looks like I missed one more occurrence of sscanf().  Thanks to Dirk
@@ -1072,7 +1072,7 @@ kdegraphics (4:2.2.2-6.8) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Thu, 17 Oct 2002 09:49:11 +0200
 
-kdegraphics (4:2.2.2-6.7) stable-security; urgency=high
+tdegraphics (4:2.2.2-6.7) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Include security patch from Olaf Kirch to fix buffer overflows in
@@ -1084,7 +1084,7 @@ kdegraphics (4:2.2.2-6.7) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Tue, 15 Oct 2002 15:24:40 +0200
 
-kdegraphics (4:2.2.2-6.6) stable-security; urgency=high
+tdegraphics (4:2.2.2-6.6) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Include security patch from Olaf Kirch to fix buffer overflows in
@@ -1094,7 +1094,7 @@ kdegraphics (4:2.2.2-6.6) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Mon, 14 Oct 2002 19:49:18 +0200
 
-kdegraphics (4:2.2.2-6.5) stable-security; urgency=high
+tdegraphics (4:2.2.2-6.5) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Applied security patch from Olaf Kirch to fix buffer overflows in
@@ -1102,21 +1102,21 @@ kdegraphics (4:2.2.2-6.5) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Mon, 14 Oct 2002 12:16:53 +0200
 
-kdegraphics (4:2.2.2-6.4) unstable; urgency=high
+tdegraphics (4:2.2.2-6.4) unstable; urgency=high
 
   * NMU
   * Fix kamera.h so that we build on all archs...hopefully
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 17 Mar 2002 16:45:00 -0700
 
-kdegraphics (4:2.2.2-6.3) unstable; urgency=high
+tdegraphics (4:2.2.2-6.3) unstable; urgency=high
 
   * NMU
   * Not so anal on build-deps
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 14 Mar 2002 00:15:00 -0700
 
-kdegraphics (4:2.2.2-6.2) unstable; urgency=high
+tdegraphics (4:2.2.2-6.2) unstable; urgency=high
 
   * NMU
   * Don't build-depend on libsane-dev for hppa and also don't build any of 
@@ -1137,7 +1137,7 @@ kdegraphics (4:2.2.2-6.2) unstable; urgency=high
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 11 Mar 2002 12:46:00 -0700
 
-kdegraphics (4:2.2.2-6) unstable; urgency=low
+tdegraphics (4:2.2.2-6) unstable; urgency=low
 
   * The "muzak-Christmas-carols-suck" release.
     Alternately, the "I'm-under-peer-pressure-to-give-this-a-name" release,
@@ -1157,7 +1157,7 @@ kdegraphics (4:2.2.2-6) unstable; urgency=low
 
  -- Daniel Stone <daniel@sfarc.net>  Sun, 23 Dec 2001 10:37:39 -0500
 
-kdegraphics (4:2.2.2-5.1) unstable; urgency=low
+tdegraphics (4:2.2.2-5.1) unstable; urgency=low
 
   * NMU
   * Add Replaces: kview (<<4:2.2.2-5) to kfract.  Closes: #125871.
@@ -1165,7 +1165,7 @@ kdegraphics (4:2.2.2-5.1) unstable; urgency=low
 
  -- LaMont Jones <lamont@security.hp.com>  Sat, 22 Dec 2001 19:41:59 -0700
 
-kdegraphics (4:2.2.2-5) unstable; urgency=low
+tdegraphics (4:2.2.2-5) unstable; urgency=low
 
   * CVS resync. (Taken at 9-12-21, 23:21 - UTC+11).
     - New repository - my /var/cvs. Sorry.
@@ -1188,20 +1188,20 @@ kdegraphics (4:2.2.2-5) unstable; urgency=low
 
  -- Daniel Stone <daniel@sfarc.net>  Fri, 30 Nov 2001 21:51:05 +1100
 
-kdegraphics (4:2.2.2-4.1) unstable; urgency=low
+tdegraphics (4:2.2.2-4.1) unstable; urgency=low
 
   * Ok..so I fixed kamera...it builds fine on i386...but doesn't on non-i386
     systems.  dig dig dig..ahhh..not linking to gphoto2_port.. (Closes: #121897)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 01 Dec 2001 01:17:00 -0700
 
-kdegraphics (4:2.2.2-4) unstable; urgency=low
+tdegraphics (4:2.2.2-4) unstable; urgency=low
 
   * fix kamera after breaking it last time
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 30 Nov 2001 00:10:00 -0700
 
-kdegraphics (4:2.2.2-3) unstable; urgency=low
+tdegraphics (4:2.2.2-3) unstable; urgency=low
 
   * Sync with upstream
   * More build cleanup/fixes
@@ -1211,34 +1211,34 @@ kdegraphics (4:2.2.2-3) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 29 Nov 2001 04:23:00 -0700
 
-kdegraphics (4:2.2.2-2) unstable; urgency=low
+tdegraphics (4:2.2.2-2) unstable; urgency=low
 
   * Let's get kamera to  work
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 27 Nov 2001 03:02:00 -0700
 
-kdegraphics (4:2.2.2-1) unstable; urgency=low
+tdegraphics (4:2.2.2-1) unstable; urgency=low
 
   * New upstream version
   * Don't build kamera as it doesn't build. :)  (Closes: #119813)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 21 Nov 2001 12:18:00 -0700
 
-kdegraphics (4:2.2.1.0-2) unstable; urgency=low
+tdegraphics (4:2.2.1.0-2) unstable; urgency=low
 
   * Fix configure
   * Add missing build-dep
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 05 Oct 2001 12:18:00 -0700
 
-kdegraphics (4:2.2.1.0-1) unstable; urgency=low
+tdegraphics (4:2.2.1.0-1) unstable; urgency=low
 
   * Provide kamera package now that libgpio is available
   * build with automake 1.5 maybe
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Oct 2001 22:17:00 -0700
 
-kdegraphics (4:2.2.1-1) unstable; urgency=low
+tdegraphics (4:2.2.1-1) unstable; urgency=low
  
   * New upstream version 2.2.1
   * Change maintainer
@@ -1246,19 +1246,19 @@ kdegraphics (4:2.2.1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 25 Aug 2001 14:38:00 -0700
 
-kdegraphics (4:2.2.0-final-1) unstable; urgency=low
+tdegraphics (4:2.2.0-final-1) unstable; urgency=low
  
   * New upstream version 2.2
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 30 Jul 2001 00:01:00 -0700
 
-kdegraphics (4:2.2.0-0.1beta1-2) unstable; urgency=low
+tdegraphics (4:2.2.0-0.1beta1-2) unstable; urgency=low
  
   * grr...get rid of that ^H so it'll build on alpha and others
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 27 Jul 2001 23:00:00 -0700
 
-kdegraphics (4:2.2.0-0.1beta1-1) unstable; urgency=low
+tdegraphics (4:2.2.0-0.1beta1-1) unstable; urgency=low
  
   * sync with upstream
   * more alpha build fixes
@@ -1266,28 +1266,28 @@ kdegraphics (4:2.2.0-0.1beta1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 27 Jul 2001 02:02:00 -0700
 
-kdegraphics (4:2.2.0-0beta1-3) unstable; urgency=low
+tdegraphics (4:2.2.0-0beta1-3) unstable; urgency=low
  
   * sync with upstream
   * More alpha build fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 07 Jul 2001 03:42:00 -0700
 
-kdegraphics (4:2.2.0-0beta1-2) unstable; urgency=low
+tdegraphics (4:2.2.0-0beta1-2) unstable; urgency=low
  
   * sync with upstream
   * Autobuild for alpha
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 03 Jul 2001 02:20:00 -0700
 
-kdegraphics (4:2.2.0-0beta1-1) unstable; urgency=low
+tdegraphics (4:2.2.0-0beta1-1) unstable; urgency=low
  
   * sync with upstream
   * add translation (Closes: #102889)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 30 Jun 2001 19:06:00 -0700
 
-kdegraphics (4:2.2-cvs20010622-1) unstable; urgency=low
+tdegraphics (4:2.2-cvs20010622-1) unstable; urgency=low
  
   * New upstream cvs pull
   * 2.2 beta1
@@ -1303,33 +1303,33 @@ kdegraphics (4:2.2-cvs20010622-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
 
-kdegraphics (4:2.1.1-2) unstable; urgency=low
+tdegraphics (4:2.1.1-2) unstable; urgency=low
   
   * Update menu bits to include new kde menu removal tag
   * a couple upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Apr 2001 17:32:00 -0700
 
-kdegraphics (4:2.1.1-1.0.1) unstable; urgency=low
+tdegraphics (4:2.1.1-1.0.1) unstable; urgency=low
  
   * Building with older libc
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 26 Mar 2001 17:00:00 -0700
 
-kdegraphics (4:2.1.1-1) unstable; urgency=low
+tdegraphics (4:2.1.1-1) unstable; urgency=low
  
   * New upstream version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Mar 2001 23:11:00 -0700
 
-kdegraphics (4:2.1.0-1) unstable; urgency=low
+tdegraphics (4:2.1.0-1) unstable; urgency=low
  
   * New upstream CVS pull
   * Updating shlibs
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Mar 2001 23:11:00 -0700
 
-kdegraphics (4:2.1-final-1) unstable; urgency=low
+tdegraphics (4:2.1-final-1) unstable; urgency=low
  
   * New upstream version
   * Upping standards version
@@ -1338,26 +1338,26 @@ kdegraphics (4:2.1-final-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
 
-kdegraphics (4:2.1-beta2-2) unstable; urgency=low
+tdegraphics (4:2.1-beta2-2) unstable; urgency=low
  
   * Adding missing gs dependency for kghostview
   * Building with --disable-debug
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 26 Jan 2001 02:31:00 -0700
 
-kdegraphics (4:2.1-beta2-1) unstable; urgency=low
+tdegraphics (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
 
-kdegraphics (4:2.1-20010115-1) unstable; urgency=low
+tdegraphics (4:2.1-20010115-1) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
 
-kdegraphics (4:2.1-20010109-1) unstable; urgency=low
+tdegraphics (4:2.1-20010109-1) unstable; urgency=low
  
   * More upstream fixes
   * breaking out kruler, kpaint and kiconedit into their own package
@@ -1365,20 +1365,20 @@ kdegraphics (4:2.1-20010109-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 09 Jan 2001 13:14:00 -0700
 
-kdegraphics (4:2.1-20010101-1) unstable; urgency=low
+tdegraphics (4:2.1-20010101-1) unstable; urgency=low
  
   * More upstream fixes
       
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Jan 2001 17:15:00 -0700
        
-kdegraphics (4:2.1-20001218-1) unstable; urgency=low
+tdegraphics (4:2.1-20001218-1) unstable; urgency=low
  
   * More upstream fixes
-  * Adding in missing conflicts for kdegraphics
+  * Adding in missing conflicts for tdegraphics
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Dec 2000 23:50:00 -0700
 
-kdegraphics (4:2.1-20001213-1) unstable; urgency=low
+tdegraphics (4:2.1-20001213-1) unstable; urgency=low
  
   * New upstream cvs version
   * Fixing build-depends (Closes: #79473)
@@ -1386,13 +1386,13 @@ kdegraphics (4:2.1-20001213-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 13 Dec 2000 18:00:00 -0700
 
-kdegraphics (4:2.0-final-7) unstable; urgency=low
+tdegraphics (4:2.0-final-7) unstable; urgency=low
  
   * Fixing task package and libminimagic-dev
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 22 Nov 2000 05:25:00 -0700
 
-kdegraphics (4:2.0-final-6) unstable; urgency=low
+tdegraphics (4:2.0-final-6) unstable; urgency=low
  
   * More upstream fixes
   * Fixing shlibs files
@@ -1402,14 +1402,14 @@ kdegraphics (4:2.0-final-6) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 21 Nov 2000 09:15:00 -0700
 
-kdegraphics (4:2.0-final-5) unstable; urgency=low
+tdegraphics (4:2.0-final-5) unstable; urgency=low
  
   * More upstream fixes
   * More dependency fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 18 Nov 2000 06:30:00 -0700
 
-kdegraphics (4:2.0-final-4.1) unstable; urgency=low
+tdegraphics (4:2.0-final-4.1) unstable; urgency=low
  
   * More upstream fixes
   * Adding in replaces for pixie
@@ -1418,20 +1418,20 @@ kdegraphics (4:2.0-final-4.1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 10 Nov 2000 13:30:00 -0700
 
-kdegraphics (4:2.0-final-4) unstable; urgency=low
+tdegraphics (4:2.0-final-4) unstable; urgency=low
  
   * More upstream fixes
   * Adding in menu hints
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
                                                                                 
-kdegraphics (4:2.0-final-3.1) unstable; urgency=low
+tdegraphics (4:2.0-final-3.1) unstable; urgency=low
  
   * Fixing kview's bmp mime entry (Closes: #72831)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 07 Nov 2000 00:30:00 -0700
                                                                                 
-kdegraphics (4:2.0-final-3) unstable; urgency=low
+tdegraphics (4:2.0-final-3) unstable; urgency=low
  
   * More upstream fixes
   * building against new xlibs
@@ -1439,228 +1439,228 @@ kdegraphics (4:2.0-final-3) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 04 Nov 2000 23:00:00 -0700
                                                                                 
-kdegraphics (4:2.0-final-2) unstable; urgency=low
+tdegraphics (4:2.0-final-2) unstable; urgency=low
  
   * More upstream fixes
   * Fixing mime entries
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
                                                                                 
-kdegraphics (4:2.0-final-0) unstable; urgency=low
+tdegraphics (4:2.0-final-0) unstable; urgency=low
  
   * KDE 2.0
   * pixie no longer provided
   * providing seperate libminimagick package as well as a kpixmap2bitmap 
-    package.  Changing kdegraphics-dev to libminimagick-dev
+    package.  Changing tdegraphics-dev to libminimagick-dev
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Oct 2000 00:00:00 -0700
                                                                                 
-kdegraphics (4:2.0-20001016-0) unstable; urgency=low
+tdegraphics (4:2.0-20001016-0) unstable; urgency=low
 
   * more upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 16 Oct 2000 15:00:00 -0700
 
-kdegraphics (4:2.0-20001011-0) unstable; urgency=low
+tdegraphics (4:2.0-20001011-0) unstable; urgency=low
  
   * KDE 2.0 RC2
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 12 Oct 2000 06:00:00 -0700
                                                                                 
-kdegraphics (4:2.0-20001006-0) unstable; urgency=low
+tdegraphics (4:2.0-20001006-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 06 Oct 2000 18:00:00 -0700
                                                                                 
-kdegraphics (4:2.0-20001005-0) unstable; urgency=low
+tdegraphics (4:2.0-20001005-0) unstable; urgency=low
  
   * More upstream fixes
-  * Compiling once again against non-versioned kdelibs
+  * Compiling once again against non-versioned tdelibs
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 05 Oct 2000 15:00:00 -0700
                                                                                 
-kdegraphics (4:2.0-20001002-0) unstable; urgency=low
+tdegraphics (4:2.0-20001002-0) unstable; urgency=low
  
   * KDE 2.0 RC1
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Oct 2000 01:30:00 -0700
                                                                                 
-kdegraphics (4:2.0-20000925-0) unstable; urgency=low
+tdegraphics (4:2.0-20000925-0) unstable; urgency=low
  
   * More upstream fixes
   * Updating build-depends
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
 
-kdegraphics (4:2.0-20000920-0) unstable; urgency=low
+tdegraphics (4:2.0-20000920-0) unstable; urgency=low
  
   * More upstream fixes
-  * Breaking up kdegraphics into individual packages
+  * Breaking up tdegraphics into individual packages
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Sep 2000 23:00:00 -0700
 
-kdegraphics (4:2.0-20000918-0) unstable; urgency=low
+tdegraphics (4:2.0-20000918-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Sep 2000 22:00:00 -0700      
 
-kdegraphics (4:2.0-20000912-0) unstable; urgency=low
+tdegraphics (4:2.0-20000912-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 12 Sep 2000 22:00:00 -0700
 
-kdegraphics (4:2.0-20000909-0) unstable; urgency=low
+tdegraphics (4:2.0-20000909-0) unstable; urgency=low
 
   * More upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 09 Sep 2000 22:00:00 -0700
 
-kdegraphics (4:2.0-20000901-0) unstable; urgency=low
+tdegraphics (4:2.0-20000901-0) unstable; urgency=low
 
   * More upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Sep 2000 17:00:00 -0700
 
-kdegraphics (4:2.0-20000827-0) experimental; urgency=low
+tdegraphics (4:2.0-20000827-0) experimental; urgency=low
  
   * More upstream fixes
   * Merging package updates into CVS
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 27 Aug 2000 19:30:00 -0700
                                                                                
-kdegraphics (4:2.0-20000825-0) experimental; urgency=low
+tdegraphics (4:2.0-20000825-0) experimental; urgency=low
  
   * KDE 2.0 beta 4
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 25 Aug 2000 22:30:00 -0700
 
-kdegraphics (4:2.0-20000820-1.0) experimental; urgency=low
+tdegraphics (4:2.0-20000820-1.0) experimental; urgency=low
  
   * new beta version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 20 Aug 2000 09:45:00 -0700
 
-kdegraphics (4:2.0-20000524-1.0) experimental; urgency=low
+tdegraphics (4:2.0-20000524-1.0) experimental; urgency=low
  
   * new cvs version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 24 May 2000 04:15:37 -0700
                                                                                 
-kdegraphics-cvs (4:2.0-20000521-1.0) experimental; urgency=low
+tdegraphics-cvs (4:2.0-20000521-1.0) experimental; urgency=low
  
   * new cvs version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 21 May 2000 02:15:37 -0700
 
-kdegraphics-cvs (4:2.0-20000512-1.1) experimental; urgency=low
+tdegraphics-cvs (4:2.0-20000512-1.1) experimental; urgency=low
 
   * new cvs version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 12 May 2000 22:00:37 -0700
 
-kdegraphics-cvs (4:2.0-20000308-1.0) experimental; urgency=low
+tdegraphics-cvs (4:2.0-20000308-1.0) experimental; urgency=low
  
   * new cvs version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 08 Mar 2000 22:00:37 -0700
 
-kdegraphics-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+tdegraphics-cvs (4:2.0-20000302-1.0) experimental; urgency=low
 
   * new cvs version
   * Adding in build-depends
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 29 Feb 2000 22:00:37 -0700
 
-kdegraphics-cvs (4:2.0-19991201-1.0) experimental; urgency=low
+tdegraphics-cvs (4:2.0-19991201-1.0) experimental; urgency=low
 
   * new cvs version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 01 Dec 1999 03:00:37 -0400
 
-kdegraphics-cvs (4:2.0-19991001-1) experimental; urgency=low
+tdegraphics-cvs (4:2.0-19991001-1) experimental; urgency=low
 
   * new cvs version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Oct 1999 03:30:37 -0400
 
-kdegraphics-cvs (4:2.0-19990825-1) experimental; urgency=low
+tdegraphics-cvs (4:2.0-19990825-1) experimental; urgency=low
 
   * new version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 25 Aug 1999 08:21:37 -0400
 
-kdegraphics-cvs (4:2.0-19990626-1) experimental; urgency=low
+tdegraphics-cvs (4:2.0-19990626-1) experimental; urgency=low
 
   * new version
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 27 Jun 1999 20:21:37 +0200
 
-kdegraphics-cvs (4:2.0-19990524-1) experimental; urgency=low
+tdegraphics-cvs (4:2.0-19990524-1) experimental; urgency=low
 
   * migrating out of /opt to /
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 24 May 1999 07:30:09 -0400
 
-kdegraphics (4:1.1-19990217-1) unstable; urgency=low
+tdegraphics (4:1.1-19990217-1) unstable; urgency=low
 
   * new upstream version
 
  -- Stephan Kulow <coolo@kde.org>  Wed, 17 Feb 1999 19:09:42 +0100
 
-kdegraphics (4:1.1-19990207-2) unstable; urgency=low
+tdegraphics (4:1.1-19990207-2) unstable; urgency=low
 
   * fixed a bug with the wrong libjpeg version
 
  -- Stephan Kulow <coolo@kde.org>  Tue,  9 Feb 1999 10:43:45 +0100
 
-kdegraphics (4:1.1-19990207-1) unstable; urgency=low
+tdegraphics (4:1.1-19990207-1) unstable; urgency=low
 
   * new upstream version 1.1 and new epoche
 
  -- Stephan Kulow <coolo@kde.org>  Sun,  7 Feb 1999 12:12:58 +0100
 
-kdegraphics (2:980710-1.0-1) unstable; urgency=low
+tdegraphics (2:980710-1.0-1) unstable; urgency=low
 
   * new upstream version 1.0
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 12 Jul 1998 10:12:19 +0200
 
-kdegraphics (2:980419-b4-1) unstable; urgency=low
+tdegraphics (2:980419-b4-1) unstable; urgency=low
 
   * new upstream version Beta4
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 19 Apr 1998 17:29:21 +0200
 
-kdegraphics (2:980312-3) frozen; urgency=low
+tdegraphics (2:980312-3) frozen; urgency=low
 
   * add man page for undocumented
-  * compile with fixed kdelibs. This time from CVS
+  * compile with fixed tdelibs. This time from CVS
   * use debhelper now
 
  -- Stephan Kulow <coolo@kde.org>  Fri,  3 Apr 1998 19:39:55 +0200
 
-kdegraphics (2:980312-2) frozen; urgency=low
+tdegraphics (2:980312-2) frozen; urgency=low
 
   * new compile cycle with qt-1.33 and libstdc++-2.8
 
  -- Stephan Kulow <coolo@kde.org>  Tue, 24 Mar 1998 21:05:12 +0100
 
-kdegraphics (2:980312-1) unstable; urgency=low
+tdegraphics (2:980312-1) unstable; urgency=low
 
   * New upstream release
 
  -- Stephan Kulow <coolo@kde.org>  Fri, 13 Mar 1998 00:04:55 +0100
 
-kdegraphics (2:980310-2) unstable; urgency=low
+tdegraphics (2:980310-2) unstable; urgency=low
 
   * added the call to kderules
 
  -- Stephan Kulow <coolo@kde.org>  Tue, 10 Mar 1998 21:28:05 +0100
 
-kdegraphics (2:980310-1) unstable; urgency=low
+tdegraphics (2:980310-1) unstable; urgency=low
 
   * Initial Release.
 
diff --git a/ubuntu/maverick/tdegraphics/debian/control b/ubuntu/maverick/tdegraphics/debian/control
index 90de29b3b..ce78e81ef 100644
--- a/ubuntu/maverick/tdegraphics/debian/control
+++ b/ubuntu/maverick/tdegraphics/debian/control
@@ -1,19 +1,19 @@
-Source: kdegraphics-trinity
+Source: tdegraphics-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>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
+Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kdegraphics-trinity
+Package: tdegraphics-trinity
 Section: kde
 Architecture: all
-Replaces: kdegraphics-kde3 (<< 4:3.5.13)
-Breaks: kdegraphics-kde3 (<< 4:3.5.13)
-Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), kdegraphics-kfile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
-Suggests: kdegraphics-trinity-doc-html (>= ${source:Version})
+Replaces: tdegraphics-kde3 (<< 4:3.5.13)
+Breaks: tdegraphics-kde3 (<< 4:3.5.13)
+Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-kfile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
+Suggests: tdegraphics-trinity-doc-html (>= ${source:Version})
 Description: graphics 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,
@@ -23,12 +23,12 @@ Description: graphics apps from the official Trinity release
  This metapackage includes a collection of graphics applications
  provided with the official release of Trinity.
 
-Package: kdegraphics-trinity-doc-html
+Package: tdegraphics-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: kdegraphics-kde3-doc-html (<< 4:3.5.13)
-Breaks: kdegraphics-kde3-doc-html (<< 4:3.5.13)
-Suggests: konqueror-trinity | www-browser, kdebase-trinity
+Replaces: tdegraphics-kde3-doc-html (<< 4:3.5.13)
+Breaks: tdegraphics-kde3-doc-html (<< 4:3.5.13)
+Suggests: konqueror-trinity | www-browser, tdebase-trinity
 Description: KDE graphics documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -41,7 +41,7 @@ Description: KDE graphics documentation in HTML format
  KDE graphics packages.
  .
  This package is part of Trinity, and a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
 Package: kamera-trinity
 Section: graphics
@@ -55,7 +55,7 @@ Description: digital camera io_slave for Konqueror
  to allow access to your camera's pictures with the URL camera:/
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
 Package: kcoloredit-trinity
 Section: graphics
@@ -69,33 +69,33 @@ Description: a color palette editor and color picker for KDE
  picker.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
-Package: kdegraphics-trinity-dev
+Package: tdegraphics-trinity-dev
 Section: devel
 Architecture: any
-Replaces: kdegraphics-kde3-dev (<< 4:3.5.13)
-Breaks: kdegraphics-kde3-dev (<< 4:3.5.13)
-Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
+Replaces: tdegraphics-kde3-dev (<< 4:3.5.13)
+Breaks: tdegraphics-kde3-dev (<< 4:3.5.13)
+Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
 Description: development files for the KDE graphics module
  This package contains headers and other development files for the KDE
  graphics module.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
-Package: kdegraphics-kfile-plugins-trinity
+Package: tdegraphics-kfile-plugins-trinity
 Section: kde
 Architecture: any
-Replaces: kdegraphics-kfile-plugins-kde3 (<< 4:3.5.13)
-Breaks: kdegraphics-kfile-plugins-kde3 (<< 4:3.5.13)
+Replaces: tdegraphics-kfile-plugins-kde3 (<< 4:3.5.13)
+Breaks: tdegraphics-kfile-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Description: KDE metainfo plugins for graphic files
  This packages provides meta information for graphic files (file sizes,
  tags, etc. all from within the file manager).
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
 Package: kdvi-trinity
 Section: graphics
@@ -108,7 +108,7 @@ Description: dvi viewer for KDE
  This program and KPart allow the user to display *.DVI files from TeX.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
 Package: kfax-trinity
 Section: graphics
@@ -121,7 +121,7 @@ Description: G3/G4 fax viewer for Trinity
  (g3, g3-2d, g4).
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
 Package: kfaxview-trinity
 Section: graphics
@@ -137,7 +137,7 @@ Description: G3/G4 fax viewer for Trinity using kviewshell
  kfax application once it reproduces all of kfax's features.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
 Package: kgamma-trinity
 Section: graphics
@@ -152,7 +152,7 @@ Description: gamma correction module for the Trinity Control Center
  etc.) will look the same on your monitor as on other monitors.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
  .
   Homepage: http://kgamma.berlios.de/index2.php
 
@@ -173,7 +173,7 @@ Description: PostScript viewer for Trinity
  online.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
 Package: kiconedit-trinity
 Section: graphics
@@ -186,7 +186,7 @@ Description: an icon editor for Trinity
  KIconedit allows you easily to create and edit icons.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
 Package: kmrml-trinity
 Section: kde
@@ -202,7 +202,7 @@ Description: a Konqueror plugin for searching pictures
  MRML server.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
 Package: kolourpaint-trinity
 Section: graphics
@@ -225,7 +225,7 @@ Description: a simple paint program for Trinity
  essential features like Undo/Redo.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
  .
   Homepage: http://kolourpaint.sourceforge.net
 
@@ -251,7 +251,7 @@ Description: scanner program for Trinity
  in kooka.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
  .
   Homepage: http://kooka.kde.org/
 
@@ -270,7 +270,7 @@ Description: PDF viewer for Trinity
  application.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
 Package: kpovmodeler-trinity
 Section: graphics
@@ -293,7 +293,7 @@ Description: a graphical editor for povray scenes
  non-free, unsupported repository.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
  .
   Homepage: http://www.kpovmodeler.org
 
@@ -308,7 +308,7 @@ Description: a screen ruler and color measurement tool for Trinity
  Kruler is a screen ruler (using pixels) and color measurement tool for KDE.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
 Package: ksnapshot-trinity
 Section: graphics
@@ -323,7 +323,7 @@ Description: screenshot utility for Trinity
  The images can then be saved in a variety of formats.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
 Package: ksvg-trinity
 Section: graphics
@@ -337,7 +337,7 @@ Description: SVG viewer for Trinity
  application.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
 Package: kview-trinity
 Section: graphics
@@ -352,7 +352,7 @@ Description: simple image viewer/converter for Trinity
  as well.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
 Package: kviewshell-trinity
 Section: graphics
@@ -369,19 +369,19 @@ Description: generic framework for viewer applications in Trinity
  DjVu images.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
 Package: libkscan-trinity-dev
 Section: libdevel
 Architecture: any
 Replaces: libkscan-kde3-dev (<< 4:3.5.13)
 Breaks: libkscan-kde3-dev (<< 4:3.5.13)
-Depends: libkscan1-trinity (= ${binary:Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libkscan1-trinity (= ${binary:Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
 Description: development files for the Trinity scanner library
  This package contains development files for Trinity's scanner library.
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
 Package: libkscan1-trinity
 Section: libs
@@ -395,7 +395,7 @@ Description: scanner library for Trinity
  (as long as it's sane compatible).
  .
  This package is part of Trinity, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
 Package: libpoppler-tqt
 Section: net
@@ -408,7 +408,7 @@ Description: TQt support for Poppler
  This library is used by the Trinity graphics file plugins for PDF support.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
 Package: libpoppler-tqt-dev
 Section: net
@@ -421,16 +421,16 @@ Description: Development files for TQt support for Poppler
  This package contains the development files needed to compile applications against poppler-tqt.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
-Package: kdegraphics-trinity-dbg
+Package: tdegraphics-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: kdegraphics-kde3-dbg (<< 4:3.5.13)
-Breaks: kdegraphics-kde3-dbg (<< 4:3.5.13)
+Replaces: tdegraphics-kde3-dbg (<< 4:3.5.13)
+Breaks: tdegraphics-kde3-dbg (<< 4:3.5.13)
 Priority: extra
-Depends: kdelibs-trinity-dbg, libkscan1-trinity (= ${binary:Version})
-Description: debugging symbols for kdegraphics
- This package contains the debugging symbols associated with kdegraphics-trinity.
- They will automatically be used by gdb for debugging kdegraphics-trinity-related
+Depends: tdelibs-trinity-dbg, libkscan1-trinity (= ${binary:Version})
+Description: debugging symbols for tdegraphics
+ This package contains the debugging symbols associated with tdegraphics-trinity.
+ They will automatically be used by gdb for debugging tdegraphics-trinity-related
  issues.
diff --git a/ubuntu/maverick/tdegraphics/debian/control.in b/ubuntu/maverick/tdegraphics/debian/control.in
index 7801bad78..3a2b2e862 100644
--- a/ubuntu/maverick/tdegraphics/debian/control.in
+++ b/ubuntu/maverick/tdegraphics/debian/control.in
@@ -1,17 +1,17 @@
-Source: kdegraphics
+Source: tdegraphics
 Section: kde
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 4:3.5.6), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, tdelibs4-dev (>= 4:3.5.6), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
 Standards-Version: 3.7.2
 
-Package: kdegraphics
+Package: tdegraphics
 Section: kde
 Architecture: all
-Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), kdegraphics-kfile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), kiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
-Suggests: kdegraphics-doc-html (>= ${source:Version})
+Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-kfile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), kiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
+Suggests: tdegraphics-doc-html (>= ${source:Version})
 Description: graphics apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -21,10 +21,10 @@ Description: graphics apps from the official KDE release
  This metapackage includes a collection of graphics applications
  provided with the official release of KDE.
 
-Package: kdegraphics-doc-html
+Package: tdegraphics-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror | www-browser, kdebase
+Suggests: konqueror | www-browser, tdebase
 Description: KDE graphics documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -37,7 +37,7 @@ Description: KDE graphics documentation in HTML format
  KDE graphics packages.
  .
  This package is part of KDE, and a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
 Package: kamera
 Section: graphics
@@ -49,7 +49,7 @@ Description: digital camera io_slave for Konqueror
  to allow access to your camera's pictures with the URL camera:/
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
 Package: kcoloredit
 Section: graphics
@@ -61,20 +61,20 @@ Description: a color palette editor and color picker for KDE
  picker.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
-Package: kdegraphics-dev
+Package: tdegraphics-dev
 Section: devel
 Architecture: any
-Depends: kghostview (= ${binary:Version}), kmrml (= ${binary:Version}), kpovmodeler (= ${binary:Version}), ksvg (= ${binary:Version}), kuickshow (= ${binary:Version}), kview (= ${binary:Version}), kviewshell (= ${binary:Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: kghostview (= ${binary:Version}), kmrml (= ${binary:Version}), kpovmodeler (= ${binary:Version}), ksvg (= ${binary:Version}), kuickshow (= ${binary:Version}), kview (= ${binary:Version}), kviewshell (= ${binary:Version}), tdelibs4-dev (>= 4:3.5.8)
 Description: development files for the KDE graphics module
  This package contains headers and other development files for the KDE
  graphics module.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
-Package: kdegraphics-kfile-plugins
+Package: tdegraphics-kfile-plugins
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -83,19 +83,19 @@ Description: KDE metainfo plugins for graphic files
  tags, etc. all from within the file manager).
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
 Package: kdvi
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}, texlive-fonts-recommended
 Suggests: khelpcenter
-Replaces: kdebase-data (<< 4:3.3.91)
+Replaces: tdebase-data (<< 4:3.3.91)
 Description: dvi viewer for KDE
  This program and KPart allow the user to display *.DVI files from TeX.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
 Package: kfax
 Section: graphics
@@ -106,7 +106,7 @@ Description: G3/G4 fax viewer for KDE
  (g3, g3-2d, g4).
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
 Package: kfaxview
 Section: graphics
@@ -120,7 +120,7 @@ Description: G3/G4 fax viewer for KDE using kviewshell
  kfax application once it reproduces all of kfax's features.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
 Package: kgamma
 Section: graphics
@@ -133,7 +133,7 @@ Description: gamma correction module for the KDE Control Center
  etc.) will look the same on your monitor as on other monitors.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
  .
   Homepage: http://kgamma.berlios.de/index2.php
 
@@ -152,7 +152,7 @@ Description: PostScript viewer for KDE
  online.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
 Package: kiconedit
 Section: graphics
@@ -163,7 +163,7 @@ Description: an icon editor for KDE
  KIconedit allows you easily to create and edit icons.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
 Package: kmrml
 Section: kde
@@ -177,7 +177,7 @@ Description: a Konqueror plugin for searching pictures
  MRML server.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
 Package: kolourpaint
 Section: graphics
@@ -198,7 +198,7 @@ Description: a simple paint program for KDE
  essential features like Undo/Redo.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
  .
   Homepage: http://kolourpaint.sourceforge.net
 
@@ -222,7 +222,7 @@ Description: scanner program for KDE
  in kooka.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
  .
   Homepage: http://kooka.kde.org/
 
@@ -239,7 +239,7 @@ Description: PDF viewer for KDE
  application.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
 Package: kpovmodeler
 Section: graphics
@@ -260,7 +260,7 @@ Description: a graphical editor for povray scenes
  non-free, unsupported repository.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
  .
   Homepage: http://www.kpovmodeler.org
 
@@ -273,21 +273,21 @@ Description: a screen ruler and color measurement tool for KDE
  Kruler is a screen ruler (using pixels) and color measurement tool for KDE.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
 Package: ksnapshot
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Replaces: kdebase-data (<< 4:3.3.91)
+Replaces: tdebase-data (<< 4:3.3.91)
 Description: screenshot utility for KDE
  KSnapshot is a simple applet for taking screenshots. It is capable of 
  capturing images of either the whole desktop or just a single window. 
  The images can then be saved in a variety of formats.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
 Package: ksvg
 Section: graphics
@@ -299,7 +299,7 @@ Description: SVG viewer for KDE
  application.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
 Package: kuickshow
 Section: graphics
@@ -315,7 +315,7 @@ Description: KDE image/slideshow viewer
  display). KuickShow also has a slideshow mode. 
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
  .
   Homepage: http://kuickshow.sourceforge.net
 
@@ -330,7 +330,7 @@ Description: simple image viewer/converter for KDE
  as well.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
 Package: kviewshell
 Section: graphics
@@ -345,17 +345,17 @@ Description: generic framework for viewer applications in KDE
  DjVu images.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
 Package: libkscan-dev
 Section: libdevel
 Architecture: any
-Depends: libkscan1 (= ${binary:Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: libkscan1 (= ${binary:Version}), tdelibs4-dev (>= 4:3.5.8)
 Description: development files for the KDE scanner library
  This package contains development files for KDE's scanner library.
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
 Package: libkscan1
 Section: libs
@@ -367,14 +367,14 @@ Description: scanner library for KDE
  (as long as it's sane compatible).
  .
  This package is part of KDE, as a component of the KDE graphics module.
- See the 'kde' and 'kdegraphics' packages for more information.
+ See the 'kde' and 'tdegraphics' packages for more information.
 
-Package: kdegraphics-dbg
+Package: tdegraphics-dbg
 Section: libdevel
 Architecture: any
 Priority: extra
-Depends: kdelibs-dbg, libkscan1 (= ${binary:Version})
-Description: debugging symbols for kdegraphics
- This package contains the debugging symbols associated with kdegraphics.
- They will automatically be used by gdb for debugging kdegraphics-related
+Depends: tdelibs-dbg, libkscan1 (= ${binary:Version})
+Description: debugging symbols for tdegraphics
+ This package contains the debugging symbols associated with tdegraphics.
+ They will automatically be used by gdb for debugging tdegraphics-related
  issues.
diff --git a/ubuntu/maverick/tdegraphics/debian/rules b/ubuntu/maverick/tdegraphics/debian/rules
index 653c978ae..42330d01a 100755
--- a/ubuntu/maverick/tdegraphics/debian/rules
+++ b/ubuntu/maverick/tdegraphics/debian/rules
@@ -21,7 +21,7 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
 DEB_BUILD_PARALLEL = true
 
-DEB_DH_STRIP_ARGS  := --dbg-package=kdegraphics-trinity-dbg
+DEB_DH_STRIP_ARGS  := --dbg-package=tdegraphics-trinity-dbg
 
 PACKAGES_WITH_LIBS := kfaxview-trinity kghostview-trinity kmrml-trinity kpovmodeler-trinity ksvg-trinity \
 			kuickshow-trinity kview-trinity kviewshell-trinity libkscan1-trinity
diff --git a/ubuntu/maverick/tdegraphics/debian/kdegraphics-dev-trinity.install b/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install
index 3c15273ee..3c15273ee 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdegraphics-dev-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kamera b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera
index d59c53442..aac5b9e11 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kamera
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera
@@ -1,4 +1,4 @@
-Document: kdegraphics-doc-html-kamera
+Document: tdegraphics-doc-html-kamera
 Title: Kamera Handbook
 Author: Not listed
 Abstract: Kamera allows you to view and download images on a digital camera.
diff --git a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kcoloredit b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit
index 99b6d6e74..a11e55ce0 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kcoloredit
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit
@@ -1,4 +1,4 @@
-Document: kdegraphics-doc-html-kcoloredit
+Document: tdegraphics-doc-html-kcoloredit
 Title: KColorEdit Handbook
 Author: Artur Rataj
 Abstract: KColorEdit is a palette files editor. It can be used for editing
diff --git a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kdvi b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi
index bc08bb1a5..b509a2764 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kdvi
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi
@@ -1,4 +1,4 @@
-Document: kdegraphics-doc-html-kdvi
+Document: tdegraphics-doc-html-kdvi
 Title: KDVI Handbook
 Author: Stefan Kebekus
 Abstract: This program and KPart allow the user to display *.DVI files from TeX.
diff --git a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kgamma b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma
index 4f714187e..77ec2c8cd 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kgamma
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma
@@ -1,4 +1,4 @@
-Document: kdegraphics-doc-html-kgamma
+Document: tdegraphics-doc-html-kgamma
 Title: KGamma Handbook
 Author: Michael v. Ostheim
 Abstract: KGamma is a simple tool for monitor gamma correction.
diff --git a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kghostview b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview
index 60fb9060e..d94829129 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kghostview
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview
@@ -1,4 +1,4 @@
-Document: kdegraphics-doc-html-kghostview
+Document: tdegraphics-doc-html-kghostview
 Title: KGhostView Handbook
 Author: Pamela Roberts
 Abstract: KGhostView displays and prints PostScript and
diff --git a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kiconedit b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kiconedit
index 92959c240..26753ee1a 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kiconedit
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kiconedit
@@ -1,4 +1,4 @@
-Document: kdegraphics-doc-html-kiconedit
+Document: tdegraphics-doc-html-kiconedit
 Title: KIconEdit Handbook
 Author: Thomas Tanghus, Lauri Watts
 Abstract: KIconEdit is designed to help create icons for KDE using the
diff --git a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kolourpaint b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint
index 1d1164d7b..c687d4648 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kolourpaint
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint
@@ -1,4 +1,4 @@
-Document: kdegraphics-doc-html-kolourpaint
+Document: tdegraphics-doc-html-kolourpaint
 Title: KolourPaint Handbook
 Author: Thurston Dang, Clarence Dang
 Abstract: KolourPaint is a free, easy-to-use paint program for KDE.
diff --git a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kooka b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka
index ddc5cde52..457a34ca1 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kooka
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka
@@ -1,4 +1,4 @@
-Document: kdegraphics-doc-html-kooka
+Document: tdegraphics-doc-html-kooka
 Title: Kooka Handbook
 Author: Klaas Freitag, Martin Sommer 
 Abstract: Kooka is a very useful KDE scanning application.
diff --git a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kpdf b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf
index ce0ad85f8..46300c860 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kpdf
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf
@@ -1,4 +1,4 @@
-Document: kdegraphics-doc-html-kpdf
+Document: tdegraphics-doc-html-kpdf
 Title: KPDF Handbook
 Author: Albert Astals Cid
 Abstract: KPDF is a KDE PDF viewer based on xpdf code.
diff --git a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kpovmodeler b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler
index fa77c4a1c..db0540150 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kpovmodeler
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler
@@ -1,4 +1,4 @@
-Document: kdegraphics-doc-html-kpovmodeler
+Document: tdegraphics-doc-html-kpovmodeler
 Title: KPovModeler Handbook
 Author: Lauri Watts, Andreas Zehender, Olivier Saraja
 Abstract: KPovModeler is a graphical 3D modeler, which can generate
diff --git a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kruler b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler
index f6b3de6a3..1ae465ddd 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kruler
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler
@@ -1,4 +1,4 @@
-Document: kdegraphics-doc-html-kruler
+Document: tdegraphics-doc-html-kruler
 Title: KRuler Handbook
 Author: Lauri Watts
 Abstract: KRuler can be used to measure objects on the screen. 
diff --git a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.ksnapshot b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot
index 1518b4854..b104ba9ef 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.ksnapshot
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot
@@ -1,4 +1,4 @@
-Document: kdegraphics-doc-html-ksnapshot
+Document: tdegraphics-doc-html-ksnapshot
 Title: KSnapshot Handbook
 Author: Richard J. Moore, Robert L. McCormick, Brad Hards, Lauri Watts
 Abstract: KSnapshot is a simple applet for taking screenshots.
diff --git a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kuickshow b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow
index e18e99ea0..5c43d6b57 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kuickshow
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow
@@ -1,4 +1,4 @@
-Document: kdegraphics-doc-html-kuickshow
+Document: tdegraphics-doc-html-kuickshow
 Title: KuickShow Handbook
 Author: Carsten Pfeiffer 
 Abstract: KuickShow is a comfortable image browser/viewer.
diff --git a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kview b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview
index 018bcbe82..f79993dfb 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdegraphics-doc-html.doc-base.kview
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview
@@ -1,4 +1,4 @@
-Document: kdegraphics-doc-html-kview
+Document: tdegraphics-doc-html-kview
 Title: KView Handbook
 Author: Hauke Hildebrandt, Sirtaj Singh Kang
 Abstract: KView is an image viewing program. 
diff --git a/ubuntu/maverick/tdegraphics/debian/kdegraphics-kfile-plugins-trinity.install b/ubuntu/maverick/tdegraphics/debian/tdegraphics-kfile-plugins-trinity.install
index d7a77267e..d7a77267e 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdegraphics-kfile-plugins-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-kfile-plugins-trinity.install
diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog
index f9979637d..ff494b112 100644
--- a/ubuntu/maverick/tdelibs/debian/changelog
+++ b/ubuntu/maverick/tdelibs/debian/changelog
@@ -1,132 +1,132 @@
-kdelibs-trinity (4:3.5.12-0ubuntu6+r1116280) lucid; urgency=low
+tdelibs-trinity (4:3.5.12-0ubuntu6+r1116280) lucid; urgency=low
 
   * Automated svn build
 
  -- root <kb9vqf@pearsoncomputing.net>  Sun, 18 Apr 2010 21:42:57 -0500
 
-kdelibs-trinity (4:3.5.10-0ubuntu16) karmic; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu16) karmic; urgency=low
 
   * Microsoft docx mimetypes handled properly
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 09 Dec 2009 21:46:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu14) karmic; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu14) karmic; urgency=low
 
   * Trinity rebranding
   * Bug report redirection to active bugtracker
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 08 Dec 2009 12:17:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu12) karmic; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu12) karmic; urgency=low
 
   * Repaired Konqueror JavaScript crash
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 25 Oct 2009 02:44:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu10) karmic; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu10) karmic; urgency=low
 
   * Added a script to generate device links /dev/cdrom and /dev/dvd if they do not already exist
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 02 Oct 2009 20:17:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu9) karmic; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu9) karmic; urgency=low
 
   * Fixed make_driver_db_cups path
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 02 Oct 2009 20:17:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu7) karmic; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu7) karmic; urgency=low
 
   * Fixed dependency on kdescripts
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 07 Aug 2009 14:14:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu6) karmic; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu6) karmic; urgency=low
 
   * Library paths fixed
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 06 Aug 2009 14:56:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu4) karmic; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu4) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu3~intrepid7) intrepid; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu3~intrepid7) intrepid; urgency=low
 
   * Updated kate syntax editor files (closes Bug #91)
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 05 Jun 2009 16:39:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu3~intrepid6) intrepid; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu3~intrepid6) intrepid; urgency=low
 
   * Added proper KDE4 application labelling and starting to Trinity menu
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 27 Mar 2009 00:13:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu3~intrepid5) intrepid; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu3~intrepid5) intrepid; urgency=low
 
-  * Added conflict and provide for kdelibs-data << 4:4.0  (Closes bug #61)
+  * Added conflict and provide for tdelibs-data << 4:4.0  (Closes bug #61)
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 20 Mar 2009 11:56:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu3~intrepid4) intrepid; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu3~intrepid4) intrepid; urgency=low
 
   * Repaired kcmshell root environment default data directory
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 20 Mar 2009 11:56:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu3~intrepid1) intrepid; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu3~intrepid1) intrepid; urgency=low
 
   * Repaired kcmshell root environment
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 09 Mar 2009 13:21:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu2~intrepid10) intrepid; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu2~intrepid10) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 25 Feb 2009 15:12:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu2~intrepid5) intrepid; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu2~intrepid5) intrepid; urgency=low
 
   * Fixed kde data directory default
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 02 Jan 2009 16:55:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu2~intrepid4) intrepid; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu2~intrepid4) intrepid; urgency=low
 
   * Added /usr/trinity/lib to ld.so.conf.d
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 17 Dec 2008 17:51:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu2~intrepid1) intrepid; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu2~intrepid1) intrepid; urgency=low
 
   * Fixed build-depends
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 15 Dec 2008 10:37:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu1~intrepid9) intrepid; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu1~intrepid9) intrepid; urgency=low
 
   * Linked several core KDE libraries to /usr/lib
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 25 Nov 2008 09:45:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu1~intrepid7) intrepid; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu1~intrepid7) intrepid; urgency=low
 
   * Changed kstartupconfig default HOME of /.kde to /.trinity
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 25 Nov 2008 09:45:00 -0600
 
-kdelibs-trinity (4:3.5.10-0ubuntu1~intrepid6) intrepid; urgency=low
+tdelibs-trinity (4:3.5.10-0ubuntu1~intrepid6) intrepid; urgency=low
 
   * Add -trinity prefix
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 25 Nov 2008 09:45:00 -0600
 
-kdelibs (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdelibs (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * Upstream bug fix release (LP: #261366)
     - Dropped kubuntu_98_kate_paste_cursor.diff applied upstream
@@ -134,7 +134,7 @@ kdelibs (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
  -- Scott Kitterman <scott@kitterman.com>  Mon, 25 Aug 2008 23:37:18 -0400
 
-kdelibs (4:3.5.9-0ubuntu7.1) hardy-security; urgency=low
+tdelibs (4:3.5.9-0ubuntu7.1) hardy-security; urgency=low
 
   * SECURITY UPDATE: integer overflow in start_kdeinit. The start_kdeinit
     processing of user-influenceable input is faulty.  A local user
@@ -148,7 +148,7 @@ kdelibs (4:3.5.9-0ubuntu7.1) hardy-security; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 22 Apr 2008 16:01:13 +0100
 
-kdelibs (4:3.5.9-0ubuntu7) hardy; urgency=low
+tdelibs (4:3.5.9-0ubuntu7) hardy; urgency=low
 
   * Update debian/patches/kubuntu_55_printer_sharing.diff to run
     system-config-printer-kde to let users enable printer sharing
@@ -156,43 +156,43 @@ kdelibs (4:3.5.9-0ubuntu7) hardy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 10 Apr 2008 00:03:28 +0100
 
-kdelibs (4:3.5.9-0ubuntu6) hardy; urgency=low
+tdelibs (4:3.5.9-0ubuntu6) hardy; urgency=low
 
   * Renamed kubuntu_99_system_config_printer_applet.diff to
     kubuntu_9901_system_config_printer_applet.diff
   * Added kubuntu_9902_kde4_kded_blacklist_modules.diff, don't autoload
     every kded modules in KDE4, replace kubuntu_9924_kde4_no_medianotifier.diff
-    from kdebase
+    from tdebase
 
  -- Guillaume Martres <smarter@ubuntu.com>  Fri, 28 Mar 2008 19:49:46 +0100
 
-kdelibs (4:3.5.9-0ubuntu5) hardy; urgency=low
+tdelibs (4:3.5.9-0ubuntu5) hardy; urgency=low
 
   * Add kubuntu_99_system_config_printer_applet.diff, don't show
     printer applet if system-config-printer-applet-kde is installed
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 12 Mar 2008 17:34:49 +0000
 
-kdelibs (4:3.5.9-0ubuntu4) hardy; urgency=low
+tdelibs (4:3.5.9-0ubuntu4) hardy; urgency=low
 
   * Fixed debian/rules, msgcat keeps the first headers only.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 11 Mar 2008 21:19:46 +0100
 
-kdelibs (4:3.5.9-0ubuntu3) hardy; urgency=low
+tdelibs (4:3.5.9-0ubuntu3) hardy; urgency=low
 
   [ Jonathan Riddell ]
   * Add kubuntu_98_kate_paste_cursor.diff from upstream
     Fixes http://bugs.kde.org/158069 "wrong cursor possition after Paste"
 
   [ Anthony Mercatante ]
-  * Fixed debian/rules, running msgcat for kdelibs.pot in
+  * Fixed debian/rules, running msgcat for tdelibs.pot in
     common-install-prehook-impl target in order to proceed
     earlier for Rosetta pot file export.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 11 Mar 2008 16:20:44 +0100
 
-kdelibs (4:3.5.9-0ubuntu2) hardy; urgency=low
+tdelibs (4:3.5.9-0ubuntu2) hardy; urgency=low
 
   * Update kubuntu_93_speedbar_xdg_user_dirs.diff. Folder names in the
     speedbar are going first_char_upper and Documents now has a nice
@@ -200,13 +200,13 @@ kdelibs (4:3.5.9-0ubuntu2) hardy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 11 Mar 2008 12:53:03 +0100
 
-kdelibs (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdelibs (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:07 +0000
 
-kdelibs (4:3.5.8-4ubuntu11) hardy; urgency=low
+tdelibs (4:3.5.8-4ubuntu11) hardy; urgency=low
 
   * Add patch kubuntu_98_kate_newline.diff from Sergei Ivanov
     <svivanov@pdmi.ras.ru>, closes LP: #184675 "kate does not show
@@ -214,7 +214,7 @@ kdelibs (4:3.5.8-4ubuntu11) hardy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 08 Feb 2008 14:04:02 +0000
 
-kdelibs (4:3.5.8-4ubuntu10) hardy; urgency=low
+tdelibs (4:3.5.8-4ubuntu10) hardy; urgency=low
 
   * Updated kubuntu_96_flash_xembed.diff:
     - Sync with current svn status.
@@ -223,20 +223,20 @@ kdelibs (4:3.5.8-4ubuntu10) hardy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 30 Jan 2008 17:38:47 +0100
 
-kdelibs (4:3.5.8-4ubuntu9) hardy; urgency=low
+tdelibs (4:3.5.8-4ubuntu9) hardy; urgency=low
 
   *   * Updated kubuntu_96_flash_xembed.diff:     - Sync with current
     svn status.     - Reported to make flash works again this time
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 30 Jan 2008 17:38:26 +0100
 
-kdelibs (4:3.5.8-4ubuntu8) hardy; urgency=low
+tdelibs (4:3.5.8-4ubuntu8) hardy; urgency=low
 
   * Fix path to hicolor icons in kubuntu_97_kde4_menu_applications.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 29 Jan 2008 16:38:45 +0000
 
-kdelibs (4:3.5.8-4ubuntu7) hardy; urgency=low
+tdelibs (4:3.5.8-4ubuntu7) hardy; urgency=low
 
   * Add kubuntu_97_kde4_menu_applications.diff modified from SuSE, run KDE 4
     apps without wrapper scripts
@@ -244,7 +244,7 @@ kdelibs (4:3.5.8-4ubuntu7) hardy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 28 Jan 2008 18:07:39 +0000
 
-kdelibs (4:3.5.8-4ubuntu6) hardy; urgency=low
+tdelibs (4:3.5.8-4ubuntu6) hardy; urgency=low
 
   * Added kubuntu_96_flash_xembed.diff:
     - Fix from KDE svn
@@ -253,13 +253,13 @@ kdelibs (4:3.5.8-4ubuntu6) hardy; urgency=low
 
  -- Anthony Mercatante <tonio@kubuntu.org>  Tue, 22 Jan 2008 17:24:14 +0100
 
-kdelibs (4:3.5.8-4ubuntu5) hardy; urgency=low
+tdelibs (4:3.5.8-4ubuntu5) hardy; urgency=low
 
   * Add depends on xdg-user-dirs, Closes LP: #175982
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 22 Jan 2008 10:46:06 +0000
 
-kdelibs (4:3.5.8-4ubuntu4) hardy; urgency=low
+tdelibs (4:3.5.8-4ubuntu4) hardy; urgency=low
 
   [ Frode M. Døving ]
   * Add kubuntu_95_kurl-not-so-pretty.diff
@@ -268,74 +268,74 @@ kdelibs (4:3.5.8-4ubuntu4) hardy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Dec 2007 17:29:27 +0000
 
-kdelibs (4:3.5.8-4ubuntu3) hardy; urgency=low
+tdelibs (4:3.5.8-4ubuntu3) hardy; urgency=low
 
   * Rebuild for libopenexr transition
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 11 Dec 2007 09:50:59 +0000
 
-kdelibs (4:3.5.8-4ubuntu2) hardy; urgency=low
+tdelibs (4:3.5.8-4ubuntu2) hardy; urgency=low
 
   * Add kubuntu_95_fix_smb_scan.diff from Guillaume Martres, fixes SMB
     printer browsing.  Closes LP: #57666
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 07 Dec 2007 18:11:39 +0000
 
-kdelibs (4:3.5.8-4ubuntu1) hardy; urgency=low
+tdelibs (4:3.5.8-4ubuntu1) hardy; urgency=low
 
-  * Merge with Debian, adds 53_kdelibs_ltdl_ext.diff
+  * Merge with Debian, adds 53_tdelibs_ltdl_ext.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 23 Nov 2007 18:22:18 +0000
 
-kdelibs (4:3.5.8.dfsg.1-4) unstable; urgency=low
+tdelibs (4:3.5.8.dfsg.1-4) unstable; urgency=low
 
   * Add a patch to allow to dlopen .so files and not only .la files.
     Now kamera, digikam and others doesn't need to depend on -dev packages.
 
  -- Sune Vuorela <debian@pusling.com>  Mon, 12 Nov 2007 13:00:41 +0100
 
-kdelibs (4:3.5.8-3ubuntu2) hardy; urgency=low
+tdelibs (4:3.5.8-3ubuntu2) hardy; urgency=low
 
   * Add kubuntu_93_speedbar_xdg_user_dirs.diff,
     kubuntu_93_xdg_dirs_document_path.diff, kubuntu_94_xdg_dirs_i18n.diff
     from Mandriva, adds support for XDG home dirs
-  * Make kdelibs4-dev replace more recent kdelibs4c2a for overlapping files
+  * Make tdelibs4-dev replace more recent tdelibs4c2a for overlapping files
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 15:10:40 +0000
 
-kdelibs (4:3.5.8-3ubuntu1) hardy; urgency=low
+tdelibs (4:3.5.8-3ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining changes:
    - --with-distribution="Debian (`lsb_release --codename --short`) $(DEB_VERSION)"
-   - binary-install/kdelibs-data installs aboutkde-kubuntu.png.uu and cr*-device-system.png.uu
+   - binary-install/tdelibs-data installs aboutkde-kubuntu.png.uu and cr*-device-system.png.uu
    - none of libgamin-dev, libfam-dev
-   - stop kdelibs4-dev depending on gamin/fam
-   - don't install .svgz icons in kdelibs-data.install
+   - stop tdelibs4-dev depending on gamin/fam
+   - don't install .svgz icons in tdelibs-data.install
    - rosetta support in rules common-install-prehook-impl:: and common-post-build-arch:: and include debian/kubuntu-desktop-i18n/
-   - build-dep on: gettext-kde, kdesdk-scripts, lsb-release, base-files, sudo
+   - build-dep on: gettext-kde, tdesdk-scripts, lsb-release, base-files, sudo
    - cdbs build-dep 0.4.41ubuntu2
-   - kdelibs4-dev depends on gettext-kde, kdesdk-scripts
+   - tdelibs4-dev depends on gettext-kde, tdesdk-scripts
    - copy debian/icons over
-   - Make kdelibs4c2a depend on launchpad-integration
+   - Make tdelibs4c2a depend on launchpad-integration
    - Remove 19_debianize_useragent.diff (changed to kubuntu_19_debianize_useragent.diff) s/Debian/Debian
-   - remove kdelibs4c2a depends on menu-xdg
+   - remove tdelibs4c2a depends on menu-xdg
    - include kubuntu_01_kdepot.diff and kde.pot in debian/patches/common
    - use a local copy of kde.mk without the common-install-prehook-impl:: rule; edit debian-qt-kde.mk to include debian/cdbs/kde.mk
-   - build with --with-sudo-kdesu-backend and build-dep on sudo and make kdelibs4c2a depend on sudo
-   - kdelibs-data.install : Add nzb mimetype
+   - build with --with-sudo-kdesu-backend and build-dep on sudo and make tdelibs4c2a depend on sudo
+   - tdelibs-data.install : Add nzb mimetype
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 13 Nov 2007 18:18:05 +0000
 
-kdelibs (4:3.5.8.dfsg.1-3) unstable; urgency=low
+tdelibs (4:3.5.8.dfsg.1-3) unstable; urgency=low
 
   * Bump shlibs. This is needed as there is a wrapper script introduced in
-    kdelibs.
+    tdelibs.
   * Pull patch from usptream to fix issue with zoom settings in kpdf, kview
     and many other applications.
 
  -- Sune Vuorela <debian@pusling.com>  Tue, 23 Oct 2007 00:17:32 +0200
 
-kdelibs (4:3.5.8.dfsg.1-2) unstable; urgency=low
+tdelibs (4:3.5.8.dfsg.1-2) unstable; urgency=low
 
   * Patch 50_handle_timestamps to handle properly X timestamps  that are so 
     high that they cannot be represented properly as signed long, only unsigned.
@@ -343,40 +343,40 @@ kdelibs (4:3.5.8.dfsg.1-2) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 20 Oct 2007 02:55:44 +0200
 
-kdelibs (4:3.5.8.dfsg.1-1) unstable; urgency=low
+tdelibs (4:3.5.8.dfsg.1-1) unstable; urgency=low
 
   * New upstream release (Closes: #444383, #328479, #425741)
   * Resync patches:
     - Remove, applied upstream:
       01_branch_kate_redo_save_fix, 01_branch_wait_for_kdeinit_to_finish,
-      48_cups13, 55_several-CVE-kdelibs-kdecore.
+      48_cups13, 55_several-CVE-tdelibs-kdecore.
   * Update *.install files. 
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 13 Oct 2007 11:53:45 +0200
 
-kdelibs (4:3.5.7.dfsg.1-7) unstable; urgency=low
+tdelibs (4:3.5.7.dfsg.1-7) unstable; urgency=low
 
   +++ Changes by Adeodato Simó:
 
   * Add appropriate Replaces headers for the files moved in -5 and -6. Remove
-    unneeded Conflict in kdelibs4-dev against kdelibs4c2a introduced in -6.
+    unneeded Conflict in tdelibs4-dev against tdelibs4c2a introduced in -6.
     (Closes: #439515, #439779)
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
-  * Add patch 55_several-CVE-kdelibs-kdecore.diff to make Konqueror address
+  * Add patch 55_several-CVE-tdelibs-kdecore.diff to make Konqueror address
     bar more robust against addressbar spoofing.
     Related CVEs: CVE-2007-4224, CVE-2007-4225, CVE-2007-3820.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 30 Aug 2007 07:18:06 +0200
 
-kdelibs (4:3.5.7.dfsg.1-6) unstable; urgency=low
+tdelibs (4:3.5.7.dfsg.1-6) unstable; urgency=low
 
-  * Move back kstartupconfig to kdelibs4c2a. (Closes: #439411)
+  * Move back kstartupconfig to tdelibs4c2a. (Closes: #439411)
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 25 Aug 2007 03:09:34 +0200
 
-kdelibs (4:3.5.7.dfsg.1-5) unstable; urgency=low
+tdelibs (4:3.5.7.dfsg.1-5) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
   
@@ -387,22 +387,22 @@ kdelibs (4:3.5.7.dfsg.1-5) unstable; urgency=low
   
   +++ Changes by Fathi Boudra:
 
-  * Move binaries to kdelibs4-dev: kconfig_compiler, ksvgtopng,
+  * Move binaries to tdelibs4-dev: kconfig_compiler, ksvgtopng,
     kunittestmodrunner, makekdewidgets, preparetips.
-    Allow kdelibs5-dev co-installable alongside kdelibs4c2a.
+    Allow tdelibs5-dev co-installable alongside tdelibs4c2a.
 
   * Suggests perl-suid instead Recommends. (Closes: #437414)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 23 Aug 2007 07:24:52 +0200
 
-kdelibs (4:3.5.7.dfsg.1-4) unstable; urgency=low
+tdelibs (4:3.5.7.dfsg.1-4) unstable; urgency=low
 
-  * Versioned kdelibs-bin conflict and remove Provides: kdelibs-bin to
-    allow kde4libs co-installable along with this kdelibs version.
+  * Versioned tdelibs-bin conflict and remove Provides: tdelibs-bin to
+    allow kde4libs co-installable along with this tdelibs version.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 12 Aug 2007 00:50:16 +0200
 
-kdelibs (4:3.5.7.dfsg.1-3) unstable; urgency=low
+tdelibs (4:3.5.7.dfsg.1-3) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -410,7 +410,7 @@ kdelibs (4:3.5.7.dfsg.1-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 23 Jul 2007 21:45:43 +0200
 
-kdelibs (4:3.5.7.dfsg.1-2) unstable; urgency=low
+tdelibs (4:3.5.7.dfsg.1-2) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -424,39 +424,39 @@ kdelibs (4:3.5.7.dfsg.1-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 19 Jul 2007 22:52:17 +0200
 
-kdelibs (4:3.5.8-0ubuntu4) hardy; urgency=low
+tdelibs (4:3.5.8-0ubuntu4) hardy; urgency=low
 
   * Sync hardy with gutsy-proposed
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 27 Oct 2007 16:23:56 +0100
 
-kdelibs (4:3.5.8-0ubuntu3.1) gutsy-proposed; urgency=low
+tdelibs (4:3.5.8-0ubuntu3.1) gutsy-proposed; urgency=low
 
   * Add kubuntu_94_kselectaction.diff Closes: LP #155144
     Editable KSelectAction stopped working for custom values
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 21 Oct 2007 00:09:25 +0100
 
-kdelibs (4:3.5.8-0ubuntu3) gutsy-proposed; urgency=low
+tdelibs (4:3.5.8-0ubuntu3) gutsy-proposed; urgency=low
 
   * Update kubuntu_93_https_fix.diff closes LP: #153500
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Oct 2007 21:40:16 +0100
 
-kdelibs (4:3.5.8-0ubuntu2) gutsy; urgency=low
+tdelibs (4:3.5.8-0ubuntu2) gutsy; urgency=low
 
   * Add kubuntu_93_https_fix.diff closes LP: #152449
     HTTPS not working with Konqueror 3.5.8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 16 Oct 2007 16:29:24 +0100
 
-kdelibs (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdelibs (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 09:37:39 +0100
 
-kdelibs (4:3.5.7-1ubuntu15) gutsy; urgency=low
+tdelibs (4:3.5.7-1ubuntu15) gutsy; urgency=low
 
   * SECURITY UPDATE: URL spoofing via trailing spaces
   * Add kubuntu_98_trailing_spaces_fix.diff: upstream fixes.
@@ -466,16 +466,16 @@ kdelibs (4:3.5.7-1ubuntu15) gutsy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 01 Oct 2007 23:07:11 +0100
 
-kdelibs (4:3.5.7-1ubuntu14) gutsy; urgency=low
+tdelibs (4:3.5.7-1ubuntu14) gutsy; urgency=low
 
   * Added kubuntu_96_cups_1.3_compatibility.diff.
     Fixes FTBFS against cups 1.3
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 28 Aug 2007 13:14:47 +0200
 
-kdelibs (4:3.5.7-1ubuntu13) gutsy; urgency=low
+tdelibs (4:3.5.7-1ubuntu13) gutsy; urgency=low
 
-  * Droped kubuntu_93_kdelibs_kdesudo_support_fade_effect.diff, still
+  * Droped kubuntu_93_tdelibs_tdesudo_support_fade_effect.diff, still
     causes building issues. We'll have to take care with the next
     version of the patch.
   * Droped kubuntu_57_nomediaioslave_fileio.diff and
@@ -485,24 +485,24 @@ kdelibs (4:3.5.7-1ubuntu13) gutsy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 27 Jul 2007 17:17:26 +0200
 
-kdelibs (4:3.5.7-1ubuntu12) gutsy; urgency=low
+tdelibs (4:3.5.7-1ubuntu12) gutsy; urgency=low
 
-  * Added kubuntu_93_kdelibs_kdesudo_support_fade_effect.diff. Support
-    for kdesudo without causing troubles with other apps. Patch by
+  * Added kubuntu_93_tdelibs_tdesudo_support_fade_effect.diff. Support
+    for tdesudo without causing troubles with other apps. Patch by
     Stefan Skotte <sfs@enhance-it.dk>
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 18 Jul 2007 23:34:52 +0200
 
-kdelibs (4:3.5.7-1ubuntu11) gutsy; urgency=low
+tdelibs (4:3.5.7-1ubuntu11) gutsy; urgency=low
 
-  * Droped kubuntu_93_kdelibs-kdesudo-support-wflags-and-kab-fix.diff
+  * Droped kubuntu_93_tdelibs-tdesudo-support-wflags-and-kab-fix.diff
     temporary, as that causes troubles building kde applications using
     KDialogbase.
     Will had the patch back once fixed to be less sensitive
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 17 Jul 2007 12:10:22 +0100
 
-kdelibs (4:3.5.7-1ubuntu10) gutsy; urgency=low
+tdelibs (4:3.5.7-1ubuntu10) gutsy; urgency=low
 
   * Removed kubuntu_61_hibernate_icons.diff.uu, added the icons uuencoded
     to debian/icons folder
@@ -511,37 +511,37 @@ kdelibs (4:3.5.7-1ubuntu10) gutsy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 14 Jul 2007 22:47:06 +0200
 
-kdelibs (4:3.5.7-1ubuntu9) gutsy; urgency=low
+tdelibs (4:3.5.7-1ubuntu9) gutsy; urgency=low
 
   [ Anthony Mercatante ]
   * Fixed kubuntu_91_execute_feedback.patch again, improving the speed
     of the effect to 3
 
   [ Sarah Hobbs ]
-  * Added kubuntu_93_kdelibs-kdesudo-support-wflags-and-kab-fix.diff.
+  * Added kubuntu_93_tdelibs-tdesudo-support-wflags-and-kab-fix.diff.
     Thankyou to Stefan Skotte for this patch
   * Removed kubuntu_28_fix_sudo.diff to fix KDM memory corruption 
     (LP: #47455, KDE bug #147454)
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 14 Jul 2007 01:51:38 +1000
 
-kdelibs (4:3.5.7-1ubuntu8) gutsy; urgency=low
+tdelibs (4:3.5.7-1ubuntu8) gutsy; urgency=low
 
   * Fixed kubuntu_91_execute_feedback.diff, slows down the animation.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 11 Jul 2007 09:17:21 +0200
 
-kdelibs (4:3.5.7-1ubuntu7) gutsy; urgency=low
+tdelibs (4:3.5.7-1ubuntu7) gutsy; urgency=low
 
   * Added XS-Vcs-Bzr:
-     https://code.launchpad.net/~kubuntu-members/kdelibs/debian, committed code
+     https://code.launchpad.net/~kubuntu-members/tdelibs/debian, committed code
      to bzr
   * Added kubuntu_70_fileshareset-nfs-kernel-server.diff. Thanks to
     dystopianray for this patch (LP #107403)
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 04 Jul 2007 14:57:25 +1000
 
-kdelibs (4:3.5.7-1ubuntu6) gutsy; urgency=low
+tdelibs (4:3.5.7-1ubuntu6) gutsy; urgency=low
 
   * Applied buildprep to regenerate makefiles, needed for suspend and
     hibernate icons to be installed. Fixes ftbfs on i386. The great
@@ -550,34 +550,34 @@ kdelibs (4:3.5.7-1ubuntu6) gutsy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 03 Jul 2007 18:04:56 +0200
 
-kdelibs (4:3.5.7-1ubuntu5) gutsy; urgency=low
+tdelibs (4:3.5.7-1ubuntu5) gutsy; urgency=low
 
   * Fix patch kubuntu_03_applications_menu_entries_move.diff to not
     conflict with earlier patches.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 19 Jun 2007 21:46:56 +0100
 
-kdelibs (4:3.5.7-1ubuntu4) gutsy; urgency=low
+tdelibs (4:3.5.7-1ubuntu4) gutsy; urgency=low
 
   * Update kubuntu_03_applications_menu_entries_move.diff to include
     ooo-draw in Office menu
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 07 Jun 2007 16:28:26 +0100
 
-kdelibs (4:3.5.7-1ubuntu3) gutsy; urgency=low
+tdelibs (4:3.5.7-1ubuntu3) gutsy; urgency=low
 
-  * Remove dependency on libgamin from kdelibs4-dev
+  * Remove dependency on libgamin from tdelibs4-dev
   * Build-dep on libjasper-dev not libjasper-1.700-2-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 May 2007 13:54:20 +0100
 
-kdelibs (4:3.5.7-1ubuntu2) gutsy; urgency=low
+tdelibs (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
   * Fix .install files for 3.5.7
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 22 May 2007 19:48:30 +0100
 
-kdelibs (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdelibs (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   [ Sarah Hobbs ]
   * Merge with Debian for new upstream version, remaining changes in KUBUNTU-DEBIAN-CHANGES
@@ -591,7 +591,7 @@ kdelibs (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Mon, 21 May 2007 09:10:10 -0500
 
-kdelibs (4:3.5.7.dfsg.1-1) unstable; urgency=low
+tdelibs (4:3.5.7.dfsg.1-1) unstable; urgency=low
 
   * New upstream release.
     - Ability to have addressbook on remote kioslaves is disabled.
@@ -604,35 +604,35 @@ kdelibs (4:3.5.7.dfsg.1-1) unstable; urgency=low
        22_konq_scroll2top_before_new_page_fix.diff,
        25_khtml_non_existant_page_crash.diff,
        45_konqueror-CVE-2007-0537.diff,
-       46_CVE-2007-1564-kdelibs-3.5.6.diff,
-       47_kdelibs-kjs-utf8-parsing.diff.
+       46_CVE-2007-1564-tdelibs-3.5.6.diff,
+       47_tdelibs-kjs-utf8-parsing.diff.
   * Apply patch 45_gmail_spoof.diff by Allan Sandfeld, fixes gmail.com when browsing 
     the website spoofing konqueror as firefox browser.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 20 May 2007 15:44:32 +0100
 
-kdelibs (4:3.5.6-4ubuntu2) gutsy; urgency=low
+tdelibs (4:3.5.6-4ubuntu2) gutsy; urgency=low
 
-  * remove kdelibs4c2a depends on menu-xdg
+  * remove tdelibs4c2a depends on menu-xdg
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 01 May 2007 12:21:06 +0100
 
-kdelibs (4:3.5.6-4ubuntu1) gutsy; urgency=low
+tdelibs (4:3.5.6-4ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 27 Apr 2007 18:08:33 +0100
 
-kdelibs (4:3.5.6.r1.dfsg.1-4) unstable; urgency=low
+tdelibs (4:3.5.6.r1.dfsg.1-4) unstable; urgency=low
 
   +++ Changes by Daniel Schepler:
 
   * Rebuild against new jasper packages, and update the Build-Depends
-    and kdelibs4-dev dependencies accordingly.
+    and tdelibs4-dev dependencies accordingly.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 20 Apr 2007 13:58:36 -0400
 
-kdelibs (4:3.5.6-0ubuntu14) feisty; urgency=low
+tdelibs (4:3.5.6-0ubuntu14) feisty; urgency=low
 
   * SECURITY UPDATE: possible XSS via incorrect UTF8 truncation.
   * Add kubuntu_97_kjs_utf8_fixes.diff: upstream fixes.
@@ -641,35 +641,35 @@ kdelibs (4:3.5.6-0ubuntu14) feisty; urgency=low
 
  -- Kees Cook <kees@ubuntu.com>  Tue, 10 Apr 2007 11:19:42 -0700
 
-kdelibs (4:3.5.6-0ubuntu13) feisty; urgency=low
+tdelibs (4:3.5.6-0ubuntu13) feisty; urgency=low
 
   * SECURITY UPDATE: FTP PASV scanning vulnerability.
   * Add kubuntu_96_ftp_pasv_scanning.diff
   * References
-    ftp://ftp.kde.org/pub/kde/security_patches/CVE-2007-1564-kdelibs-3.5.6.diff
+    ftp://ftp.kde.org/pub/kde/security_patches/CVE-2007-1564-tdelibs-3.5.6.diff
     CVE-2007-1564
 
  -- Kees Cook <kees@ubuntu.com>  Tue, 27 Mar 2007 16:24:53 -0700
 
-kdelibs (4:3.5.6-0ubuntu12) feisty; urgency=low
+tdelibs (4:3.5.6-0ubuntu12) feisty; urgency=low
 
   * Add kubuntu_95_ajax_encoding.diff, closes http://bugs.kde.org/130234
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 26 Mar 2007 18:28:18 +0100
 
-kdelibs (4:3.5.6-0ubuntu11) feisty; urgency=low
+tdelibs (4:3.5.6-0ubuntu11) feisty; urgency=low
 
   * Build-dep on new qt 3.3.7
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 26 Mar 2007 15:35:26 +0100
 
-kdelibs (4:3.5.6-0ubuntu10) feisty; urgency=low
+tdelibs (4:3.5.6-0ubuntu10) feisty; urgency=low
 
   * Add kubuntu_94_real_mimetype.diff, installs realaudio plugin mimetype
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 26 Mar 2007 12:24:15 +0100
 
-kdelibs (4:3.5.6-0ubuntu9) feisty; urgency=low
+tdelibs (4:3.5.6-0ubuntu9) feisty; urgency=low
 
   * Improved kubuntu_65_nzb_mimetype.diff, fixes Makefiles
     for installation
@@ -679,7 +679,7 @@ kdelibs (4:3.5.6-0ubuntu9) feisty; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 20 Mar 2007 04:02:32 +0100
 
-kdelibs (4:3.5.6-0ubuntu8) feisty; urgency=low
+tdelibs (4:3.5.6-0ubuntu8) feisty; urgency=low
 
   * Add kubuntu_93_kjs_iframe_crash.diff from SVN,
     fixes javascript crash when referencing iframe with FTP URL
@@ -688,21 +688,21 @@ kdelibs (4:3.5.6-0ubuntu8) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Mar 2007 17:42:42 +0000
 
-kdelibs (4:3.5.6-0ubuntu7) feisty; urgency=low
+tdelibs (4:3.5.6-0ubuntu7) feisty; urgency=low
 
   * Add kubuntu_92_kdeprint_filter.diff, closes Malone
     #51354. Patch from Marcus Trautwig
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 22 Feb 2007 17:27:47 +0100
 
-kdelibs (4:3.5.6-0ubuntu6) feisty; urgency=low
+tdelibs (4:3.5.6-0ubuntu6) feisty; urgency=low
 
   * Fixed kubuntu_56_langpacks_desktop_files.diff, don't avoid
     Catalogue loading for kdesktop
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 20 Feb 2007 17:14:32 +0100
 
-kdelibs (4:3.5.6-0ubuntu5) feisty; urgency=low
+tdelibs (4:3.5.6-0ubuntu5) feisty; urgency=low
 
   * Add kubuntu_91_execute_feedback.diff, replaces the zooming
     rectangle that is drawn if you activate an icon in konqueror
@@ -712,14 +712,14 @@ kdelibs (4:3.5.6-0ubuntu5) feisty; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 13 Feb 2007 07:02:54 +0100
 
-kdelibs (4:3.5.6-0ubuntu4) feisty; urgency=low
+tdelibs (4:3.5.6-0ubuntu4) feisty; urgency=low
 
   * Add kubuntu_68_xdg_autostart.diff, kinit provides autostart
     via /etc/xdg/autostart
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 12 Feb 2007 21:42:32 +0100
 
-kdelibs (4:3.5.6-0ubuntu3) feisty; urgency=low
+tdelibs (4:3.5.6-0ubuntu3) feisty; urgency=low
 
   * SECURITY UPDATE: XSS attacks possible with comment in TITLE tag.
   * Add 'debian/patches/kubuntu_90_title_tokenizer.diff': fix parser,
@@ -729,7 +729,7 @@ kdelibs (4:3.5.6-0ubuntu3) feisty; urgency=low
 
  -- Kees Cook <kees@ubuntu.com>  Mon,  5 Feb 2007 19:32:41 -0800
 
-kdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low
+tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low
 
   * Add kubuntu_67_kwallet_auto_save.diff
     Kwallet auto-saves any modification.
@@ -737,7 +737,7 @@ kdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 26 Jan 2007 02:33:45 +0100
 
-kdelibs (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdelibs (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * Remove 02_kate_kdeprint_fixes_branch.diff
   * Update 27_kdnssd_avahi.dif
@@ -752,20 +752,20 @@ kdelibs (4:3.5.6-0ubuntu1) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:46:17 +0000
 
-kdelibs (4:3.5.5a.dfsg.1-3ubuntu9) feisty; urgency=low
+tdelibs (4:3.5.5a.dfsg.1-3ubuntu9) feisty; urgency=low
 
   * Added kubuntu_65_kstyle_password_noasterisk.diff to change the asterisks
     in any password field to dots.  Thanks to Danimo for this patch.
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Sun, 10 Dec 2006 23:55:33 +1100
 
-kdelibs (4:3.5.5a.dfsg.1-3ubuntu8) feisty; urgency=low
+tdelibs (4:3.5.5a.dfsg.1-3ubuntu8) feisty; urgency=low
 
   * Fix syntax error in kubuntu_64_rosetta_translation.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  7 Dec 2006 11:03:01 +0000
 
-kdelibs (4:3.5.5a.dfsg.1-3ubuntu7) feisty; urgency=low
+tdelibs (4:3.5.5a.dfsg.1-3ubuntu7) feisty; urgency=low
 
   * Add kubuntu_64_rosetta_translation.diff to explain in
     application About box that translations are not always the same as
@@ -774,38 +774,38 @@ kdelibs (4:3.5.5a.dfsg.1-3ubuntu7) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Dec 2006 19:47:28 +0000
 
-kdelibs (4:3.5.5a.dfsg.1-3ubuntu6) feisty; urgency=low
+tdelibs (4:3.5.5a.dfsg.1-3ubuntu6) feisty; urgency=low
 
-  * Add suspend and hibernate icons to kdelibs.install
+  * Add suspend and hibernate icons to tdelibs.install
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Dec 2006 17:32:20 +0000
 
-kdelibs (4:3.5.5a.dfsg.1-3ubuntu5) feisty; urgency=low
+tdelibs (4:3.5.5a.dfsg.1-3ubuntu5) feisty; urgency=low
 
-  * Build-dep on sudo and make kdelibs4c2a depend on sudo
+  * Build-dep on sudo and make tdelibs4c2a depend on sudo
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 21 Nov 2006 10:59:43 +0000
 
-kdelibs (4:3.5.5a.dfsg.1-3ubuntu4) feisty; urgency=low
+tdelibs (4:3.5.5a.dfsg.1-3ubuntu4) feisty; urgency=low
 
   * Compile with --with-sudo-kdesu-backend
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Nov 2006 10:16:08 +0000
 
-kdelibs (4:3.5.5a.dfsg.1-3ubuntu3) feisty; urgency=low
+tdelibs (4:3.5.5a.dfsg.1-3ubuntu3) feisty; urgency=low
 
-  * Add gettext-kde, kdesdk-scripts depends on kdelibs4-dev
+  * Add gettext-kde, tdesdk-scripts depends on tdelibs4-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 07:16:18 +0000
 
-kdelibs (4:3.5.5a.dfsg.1-3ubuntu2) feisty; urgency=low
+tdelibs (4:3.5.5a.dfsg.1-3ubuntu2) feisty; urgency=low
 
   * Add missing kubuntu_01_kdepot.diff patch
   * Use local kde.mk due to different .pot generation rules
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Nov 2006 21:15:00 +0000
 
-kdelibs (4:3.5.5a.dfsg.1-3ubuntu1) feisty; urgency=low
+tdelibs (4:3.5.5a.dfsg.1-3ubuntu1) feisty; urgency=low
 
   * Merge with Debian
   * Add --enable-gcc-hidden-visibility
@@ -813,12 +813,12 @@ kdelibs (4:3.5.5a.dfsg.1-3ubuntu1) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 14 Nov 2006 22:45:03 +0000
 
-kdelibs (4:3.5.6.r1.dfsg.1-3) unstable; urgency=low
+tdelibs (4:3.5.6.r1.dfsg.1-3) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
   * Take the patches from branches/etch to fix two security issues
-    46_CVE-2007-1564-kdelibs-3.5.6.diff and 47_kdelibs-kjs-utf8-parsing.diff
+    46_CVE-2007-1564-tdelibs-3.5.6.diff and 47_tdelibs-kjs-utf8-parsing.diff
     Fixes CVE-2007-1564 and CVE-2007-0242. (Closes: #417394, #416318)
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
@@ -829,7 +829,7 @@ kdelibs (4:3.5.6.r1.dfsg.1-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 18 Apr 2007 14:45:54 +0100
 
-kdelibs (4:3.5.6.r1.dfsg.1-2) experimental; urgency=low
+tdelibs (4:3.5.6.r1.dfsg.1-2) experimental; urgency=low
 
   +++ Changes by Modestas Vainius:
 
@@ -851,13 +851,13 @@ kdelibs (4:3.5.6.r1.dfsg.1-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 07 Feb 2007 20:16:33 +0100
 
-kdelibs (4:3.5.6.r1.dfsg.1-1) experimental; urgency=low
+tdelibs (4:3.5.6.r1.dfsg.1-1) experimental; urgency=low
 
   * New upstream tarball.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 18 Jan 2007 18:57:06 +0100
 
-kdelibs (4:3.5.6.dfsg.1-1) experimental; urgency=low
+tdelibs (4:3.5.6.dfsg.1-1) experimental; urgency=low
 
   * New upstream release:
     * Fixes "Up arrow confused with PrintScrn on evdev keyboards". (Closes: #400887)
@@ -870,29 +870,29 @@ kdelibs (4:3.5.6.dfsg.1-1) experimental; urgency=low
 
   +++ Changes by Modestas Vainius:
 
-  * Update kdelibs-data.install
+  * Update tdelibs-data.install
   * Resync debian/patches:
     * Adapt to upstream changes - 27.
     * Remove, applied upstream - 02, 33, 35 (different patch), 36, 41, 42.
     * Fix offsets - 10, 16, 19, 21, 23.
-  * Add libc6-dbg to kdelibs-dbg dependencies on amd64. It seems to be
+  * Add libc6-dbg to tdelibs-dbg dependencies on amd64. It seems to be
     needed to get a useful backtrace from drkonqi on this arch.
   * Add myself to Uploaders.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 16 Jan 2007 15:54:12 +0100
 
-kdelibs (4:3.5.5a.dfsg.1-5) unstable; urgency=low
+tdelibs (4:3.5.5a.dfsg.1-5) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
-  * Add qt3-x11-free-dbg to kdelibs-dbg to try to get better backtraces.
-  * Add multiple manpages to kdelibs4c2a. Thanks very much to Holger Hartmann.
+  * Add qt3-x11-free-dbg to tdelibs-dbg to try to get better backtraces.
+  * Add multiple manpages to tdelibs4c2a. Thanks very much to Holger Hartmann.
     (Closes: #376099, #351610, #368180)
-  * Add kdelibs4c2a.links to handle common manpages.
+  * Add tdelibs4c2a.links to handle common manpages.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 21 Nov 2006 19:30:14 +0100
 
-kdelibs (4:3.5.5a.dfsg.1-4) unstable; urgency=medium
+tdelibs (4:3.5.5a.dfsg.1-4) unstable; urgency=medium
 
   [ Debian Qt/KDE Maintainers ]
   * Add 42_xdgMenuPrefix_support patch: add XDG_MENU_PREFIX support. Thanks to
@@ -900,19 +900,19 @@ kdelibs (4:3.5.5a.dfsg.1-4) unstable; urgency=medium
   * Add 43_hardcode_xdgMenuPrefix patch: hardcode xdgMenuPrefix to "kde-"
     string until proper upstream fix.
   * Remove 18_applications_menu_rename patch.
-  * Urgency medium, as along with kdebase this upload fixes broken fresh
+  * Urgency medium, as along with tdebase this upload fixes broken fresh
     installs.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 16 Nov 2006 17:07:00 -0500
 
-kdelibs (4:3.5.5a.dfsg.1-3) unstable; urgency=medium
+tdelibs (4:3.5.5a.dfsg.1-3) unstable; urgency=medium
 
   * Patch: 41_x_kde_getactionmenu_no_timeout.diff
     Do not time out when waiting for the reply for the X-KDE-GetActionMenu
     DCOP call. DCOP protocol is synchronouos by design and a reply for the
     timed out call (i.e. garbage) still arrives and might be falsely returned
     as a valid reply for the subsequent DCOP call on the same connection. The
-    application currently known to be badly hurt by this is kdesvn and its
+    application currently known to be badly hurt by this is tdesvn and its
     konqueror service menu integration. Its X-KDE-GetActionMenu might take
     longer than current 100 milisecond timeout to complete. As a result
     then, a late reply will "pollute" a main DCOP connection of the client
@@ -930,26 +930,26 @@ kdelibs (4:3.5.5a.dfsg.1-3) unstable; urgency=medium
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  2 Nov 2006 17:54:30 -0500
 
-kdelibs (4:3.5.5a.dfsg.1-2) unstable; urgency=high
+tdelibs (4:3.5.5a.dfsg.1-2) unstable; urgency=high
 
   * Rebuild against qt-x11-free 3.3.7. There exists a strange KDE build system
-    bug wherein some packages fail to build if the kdelibs against which they
+    bug wherein some packages fail to build if the tdelibs against which they
     are building was itself built against a release of qt-x11-free different
     from the one currently present. Until we figure this out, let's just
-    rebuild kdelibs against the new qt-x11-free, and thus make the problem
+    rebuild tdelibs against the new qt-x11-free, and thus make the problem
     go away for now. Urgency=high because this doesn't actually change
     anything.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 23 Oct 2006 20:02:45 -0400
 
-kdelibs (4:3.5.5a.dfsg.1-1) unstable; urgency=medium
+tdelibs (4:3.5.5a.dfsg.1-1) unstable; urgency=medium
 
   * Remove non-free RFC documentation from the upstream tarball.
     (Closes: #393378)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 16 Oct 2006 17:49:07 -0400
 
-kdelibs (4:3.5.5a-2) unstable; urgency=medium
+tdelibs (4:3.5.5a-2) unstable; urgency=medium
 
   * Grab two more fixes from KDE_3_5_BRANCH.
     + Fix kate's indentation of C/C++ files.
@@ -958,13 +958,13 @@ kdelibs (4:3.5.5a-2) unstable; urgency=medium
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 13 Oct 2006 17:04:21 -0400
 
-kdelibs (4:3.5.5a-1) unstable; urgency=medium
+tdelibs (4:3.5.5a-1) unstable; urgency=medium
 
   * Nes upstream tarball, fixes a grave bug in katepart (Closes: 391414).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  7 Oct 2006 16:58:29 +0200
 
-kdelibs (4:3.5.5-1) unstable; urgency=low
+tdelibs (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
     + Fixes crashes in kate when creating doxygen comments.
@@ -986,33 +986,33 @@ kdelibs (4:3.5.5-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue,  3 Oct 2006 18:28:15 -0400
 
-kdelibs (4:3.5.4-3) unstable; urgency=low
+tdelibs (4:3.5.4-3) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Fix the avahi patch so that kdelibs builds with or without --enable-final.
+  * Fix the avahi patch so that tdelibs builds with or without --enable-final.
     (Disabling it on slow architectures had the unfortunate side effect of
     revealing a problem in the patch, which had unwittingly made
-    --enable-final necessary to build the package.) kdelibs should now build
+    --enable-final necessary to build the package.) tdelibs should now build
     on arm and m68k.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 31 Jul 2006 20:12:25 -0400
 
-kdelibs (4:3.5.4-2) unstable; urgency=low
+tdelibs (4:3.5.4-2) unstable; urgency=low
 
   * KDE_3_5_BRANCH update (up to r567679).
 
   +++ Changes by Christopher Martin:
 
   * Re-upload 3.5.4 with a new build hack that disables the use of
-    --enable-final on slow architectures. This will hopefully allow kdelibs
+    --enable-final on slow architectures. This will hopefully allow tdelibs
     (and other KDE modules) to build on arm and m68k more easily. This should
     in turn ease the movement of recent KDE modules into Testing. Thanks to
     Adeodato Simo for the fix.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 29 Jul 2006 15:22:37 -0400
 
-kdelibs (4:3.5.4-1) unstable; urgency=low
+tdelibs (4:3.5.4-1) unstable; urgency=low
 
   * new upstreal release:
 
@@ -1023,7 +1023,7 @@ kdelibs (4:3.5.4-1) unstable; urgency=low
   +++ Changes by Christopher Martin:
 
   * Add replaces for kaffeine (<< 0.8.1-3), since x-mplayer2.desktop is now in
-    kdelibs-data.
+    tdelibs-data.
 
   * Add a number of patches, courtesy of Debian, which attempt to get
     kdeprint working reasonably well with CUPS 1.2.x. These patches should
@@ -1035,27 +1035,27 @@ kdelibs (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 27 Jul 2006 10:14:08 +0200
 
-kdelibs (4:3.5.5-0ubuntu4) feisty; urgency=low
+tdelibs (4:3.5.5-0ubuntu4) feisty; urgency=low
 
   * Add kubuntu_63_ark.diff for better 7z management
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 24 Oct 2006 00:32:33 +0200
 
-kdelibs (4:3.5.5-0ubuntu3) edgy; urgency=low
+tdelibs (4:3.5.5-0ubuntu3) edgy; urgency=low
 
   * Update kubuntu_56_langpacks_desktop_files.diff to fix
     malone No 63325
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 22 Oct 2006 19:57:23 +0100
 
-kdelibs (4:3.5.5-0ubuntu2) edgy; urgency=low
+tdelibs (4:3.5.5-0ubuntu2) edgy; urgency=low
 
   * Revert kdeprint directory and patches to those from kde 3.5.4 packages
     closes malone No 65665
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 14 Oct 2006 01:54:33 +0000
 
-kdelibs (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdelibs (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
   * Remove patches which no longer apply:
@@ -1070,107 +1070,107 @@ kdelibs (4:3.5.5-0ubuntu1) edgy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 11:23:11 +0000
 
-kdelibs (4:3.5.4-0ubuntu18) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu18) edgy; urgency=low
 
   * Add kubuntu_62_flash_installer.diff. Make it easier to
     install flash plugin, the same way Firefox does.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 26 Sep 2006 11:41:01 +0200
 
-kdelibs (4:3.5.4-0ubuntu17) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu17) edgy; urgency=low
 
-  * Remove dependency on menu-xdg from kdelibs4c2a
+  * Remove dependency on menu-xdg from tdelibs4c2a
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 21 Sep 2006 16:01:01 +0100
 
-kdelibs (4:3.5.4-0ubuntu16) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu16) edgy; urgency=low
 
   * Rebuild on latest cdbs to change .pot files to UTF8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 20 Sep 2006 13:08:59 +0100
 
-kdelibs (4:3.5.4-0ubuntu15) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu15) edgy; urgency=low
 
   * Add kubuntu_61_hibernate_icons.diff.uu, add icons for suspend and hibernate
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 19 Sep 2006 12:11:45 +0100
 
-kdelibs (4:3.5.4-0ubuntu14) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu14) edgy; urgency=low
 
   * Add common-post-build-arch rule to debian/rules to merge 
-    kde.pot into kdelibs.pot, closes malone #61107
+    kde.pot into tdelibs.pot, closes malone #61107
   * Fix distribution string
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 18 Sep 2006 18:50:35 +0100
 
-kdelibs (4:3.5.4-0ubuntu13) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu13) edgy; urgency=low
 
   * Fix kubuntu_version in debian/rules
   * Use newer version of kubuntu_19_debianize_useragent.diff from Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 18 Sep 2006 15:55:52 +0100
 
-kdelibs (4:3.5.4-0ubuntu12) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu12) edgy; urgency=low
 
   * Add kubuntu_60_kresolver_asserts.diff, fixes http://bugs.kde.org/132851
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 18 Sep 2006 15:18:52 +0100
 
-kdelibs (4:3.5.4-0ubuntu11) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu11) edgy; urgency=low
 
   * Removed kubuntu_58_aboutpage_artwork.diff.uu since kubuntu
     colors are changing back to blue.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 12 Sep 2006 12:14:58 +0000
 
-kdelibs (4:3.5.4-0ubuntu10) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu10) edgy; urgency=low
 
   * Update kubuntu_52_xinerama.diff with improved patch by Lubos Lunak
   * Add kubuntu_59_nomediaioslave_kfile_speedbar.diff from Simon Edwards
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  1 Sep 2006 17:20:58 +0000
 
-kdelibs (4:3.5.4-0ubuntu9) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu9) edgy; urgency=low
 
   * Add missing .h file to kubuntu_56_langpacks_desktop_files.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 30 Aug 2006 21:11:59 +0000
 
-kdelibs (4:3.5.4-0ubuntu8) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu8) edgy; urgency=low
 
   * Add missing #include to kubuntu_56_langpacks_desktop_files.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 30 Aug 2006 16:12:14 +0000
 
-kdelibs (4:3.5.4-0ubuntu7) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu7) edgy; urgency=low
 
   * Add kubuntu_58_aboutpage_artwork.diff with artwork by
     Brandon Holtsclaw <imbrandon@kubuntu.org>
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 29 Aug 2006 16:11:49 +0000
 
-kdelibs (4:3.5.4-0ubuntu6) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu6) edgy; urgency=low
 
   * Ensure kubuntu_57_nomediaioslave_fileio.diff patch is not applied
     before upload.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 22 Aug 2006 13:35:21 +0000
 
-kdelibs (4:3.5.4-0ubuntu5) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu5) edgy; urgency=low
 
   * Modified kubuntu_57_nomediaioslave_fileio.diff from 
     Simon Edwards, https://wiki.ubuntu.com/DebianKDEMedia with new updates
 
  -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Tue, 22 Aug 2006 13:27:49 -0500
 
-kdelibs (4:3.5.4-0ubuntu4) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu4) edgy; urgency=low
 
   * Add kubuntu_57_nomediaioslave_fileio.diff from 
     Simon Edwards, http://www.kdedevelopers.org/node/2231
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Aug 2006 13:27:49 +0000
 
-kdelibs (4:3.5.4-0ubuntu3) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu3) edgy; urgency=low
 
   * Add kubuntu_56_langpacks_desktop_files.diff 
     and debian/kubuntu-desktop-i18n/
@@ -1178,26 +1178,26 @@ kdelibs (4:3.5.4-0ubuntu3) edgy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  3 Aug 2006 00:52:20 +0000
 
-kdelibs (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu2) edgy; urgency=low
 
   * Remove debugging output from kubuntu_28_fix_sudo.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  1 Aug 2006 16:59:36 +0000
 
-kdelibs (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdelibs (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:19 +0000
 
-kdelibs (4:3.5.3-1ubuntu9) edgy; urgency=low
+tdelibs (4:3.5.3-1ubuntu9) edgy; urgency=low
 
   * Add kubuntu_55_printer_sharing.diff for
     https://launchpad.net/distros/ubuntu/+spec/kubuntu-printer-sharing
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 24 Jul 2006 14:45:17 +0100
 
-kdelibs (4:3.5.3-1ubuntu8) edgy; urgency=low
+tdelibs (4:3.5.3-1ubuntu8) edgy; urgency=low
 
   * Added kubuntu_53_tabs_hover_close_delaying.diff to remove delay on
     tabs close button
@@ -1206,7 +1206,7 @@ kdelibs (4:3.5.3-1ubuntu8) edgy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 21 Jul 2006 22:15:34 +0200
 
-kdelibs (4:3.5.3-1ubuntu7) edgy; urgency=low
+tdelibs (4:3.5.3-1ubuntu7) edgy; urgency=low
 
   * SECURITY UPDATE: fix remote browser crash
   * KDE Konqueror allows remote attackers to cause a denial
@@ -1220,21 +1220,21 @@ kdelibs (4:3.5.3-1ubuntu7) edgy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Jul 2006 13:23:01 +0100
 
-kdelibs (4:3.5.3-1ubuntu6) edgy; urgency=low
+tdelibs (4:3.5.3-1ubuntu6) edgy; urgency=low
 
   * Add kubuntu_52_xinerama.diff from 
     http://ktown.kde.org/~seli/xinerama/
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 20 Jul 2006 17:38:55 +0100
 
-kdelibs (4:3.5.3-1ubuntu5) edgy; urgency=low
+tdelibs (4:3.5.3-1ubuntu5) edgy; urgency=low
 
   * Fix kubuntu_28_fix_sudo.diff for https://launchpad.net/bugs/44920
-  * Make kdelibs4c2a depend on launchpad-integration
+  * Make tdelibs4c2a depend on launchpad-integration
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 17 Jul 2006 20:44:47 +0000
 
-kdelibs (4:3.5.3-1ubuntu4) edgy; urgency=low
+tdelibs (4:3.5.3-1ubuntu4) edgy; urgency=low
 
   * Add kubuntu_51_launchpad_integration.diff for 
     https://launchpad.net/distros/ubuntu/+spec/kubuntu-launchpad-integration
@@ -1242,25 +1242,25 @@ kdelibs (4:3.5.3-1ubuntu4) edgy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 12 Jul 2006 16:40:37 +0000
 
-kdelibs (4:3.5.3-1ubuntu3) edgy; urgency=low
+tdelibs (4:3.5.3-1ubuntu3) edgy; urgency=low
 
-  * Add gettext-kde, kdesdk-scripts as depends to kdelibs4-dev
+  * Add gettext-kde, tdesdk-scripts as depends to tdelibs4-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Jun 2006 16:31:18 +0000
 
-kdelibs (4:3.5.3-1ubuntu2) edgy; urgency=low
+tdelibs (4:3.5.3-1ubuntu2) edgy; urgency=low
 
   * Rebuild on new Qt to fix binary compatibility breakage
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Jun 2006 14:21:28 +0000
 
-kdelibs (4:3.5.3-1ubuntu1) edgy; urgency=low
+tdelibs (4:3.5.3-1ubuntu1) edgy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 26 Jun 2006 13:42:57 +0000
 
-kdelibs (4:3.5.3-1) unstable; urgency=low
+tdelibs (4:3.5.3-1) unstable; urgency=low
 
   * New upstream release:
     + Fixes crashes in konqueror. (Closes: #356876)
@@ -1271,23 +1271,23 @@ kdelibs (4:3.5.3-1) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Eliminate the kdelibs-bin package, merging it completely into kdelibs4c2a.
+  * Eliminate the tdelibs-bin package, merging it completely into tdelibs4c2a.
 
-    There existed a (necessary) circular dependency between kdelibs-bin and
-    kdelibs4c2a. kdelibs-bin is linked to kdelibs4c2a. Also, every KDE
-    application needs the binaries in kdelibs-bin to function properly, yet
+    There existed a (necessary) circular dependency between tdelibs-bin and
+    tdelibs4c2a. tdelibs-bin is linked to tdelibs4c2a. Also, every KDE
+    application needs the binaries in tdelibs-bin to function properly, yet
     virtually none depend on it. So to break the circular dependency by
-    removing kdelibs4c2a's dependency on kdelibs-bin would require that all
+    removing tdelibs4c2a's dependency on tdelibs-bin would require that all
     KDE packages be re-uploaded. And every KDE-using system would still need
-    both kdelibs-bin and kdelibs4c2a.
+    both tdelibs-bin and tdelibs4c2a.
 
     So we'll simply merge them. The general practice of separating libraries
-    and programs makes no sense for kdelibs, given the close ties between the
+    and programs makes no sense for tdelibs, given the close ties between the
     two. Multiple versions of the KDE libraries can't be installed
     side-by-side in any case.
 
-    For the rare package which depends on kdelibs-bin, kdelibs4c2a will
-    "Provides: kdelibs-bin".
+    For the rare package which depends on tdelibs-bin, tdelibs4c2a will
+    "Provides: tdelibs-bin".
 
     The removal of the circular dependency should make future transitions
     easier for users, avoiding difficulties such as those encountered during
@@ -1295,7 +1295,7 @@ kdelibs (4:3.5.3-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 28 May 2006 16:57:06 +0200
 
-kdelibs (4:3.5.2-2) unstable; urgency=low
+tdelibs (4:3.5.2-2) unstable; urgency=low
 
   * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for khtml.
     Pages which, since the last upload, didn't render at all, or only showed
@@ -1303,7 +1303,7 @@ kdelibs (4:3.5.2-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue,  4 Apr 2006 09:03:26 -0400
 
-kdelibs (4:3.5.2-1) unstable; urgency=low
+tdelibs (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -1311,7 +1311,7 @@ kdelibs (4:3.5.2-1) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Remove apparently obsolete python dependency from kdelibs-bin.
+  * Remove apparently obsolete python dependency from tdelibs-bin.
     (Closes: #356934)
 
   * Enable inotify support, and change the Recommends: gamin to a Suggests:
@@ -1326,19 +1326,19 @@ kdelibs (4:3.5.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 28 Mar 2006 18:02:00 -0500
 
-kdelibs (4:3.5.1-4) unstable; urgency=low
+tdelibs (4:3.5.1-4) unstable; urgency=low
 
   * KDE_3_5_BRANCH update (up to r517245).
 
   +++ Changes by Christopher Martin:
 
   * Add a Makefile.am patch that works around a bit of libtool oddness, to be
-    investigated. This problem was causing the kdelibs build to fail. Thanks
+    investigated. This problem was causing the tdelibs build to fail. Thanks
     to Daniel Schepler for finding the fix. (Closes: #355099)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 10 Mar 2006 12:06:36 -0500
 
-kdelibs (4:3.5.1-3) unstable; urgency=medium
+tdelibs (4:3.5.1-3) unstable; urgency=medium
 
   * KDE_3_5_BRANCH update (up to r515119).
 
@@ -1348,15 +1348,15 @@ kdelibs (4:3.5.1-3) unstable; urgency=medium
     documentation license from being set as the GFDL, even if the author
     specified a different license. Bump urgency for RC fix. (Closes: #353814)
 
-  * Add Replaces for krita and digikam, now that kdelibs includes
+  * Add Replaces for krita and digikam, now that tdelibs includes
     x-raw.desktop.
 
-  * Allow building against libgamin-dev as well as libfam-dev. kdelibs4-dev
+  * Allow building against libgamin-dev as well as libfam-dev. tdelibs4-dev
     will also depend on libfam-dev | libgamin-dev.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  2 Mar 2006 13:26:25 -0500
 
-kdelibs (4:3.5.1-2) unstable; urgency=low
+tdelibs (4:3.5.1-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -1368,23 +1368,23 @@ kdelibs (4:3.5.1-2) unstable; urgency=low
   * Update the avahi patch, fixing kpf crashes, and probably some kded crashes
     users reported as well. (Closes: #350266, #351598)
 
-  * Remove obsolete netpbm dependency from kdelibs-bin.
+  * Remove obsolete netpbm dependency from tdelibs-bin.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon,  6 Feb 2006 19:42:06 -0500
 
-kdelibs (4:3.5.1-1) unstable; urgency=low
+tdelibs (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
 
   +++ Changes by Josh Metzler:
   
-  * Add kdelibs-data Replaces for libdjvulibre1 and libdjvulibre15 (<< 3.5.1-2)
+  * Add tdelibs-data Replaces for libdjvulibre1 and libdjvulibre15 (<< 3.5.1-2)
     which also include x-djvu.desktop.
     (Closes: #347218, #347885, #348020, #348365, #348899)
 
   +++ Changes by Isaac Clerencia:
 
-  * Apply patch 27_kdnssd_avahi.diff to replace dummy kdelibs kdnssd
+  * Apply patch 27_kdnssd_avahi.diff to replace dummy tdelibs kdnssd
     implementation with a working avahi-based one.
 
   * Add Build-Depends on libavahi-client-dev and libavahi-qt3-dev to get
@@ -1396,7 +1396,7 @@ kdelibs (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 26 Jan 2006 18:37:01 -0500
 
-kdelibs (4:3.5.0-3) unstable; urgency=low
+tdelibs (4:3.5.0-3) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -1417,16 +1417,16 @@ kdelibs (4:3.5.0-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri,  6 Jan 2006 14:54:24 +0100
 
-kdelibs (4:3.5.0-2) experimental; urgency=low
+tdelibs (4:3.5.0-2) experimental; urgency=low
 
   * Upload to experimental.
 
-  * KDE_3_5_BRANCH update (up to r488534). Bump kdelibs4c2a shlibs to account
+  * KDE_3_5_BRANCH update (up to r488534). Bump tdelibs4c2a shlibs to account
     for changes.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 14 Dec 2005 16:16:45 -0500
 
-kdelibs (4:3.5.0-1) alioth; urgency=low
+tdelibs (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
 
@@ -1435,16 +1435,16 @@ kdelibs (4:3.5.0-1) alioth; urgency=low
   * Remove an old conffile from KDE 3.3, ktexteditor_autobookmarkerrc, on
     upgrade. (Closes: #339491)
 
-  * Bump DH_COMPAT to 5. No changes, except kdelibs4c2a-dbg is replaced by
-    kdelibs-dbg, which contains debugging symbols for all kdelibs binaries.
+  * Bump DH_COMPAT to 5. No changes, except tdelibs4c2a-dbg is replaced by
+    tdelibs-dbg, which contains debugging symbols for all tdelibs binaries.
 
-  * Make kdelibs4c2a Recommend gamin, since it supports inotify. Continue
+  * Make tdelibs4c2a Recommend gamin, since it supports inotify. Continue
     to build against fam for now, however, to ensure that our users have
     choice.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 29 Nov 2005 17:19:36 -0500
 
-kdelibs (4:3.4.3-2) unstable; urgency=low
+tdelibs (4:3.4.3-2) unstable; urgency=low
 
   * KDE_3_4_BRANCH update (up to r483731).
 
@@ -1455,65 +1455,65 @@ kdelibs (4:3.4.3-2) unstable; urgency=low
 
   +++ Changes by Adeodato Simó:
 
-  * libstdc++ allocator transition: rename kdelibs4c2 to kdelibs4c2a. Bumped
+  * libstdc++ allocator transition: rename tdelibs4c2 to tdelibs4c2a. Bumped
     build-dependency version on libarts1-dev and libopenexr-dev.
     (Closes: #339190)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 27 Nov 2005 23:47:21 +0100
 
-kdelibs (4:3.5.2-0ubuntu18) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu18) dapper; urgency=low
 
   * Use msgcat not cat to join together two .pot files
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 12 May 2006 20:18:48 +0300
 
-kdelibs (4:3.5.2-0ubuntu17) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu17) dapper; urgency=low
 
   * Add kubuntu_50_kdesu_non_root.patch to fix running commands as non-root
     with kdesu with su instead of sudo (Malone #41184)
 
  -- Luka Renko <lure.net@gmail.net>  Wed, 10 May 2006 22:45:27 +0200
 
-kdelibs (4:3.5.2-0ubuntu16) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu16) dapper; urgency=low
 
   * Add EXTRACTATTR for .pot generation in kde.mk
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  9 May 2006 18:28:27 +0300
 
-kdelibs (4:3.5.2-0ubuntu15) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu15) dapper; urgency=low
 
   * Remove highlighting of KJanusWidget sidebar in 
-    17_kdelibs_rubberband.diff it caused a crash in Adept Installer
+    17_tdelibs_rubberband.diff it caused a crash in Adept Installer
     Closes Malone #43472
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  8 May 2006 15:13:19 +0000
 
-kdelibs (4:3.5.2-0ubuntu14) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu14) dapper; urgency=low
 
   * Edit kubuntu_03_applications_menu_entries_move.diff to 
     exclude OpenOffice Draw from Graphics (duplicate entry also in Office)
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  4 May 2006 12:09:54 -0400
 
-kdelibs (4:3.5.2-0ubuntu13) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu13) dapper; urgency=low
 
   * Add kubuntu_49_3DES_EDE_CBC.diff from http://bugs.kde.org/124684 
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  2 May 2006 15:42:27 +0100
 
-kdelibs (4:3.5.2-0ubuntu12) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu12) dapper; urgency=low
 
-  * Alter kde.mk to include kde.pot strings in kdelibs.po 
+  * Alter kde.mk to include kde.pot strings in tdelibs.po 
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 29 Apr 2006 11:48:19 +0100
 
-kdelibs (4:3.5.2-0ubuntu11) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu11) dapper; urgency=low
 
   * Update kubuntu_19_debianize_useragent.diff for 6.04 -> 6.06 change 
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 27 Apr 2006 17:54:52 +0100
 
-kdelibs (4:3.5.2-0ubuntu10) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu10) dapper; urgency=low
 
   * Patch from Michael Hofmann <mh21@piware.de>
     - Add kubuntu_47_cups12_list_ignore_warnings.diff quick fix for 
@@ -1523,7 +1523,7 @@ kdelibs (4:3.5.2-0ubuntu10) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 26 Apr 2006 00:50:37 +0000
 
-kdelibs (4:3.5.2-0ubuntu9) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu9) dapper; urgency=low
 
   * Add kubuntu_45_kcmoduleinfo.diff to fix module name test in
     KCModuleInfo::KCModuleInfo, thanks to Julien Richard-Foy
@@ -1532,19 +1532,19 @@ kdelibs (4:3.5.2-0ubuntu9) dapper; urgency=low
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Mon, 24 Apr 2006 00:15:55 +0200
 
-kdelibs (4:3.5.2-0ubuntu8) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu8) dapper; urgency=low
 
   * Fix kubuntu_42_cups12_addmodify.diff for CUPS 1.2 rc2
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 23 Apr 2006 18:56:33 +0100
 
-kdelibs (4:3.5.2-0ubuntu7) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu7) 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:29 +0100
 
-kdelibs (4:3.5.2-0ubuntu6) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu6) dapper; urgency=low
 
   * Add further patches for CUPS 1.2 support from
     Michael Hofmann <mh21@piware.de>
@@ -1557,7 +1557,7 @@ kdelibs (4:3.5.2-0ubuntu6) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 17 Apr 2006 21:14:35 +0000
 
-kdelibs (4:3.5.2-0ubuntu5) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu5) dapper; urgency=low
 
   * Add kubuntu_37_wm_branch_fixes.diff 
     Handle X timestamp wrapping correctly even on 64bit platforms.
@@ -1566,35 +1566,35 @@ kdelibs (4:3.5.2-0ubuntu5) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Apr 2006 16:19:11 +0000
 
-kdelibs (4:3.5.2-0ubuntu4) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu4) dapper; urgency=low
 
   * Add kubuntu_36_ioslave_filedialogue.diff from 3.5 branch
     makes file dialogues support system:/ and media:/ ioslaves
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Apr 2006 15:25:15 +0000
 
-kdelibs (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Add kubuntu_35_kdeprint_branch.diff to fix compile error
     with CUPS 1.2, remove my random hack from kubuntu_34_cups12.diff 
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Apr 2006 18:53:24 +0100
 
-kdelibs (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_34_cups12.diff, start of a fix for CUPS 1.2 
     compatibility.  Patch by Michael Hofmann 
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Apr 2006 14:35:20 +0100
 
-kdelibs (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * Added kubuntu_30_fix_copy_and_rename.diff to fix copy/paste
     to same folder
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 31 Mar 2006 00:23:17 +0100
 
-kdelibs (4:3.5.2-0ubuntu0) dapper; urgency=low
+tdelibs (4:3.5.2-0ubuntu0) dapper; urgency=low
 
   * New upstream release
   * Remove kubuntu_30_kurllabel.diff, now upstream
@@ -1604,7 +1604,7 @@ kdelibs (4:3.5.2-0ubuntu0) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 11:08:32 +0000
 
-kdelibs (4:3.5.1-0ubuntu11) dapper; urgency=low
+tdelibs (4:3.5.1-0ubuntu11) dapper; urgency=low
 
   * Remove stray comma from configure.in.in in 
     kubuntu_27_kdnssd_avahi.diff that stopped it picking up 
@@ -1612,67 +1612,67 @@ kdelibs (4:3.5.1-0ubuntu11) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Mar 2006 17:35:07 +0000
 
-kdelibs (4:3.5.1-0ubuntu10) dapper; urgency=low
+tdelibs (4:3.5.1-0ubuntu10) dapper; urgency=low
 
   * Fix include path in kubuntu_27_kdnssd_avahi.diff patch
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 10 Mar 2006 15:34:38 +0000
 
-kdelibs (4:3.5.1-0ubuntu9) dapper; urgency=low
+tdelibs (4:3.5.1-0ubuntu9) dapper; urgency=low
 
   * Update 27_kdnssd_avahi.diff now called kubuntu_27_kdnssd_avahi.diff to 
     fix crash when avahi is not installed
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  9 Mar 2006 09:59:35 +0000
 
-kdelibs (4:3.5.1-0ubuntu8) dapper; urgency=low
+tdelibs (4:3.5.1-0ubuntu8) dapper; urgency=low
 
   * Add patch kubuntu_33_kabc_fix_save to fix loss of addressbook
     on exiting kontact (Closes: KDE Bug http://bugs.kde.org/118924). 
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Mon,  6 Mar 2006 23:59:09 +0100
 
-kdelibs (4:3.5.1-0ubuntu7) dapper; urgency=low
+tdelibs (4:3.5.1-0ubuntu7) dapper; urgency=low
 
   * Drop build dependency on g++-3.4 [hppa].
 
  -- Matthias Klose <doko@ubuntu.com>  Fri, 17 Feb 2006 00:18:27 +0000
 
-kdelibs (4:3.5.1-0ubuntu6) dapper; urgency=low
+tdelibs (4:3.5.1-0ubuntu6) dapper; urgency=low
 
   * Don't use GCC 3.4 on hppa
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Feb 2006 12:02:55 +0000
 
-kdelibs (4:3.5.1-0ubuntu5) dapper; urgency=low
+tdelibs (4:3.5.1-0ubuntu5) dapper; urgency=low
 
   * Add kubuntu_32_autostart_onlykde.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  9 Feb 2006 12:55:35 +0000
 
-kdelibs (4:3.5.1-0ubuntu4) dapper; urgency=low
+tdelibs (4:3.5.1-0ubuntu4) dapper; urgency=low
 
   * Add kubuntu_31_onlyshowin_autostart.diff to respect OnlyShowIn and
     NotShowIn for autostart files
-  * Change kdelibs4c2a-dbg to kdelibs-dbg (sync with debian)
+  * Change tdelibs4c2a-dbg to tdelibs-dbg (sync with debian)
   * Change debian/compat to 5 for dapper to fix -dbg package
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  7 Feb 2006 12:57:52 +0000
 
-kdelibs (4:3.5.1-0ubuntu3) dapper; urgency=low
+tdelibs (4:3.5.1-0ubuntu3) dapper; urgency=low
 
-  * Add back kdelibs4c2.install for backports
+  * Add back tdelibs4c2.install for backports
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  7 Feb 2006 00:43:24 +0000
 
-kdelibs (4:3.5.1-0ubuntu2) dapper; urgency=low
+tdelibs (4:3.5.1-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_30_kurllabel.diff fix Konqueror status bar icons
   * Add configure option --with-lua-includes=/usr/include/lua50
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  1 Feb 2006 14:27:16 +0000
 
-kdelibs (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdelibs (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Sync 27_kdnssd_avahi.diff with Debian
@@ -1680,14 +1680,14 @@ kdelibs (4:3.5.1-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 15:04:54 +0000
 
-kdelibs (4:3.5.0-0ubuntu11) dapper; urgency=low
+tdelibs (4:3.5.0-0ubuntu11) dapper; urgency=low
 
-  * Remove netpbm from kdelibs-bin depends,
+  * Remove netpbm from tdelibs-bin depends,
     it is no longer used by kimgio
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 25 Jan 2006 18:10:28 +0000
 
-kdelibs (4:3.5.0-0ubuntu10) dapper; urgency=low
+tdelibs (4:3.5.0-0ubuntu10) dapper; urgency=low
 
   * Add kubuntu_28_fix_sudo.diff to set home directory when 
     run as root via sudo, stops KDE apps settings wrong permissions on 
@@ -1695,7 +1695,7 @@ kdelibs (4:3.5.0-0ubuntu10) dapper; urgency=low
   * Add kubuntu_29_quiet_kbuildsycoca.diff stop kbuildsycoca complaining
     about unknown mimetypes
   * SECURITY UPDATE: kjs encodeuri/decodeuri heap overflow vulnerability
-  * Add kubuntu_20_post_3.4.3_kdelibs_kjs.diff
+  * Add kubuntu_20_post_3.4.3_tdelibs_kjs.diff
   * An incorrect bounds check in kjs, the Javascript interpreter
     engine used by Konqueror and other parts of KDE, that allows
     a heap based buffer overflow when decoding invalid utf8 encoded
@@ -1706,104 +1706,104 @@ kdelibs (4:3.5.0-0ubuntu10) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 20 Jan 2006 14:39:41 +0000
 
-kdelibs (4:3.5.0-0ubuntu9) dapper; urgency=low
+tdelibs (4:3.5.0-0ubuntu9) dapper; urgency=low
 
-  * Make kdelibs4-dev depend on libavahi-client-dev
+  * Make tdelibs4-dev depend on libavahi-client-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 17:25:14 +0000
 
-kdelibs (4:3.5.0-0ubuntu8) dapper; urgency=low
+tdelibs (4:3.5.0-0ubuntu8) dapper; urgency=low
 
-  * Make kdelibs4-dev depend on libavahi-common-dev
+  * Make tdelibs4-dev depend on libavahi-common-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 13:47:03 +0000
 
-kdelibs (4:3.5.0-0ubuntu7) dapper; urgency=low
+tdelibs (4:3.5.0-0ubuntu7) dapper; urgency=low
 
-  * Make kdelibs4-dev depend on libavahi-qt3-dev
+  * Make tdelibs4-dev depend on libavahi-qt3-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 11:50:47 +0000
 
-kdelibs (4:3.5.0-0ubuntu6) dapper; urgency=low
+tdelibs (4:3.5.0-0ubuntu6) dapper; urgency=low
 
-  * Remove libkdnssd depend from kdelibs4-dev
+  * Remove libkdnssd depend from tdelibs4-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 09:09:29 +0000
 
-kdelibs (4:3.5.0-0ubuntu5) dapper; urgency=low
+tdelibs (4:3.5.0-0ubuntu5) dapper; urgency=low
 
   * Add kubuntu_27_kdnssd_avahi.diff for avahi support directly in
-    kdelibs
+    tdelibs
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Jan 2006 21:14:20 +0000
 
-kdelibs (4:3.5.0-0ubuntu4) dapper; urgency=low
+tdelibs (4:3.5.0-0ubuntu4) dapper; urgency=low
 
   * Do not install kdnssd library files, they now come from
-    libkdnssd1-avahi package.  Development files stay in kdelibs4-dev.
-  * Add depends on libkdnssd1-avahi from kdelibs4-dev
+    libkdnssd1-avahi package.  Development files stay in tdelibs4-dev.
+  * Add depends on libkdnssd1-avahi from tdelibs4-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Jan 2006 01:25:52 +0000
 
-kdelibs (4:3.5.0-0ubuntu3) dapper; urgency=low
+tdelibs (4:3.5.0-0ubuntu3) dapper; urgency=low
 
   * Build-dep on latest qt
   * Un-apply patch before uploading
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 16 Dec 2005 17:48:30 +0000
 
-kdelibs (4:3.5.0-0ubuntu2) dapper; urgency=low
+tdelibs (4:3.5.0-0ubuntu2) dapper; urgency=low
 
   * Add back updated kubuntu_06_kwallet_simplify_string.diff
     and kubuntu_03_applications_menu_entries_move.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Dec 2005 14:34:41 +0000
 
-kdelibs (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdelibs (4:3.5.0-0ubuntu1) dapper; urgency=low
 
   * New upstream release
-  * Make kdelibs4-dev depend on gamin not fam
+  * Make tdelibs4-dev depend on gamin not fam
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 29 Nov 2005 19:50:37 +0000
 
-kdelibs (4:3.5-rc2-0ubuntu6) dapper; urgency=low
+tdelibs (4:3.5-rc2-0ubuntu6) dapper; urgency=low
 
-  * Add gettext-kde, kdesdk-scripts, hspell, liblualib50-dev as
-    depends to kdelibs4-dev
+  * Add gettext-kde, tdesdk-scripts, hspell, liblualib50-dev as
+    depends to tdelibs4-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 26 Nov 2005 00:30:51 +0000
 
-kdelibs (4:3.5-rc2-0ubuntu5) dapper; urgency=low
+tdelibs (4:3.5-rc2-0ubuntu5) dapper; urgency=low
 
-  * Add libattr1-dev and libacl1-dev as depends to kdelibs4-dev
+  * Add libattr1-dev and libacl1-dev as depends to tdelibs4-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 26 Nov 2005 00:20:02 +0000
 
-kdelibs (4:3.5-rc2-0ubuntu4) dapper; urgency=low
+tdelibs (4:3.5-rc2-0ubuntu4) dapper; urgency=low
 
   * Add debian/patches/kubuntu_06_fix_kdeprint_cups12_fix.diff, fix kdeprint compile error properly
   * Add common/kubuntu_01_kdepot.diff and common/kde.pot, fix .pot generation
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 25 Nov 2005 22:11:51 +0000
 
-kdelibs (4:3.5-rc2-0ubuntu3) dapper; urgency=low
+tdelibs (4:3.5-rc2-0ubuntu3) dapper; urgency=low
 
   * Fix broken kubuntu_06_fix_kdeprint_compile_hack.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 25 Nov 2005 18:44:54 +0000
 
-kdelibs (4:3.5-rc2-0ubuntu2) dapper; urgency=low
+tdelibs (4:3.5-rc2-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_06_fix_kdeprint_compile_hack.diff, quick patch until I
     work out how to fix it properly
-  * Fix kdelibs4-doc.install for correct path of files
+  * Fix tdelibs4-doc.install for correct path of files
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 25 Nov 2005 17:08:31 +0000
 
-kdelibs (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdelibs (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
-  * libstdc++ transition.  Rename kdelibs4c2 to kdelibs4c2a
+  * libstdc++ transition.  Rename tdelibs4c2 to tdelibs4c2a
     http://lists.ubuntu.com/archives/ubuntu-devel-announce/2005-November/000016.html
   * Tighten build-dep on arts, qt and openexr to pick up libstd++ transition
   * build-dep on libattr1-dev and libacl1-dev
@@ -1811,18 +1811,18 @@ kdelibs (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 17:29:53 +0000
 
-kdelibs (4:3.5-rc1-0ubuntu1) dapper; urgency=low
+tdelibs (4:3.5-rc1-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Sync with Debian
   * Remove 16_default_fonts.diff, merged upstream
   * Remove 22_htmltokenizer_cpp_from_3_5.diff, already upstream
   * Remove 23_kfiledialog.diff, merged upstream
-  * kdelibs-data replaces old kttsd
+  * tdelibs-data replaces old kttsd
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 10 Nov 2005 17:24:33 +0000
 
-kdelibs (4:3.4.3-1) experimental; urgency=low
+tdelibs (4:3.4.3-1) experimental; urgency=low
 
   * New upstream release.
 
@@ -1833,17 +1833,17 @@ kdelibs (4:3.4.3-1) experimental; urgency=low
 
   * Add a patch to generate a PIC static libkdefakes, libkdefakes_pic.a.
     This will allow other libraries, such as mimelib, to use libkdefakes,
-    without acquiring non-PIC code or a dependency upon the full kdelibs.
+    without acquiring non-PIC code or a dependency upon the full tdelibs.
     (Closes: #326113)
 
   +++ Changes by Pierre Habouzit:
 
-  * Add /usr/share/bug/$package/presubj for kdelibs{4c2,-bin,} kindly asking
+  * Add /usr/share/bug/$package/presubj for tdelibs{4c2,-bin,} kindly asking
     our users to restart their KDE if reporting a bug just after an upgrade.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 15 Oct 2005 13:52:25 -0400
 
-kdelibs (4:3.4.2-4) unstable; urgency=low
+tdelibs (4:3.4.2-4) unstable; urgency=low
 
   * KDE_3_4_BRANCH update (up to r458612).
 
@@ -1867,11 +1867,11 @@ kdelibs (4:3.4.2-4) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 16 Sep 2005 12:52:36 -0400
 
-kdelibs (4:3.4.2-3) unstable; urgency=low
+tdelibs (4:3.4.2-3) unstable; urgency=low
 
   +++ Changes by Adeodato Simó:
 
-  * Build with g++-3.4 on arm, m68k and hppa; kdelibs triggers the same gcc
+  * Build with g++-3.4 on arm, m68k and hppa; tdelibs triggers the same gcc
     4.0 ICE as arts does.
 
   * Apply patch by Aurelien Jarno and Robert Millan for GNU/kFreeBSD support
@@ -1887,25 +1887,25 @@ kdelibs (4:3.4.2-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 29 Aug 2005 20:33:32 +0200
 
-kdelibs (4:3.4.2-2) unstable; urgency=low
+tdelibs (4:3.4.2-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin and Adeodato Simó:
 
-  * Improve the fix for #311958 to make kdelibs binNMUable again. Instead of
-    having kdelibs4c2 depend on kdelibs-data (= ${Source-Version}), split that
+  * Improve the fix for #311958 to make tdelibs binNMUable again. Instead of
+    having tdelibs4c2 depend on tdelibs-data (= ${Source-Version}), split that
     in (>> 3.X.Y) plus (<< 3.X+1).
 
-    Since this fix can't be introduced in Sarge's kdelibs4, introduce (sigh) a
-    conflicts in kdelibs-data against kdelibs4, which fortunately needs not be
-    versioned because there is no 3.4.2 version of kdelibs4. This will prevent
+    Since this fix can't be introduced in Sarge's tdelibs4, introduce (sigh) a
+    conflicts in tdelibs-data against tdelibs4, which fortunately needs not be
+    versioned because there is no 3.4.2 version of tdelibs4. This will prevent
     breakage due to partial upgrades and thus closes: #323747, #323967,
     #324147.
 
   +++ Changes by Christopher Martin:
 
-  * Drop the versioning from kdelibs4-dev's too strict dependency on
+  * Drop the versioning from tdelibs4-dev's too strict dependency on
     libfam-dev. This should allow libgamin-dev to be installed along with
-    kdelibs4-dev once the fam transition is reversed, or libgamin0 stops
+    tdelibs4-dev once the fam transition is reversed, or libgamin0 stops
     providing libfam0c102. (Closes: #324174)
 
   +++ Changes by Adeodato Simó:
@@ -1913,12 +1913,12 @@ kdelibs (4:3.4.2-2) unstable; urgency=low
   * Patched some Makefiles.am to not use LIBADD for convenience libraries,
     since libtool can't prune those; specify the dependencies each time the
     library is used. This allows to reduce a bit more the number of Depends of
-    the kdelibs4 package; in total, this version drops 11 dependencies with
+    the tdelibs4 package; in total, this version drops 11 dependencies with
     respect to the 3.3.x series.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 24 Aug 2005 16:05:07 +0200
 
-kdelibs (4:3.4.2-1) unstable; urgency=low
+tdelibs (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release. Includes a forward declaration of KXMLGUIClient in
     kactioncollection.h, which makes gcc-4.0 happy and thus closes: #317543,
@@ -1928,13 +1928,13 @@ kdelibs (4:3.4.2-1) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
   
-  * GCC 4.0 transition: kdelibs4 becomes kdelibs4c2. Tighten build depends on
+  * GCC 4.0 transition: tdelibs4 becomes tdelibs4c2. Tighten build depends on
     libarts1-dev, libqt3-mt-dev, libfam-dev, libtiff4-dev, and libopenexr-dev
     to ensure that we build against transitioned packages.
 
-    Since kdelibs4 now depends on libopenexr2c2, this upload closes: #320450.
+    Since tdelibs4 now depends on libopenexr2c2, this upload closes: #320450.
   
-  * Make kdelibs4 always depend on the identical version of kdelibs-data.
+  * Make tdelibs4 always depend on the identical version of tdelibs-data.
     (Closes: #311958)
 
   +++ Changes by Adeodato Simó:
@@ -1944,71 +1944,71 @@ kdelibs (4:3.4.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 16 Aug 2005 11:16:00 -0400
  
-kdelibs (4:3.4.1-1) experimental; urgency=low
+tdelibs (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
 
-kdelibs (4:3.4.92-0ubuntu2) breezy; urgency=low
+tdelibs (4:3.4.92-0ubuntu2) breezy; urgency=low
 
   * New upstream beta release
   * Build with nostrip
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 15 Oct 2005 12:19:22 +0000
 
-kdelibs (4:3.4.91-0ubuntu1) breezy; urgency=low
+tdelibs (4:3.4.91-0ubuntu1) breezy; urgency=low
 
   * New upstream beta release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 13 Sep 2005 11:21:10 +0000
 
-kdelibs (4:3.4.2-0ubuntu4) breezy; urgency=low
+tdelibs (4:3.4.2-0ubuntu4) breezy; urgency=low
 
-  * Add replaces on old knetworkconf for kdelibs-data
+  * Add replaces on old knetworkconf for tdelibs-data
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  3 Aug 2005 12:44:18 +0000
 
-kdelibs (4:3.4.2-0ubuntu3) breezy; urgency=low
+tdelibs (4:3.4.2-0ubuntu3) breezy; urgency=low
 
   * Rebuild for new Qt buildkey and tighten build-dep
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 28 Jul 2005 13:37:13 +0000
 
-kdelibs (4:3.4.2-0ubuntu2) breezy; urgency=low
+tdelibs (4:3.4.2-0ubuntu2) breezy; urgency=low
 
   * Add build-dep on autoconf
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 16:37:24 +0000
 
-kdelibs (4:3.4.2-0ubuntu1) breezy; urgency=low
+tdelibs (4:3.4.2-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Build using unsermake
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 25 Jul 2005 15:49:02 +0000
 
-kdelibs (4:3.4.1-0ubuntu11) breezy; urgency=low
+tdelibs (4:3.4.1-0ubuntu11) breezy; urgency=low
 
   * Rebuild for removed libXcursor.la and tighten 
     dependency on Qt and arts
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 24 Jul 2005 20:47:00 +0000
 
-kdelibs (4:3.4.1-0ubuntu10) breezy; urgency=low
+tdelibs (4:3.4.1-0ubuntu10) breezy; urgency=low
 
-  * Add depend on iceauth for kdelibs4c2
+  * Add depend on iceauth for tdelibs4c2
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 20 Jul 2005 20:47:45 +0000
 
-kdelibs (4:3.4.1-0ubuntu9) breezy; urgency=low
+tdelibs (4:3.4.1-0ubuntu9) breezy; urgency=low
 
-  * Remove xbase-clients depenency from kdelibs.  
+  * Remove xbase-clients depenency from tdelibs.  
     iceauth will appear again soon in a new package.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 20 Jul 2005 20:25:29 +0000
 
-kdelibs (4:3.4.1-0ubuntu8) breezy; urgency=low
+tdelibs (4:3.4.1-0ubuntu8) breezy; urgency=low
 
   * Add kubuntu_06_kwallet_simplify_string.diff to simplify KWallet question
   * Add kubuntu_07_rubberband.diff for pretty file manager selection
@@ -2017,20 +2017,20 @@ kdelibs (4:3.4.1-0ubuntu8) breezy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 18 Jul 2005 19:20:50 +0000
 
-kdelibs (4:3.4.1-0ubuntu7) breezy; urgency=low
+tdelibs (4:3.4.1-0ubuntu7) breezy; urgency=low
 
   * Rebuild for libXrender.la changes
   * Make versioned build-dep on arts stricter
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 17 Jul 2005 09:23:49 +0000
 
-kdelibs (4:3.4.1-0ubuntu6) breezy; urgency=low
+tdelibs (4:3.4.1-0ubuntu6) breezy; urgency=low
 
   * Rebuild for new X dependencies.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 16 Jul 2005 22:01:57 +0000
 
-kdelibs (4:3.4.1-0ubuntu5) breezy; urgency=low
+tdelibs (4:3.4.1-0ubuntu5) breezy; urgency=low
 
   * Add kubuntu_04_add_langpack_path.diff to use path for langpacks
   * Add Debian system icons in debian/system-icons
@@ -2038,32 +2038,32 @@ kdelibs (4:3.4.1-0ubuntu5) breezy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  4 Jul 2005 12:39:22 +0000
 
-kdelibs (4:3.4.1-0ubuntu4) breezy; urgency=low
+tdelibs (4:3.4.1-0ubuntu4) breezy; urgency=low
 
   * Add build depend on libxi-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 21 Jun 2005 21:28:59 +0000
 
-kdelibs (4:3.4.1-0ubuntu3) breezy; urgency=low
+tdelibs (4:3.4.1-0ubuntu3) breezy; urgency=low
 
   * Recompile with new Qt
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue, 21 Jun 2005 17:35:37 +0000
 
-kdelibs (4:3.4.1-0ubuntu2) breezy; urgency=low
+tdelibs (4:3.4.1-0ubuntu2) breezy; urgency=low
 
   * Build-dep on a good libqt3-mt-dev (xorg dependencies)
 
  -- LaMont Jones <lamont@ubuntu.com>  Tue, 24 May 2005 21:18:18 -0600
 
-kdelibs (4:3.4.1-0ubuntu1) breezy; urgency=low
+tdelibs (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Sync with Debian
 
  -- Jonathan Riddell <jr@jriddell.org>  Mon, 23 May 2005 18:09:36 +0100
 
-kdelibs (4:3.4.0-0pre5) alioth; urgency=low
+tdelibs (4:3.4.0-0pre5) alioth; urgency=low
 
   * New upstream release.
 
@@ -2078,7 +2078,7 @@ kdelibs (4:3.4.0-0pre5) alioth; urgency=low
 
   +++ Changes by Adeodato Simó:
 
-  * Added new package kdelibs4-dbg, with separate debugging symbols. Added
+  * Added new package tdelibs4-dbg, with separate debugging symbols. Added
     Build-Dependency on binutils (>= 2.14.90.0.7) as per the dh_strip man
     page. (Closes: #257588).
 
@@ -2111,7 +2111,7 @@ kdelibs (4:3.4.0-0pre5) alioth; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 14 May 2005 13:00:44 -0400
 
-kdelibs (4:3.3.2-7) unstable; urgency=high
+tdelibs (4:3.3.2-7) unstable; urgency=high
 
   +++ Changes by Adeodato Simó:
 
@@ -2119,39 +2119,39 @@ kdelibs (4:3.3.2-7) unstable; urgency=high
     the libtool used to build to the one currently in sid, so that it prunes
     unnecessary dependencies.
 
-  * The above libtool update removes the kdelibs4 dependency on libmad0, so
+  * The above libtool update removes the tdelibs4 dependency on libmad0, so
     closes: #311710 ("does not have a versioned dependency on libmad0").
 
   * Do not unconditionally remove /etc/kderc and other files in /etc on
     upgrades. Whatever those bits were there for, can be removed now that
     Sarge is released and shipped with them... (Closes: #316255) Deleted the
-    now empty preinst scripts for kdelibs4 and kdelibs-bin.
+    now empty preinst scripts for tdelibs4 and tdelibs-bin.
 
   * Acknowledge NMU by Frank Lichtenheld, thanks! (Closes: #309955)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 02 Jul 2005 00:14:21 +0200
 
-kdelibs (4:3.4.0-0ubuntu6) breezy; urgency=low
+tdelibs (4:3.4.0-0ubuntu6) breezy; urgency=low
 
   * removed rm -f /etc/kderc from postinstall
-  * removed old kdelibs4.postinstall file 
+  * removed old tdelibs4.postinstall file 
   * changed in rules distribution part for breezy 
 
  -- Andreas Mueller <amu@ubuntu.com>  Fri, 20 May 2005 11:09:57 +0000
 
-kdelibs (4:3.4.0-0ubuntu5) breezy; urgency=low
+tdelibs (4:3.4.0-0ubuntu5) breezy; urgency=low
 
-  * CXX transition: Rename kdelibs4 to kdelibs4c2.
+  * CXX transition: Rename tdelibs4 to tdelibs4c2.
 
  -- Matthias Klose <doko@ubuntu.com>  Sat, 14 May 2005 13:49:24 +0000
 
-kdelibs (4:3.4.0-0ubuntu4) breezy; urgency=low
+tdelibs (4:3.4.0-0ubuntu4) breezy; urgency=low
 
   * Breezy upload
 
  -- Jonathan Riddell <jr@jriddell.org>  Mon,  9 May 2005 09:52:08 +0100
 
-kdelibs (4:3.4.0-0ubuntu3.1) hoary-security; urgency=low
+tdelibs (4:3.4.0-0ubuntu3.1) hoary-security; urgency=low
 
   * Add kubuntu_04_kimgio_security.diff
   * SECURITY UPDATE: kimgio input validation errors
@@ -2168,13 +2168,13 @@ kdelibs (4:3.4.0-0ubuntu3.1) hoary-security; urgency=low
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 21 Apr 2005 04:46:47 +0000
 
-kdelibs (4:3.4.0-0ubuntu3) hoary; urgency=low
+tdelibs (4:3.4.0-0ubuntu3) hoary; urgency=low
 
   * Move TextEditors from Utilities More to Utilities
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 24 Mar 2005 04:32:44 +0000
 
-kdelibs (4:3.4.0-0ubuntu2) hoary; urgency=low
+tdelibs (4:3.4.0-0ubuntu2) hoary; urgency=low
 
   * Move kubuntu_03_applications_menu_editors_move.diff to
     kubuntu_03_applications_menu_entries_move.diff which also moves
@@ -2182,46 +2182,46 @@ kdelibs (4:3.4.0-0ubuntu2) hoary; urgency=low
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 17 Mar 2005 01:19:23 +0000
 
-kdelibs (4:3.4.0-0ubuntu1) hoary; urgency=low
+tdelibs (4:3.4.0-0ubuntu1) hoary; urgency=low
 
   * Add aboutkde-kubuntu.png.uu konqi image for about kde dialogue
   * Add kubuntu_03_applications_menu_editors_move.diff moving Editors menu entries to Utilities
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 01:04:26 +0000
 
-kdelibs (4:3.4.0-0pre1ubuntu2) hoary; urgency=low
+tdelibs (4:3.4.0-0pre1ubuntu2) hoary; urgency=low
 
-  * Add conflicts on old konq-plugins, kdeartwork-style and ksvg.
+  * Add conflicts on old konq-plugins, tdeartwork-style and ksvg.
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue,  8 Mar 2005 22:37:52 +0000
 
-kdelibs (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+tdelibs (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jr@jriddell.org>  Sun,  6 Mar 2005 00:57:03 +0000
 
-kdelibs (4:3.4.0~rc1-1ubuntu0.2) hoary; urgency=low
+tdelibs (4:3.4.0~rc1-1ubuntu0.2) hoary; urgency=low
 
   * Add sudo for kdesu patch kubuntu_01_kdesu_sudo.diff
   * Add applications.menu move patch to stop collisions with Gnome kubuntu_02_applications_menu_rename.diff
 
  -- Jonathan Riddell <jr@jriddell.org>  Sat,  5 Mar 2005 21:00:03 +0000
 
-kdelibs (4:3.4.0~rc1-1ubuntu0.1) hoary; urgency=low
+tdelibs (4:3.4.0~rc1-1ubuntu0.1) hoary; urgency=low
 
   * New upstram release RC1
 
  -- Andreas Mueller <amu@ubuntu.com>  Tue, 1 Mar 2005 19:12:23 +0000
 
-kdelibs (4:3.3.2-6.1) unstable; urgency=low
+tdelibs (4:3.3.2-6.1) unstable; urgency=low
 
   * Non-maintainer upload.
   * Export modXModeSwitch. Patch by Mattia Dongili (Closes: #309955)
 
  -- Frank Lichtenheld <djpig@debian.org>  Sat, 21 May 2005 22:02:29 +0200
 
-kdelibs (4:3.3.2-6) unstable; urgency=high
+tdelibs (4:3.3.2-6) unstable; urgency=high
 
   +++ Changes by Christopher Martin:
 
@@ -2230,7 +2230,7 @@ kdelibs (4:3.3.2-6) unstable; urgency=high
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  7 May 2005 10:30:05 -0400
 
-kdelibs (4:3.3.2-5) unstable; urgency=medium
+tdelibs (4:3.3.2-5) unstable; urgency=medium
 
   +++ Changes by Christopher Martin:
 
@@ -2245,7 +2245,7 @@ kdelibs (4:3.3.2-5) unstable; urgency=medium
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 22 Apr 2005 11:21:11 -0400
 
-kdelibs (4:3.3.2-4) unstable; urgency=low
+tdelibs (4:3.3.2-4) unstable; urgency=low
 
   * Improve the fix for CAN-2005-0365 ("insecure temporary file
     creation") with a patch provided by Javier Fernández-Sanguino Peña:
@@ -2266,7 +2266,7 @@ kdelibs (4:3.3.2-4) unstable; urgency=low
     in /usr/lib/aspell-0.6, which is now used by Aspell. (Closes: #296240)
 
   * As OpenOffice.org 1.1.3 will enter testing together with this version of
-    kdelibs, re-add to kdelibs-data the template .desktop files removed in
+    tdelibs, re-add to tdelibs-data the template .desktop files removed in
     3.3.2-1. Replace openoffice.org-mimelnk (<< 1.1.3), but don't conflict.
 
   * This upload will get built with a non-broken gcc version in mipsel,
@@ -2274,13 +2274,13 @@ kdelibs (4:3.3.2-4) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 12 Mar 2005 18:02:54 +0100
 
-kdelibs (4:3.3.2-3) unstable; urgency=high
+tdelibs (4:3.3.2-3) unstable; urgency=high
 
   * Urgency high as it closes a security RC bug.
 
   +++ Changes by Isaac Clerencia:
 
-  * Fix syntax error in dcopidlng, closes: #297095 (was causing kdepim an
+  * Fix syntax error in dcopidlng, closes: #297095 (was causing tdepim an
     others to FTBFS).
  
   * Apply patch from KDE 3.4 to fix CAN-2005-0237 (spoofing using IDN),
@@ -2292,12 +2292,12 @@ kdelibs (4:3.3.2-3) unstable; urgency=high
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 28 Feb 2005 14:05:30 +0100
 
-kdelibs (4:3.3.2-2) unstable; urgency=high
+tdelibs (4:3.3.2-2) unstable; urgency=high
 
   +++ Changes by Adeodato Simó:
 
   * Include patch to fix CAN-2005-0365, "insecure temporary file creation in
-    kdelibs 3.3.2". dcopidlng no longer creates its temporary files in /tmp.
+    tdelibs 3.3.2". dcopidlng no longer creates its temporary files in /tmp.
     (Closes: #294832, #294896) Urgency set to high because of this and other
     RC bug fixes below.
 
@@ -2313,7 +2313,7 @@ kdelibs (4:3.3.2-2) unstable; urgency=high
     to be executed (mainly games), confused kdeinit.
     (Closes: #270592, #290323)
 
-  * debian/control: Add necessary kdelibs-data Replaces for old
+  * debian/control: Add necessary tdelibs-data Replaces for old
     openoffice.org packages. (Closes: #292569)
 
   * Add better manpage for lnusertemp. Thanks to Javier Fernández-Sanguino
@@ -2321,7 +2321,7 @@ kdelibs (4:3.3.2-2) unstable; urgency=high
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 13 Feb 2005 04:58:29 +0100
 
-kdelibs (4:3.3.2-1) unstable; urgency=medium
+tdelibs (4:3.3.2-1) unstable; urgency=medium
 
   +++ Changes by Adeodato Simó:
 
@@ -2332,10 +2332,10 @@ kdelibs (4:3.3.2-1) unstable; urgency=medium
     packages).
 
   * debian/control:
-    - make kdelibs-data replace kjscmd (<< 4:3.3.0), which was missed in the
+    - make tdelibs-data replace kjscmd (<< 4:3.3.0), which was missed in the
       3.3.1-1 upload and completely forgotten since then. (Closes: #288653)
 
-  * debian/kdelibs-data.install: the files added in the previous upload were
+  * debian/tdelibs-data.install: the files added in the previous upload were
     checked not to exist in oo.o-mimelnk in sid, but sadly they exist in the
     version in sarge. Reverted them for now, will be re-added when OpenOffice
     1.1.3 enters sarge (with the proper Conflicts: entry). (Closes: #287097)
@@ -2366,15 +2366,15 @@ kdelibs (4:3.3.2-1) unstable; urgency=medium
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 16 Jan 2005 20:48:01 +0100
 
-kdelibs (4:3.3.2-0pre1) experimental; urgency=low
+tdelibs (4:3.3.2-0pre1) experimental; urgency=low
 
   * New upstream release.
 
-  * KDE_3_3_BRANCH update. Includes the kdelibs part of the fix
+  * KDE_3_3_BRANCH update. Includes the tdelibs part of the fix
     for CAN-2004-1158. [CM]
 
   * Removed patches:
-    - post-3.3.1-kdelibs-khtml.diff and post-3.3.1-kdelibs-kio.diff since
+    - post-3.3.1-tdelibs-khtml.diff and post-3.3.1-tdelibs-kio.diff since
       these fixes are in KDE_3_3_BRANCH. [CM]
 
   * New patches:
@@ -2384,7 +2384,7 @@ kdelibs (4:3.3.2-0pre1) experimental; urgency=low
 
   * Updated dcop.1 manpage with patch by Helge Kreutzman. (Closes: #250631)
 
-  * New entries in debian/kdelibs-data.install:
+  * New entries in debian/tdelibs-data.install:
     - usr/share/mimelnk/application/java.desktop
     - usr/share/mimelnk/application/xml.desktop
     - usr/share/mimelnk/application/vnd.sun.xml.calc.template.desktop
@@ -2393,7 +2393,7 @@ kdelibs (4:3.3.2-0pre1) experimental; urgency=low
     - usr/share/mimelnk/application/vnd.sun.xml.writer.template.desktop
     - usr/share/apps/ksgmltools2/customization/cs/entities/underLGPL.docbook
 
-  * New entries in debian/kdelibs4-dev.install:
+  * New entries in debian/tdelibs4-dev.install:
     - usr/include/kiobuffer.h
     - usr/include/kwallettypes.h
 
@@ -2406,64 +2406,64 @@ kdelibs (4:3.3.2-0pre1) experimental; urgency=low
 
  -- Adeodato Simó <asp16@alu.ua.es>  Fri, 17 Dec 2004 01:30:13 +0100
 
-kdelibs (4:3.3.1-4) unstable; urgency=high
+tdelibs (4:3.3.1-4) unstable; urgency=high
 
   * The "from kde maintainers to m68k porters with love" release.
-  * Move the Conflicts with (<< 3.3.0) packages from kdelibs (dummy package)
-    to kdelibs4 (real package). They were put in the wrong package due to a
+  * Move the Conflicts with (<< 3.3.0) packages from tdelibs (dummy package)
+    to tdelibs4 (real package). They were put in the wrong package due to a
     wrong assumption on how the testing scripts work.
 
  -- Riku Voipio <riku.voipio@iki.fi>  Sun, 19 Dec 2004 16:45:39 +0000
 
-kdelibs (4:3.3.1-3) unstable; urgency=high
+tdelibs (4:3.3.1-3) unstable; urgency=high
 
   * Fix kdeaccessability Conflict. Closes: #285391
   * Added patch to fix half of Konqueror Window Injection Vulnerability 
-    CAN-2004-1158. kdebase upload will fix the rest.
+    CAN-2004-1158. tdebase upload will fix the rest.
 
  -- Riku Voipio <riku.voipio@iki.fi>  Mon, 13 Dec 2004 18:53:21 +0000
 
-kdelibs (4:3.3.1-2) unstable; urgency=medium
+tdelibs (4:3.3.1-2) unstable; urgency=medium
 
   * New upload to aid with transition of KDE 3.3 to sarge and to fix security
     hole. Urgency set to medium because of these reasons.
 
   * Add versioned conflicts (<< 4:3.3.0) for all KDE official modules in
-    kdelibs. This will permit the testing transition to happen all at once.
+    tdelibs. This will permit the testing transition to happen all at once.
   
-  * Fixed kdewebdev conflict (was << 4:3.3.0, while kdewebdev in sid
+  * Fixed tdewebdev conflict (was << 4:3.3.0, while tdewebdev in sid
     is 1:3.3.0 -Riku
 
   * Include patch to fix CAN-2004-1171 ("plain text password exposure").
     Closes half of #285126. Notes about the patches:
 
-    - post-3.3.1-kdelibs-khtml.diff: dropped hunks #2 and #3 of patch to
+    - post-3.3.1-tdelibs-khtml.diff: dropped hunks #2 and #3 of patch to
       khtml_part.cpp, since they were whitespace adjustments and were causing
       failures to apply.
 
-    - post-3.3.1-kdelibs-kio.diff: the patch as given in the KDE Advisory
-      can't be used, since kdelibs 3.3.1-1 includes a KDE_3_3_BRANCH pull that
+    - post-3.3.1-tdelibs-kio.diff: the patch as given in the KDE Advisory
+      can't be used, since tdelibs 3.3.1-1 includes a KDE_3_3_BRANCH pull that
       already modifies kio/kio/job.cpp and makes the supplied patch unusable.
 
-      Regenerated patch from CVS: Diff for /kdelibs/kio/kio/job.cpp between
+      Regenerated patch from CVS: Diff for /tdelibs/kio/kio/job.cpp between
       version 1.397.2.7 and 1.397.2.8.
 
  -- Adeodato Simó <asp16@alu.ua.es>  Sat, 11 Dec 2004 00:23:09 +0100
 
-kdelibs (4:3.3.1-1) unstable; urgency=low
+tdelibs (4:3.3.1-1) unstable; urgency=low
 
   * New upstream release.
   * KDE_3_3_BRANCH update.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sun, 31 Oct 2004 03:30:00 -0600
 
-kdelibs (4:3.3.0-2) unstable; urgency=low
+tdelibs (4:3.3.0-2) unstable; urgency=low
 
   * KDE_3_3_BRANCH update.
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu, 23 Sep 2004 17:00:00 -0500
 
-kdelibs (4:3.3.0-1.1) unstable; urgency=low
+tdelibs (4:3.3.0-1.1) unstable; urgency=low
 
   * The "Please stop spamming the OpenEXR maintainer (me)" Debian release.
     - Non Maintainer Upload.
@@ -2472,13 +2472,13 @@ kdelibs (4:3.3.0-1.1) unstable; urgency=low
 
  -- Andrew Lau <netsnipe@users.sourceforge.net>  Fri, 27 Aug 2004 14:22:03 +1000
 
-kdelibs (4:3.3.0-1) unstable; urgency=high
+tdelibs (4:3.3.0-1) unstable; urgency=high
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri, 13 Aug 2004 18:00:00 -0500
 
-kdelibs (4:3.2.3-4) unstable; urgency=high
+tdelibs (4:3.2.3-4) unstable; urgency=high
 
   * KDE_3_2_BRANCH Update.
   * Apply patch for mktemp security issue. (Closes: #261386)
@@ -2486,44 +2486,44 @@ kdelibs (4:3.2.3-4) unstable; urgency=high
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon,  2 Aug 2004 22:00:00 -0500
 
-kdelibs (4:3.2.3-3) unstable; urgency=low
+tdelibs (4:3.2.3-3) unstable; urgency=low
 
   * KDE_3_2_BRANCH Update.
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu, 22 Jul 2004 03:00:00 -0500
 
-kdelibs (4:3.2.3-2) unstable; urgency=low
+tdelibs (4:3.2.3-2) unstable; urgency=low
 
   * KDE_3_2_BRANCH Update.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat, 12 Jun 2004 14:30:00 -0500
 
-kdelibs (4:3.2.3-1) unstable; urgency=high
+tdelibs (4:3.2.3-1) unstable; urgency=high
 
   * New upstream release.
-  * kdelibs-bin Depends: menu-xdg. (Closes: #248610)
+  * tdelibs-bin Depends: menu-xdg. (Closes: #248610)
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu,  3 Jun 2004 19:00:00 -0500
 
-kdelibs (4:3.2.2-2) unstable; urgency=high
+tdelibs (4:3.2.2-2) unstable; urgency=high
 
-  * kdelibs-data Depends: hicolor-icon-theme. (Closes: #238839)
+  * tdelibs-data Depends: hicolor-icon-theme. (Closes: #238839)
   * Remove preinst bashism. (Closes: #242946, #242961, #243475)
   * Do not remove /etc/trinity/system.kdeglobals. (Closes: #245149)
-  * kdelibs-bin Recommends: menu-xdg.
+  * tdelibs-bin Recommends: menu-xdg.
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed, 21 Apr 2004 18:00:00 -0500
 
-kdelibs (4:3.2.2-1) unstable; urgency=low
+tdelibs (4:3.2.2-1) unstable; urgency=low
 
   * New upstream release.
   * Added CUPS usage information to README.Debian. (Closes: #132587)
-  * Update kdelibs-data Replaces: openoffice.org-mimlnk. (Closes: #233700,
+  * Update tdelibs-data Replaces: openoffice.org-mimlnk. (Closes: #233700,
     #236508)
   * Correct debian menu replacewith usage. (Closes: #237260, #238769,
     #239260, #241083, #241420, #242266)
   * debian/Packaging.txt, debian/dh-make/menu.ex: Removed references to
-    the obsolete kderemove menu tag in kdelibs' documentation.
+    the obsolete kderemove menu tag in tdelibs' documentation.
   * debian/Packaging.txt, debian/dh-make/menu.ex: Added quotes to the menu
     file examples.
   * debian/dh-make/rules, debian/Packaging.txt: updated the information to
@@ -2535,26 +2535,26 @@ kdelibs (4:3.2.2-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon,  5 Apr 2004 23:00:00 -0500
 
-kdelibs (4:3.2.1-1) unstable; urgency=low
+tdelibs (4:3.2.1-1) unstable; urgency=low
 
   * New upstream release.
-  * Added kdelibs4 Depends xbase-clients. (Closes: #232348)
+  * Added tdelibs4 Depends xbase-clients. (Closes: #232348)
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu, 04 Mar 2004 22:00:00 -0600
 
-kdelibs (4:3.2.0-0pre1v1) experimental; urgency=low
+tdelibs (4:3.2.0-0pre1v1) experimental; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue, 17 Feb 2004 01:00:00 -0600
 
-kdelibs (4:3.1.95-1) unstable; urgency=low
+tdelibs (4:3.1.95-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed, 21 Jan 2004 21:00:00 -0600
 
-kdelibs (4:3.1.5-1) unstable; urgency=low
+tdelibs (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
   * Added libtool arm patch.
@@ -2563,17 +2563,17 @@ kdelibs (4:3.1.5-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat, 10 Jan 2004 14:00:00 -0600
 
-kdelibs (4:3.1.4-3) unstable; urgency=low
+tdelibs (4:3.1.4-3) unstable; urgency=low
 
-  * Added Replaces to kdelibs-data for arson, k3b. (Closes: #214534)
-  * Move meinproc to kdelibs-bin so that khelpcenter glossary works.
+  * Added Replaces to tdelibs-data for arson, k3b. (Closes: #214534)
+  * Move meinproc to tdelibs-bin so that khelpcenter glossary works.
     (Closes: #214815)
   * Restore generation of system.kdeglobals. (Closes: #216463)
   * Remove symlink /usr/share/config -> /etc/trinity.
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue,  4 Nov 2003 22:00:00 -0600
 
-kdelibs (4:3.1.4-2) unstable; urgency=low
+tdelibs (4:3.1.4-2) unstable; urgency=low
 
   * Added patch to update autotools files.
   * Added patch to remove pedantic-errors from KDE_CHECK_FUNC_EXT since it
@@ -2583,80 +2583,80 @@ kdelibs (4:3.1.4-2) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Sun,  5 Oct 2003 18:00:00 -0500
 
-kdelibs (4:3.1.4-1) unstable; urgency=low
+tdelibs (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat, 27 Sep 2003 02:00:00 -0500
 
-kdelibs (4:3.1.3-1) unstable; urgency=low
+tdelibs (4:3.1.3-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue, 29 Jul 2003 20:00:00 -0500
 
-kdelibs (4:3.1.2-2.1) unstable; urgency=low
+tdelibs (4:3.1.2-2.1) unstable; urgency=low
 
   * NMU
-  * kdelibs4-dev Depends: libxml2-utils.
+  * tdelibs4-dev Depends: libxml2-utils.
     Closes: #196222, #196958, #199044, #200483, #200484
 
  -- LaMont Jones <lamont@debian.org>  Wed,  9 Jul 2003 15:26:11 -0600
 
-kdelibs (4:3.1.2-2) unstable; urgency=low
+tdelibs (4:3.1.2-2) unstable; urgency=low
 
-  * Add xlibs-pic to kdelibs-dev Depends. (Closes: #193863)
-  * Add libssl-dev to kdelibs-dev Depends. (Closes: #180542)
+  * Add xlibs-pic to tdelibs-dev Depends. (Closes: #193863)
+  * Add libssl-dev to tdelibs-dev Depends. (Closes: #180542)
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon, 19 May 2003 12:00:00 -0500
 
-kdelibs (4:3.1.2-1) unstable; urgency=low
+tdelibs (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release. (Closes: #185697, #192616, #192931)
 
  -- Christopher L Cheney <ccheney@debian.org>  Sun, 18 May 2003 01:00:00 -0500
 
-kdelibs (4:3.1.1-1) unstable; urgency=low
+tdelibs (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release. (Closes: #181547, #181870)
   * Correct imagetops manpage description. (Closes: #180868)
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue, 11 Mar 2003 19:00:00 -0600
 
-kdelibs (4:3.1.0-2) unstable; urgency=low
+tdelibs (4:3.1.0-2) unstable; urgency=low
 
   * Add 'chmod +x configure' to rules.
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed,  5 Feb 2003 12:00:00 -0600
 
-kdelibs (4:3.1.0-1) unstable; urgency=low
+tdelibs (4:3.1.0-1) unstable; urgency=low
 
   * New Upstream.
   * Rebuilt debian dir.
-  * Split arts out of kdelibs source.
+  * Split arts out of tdelibs source.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat, 01 Feb 2003 01:00:00 -0600
 
-kdelibs (4:2.2.2-14) unstable; urgency=low
+tdelibs (4:2.2.2-14) unstable; urgency=low
 
   * And a quick update to send it to unstable; no changes from -13.woody.3.
 
  -- Daniel Stone <dstone@trinity.unimelb.edu.au>  Wed, 11 Sep 2002 22:29:31 +1000
 
-kdelibs (4:2.2.2-13.woody.8) stable-security; urgency=high
+tdelibs (4:2.2.2-13.woody.8) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Apply the following patches from upstream:
-    - post-2.2.2-kdelibs-http.patch (CAN-2003-0459)
-    - post-2.2.2-kdelibs-kio-2.diff (CAN-2003-0370)
-    - post-2.2.2-kdelibs-kssl-2.diff (CAN-2003-0370)
+    - post-2.2.2-tdelibs-http.patch (CAN-2003-0459)
+    - post-2.2.2-tdelibs-kio-2.diff (CAN-2003-0370)
+    - post-2.2.2-tdelibs-kssl-2.diff (CAN-2003-0370)
   * These address the issues described in:
     - http://www.kde.org/info/security/advisory-20030602-1.txt
     - An upcoming KDE advisory regarding CAN-2003-0370
 
  -- Matt Zimmerman <mdz@debian.org>  Thu, 24 Jul 2003 12:57:56 -0400
 
-kdelibs (4:2.2.2-13.woody.7) stable-security; urgency=high
+tdelibs (4:2.2.2-13.woody.7) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Applied upstream patch so ghostscript won't execute arbitrary commands
@@ -2664,7 +2664,7 @@ kdelibs (4:2.2.2-13.woody.7) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Thu, 10 Apr 2003 12:05:36 +0200
 
-kdelibs (4:2.2.2-13.woody.6) stable-security; urgency=high
+tdelibs (4:2.2.2-13.woody.6) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Applied upstream patches to fix several potential vulnerabilities.
@@ -2672,7 +2672,7 @@ kdelibs (4:2.2.2-13.woody.6) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Mon,  6 Jan 2003 08:20:04 +0100
 
-kdelibs (4:2.2.2-13.woody.5) stable-security; urgency=high
+tdelibs (4:2.2.2-13.woody.5) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Second (or third, since the first one burnt together with satie and
@@ -2682,7 +2682,7 @@ kdelibs (4:2.2.2-13.woody.5) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Sat, 30 Nov 2002 18:25:33 +0100
 
-kdelibs (4:2.2.2-13.woody.4) stable-security; urgency=high
+tdelibs (4:2.2.2-13.woody.4) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Remove rlogin.protocol and telnet.protocol to fix URL KIO
@@ -2694,7 +2694,7 @@ kdelibs (4:2.2.2-13.woody.4) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Fri, 22 Nov 2002 11:42:59 +0100
 
-kdelibs (4:2.2.2-13.woody.3) stable-security; urgency=high
+tdelibs (4:2.2.2-13.woody.3) stable-security; urgency=high
 
   * Non-maintainer upload authored by security team (Joey)
   * Fixes cross-site scripting vulnerability in KHTML.
@@ -2702,7 +2702,7 @@ kdelibs (4:2.2.2-13.woody.3) stable-security; urgency=high
 
  -- Daniel Stone <dstone@trinity.unimelb.edu.au>  Wed, 11 Sep 2002 22:24:35 +1000
 
-kdelibs (4:2.2.2-13.woody.2) stable-security; urgency=high
+tdelibs (4:2.2.2-13.woody.2) stable-security; urgency=high
 
   * Non-maintainer upload by security team
   * Security upload to fix SSL problems with Konqueror.
@@ -2719,7 +2719,7 @@ kdelibs (4:2.2.2-13.woody.2) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Fri, 16 Aug 2002 18:46:10 +0200
 
-kdelibs (4:2.2.2-13.woody.1) testing-security; urgency=high
+tdelibs (4:2.2.2-13.woody.1) testing-security; urgency=high
 
   * Non-maintainer upload by security team
   * Don't install artswrapper suid, it is a security problem waiting to
@@ -2727,13 +2727,13 @@ kdelibs (4:2.2.2-13.woody.1) testing-security; urgency=high
 
  -- Wichert Akkerman <wakkerma@debian.org>  Fri, 12 Jul 2002 22:47:26 +0200
 
-kdelibs (4:2.2.2-13) unstable; urgency=high
+tdelibs (4:2.2.2-13) unstable; urgency=high
 
-  * Fixed kdelibs-dev dependency should be libpng2-dev
+  * Fixed tdelibs-dev dependency should be libpng2-dev
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri,  1 Mar 2002 17:00:00 -0600
 
-kdelibs (4:2.2.2-12) unstable; urgency=high
+tdelibs (4:2.2.2-12) unstable; urgency=high
 
   * New maintainer.
   * Remove Build-Depends on libglib1.3-dev since it has unstable ABI
@@ -2742,14 +2742,14 @@ kdelibs (4:2.2.2-12) unstable; urgency=high
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu, 28 Feb 2002 13:00:00 -0600
 
-kdelibs (4:2.2.2-11) unstable; urgency=low
+tdelibs (4:2.2.2-11) unstable; urgency=low
 
   * Adopting orphaned package, thanks to Ivan for all the great work over the
     years.
 
  -- Daniel Stone <daniel@sfarc.net>  Fri,  4 Jan 2002 09:14:46 -0500
 
-kdelibs (4:2.2.2-10) unstable; urgency=low
+tdelibs (4:2.2.2-10) unstable; urgency=low
 
   * Fix Deps (Closes: #126232)
   * Change nas-dev suggests to depends
@@ -2757,7 +2757,7 @@ kdelibs (4:2.2.2-10) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 27 Dec 2001 23:20:00 -0700
 
-kdelibs (4:2.2.2-9) unstable; urgency=low
+tdelibs (4:2.2.2-9) unstable; urgency=low
 
   * Move all non-module .la files from /usr/lib into -dev package.  We leave 
     all the .la files out of /usr/lib/kde2 and those that may not be normal
@@ -2766,28 +2766,28 @@ kdelibs (4:2.2.2-9) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 17 Dec 2001 22:00:00 -0700
 
-kdelibs (4:2.2.2-8) unstable; urgency=low
+tdelibs (4:2.2.2-8) unstable; urgency=low
 
   * Depend on libfam-dev (Closes: #124264)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 16 Dec 2001 17:21:00 -0700
 
-kdelibs (4:2.2.2-7) unstable; urgency=low
+tdelibs (4:2.2.2-7) unstable; urgency=low
 
-  * Break out bin files from kdelibs3 so that we can interoperate with
-    kdelibs4 easily.
+  * Break out bin files from tdelibs3 so that we can interoperate with
+    tdelibs4 easily.
   * Fix deviceman.cc (Closes: #124132)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 14 Dec 2001 18:28:00 -0700
 
-kdelibs (4:2.2.2-6) unstable; urgency=low
+tdelibs (4:2.2.2-6) unstable; urgency=low
 
   * sync with upstream
   * Add in Build-Depends we normally get through libqt-dev so we can better
     follow policy
   * Add libfam-dev to Build-Depends
   * Version the libjpeg62-dev deps and add libjpeg to the depends for
-    kdelibs-dev since some older versions don't have the .la file
+    tdelibs-dev since some older versions don't have the .la file
   * Put bug reporting back to KDE so the users are happy and the developers
     are not.
   * Conflict (Closes: #123846)
@@ -2795,7 +2795,7 @@ kdelibs (4:2.2.2-6) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 13 Dec 2001 00:57:00 -0700
 
-kdelibs (4:2.2.2-5) unstable; urgency=low
+tdelibs (4:2.2.2-5) unstable; urgency=low
 
   * sync with upstream
   * Build with nas support by popular demand
@@ -2803,7 +2803,7 @@ kdelibs (4:2.2.2-5) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 05 Dec 2001 06:04:00 -0700
 
-kdelibs (4:2.2.2-4) unstable; urgency=low
+tdelibs (4:2.2.2-4) unstable; urgency=low
 
   * sync with upstream
   * Build cleanup.  export CFLAGS/CXXFLAGS instead of the old method
@@ -2822,7 +2822,7 @@ kdelibs (4:2.2.2-4) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 30 Nov 2001 12:39:00 -0700
 
-kdelibs (4:2.2.2-3) unstable; urgency=low
+tdelibs (4:2.2.2-3) unstable; urgency=low
 
   * a couple upstream fixes
   * debianrules cleanup
@@ -2833,7 +2833,7 @@ kdelibs (4:2.2.2-3) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 25 Nov 2001 20:11:00 -0700
 
-kdelibs (4:2.2.2-2) unstable; urgency=low
+tdelibs (4:2.2.2-2) unstable; urgency=low
 
   * Remove recommends for libssl as I'm breaking policy by recommending
     something outside of main.  Will put this back once libssl goes into
@@ -2842,7 +2842,7 @@ kdelibs (4:2.2.2-2) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 22 Nov 2001 20:14:00 -0700
 
-kdelibs (4:2.2.2-1) unstable; urgency=low
+tdelibs (4:2.2.2-1) unstable; urgency=low
 
   * New upstream version
   * Provide replace/etc bits for easier migration to/from trinity
@@ -2850,7 +2850,7 @@ kdelibs (4:2.2.2-1) unstable; urgency=low
   * Fix glib inclusion bits for gmcop stuff...however we are still
     not going to build with it until someone has a need for it.
   * Remove some other hacks
-  * Update deps for qt as qt 2.3.2 has a fix which breaks a piece of kdelibs
+  * Update deps for qt as qt 2.3.2 has a fix which breaks a piece of tdelibs
     so let's make sure we match up across the board.
   * Update shlibs for the same reason
   * Use libasound2
@@ -2868,7 +2868,7 @@ kdelibs (4:2.2.2-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Nov 2001 23:17:00 -0700
 
-kdelibs (4:2.2.1-14) unstable; urgency=low
+tdelibs (4:2.2.1-14) unstable; urgency=low
 
   * Fix overwrite problem (Closes: #116773)
   * Hopefully fix arts for bigendian (Closes: #115292)
@@ -2876,14 +2876,14 @@ kdelibs (4:2.2.1-14) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 25 Oct 2001 09:39:00 -0700
 
-kdelibs (4:2.2.1-13) unstable; urgency=low
+tdelibs (4:2.2.1-13) unstable; urgency=low
 
   * Fix overwrite problem (Closes: #116568)
   * Sync with upstream
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 21 Oct 2001 19:27:00 -0700
 
-kdelibs (4:2.2.1-12) unstable; urgency=low
+tdelibs (4:2.2.1-12) unstable; urgency=low
 
   * more js fixes
   * more ssl fixes
@@ -2894,7 +2894,7 @@ kdelibs (4:2.2.1-12) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 19 Oct 2001 12:43:00 -0700
 
-kdelibs (4:2.2.1-11) unstable; urgency=low
+tdelibs (4:2.2.1-11) unstable; urgency=low
 
   * Several crash fixes
   * js fixes
@@ -2903,7 +2903,7 @@ kdelibs (4:2.2.1-11) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 15 Oct 2001 00:15:00 -0700
 
-kdelibs (4:2.2.1-10) unstable; urgency=low
+tdelibs (4:2.2.1-10) unstable; urgency=low
 
   * Hopefully fix both the AA problem and the kicker crash problem
   * Clean up lintian overrides
@@ -2911,13 +2911,13 @@ kdelibs (4:2.2.1-10) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 12 Oct 2001 10:18:00 -0700
 
-kdelibs (4:2.2.1-9) unstable; urgency=low
+tdelibs (4:2.2.1-9) unstable; urgency=low
 
   * Fix deps (Closes: #115064)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 08 Sep 2001 09:55:00 -0700
 
-kdelibs (4:2.2.1-8) unstable; urgency=low
+tdelibs (4:2.2.1-8) unstable; urgency=low
 
   * Remove build-depends for auto* since we are doing that locally to
     get around the automake 1.5 issues
@@ -2928,7 +2928,7 @@ kdelibs (4:2.2.1-8) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 08 Sep 2001 09:55:00 -0700
 
-kdelibs (4:2.2.1-7) unstable; urgency=low
+tdelibs (4:2.2.1-7) unstable; urgency=low
 
   * Not sure what happened but let's chmod 755 configure just to make
     sure it's got the proper perms before we execute it (Closes: #114552)
@@ -2936,14 +2936,14 @@ kdelibs (4:2.2.1-7) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 05 Sep 2001 09:48:00 -0700
 
-kdelibs (4:2.2.1-6) unstable; urgency=low
+tdelibs (4:2.2.1-6) unstable; urgency=low
 
   * let this puppy build with automake 1.5
   * Various other upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 02 Sep 2001 01:00:00 -0700
 
-kdelibs (4:2.2.1-5) unstable; urgency=low
+tdelibs (4:2.2.1-5) unstable; urgency=low
 
   * arts updates ... this should fix some of the arts related problems
   * crash fix for css
@@ -2952,19 +2952,19 @@ kdelibs (4:2.2.1-5) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 30 Sep 2001 01:00:00 -0700
 
-kdelibs (4:2.2.1-4) unstable; urgency=low
+tdelibs (4:2.2.1-4) unstable; urgency=low
 
   * Build-Conflict for nas-lib so that we can build properly
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 24 Sep 2001 19:25:00 -0700
 
-kdelibs (4:2.2.1-3) unstable; urgency=low
+tdelibs (4:2.2.1-3) unstable; urgency=low
 
   * Post 2.2.1 quick fixes from upstream
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 23 Sep 2001 18:42:00 -0700
 
-kdelibs (4:2.2.1-2) unstable; urgency=low
+tdelibs (4:2.2.1-2) unstable; urgency=low
 
   * Grrrr build on alpha!
   * Fix replaces (Closes: #112902)
@@ -2972,7 +2972,7 @@ kdelibs (4:2.2.1-2) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 19 Sep 2001 16:27:00 -0700
 
-kdelibs (4:2.2.1-1) unstable; urgency=low
+tdelibs (4:2.2.1-1) unstable; urgency=low
  
   * New upstream version
   * Move artsc-config into -dev package (Closes: #109973)
@@ -2989,14 +2989,14 @@ kdelibs (4:2.2.1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 07 Sep 2001 12:10:00 -0700
 
-kdelibs (4:2.2.0-final-3) unstable; urgency=low
+tdelibs (4:2.2.0-final-3) unstable; urgency=low
  
   * Sync with upstream
   * Fix a couple more deps/build-deps
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 22 Aug 2001 10:59:00 -0700
 
-kdelibs (4:2.2.0-final-2) unstable; urgency=low
+tdelibs (4:2.2.0-final-2) unstable; urgency=low
  
   * update build-depends for i386
   * Updated translation bits
@@ -3004,7 +3004,7 @@ kdelibs (4:2.2.0-final-2) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 19 Aug 2001 00:01:00 -0700
 
-kdelibs (4:2.2.0-final-1) unstable; urgency=low
+tdelibs (4:2.2.0-final-1) unstable; urgency=low
  
   * New upstream version 2.2
   * Build with objprelink for i386
@@ -3013,17 +3013,17 @@ kdelibs (4:2.2.0-final-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 04 Aug 2001 02:30:00 -0700
 
-kdelibs (4:2.2.0-0.1beta1-2) unstable; urgency=low
+tdelibs (4:2.2.0-0.1beta1-2) unstable; urgency=low
  
   * synce with upstream
   * more https related fixes
   * Fix shlibs
   * Fix build issues with new libxml2-dev (Closes: #106766)
-  * fix postrm of kdelibs-dev
+  * fix postrm of tdelibs-dev
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 27 Jul 2001 12:18:00 -0700
 
-kdelibs (4:2.2.0-0.1beta1-1) unstable; urgency=low
+tdelibs (4:2.2.0-0.1beta1-1) unstable; urgency=low
  
   * synce with upstream
   * Drop optimization down for cross arch building
@@ -3031,7 +3031,7 @@ kdelibs (4:2.2.0-0.1beta1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 25 Jul 2001 03:35:00 -0700
 
-kdelibs (4:2.2.0-0beta1-6) unstable; urgency=low
+tdelibs (4:2.2.0-0beta1-6) unstable; urgency=low
  
   * synce with upstream
   * Update debhelper templates for alpha build bits
@@ -3039,7 +3039,7 @@ kdelibs (4:2.2.0-0beta1-6) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Jul 2001 00:53:00 -0700
 
-kdelibs (4:2.2.0-0beta1-5) unstable; urgency=low
+tdelibs (4:2.2.0-0beta1-5) unstable; urgency=low
  
   * synce with upstream
   * Add -mieee for Alpha builds
@@ -3047,7 +3047,7 @@ kdelibs (4:2.2.0-0beta1-5) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 07 Jul 2001 00:57:00 -0700
 
-kdelibs (4:2.2.0-0beta1-4) unstable; urgency=low
+tdelibs (4:2.2.0-0beta1-4) unstable; urgency=low
  
   * synce with upstream
   * Remove old pam bit (Closes: #103493)
@@ -3058,7 +3058,7 @@ kdelibs (4:2.2.0-0beta1-4) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 04 Jul 2001 14:37:00 -0700
 
-kdelibs (4:2.2.0-0beta1-3) unstable; urgency=low
+tdelibs (4:2.2.0-0beta1-3) unstable; urgency=low
  
   * Fix description (Closes: #103206)
   * Sync with upstream
@@ -3068,17 +3068,17 @@ kdelibs (4:2.2.0-0beta1-3) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Jul 2001 13:18:00 -0700
 
-kdelibs (4:2.2.0-0beta1-2) unstable; urgency=low
+tdelibs (4:2.2.0-0beta1-2) unstable; urgency=low
  
   * Move over a cups file that didn't get into -cups package
   * Fix alsa-stamp build location
-  * Change kdelibs3-cups depends on kdebase-libs to a recommends
+  * Change tdelibs3-cups depends on tdebase-libs to a recommends
   * More upstream fixes
   * Fix overwrites (Closes: #102857)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 29 Jun 2001 13:18:00 -0700
 
-kdelibs (4:2.2.0-0beta1-1) unstable; urgency=low
+tdelibs (4:2.2.0-0beta1-1) unstable; urgency=low
 
   * Fix mips build (Closes: #102007)
   * Fix postinst stuff
@@ -3098,40 +3098,40 @@ kdelibs (4:2.2.0-0beta1-1) unstable; urgency=low
   * move artsmessage into libarts package where it belongs
   * Update copyright information
   * more build cleanup...moving to debhelper version 3
-  * Move dh_make files into kdelibs-dev package where they were supposed to be
-  * Move more includes from kdelibs3 to kdelibs-dev ... new stuff I missed
-  * More more cups bits out of kdelibs3 and into kdelibs3-cups
+  * Move dh_make files into tdelibs-dev package where they were supposed to be
+  * Move more includes from tdelibs3 to tdelibs-dev ... new stuff I missed
+  * More more cups bits out of tdelibs3 and into tdelibs3-cups
   * Reseting all lintian overrides
   * Add flex to build-depends as well as other deps
   * Add Debian menu items: cupsdconf
-  * New packages: kdelibs3-cups
+  * New packages: tdelibs3-cups
   * Moving kdoc and qt-doc into Build-Depends-Indep
   * Add Provides in for libarts-alsa/libkmid-alsa
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
 
-kdelibs (4:2.1.1-7) unstable; urgency=low
+tdelibs (4:2.1.1-7) unstable; urgency=low
  
-  * Adding in a dh-make template tree under /usr/share/doc/kdelibs-dev/dh-make
+  * Adding in a dh-make template tree under /usr/share/doc/tdelibs-dev/dh-make
     It is for a single binary package.  
   * Update README
   * Remove old undocumented.in bits since it's now pointless
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 09 Apr 2001 03:00:00 -0700
 
-kdelibs (4:2.1.1-6) unstable; urgency=low
+tdelibs (4:2.1.1-6) unstable; urgency=low
  
   * Sync with upstream.
     Locale updates
     More http fixes
   * Update build-depends to include real | virtual
-  * Adding in a Packaging.txt document to kdelibs-dev the goal of which is to
+  * Adding in a Packaging.txt document to tdelibs-dev the goal of which is to
     answer any question one might have about packaging a KDE app for Debian.
   * Fixing docs file for libarts
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 09 Apr 2001 03:00:00 -0700
 
-kdelibs (4:2.1.1-5) unstable; urgency=low
+tdelibs (4:2.1.1-5) unstable; urgency=low
  
   * Sync with upstream.
     Several more http fixes
@@ -3139,7 +3139,7 @@ kdelibs (4:2.1.1-5) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 07 Apr 2001 04:33:00 -0700
 
-kdelibs (4:2.1.1-4) unstable; urgency=low
+tdelibs (4:2.1.1-4) unstable; urgency=low
  
   * Sync with upstream.
     Proxy Authentication fix...round 2.
@@ -3147,7 +3147,7 @@ kdelibs (4:2.1.1-4) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 04 Apr 2001 18:04:00 -0700
 
-kdelibs (4:2.1.1-3) unstable; urgency=low
+tdelibs (4:2.1.1-3) unstable; urgency=low
  
   * Sync with upstream.  
     Includes several khtml fixes
@@ -3157,7 +3157,7 @@ kdelibs (4:2.1.1-3) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 03 Apr 2001 10:18:00 -0700
 
-kdelibs (4:2.1.1-2) unstable; urgency=low
+tdelibs (4:2.1.1-2) unstable; urgency=low
  
   * 2 birds with 1 debuild.  
     Rebuild against older libc6
@@ -3165,22 +3165,22 @@ kdelibs (4:2.1.1-2) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Mar 2001 13:39:00 -0700
 
-kdelibs (4:2.1.1-1) unstable; urgency=low
+tdelibs (4:2.1.1-1) unstable; urgency=low
  
   * New upstream release
-  * Dropping provides for kdelibs3-dev
+  * Dropping provides for tdelibs3-dev
   * don't allow POST data to dump to the debug output...
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Mar 2001 10:26:00 -0700
 
-kdelibs (4:2.1.0.1-5) unstable; urgency=low
+tdelibs (4:2.1.0.1-5) unstable; urgency=low
  
   * Several fixes moving us towards 2.1.1
   * Several "don't crash when..." fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 15 Mar 2001 10:26:00 -0700
 
-kdelibs (4:2.1.0.1-4) unstable; urgency=low
+tdelibs (4:2.1.0.1-4) unstable; urgency=low
  
   * More upstream fixes
   * Add in a pam_env statement to kde pam file.  This *should* fix problems
@@ -3188,14 +3188,14 @@ kdelibs (4:2.1.0.1-4) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 13 Mar 2001 16:24:00 -0700
 
-kdelibs (4:2.1.0.1-3) unstable; urgency=low
+tdelibs (4:2.1.0.1-3) unstable; urgency=low
  
   * More upstream fixes
     location object fixes for JavaScript
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 11 Mar 2001 02:43:00 -0700
 
-kdelibs (4:2.1.0.1-2) unstable; urgency=low
+tdelibs (4:2.1.0.1-2) unstable; urgency=low
  
   * More upstream fixes
     several khtml fixes especially with css
@@ -3205,14 +3205,14 @@ kdelibs (4:2.1.0.1-2) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 11 Mar 2001 02:43:00 -0700
 
-kdelibs (4:2.1.0.1-1) unstable; urgency=low
+tdelibs (4:2.1.0.1-1) unstable; urgency=low
  
   * Fix proxy authentication
   * Several other upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 08 Mar 2001 15:22:00 -0700
 
-kdelibs (4:2.1.0-3) unstable; urgency=low
+tdelibs (4:2.1.0-3) unstable; urgency=low
  
   * More upstream fixes
    Fix for URLs like "http://www.kde.org?query=bla" and "http://www.kde.org#ref"
@@ -3224,7 +3224,7 @@ kdelibs (4:2.1.0-3) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Mar 2001 01:54:00 -0700
 
-kdelibs (4:2.1.0-2) unstable; urgency=low
+tdelibs (4:2.1.0-2) unstable; urgency=low
  
   * Adding libbz2-dev and libsasl-dev into Build-Depends so that the ioslaves
     will be built on other archs.  Other archs probably didn't even notice. 
@@ -3235,7 +3235,7 @@ kdelibs (4:2.1.0-2) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 04 Mar 2001 09:09:00 -0700
 
-kdelibs (4:2.1.0-1) unstable; urgency=low
+tdelibs (4:2.1.0-1) unstable; urgency=low
  
    * Re-pulling from CVS instead of using the official tarballs.  The
      official tarballs had problems which made it hard to handle patches
@@ -3247,28 +3247,28 @@ kdelibs (4:2.1.0-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 27 Feb 2001 19:00:00 -0700
 
-kdelibs (4:2.1-final-1) unstable; urgency=low
+tdelibs (4:2.1-final-1) unstable; urgency=low
  
    * New upstream version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
 
-kdelibs (4:2.1-beta2-0128-2) unstable; urgency=low
+tdelibs (4:2.1-beta2-0128-2) unstable; urgency=low
   
    * Adding in cleanup for kde doc link (Closes: #85653)
-   * Moving from kdelibs3-dev to kdelibs-dev to conform to policy
+   * Moving from tdelibs3-dev to tdelibs-dev to conform to policy
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 18 Feb 2001 02:31:00 -0700
 
-kdelibs (4:2.1-beta2-0128-1) unstable; urgency=low
+tdelibs (4:2.1-beta2-0128-1) unstable; urgency=low
  
    * Fixing artsdsp LD_PRELOAD problem (Closes: #83592)
-   * Adding in replaces/conflicts for *ancient* non-existant kdelibs-nossl
+   * Adding in replaces/conflicts for *ancient* non-existant tdelibs-nossl
      package. (Closes: #83607)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 28 Jan 2001 01:30:00 -0700
 
-kdelibs (4:2.1-beta2-3) unstable; urgency=low
+tdelibs (4:2.1-beta2-3) unstable; urgency=low
  
    * Lots of little fixes
    * Fixing -dev dependencies...(allowing for -alsa packages)
@@ -3277,14 +3277,14 @@ kdelibs (4:2.1-beta2-3) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 25 Jan 2001 02:16:00 -0700
 
-kdelibs (4:2.1-beta2-2) unstable; urgency=low
+tdelibs (4:2.1-beta2-2) unstable; urgency=low
  
    * Fixes problem with version number not showing
    * Cleaning up depends for -dev packages
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 23 Jan 2001 12:36:00 -0700
 
-kdelibs (4:2.1-beta2-1) unstable; urgency=low
+tdelibs (4:2.1-beta2-1) unstable; urgency=low
  
    * New upstream beta
    * Fixing shlibs
@@ -3292,18 +3292,18 @@ kdelibs (4:2.1-beta2-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 22 Jan 2001 06:00:00 -0700
 
-kdelibs (4:2.1-20010118-1) unstable; urgency=low
+tdelibs (4:2.1-20010118-1) unstable; urgency=low
  
    * more upstream bug fixes
      fix JS and onmouseovers
    * mimetype fixes (Closes: #76455)
    * fix build order for libarts-alsa
    * breaking out libkmid to avoid unnessary depends (Closes: #82901, #82924)
-   * libarts and libkmid are Recommends of kdelibs3 and not dependant now
+   * libarts and libkmid are Recommends of tdelibs3 and not dependant now
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 18 Jan 2001 13:00:00 -0700
 
-kdelibs (4:2.1-20010115-1) unstable; urgency=low
+tdelibs (4:2.1-20010115-1) unstable; urgency=low
  
    * more upstream bug fixes
    * a ton of documentation updates
@@ -3316,11 +3316,11 @@ kdelibs (4:2.1-20010115-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
 
-kdelibs (4:2.1-20010109-1) unstable; urgency=low
+tdelibs (4:2.1-20010109-1) unstable; urgency=low
  
    * more upstream bug fixes
    * More dependency/build-depend fixes
-   * This was definatly built with the same dpkg that kdelibs-crypto was so
+   * This was definatly built with the same dpkg that tdelibs-crypto was so
      I'm assuming this just squeaked by dinstall...so just to be sure...
    * Java should work again
    * Fix kdesud security by
@@ -3329,15 +3329,15 @@ kdelibs (4:2.1-20010109-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 09 Jan 2001 10:00:00 -0700
 
-kdelibs (4:2.1-20010106-1) unstable; urgency=low
+tdelibs (4:2.1-20010106-1) unstable; urgency=low
  
    * more upstream bug fixes
    * Contains both the symlink/sniff attack fix for kdesu
-   * Moving conflicts for task-* packages to kdebase
+   * Moving conflicts for task-* packages to tdebase
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 06 Jan 2001 15:00:00 -0700
 
-kdelibs (4:2.1-20010101-1) unstable; urgency=low
+tdelibs (4:2.1-20010101-1) unstable; urgency=low
  
    * more upstream bug fixes
    * Applying new i18n patch
@@ -3345,48 +3345,48 @@ kdelibs (4:2.1-20010101-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Jan 2001 03:30:00 -0700
 
-kdelibs (4:2.1-20001218-2) unstable; urgency=low
+tdelibs (4:2.1-20001218-2) unstable; urgency=low
  
   * more upstream bug fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Dec 2000 12:22:00 -0700
 
-kdelibs (4:2.1-20001218-1) unstable; urgency=low
+tdelibs (4:2.1-20001218-1) unstable; urgency=low
  
   * more upstream bug fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Dec 2000 22:44:00 -0700
 
-kdelibs (4:2.1-20001216-1) unstable; urgency=low
+tdelibs (4:2.1-20001216-1) unstable; urgency=low
  
   * more upstream bug fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 16 Dec 2000 18:44:00 -0700
 
-kdelibs (4:2.1-20001214-1) unstable; urgency=low
+tdelibs (4:2.1-20001214-1) unstable; urgency=low
 
-  * new kdelibs-doc rules thanks to Gordon Sadler w/ tweaks to allow building
-    when kdelibs is not already installed... (Closes: #79583)
+  * new tdelibs-doc rules thanks to Gordon Sadler w/ tweaks to allow building
+    when tdelibs is not already installed... (Closes: #79583)
   * more upstream bug fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 14 Dec 2000 13:35:00 -0700
 
-kdelibs (4:2.1-20001213-1) unstable; urgency=low
+tdelibs (4:2.1-20001213-1) unstable; urgency=low
  
   * New upstream beta
   * Breaking out aRts pieces into their own packages so that others don't
-    need to install kdelibs in it's entirety to use arts.
+    need to install tdelibs in it's entirety to use arts.
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 13 Dec 2000 14:22:00 -0700
 
-kdelibs (4:2.0-final-5) unstable; urgency=low
+tdelibs (4:2.0-final-5) unstable; urgency=low
  
   * More upstream fixes
   * More dependency work
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 12 Nov 2000 18:15:00 -0700
 
-kdelibs (4:2.0-final-4) unstable; urgency=low
+tdelibs (4:2.0-final-4) unstable; urgency=low
  
   * More upstream fixes
   * Applying new i18n patch
@@ -3394,13 +3394,13 @@ kdelibs (4:2.0-final-4) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 08 Nov 2000 17:30:00 -0700
                                                                                 
-kdelibs (4:2.0-final-3.1) unstable; urgency=low
+tdelibs (4:2.0-final-3.1) unstable; urgency=low
  
   * Applying i18n patch (Closes: #75830)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 05 Nov 2000 23:00:00 -0700
 
-kdelibs (4:2.0-final-3) unstable; urgency=low
+tdelibs (4:2.0-final-3) unstable; urgency=low
  
   * More upstream fixes
   * Fixing (again) suid bit on artswrapper
@@ -3410,157 +3410,157 @@ kdelibs (4:2.0-final-3) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 04 Nov 2000 01:30:00 -0700
                                                                                 
-kdelibs (4:2.0-final-2.2) unstable; urgency=low
+tdelibs (4:2.0-final-2.2) unstable; urgency=low
  
   * Fixing dependency I hosed 
   * Fixing suid bit on artswrapper
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 03 Nov 2000 00:30:00 -0700
                                                                                 
-kdelibs (4:2.0-final-2.1) unstable; urgency=low
+tdelibs (4:2.0-final-2.1) unstable; urgency=low
  
-  * kdelibs-doc once again contains it's kdoc output
+  * tdelibs-doc once again contains it's kdoc output
   * kstyles upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Nov 2000 21:46:00 -0700
 
-kdelibs (4:2.0-final-2) unstable; urgency=low
+tdelibs (4:2.0-final-2) unstable; urgency=low
 
   * more upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
 
-kdelibs (4:2.0-final-0) unstable; urgency=low
+tdelibs (4:2.0-final-0) unstable; urgency=low
  
   * KDE 2.0
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Oct 2000 00:00:00 -0700
                                                                                 
-kdelibs (4:2.0-20001016-0) unstable; urgency=low
+tdelibs (4:2.0-20001016-0) unstable; urgency=low
 
   * more upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 16 Oct 2000 15:00:00 -0700
 
-kdelibs (4:2.0-20001015-0) unstable; urgency=low
+tdelibs (4:2.0-20001015-0) unstable; urgency=low
  
   * more upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 15 Oct 2000 20:05:00 -0700
                                                                                 
-kdelibs (4:2.0-20001013-0) unstable; urgency=low
+tdelibs (4:2.0-20001013-0) unstable; urgency=low
  
   * more upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 13 Oct 2000 23:45:00 -0700
                                                                                 
-kdelibs (4:2.0-20001011-0) unstable; urgency=low
+tdelibs (4:2.0-20001011-0) unstable; urgency=low
  
   * more upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 11 Oct 2000 03:45:00 -0700
                                                                                 
-kdelibs (4:2.0-20001009-3) unstable; urgency=low
+tdelibs (4:2.0-20001009-3) unstable; urgency=low
  
   * more upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 10 Oct 2000 17:00:00 -0700
                                                                                 
-kdelibs (4:2.0-20001009-2) unstable; urgency=low
+tdelibs (4:2.0-20001009-2) unstable; urgency=low
  
   * more upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 10 Oct 2000 00:00:00 -0700
                                                                                 
-kdelibs (4:2.0-20001009-0) unstable; urgency=low
+tdelibs (4:2.0-20001009-0) unstable; urgency=low
  
   * KDE 2.0 RC2
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 09 Oct 2000 08:00:00 -0700
                                                                                 
-kdelibs (4:2.0-20001006-4) unstable; urgency=low
+tdelibs (4:2.0-20001006-4) unstable; urgency=low
  
   * Fixing startup crashes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Oct 2000 09:00:00 -0700
                                                                                 
-kdelibs (4:2.0-20001006-3) unstable; urgency=low
+tdelibs (4:2.0-20001006-3) unstable; urgency=low
  
   * More upstream fixes
   * Fixing preinst applnk problem (Closes: #74195, #74218)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Oct 2000 03:00:00 -0700
                                                                                 
-kdelibs (4:2.0-20001006-2) unstable; urgency=low
+tdelibs (4:2.0-20001006-2) unstable; urgency=low
  
   * More crypto fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 06 Oct 2000 15:30:00 -0700
                                                                                 
-kdelibs (4:2.0-20001006-0) unstable; urgency=low
+tdelibs (4:2.0-20001006-0) unstable; urgency=low
    
   * More upstream fixes
-  * Getting rid of kdelibs-nossl and now providing a kdelibs-crypto package
+  * Getting rid of tdelibs-nossl and now providing a tdelibs-crypto package
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 06 Oct 2000 01:30:00 -0700
                                                                                 
-kdelibs-nossl (4:2.0-20001004-2) unstable; urgency=low
+tdelibs-nossl (4:2.0-20001004-2) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 05 Oct 2000 15:00:00 -0700
                                                                                 
-kdelibs-nossl (4:2.0-20001004-0) unstable; urgency=low
+tdelibs-nossl (4:2.0-20001004-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 04 Oct 2000 23:30:00 -0700
                                                                                 
-kdelibs (4:2.0-20001002-0) unstable; urgency=low
+tdelibs (4:2.0-20001002-0) unstable; urgency=low
  
   * KDE 2.0 RC1
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Oct 2000 01:30:00 -0700
                                                                                 
-kdelibs (4:2.0-20000927-0) unstable; urgency=low
+tdelibs (4:2.0-20000927-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 27 Sep 2000 23:30:00 -0700
 
-kdelibs (4:2.0-20000925-0) unstable; urgency=low
+tdelibs (4:2.0-20000925-0) unstable; urgency=low
 
   * More upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
 
-kdelibs (4:2.0-20000923-0) unstable; urgency=low
+tdelibs (4:2.0-20000923-0) unstable; urgency=low
  
   * More upstream fixes
   * Fixing build issues
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 23 Sep 2000 23:00:00 -0700
 
-kdelibs (4:2.0-20000920-0) unstable; urgency=low
+tdelibs (4:2.0-20000920-0) unstable; urgency=low
  
   * More upstream fixes 
   * Fixing build issues 
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Sep 2000 23:00:00 -0700
 
-kdelibs (4:2.0-20000918-0) unstable; urgency=low
+tdelibs (4:2.0-20000918-0) unstable; urgency=low
  
   * More upstream fixes (-beta5)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Sep 2000 17:00:00 -0700
                                                                                 
-kdelibs (4:2.0-20000910-0) unstable; urgency=low
+tdelibs (4:2.0-20000910-0) unstable; urgency=low
 
   * More upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 10 Sep 2000 23:00:00 -0700
 
-kdelibs (4:2.0-20000909-0) unstable; urgency=low
+tdelibs (4:2.0-20000909-0) unstable; urgency=low
   
   * More package cleanup
   * More upstream fixes
@@ -3570,39 +3570,39 @@ kdelibs (4:2.0-20000909-0) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 09 Sep 2000 02:00:00 -0700
 
-kdelibs (4:2.0-20000907-0.1) unstable; urgency=low
+tdelibs (4:2.0-20000907-0.1) unstable; urgency=low
  
   * Fixing issue with requiring -dev package
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 07 Sep 2000 21:00:00 -0700
 
-kdelibs-nossl (4:2.0-20000907-0) unstable; urgency=low
+tdelibs-nossl (4:2.0-20000907-0) unstable; urgency=low
 
   * More Upstream fixes
   * Initial Debian upload
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 07 Sep 2000 01:00:00 -0700
 
-kdelibs (4:2.0-20000905-0.1) unstable; urgency=low
+tdelibs (4:2.0-20000905-0.1) unstable; urgency=low
 
   * More Upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 05 Sep 2000 18:30:00 -0700
 
-kdelibs (4:2.0-20000905-0) unstable; urgency=low
+tdelibs (4:2.0-20000905-0) unstable; urgency=low
 
   * More Upstream fixes
   * Adding in a version number for libqt2.2 dependency
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 05 Sep 2000 00:30:00 -0700
 
-kdelibs (4:2.0-20000901-0) unstable; urgency=low
+tdelibs (4:2.0-20000901-0) unstable; urgency=low
 
   * More Upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Sep 2000 00:02:00 -0700
 
-kdelibs (4:2.0-20000829-0) unstable; urgency=low
+tdelibs (4:2.0-20000829-0) unstable; urgency=low
  
   * More Upstream fixes
   * Committing most package updates to CVS tree
@@ -3610,53 +3610,53 @@ kdelibs (4:2.0-20000829-0) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 29 Aug 2000 21:15:00 -0700
 
-kdelibs (4:2.0-20000825-0) experimental; urgency=low
+tdelibs (4:2.0-20000825-0) experimental; urgency=low
  
   * Upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 25 Aug 2000 20:00:00 -0700
                                                                                 
-kdelibs (4:2.0-20000824-1.0) experimental; urgency=low
+tdelibs (4:2.0-20000824-1.0) experimental; urgency=low
  
   * KDE 2.0 beta 4
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 24 Aug 2000 18:30:00 -0700
                                                                                 
-kdelibs (4:2.0-20000821-1.0) experimental; urgency=low
+tdelibs (4:2.0-20000821-1.0) experimental; urgency=low
 
   * New upstream fixes
   * Adding config link check into postinst script
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 21 Aug 2000 22:45:00 -0700
 
-kdelibs (4:2.0-20000820-1.0) experimental; urgency=low
+tdelibs (4:2.0-20000820-1.0) experimental; urgency=low
  
   * New upstream fixes
   * No requirement for -dev package now
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 20 Aug 2000 07:45:00 -0700
                                                                                 
-kdelibs (4:2.0-20000816-1.0) experimental; urgency=low
+tdelibs (4:2.0-20000816-1.0) experimental; urgency=low
 
   * Major hacking to fix tons of issues
   * New upstream beta version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 16 Aug 2000 22:30:00 -0700
 
-kdelibs (4:2.0-20000814-1.0) experimental; urgency=low
+tdelibs (4:2.0-20000814-1.0) experimental; urgency=low
 
   * More CVS updates
   * Tweaks to applnk items
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 14 Aug 2000 02:30:00 -0700
 
-kdelibs (4:2.0-20000810-1.0) experimental; urgency=low
+tdelibs (4:2.0-20000810-1.0) experimental; urgency=low
  
   * More CVS updates
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 10 Aug 2000 02:30:00 -0700
 
-kdelibs-cvs (4:2.0-20000517-1.0) experimental; urgency=low
+tdelibs-cvs (4:2.0-20000517-1.0) experimental; urgency=low
  
   * More CVS updates
   * Turning on debugging
@@ -3664,33 +3664,33 @@ kdelibs-cvs (4:2.0-20000517-1.0) experimental; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 17 May 2000 22:30:00 -0700
 
-kdelibs-cvs (4:2.0-20000512-1.2) experimental; urgency=low
+tdelibs-cvs (4:2.0-20000512-1.2) experimental; urgency=low
 
   * New upstream beta version
   * Turning on debugging
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 12 May 2000 20:30:00 -0700
 
-kdelibs-cvs (4:2.0-20000403-1.0) experimental; urgency=low
+tdelibs-cvs (4:2.0-20000403-1.0) experimental; urgency=low
  
   * More upstream CVS updates
   * Adding in depends for kde-qt-addon
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 03 Apr 2000 06:30:00 -0700
 
-kdelibs-cvs (4:2.0-20000306-1.1) experimental; urgency=low
+tdelibs-cvs (4:2.0-20000306-1.1) experimental; urgency=low
  
   * More upstream CVS updates
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 06 Mar 2000 22:45:00 -0700
 
-kdelibs-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+tdelibs-cvs (4:2.0-20000302-1.0) experimental; urgency=low
  
   * More upstream CVS updates
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Mar 2000 22:00:00 -0700
                                                                 
-kdelibs-cvs (4:2.0-20000229-1.0) experimental; urgency=low
+tdelibs-cvs (4:2.0-20000229-1.0) experimental; urgency=low
 
   * More upstream CVS updates
   * Adding in build-depends
@@ -3698,13 +3698,13 @@ kdelibs-cvs (4:2.0-20000229-1.0) experimental; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 29 Feb 2000 22:00:00 -0700
 
-kdelibs-cvs (4:2.0-20000221-1.1) experimental; urgency=low
+tdelibs-cvs (4:2.0-20000221-1.1) experimental; urgency=low
 
   * Rebuild with updated CVS files and new cleanups
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 22 Feb 2000 18:00:00 -0700
 
-kdelibs-cvs (4:2.0-20000221-1.0) experimental; urgency=low
+tdelibs-cvs (4:2.0-20000221-1.0) experimental; urgency=low
 
   * More upstream changes
   * Adding in a shlibs.local file to clear up self-dependency
@@ -3713,19 +3713,19 @@ kdelibs-cvs (4:2.0-20000221-1.0) experimental; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 21 Feb 2000 22:00:00 -0700
 
-kdelibs-cvs (4:2.0-19991117-1.0) experimental; urgency=low
+tdelibs-cvs (4:2.0-19991117-1.0) experimental; urgency=low
 
   * More upstream changes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 17 Nov 1999 05:30:00 -0400
 
-kdelibs-cvs (4:2.0-19991020-1.0) experimental; urgency=low
+tdelibs-cvs (4:2.0-19991020-1.0) experimental; urgency=low
 
   * More upstream changes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Oct 1999 06:30:00 -0400
 
-kdelibs-cvs (4:2.0-19991013-1.0) experimental; urgency=low
+tdelibs-cvs (4:2.0-19991013-1.0) experimental; urgency=low
 
   * More upstream changes
   * More cleanup
@@ -3735,13 +3735,13 @@ kdelibs-cvs (4:2.0-19991013-1.0) experimental; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 13 Oct 1999 23:30:00 -0400
 
-kdelibs-cvs (4:2.0-19991001-0.1) experimental; urgency=low
+tdelibs-cvs (4:2.0-19991001-0.1) experimental; urgency=low
 
   * new upstream CVS version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Oct 1999 14:30:00 -0400
 
-kdelibs-cvs (4:2.0-19990921-0.1) experimental; urgency=low
+tdelibs-cvs (4:2.0-19990921-0.1) experimental; urgency=low
 
   * new upstream CVS version
   * Fixing postinst script and one minor issue with rules to bring everything
@@ -3749,20 +3749,20 @@ kdelibs-cvs (4:2.0-19990921-0.1) experimental; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 21 Sep 1999 11:15:00 -0400
 
-kdelibs-cvs (4:2.0-19990912-0.1) experimental; urgency=low
+tdelibs-cvs (4:2.0-19990912-0.1) experimental; urgency=low
 
   * new upstream CVS version
   * Using 0.x numbers for my updates which is mainly to keep up with CVS
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 13 Sep 1999 14:30:39 -0400
 
-kdelibs-cvs (4:2.0-19990903-1.0) experimental; urgency=low
+tdelibs-cvs (4:2.0-19990903-1.0) experimental; urgency=low
 
   * new upstream version
 
  -- Stephan Kulow <coolo@kde.org>  Fri,  3 Sep 1999 21:01:39 +0200
 
-kdelibs-cvs (4:2.0-19990823-1.0) experimental; urgency=low
+tdelibs-cvs (4:2.0-19990823-1.0) experimental; urgency=low
 
   * More CVS updates
   * Adding in a process to the postinst to verify that /usr/doc/kde/HTML/default
@@ -3771,7 +3771,7 @@ kdelibs-cvs (4:2.0-19990823-1.0) experimental; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Aug 1999 07:30:28 -0400
 
-kdelibs-cvs (4:2.0-19990822-1.0) experimental; urgency=low
+tdelibs-cvs (4:2.0-19990822-1.0) experimental; urgency=low
 
   * Adding a link from /etc/kde2 to /usr/share/config until the proper
     solution is made.
@@ -3779,26 +3779,26 @@ kdelibs-cvs (4:2.0-19990822-1.0) experimental; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 22 Aug 1999 05:00:28 -0400
 
-kdelibs-cvs (4:2.0-19990820-1.1) experimental; urgency=low
+tdelibs-cvs (4:2.0-19990820-1.1) experimental; urgency=low
 
   * New upstream CVS version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 21 Aug 1999 00:30:28 -0400
 
-kdelibs-cvs (4:2.0-19990820-1) experimental; urgency=low
+tdelibs-cvs (4:2.0-19990820-1) experimental; urgency=low
 
   * New upstream CVS version
   * Moving into /usr from /opt
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 20 Aug 1999 11:00:28 -0400
 
-kdelibs-cvs (4:2.0-19990720-1) experimental; urgency=low
+tdelibs-cvs (4:2.0-19990720-1) experimental; urgency=low
 
   * New upstream CVS version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 20 Jul 1999 07:45:28 -0400
 
-kdelibs-cvs (4:2.0-19990626-2) experimental; urgency=low
+tdelibs-cvs (4:2.0-19990626-2) experimental; urgency=low
 
   * back to using the paths out of debianrules with some dependency trick
     in rules. No more hardcoded paths there
@@ -3813,34 +3813,34 @@ kdelibs-cvs (4:2.0-19990626-2) experimental; urgency=low
   
  -- Stephan Kulow <coolo@kde.org>  Sat, 26 Jun 1999 14:33:05 +0200
 
-kdelibs-cvs (4:2.0-19990626-1) experimental; urgency=low
+tdelibs-cvs (4:2.0-19990626-1) experimental; urgency=low
 
   * New upstream CVS version
   * Fixing the /etc/kderc file (had it there, just didn't install it)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 26 Jun 1999 07:00:28 -0400
 
-kdelibs-cvs (4:2.0-19990624-1) experimental; urgency=low
+tdelibs-cvs (4:2.0-19990624-1) experimental; urgency=low
 
   * New upstream CVS version
   * Adding in a /etc/kderc file
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 25 Jun 1999 23:50:28 -0400
 
-kdelibs-cvs (4:2.0-19990620-1) experimental; urgency=low
+tdelibs-cvs (4:2.0-19990620-1) experimental; urgency=low
 
   * New upstream CVS version
   * Migrating to /etc/kde from /etc/kde2
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 20 Jun 1999 11:00:28 -0400
 
-kdelibs-cvs (4:2.0-19990601-1) experimental; urgency=low
+tdelibs-cvs (4:2.0-19990601-1) experimental; urgency=low
 
   * New upstream CVS version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 01 Jun 1999 01:00:28 -0400
 
-kdelibs-cvs (4:2.0-19990524-1) experimental; urgency=low
+tdelibs-cvs (4:2.0-19990524-1) experimental; urgency=low
 
   * migrating back to / from /opt
   * migrating in new build fixes from -stable bringing package more in
@@ -3848,31 +3848,31 @@ kdelibs-cvs (4:2.0-19990524-1) experimental; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 24 May 1999 07:00:28 -0400
 
-kdelibs-cvs (4:2.0-19990314-1) experimental; urgency=low
+tdelibs-cvs (4:2.0-19990314-1) experimental; urgency=low
 
   * moving the -cvs from version to package name
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 14 Mar 1999 21:12:28 +0100
 
-kdelibs (4:2.0-19990312-cvs-3) experimental; urgency=low
+tdelibs (4:2.0-19990312-cvs-3) experimental; urgency=low
 
   * use INSTALL_DATA with -p
 
  -- Stephan Kulow <coolo@kde.org>  Sat, 13 Mar 1999 23:13:09 +0100
 
-kdelibs (4:2.0-19990312-cvs-2) experimental; urgency=low
+tdelibs (4:2.0-19990312-cvs-2) experimental; urgency=low
 
   * use DESTDIR
 
  -- Stephan Kulow <coolo@kde.org>  Sat, 13 Mar 1999 23:11:16 +0100
 
-kdelibs (4:2.0-19990312-cvs-1) experimental; urgency=low
+tdelibs (4:2.0-19990312-cvs-1) experimental; urgency=low
 
   * new upstream version with corba support libraries integrated
 
  -- Stephan Kulow <coolo@kde.org>  Fri, 12 Mar 1999 23:31:27 +0100
 
-kdelibs (4:2.0-19990309-1) experimental; urgency=low
+tdelibs (4:2.0-19990309-1) experimental; urgency=low
 
   * new upstream version out of CVS (many translation updates and some
     security fixes
@@ -3880,66 +3880,66 @@ kdelibs (4:2.0-19990309-1) experimental; urgency=low
 
  -- Stephan Kulow <coolo@kde.org>  Sat,  6 Mar 1999 18:03:04 +0100
 
-kdelibs (4:1.1-19990217-1) unstable; urgency=low
+tdelibs (4:1.1-19990217-1) unstable; urgency=low
 
   * new upstream version
 
  -- Stephan Kulow <coolo@kde.org>  Wed, 17 Feb 1999 19:09:42 +0100
 
-kdelibs (4:1.1-19990207-2) unstable; urgency=low
+tdelibs (4:1.1-19990207-2) unstable; urgency=low
 
   * fixed a bug with the jpeglib version
 
  -- Stephan Kulow <coolo@kde.org>  Tue,  9 Feb 1999 09:31:40 +0100
 
-kdelibs (4:1.1-19990207-1) unstable; urgency=low
+tdelibs (4:1.1-19990207-1) unstable; urgency=low
 
   * new upstream version 1.1 and new epoche
 
  -- Stephan Kulow <coolo@kde.org>  Sun,  7 Feb 1999 12:12:58 +0100
 
-kdelibs (2:980710-1.0-1) unstable; urgency=low
+tdelibs (2:980710-1.0-1) unstable; urgency=low
 
   * new upstream version 1.0
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 12 Jul 1998 10:12:19 +0200
 
-kdelibs (2:980419-b4-1) unstable; urgency=low
+tdelibs (2:980419-b4-1) unstable; urgency=low
 
   * new upstream version Beta4
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 19 Apr 1998 13:58:13 +0200
 
-kdelibs (2:980312-4) frozen; urgency=low
+tdelibs (2:980312-4) frozen; urgency=low
 
   * touch the .so.0 files to satisfy lintian
   * moved all unnecessary files out of -dev
-  * moved the symbolic link default->en to kdelibs, where it belongs
+  * moved the symbolic link default->en to tdelibs, where it belongs
   * fixed the shlibs format
   * new qt1g release (1.33)
 
  -- Stephan Kulow <coolo@kde.org>  Tue, 31 Mar 1998 13:00:00 +0100   
 
-kdelibs (2:980312-3) frozen; urgency=low
+tdelibs (2:980312-3) frozen; urgency=low
 
   * new g++ and libstdc++ release (egcs-2.90.26-1)
 
  -- Stephan Kulow <coolo@kde.org>  Tue, 24 Mar 1998 14:45:16 +0100
 
-kdelibs (2:980312-2) unstable; urgency=low
+tdelibs (2:980312-2) unstable; urgency=low
 
   * use debhelper now
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 15 Mar 1998 21:28:42 +0100
 
-kdelibs (2:980312-1) experimental; urgency=low
+tdelibs (2:980312-1) experimental; urgency=low
 
   * changed the files file
   * New upstream release
 
  -- Stephan Kulow <coolo@kde.org>  Thu, 12 Mar 1998 22:15:37 +0100
 
-kdelibs (2:980310-3) experimental; urgency=low
+tdelibs (2:980310-3) experimental; urgency=low
 
   * removed the preinst script
   * use absolute paths instead of the one with 
@@ -3947,39 +3947,39 @@ kdelibs (2:980310-3) experimental; urgency=low
 
  -- Stephan Kulow <coolo@kde.org>  Wed, 11 Mar 1998 20:11:50 +0100
 
-kdelibs (2:980310-2) experimental; urgency=low
+tdelibs (2:980310-2) experimental; urgency=low
 
   * removed the file correction part from kderules
 
  -- Stephan Kulow <coolo@kde.org>  Mon,  9 Mar 1998 23:29:50 +0100
 
-kdelibs (2:980310-1) experimental; urgency=low
+tdelibs (2:980310-1) experimental; urgency=low
 
   * New upstream release
 
  -- Stephan Kulow <coolo@kde.org>  Mon,  9 Mar 1998 22:47:16 +0100
 
-kdelibs (980303-1) experimental; urgency=low
+tdelibs (980303-1) experimental; urgency=low
 
   * New upstream release
 
  -- Stephan Kulow <coolo@kde.org>  Wed, 4 Mar 1998 10:43:42 +0100
 
-kdelibs (980228-1) experimental; urgency=low
+tdelibs (980228-1) experimental; urgency=low
 
   * added *.moc to the clean target
   * New upstream release
 
  -- Stephan Kulow <coolo@kde.org>  Sat, 28 Feb 1998 21:05:58 +0100
 
-kdelibs (980227-2) experimental; urgency=low
+tdelibs (980227-2) experimental; urgency=low
 
   * removed the REENTRANT flag. KDE don't uses threds
   * updated libmediatool
 
  -- Stephan Kulow <coolo@kde.org>  Sat, 28 Feb 1998 01:22:56 +0100
 
-kdelibs (980227-1) experimental; urgency=low
+tdelibs (980227-1) experimental; urgency=low
 
   * changed the name of libjpeg-dev
   * renamed preint to preinst (typo while moving last time)
@@ -3988,55 +3988,55 @@ kdelibs (980227-1) experimental; urgency=low
 
  -- Stephan Kulow <coolo@kde.org>  Fri, 27 Feb 1998 20:20:24 +0100
 
-kdelibs (980225-1) experimental; urgency=low
+tdelibs (980225-1) experimental; urgency=low
 
   * New upstream release
 
  -- Stephan Kulow <coolo@kde.org>  Wed, 25 Dec 1998 19:23:12 +0100
 
-kdelibs (980224-1) experimental; urgency=low
+tdelibs (980224-1) experimental; urgency=low
 
   * New upstream release
 
  -- Stephan Kulow <coolo@kde.org>  Wed, 25 Dec 1998 11:25:23 +0100
 
-kdelibs (1:Beta2-2.1) experimental; urgency=low
+tdelibs (1:Beta2-2.1) experimental; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Fri,  5 Dec 1997 21:15:52 +0100
 
-kdelibs (1:Beta2-2) unstable; urgency=low
+tdelibs (1:Beta2-2) unstable; urgency=low
 
   * removed virtual package names.
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun, 30 Nov 1997 16:59:27 +0100
 
-kdelibs (1:Beta2-1) unstable; urgency=low
+tdelibs (1:Beta2-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun, 23 Nov 1997 14:04:20 +0100
 
-kdelibs (1:Beta1.2-2) unstable; urgency=low
+tdelibs (1:Beta1.2-2) unstable; urgency=low
 
   * new compile cycle with bugfixes.
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun,  9 Nov 1997 19:43:46 +0100
 
-kdelibs (1:Beta1.2-1) unstable; urgency=low
+tdelibs (1:Beta1.2-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 27 Oct 1997 11:16:24 +0100
 
-kdelibs (1:Beta1.1-1) unstable; urgency=low
+tdelibs (1:Beta1.1-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 20 Oct 1997 12:33:52 +0200
 
-kdelibs (971019-1) unstable; urgency=low
+tdelibs (971019-1) unstable; urgency=low
 
   * New upstream release
   * Fixed all paths to match debian setup
@@ -4044,116 +4044,116 @@ kdelibs (971019-1) unstable; urgency=low
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun, 19 Oct 1997 12:05:32 +0200
 
-kdelibs (971013-1) unstable; urgency=low
+tdelibs (971013-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 13 Oct 1997 08:18:16 +0200
 
-kdelibs (971011-1) unstable; urgency=low
+tdelibs (971011-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun, 12 Oct 1997 12:08:40 +0200
 
-kdelibs (971009-1) unstable; urgency=low
+tdelibs (971009-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Thu,  9 Oct 1997 10:47:00 +0200
 
-kdelibs (971008-1) unstable; urgency=low
+tdelibs (971008-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Wed,  8 Oct 1997 10:03:09 +0200
 
-kdelibs (971006-2) unstable; urgency=low
+tdelibs (971006-2) unstable; urgency=low
 
   * daily recompile of everything.
 
  -- Andreas Jellinghaus <aj@debian.org>  Tue,  7 Oct 1997 10:36:58 +0200
 
-kdelibs (971006-1) unstable; urgency=low
+tdelibs (971006-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon,  6 Oct 1997 09:19:17 +0200
 
-kdelibs (971005-1) unstable; urgency=low
+tdelibs (971005-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun,  5 Oct 1997 17:27:13 +0200
 
-kdelibs (971003-1) unstable; urgency=low
+tdelibs (971003-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Fri,  3 Oct 1997 08:16:14 +0200
 
-kdelibs (971002-1) unstable; urgency=low
+tdelibs (971002-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Thu,  2 Oct 1997 08:47:49 +0200
 
-kdelibs (970930-1) unstable; urgency=low
+tdelibs (970930-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Tue, 30 Sep 1997 11:39:38 +0200
 
-kdelibs (970929-1) unstable; urgency=low
+tdelibs (970929-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 29 Sep 1997 09:36:11 +0200
 
-kdelibs (970925-2) unstable; urgency=low
+tdelibs (970925-2) unstable; urgency=low
 
   * daily recompile of everything.
 
  -- Andreas Jellinghaus <aj@debian.org>  Fri, 26 Sep 1997 08:42:24 +0200
 
-kdelibs (970925-1) unstable; urgency=low
+tdelibs (970925-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Thu, 25 Sep 1997 08:04:45 +0200
 
-kdelibs (970924-2) unstable; urgency=low
+tdelibs (970924-2) unstable; urgency=low
 
   * new use kderules.
   * daily recompile of everything.
 
  -- Andreas Jellinghaus <aj@debian.org>  Wed, 24 Sep 1997 10:21:17 +0200
 
-kdelibs (970924-1) unstable; urgency=low
+tdelibs (970924-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Wed, 24 Sep 1997 08:28:48 +0200
 
-kdelibs (970923-1) unstable; urgency=low
+tdelibs (970923-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Tue, 23 Sep 1997 08:36:52 +0200
 
-kdelibs (970922-1) unstable; urgency=low
+tdelibs (970922-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 22 Sep 1997 09:48:41 +0200
 
-kdelibs (970921-1) unstable; urgency=low
+tdelibs (970921-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun, 21 Sep 1997 13:45:48 +0200
 
-kdelibs (970920-1) unstable; urgency=low
+tdelibs (970920-1) unstable; urgency=low
 
   * Initial Release.
 
diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control
index d9ecd1121..d17521614 100644
--- a/ubuntu/maverick/tdelibs/debian/control
+++ b/ubuntu/maverick/tdelibs/debian/control
@@ -1,4 +1,4 @@
-Source: kdelibs-trinity
+Source: tdelibs-trinity
 Section: libs
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@@ -20,15 +20,15 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
 
-Package: kdelibs-trinity
+Package: tdelibs-trinity
 Section: libs
 Architecture: all
-Replaces: kdelibs-kde3 (<< 4:3.5.13)
-Breaks: kdelibs-kde3 (<< 4:3.5.13)
-Provides: kdelibs
-Conflicts: kdelibs
-Depends: kdelibs4c2a-trinity (>= ${Source-Version}),
- kdelibs-data-trinity (>= ${Source-Version})
+Replaces: tdelibs-kde3 (<< 4:3.5.13)
+Breaks: tdelibs-kde3 (<< 4:3.5.13)
+Provides: tdelibs
+Conflicts: tdelibs
+Depends: tdelibs4c2a-trinity (>= ${Source-Version}),
+ tdelibs-data-trinity (>= ${Source-Version})
 Description: core libraries from the official Trinity release
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -39,29 +39,29 @@ Description: core libraries from the official Trinity release
  needed by virtually all TDE applications. It does not include
  development files.
 
-Package: kdelibs-data-trinity
+Package: tdelibs-data-trinity
 Section: libs
 Architecture: all
-Replaces: kdelibs-data-kde3 (<< 4:3.5.13)
-Breaks: kdelibs-data-kde3 (<< 4:3.5.13)
+Replaces: tdelibs-data-kde3 (<< 4:3.5.13)
+Breaks: tdelibs-data-kde3 (<< 4:3.5.13)
 Depends: hicolor-icon-theme
-Provides: kdelibs-data
-Conflicts: kdelibs-data
+Provides: tdelibs-data
+Conflicts: tdelibs-data
 Description: core shared data for all TDE applications
  This package contains all the architecture independent data files
  commonly used by TDE applications. You need these data files to run
  TDE applications.
  .
  This package is part of TDE, and a component of the TDE libraries module.
- See the 'kde-trinity' and 'kdelibs-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdelibs-trinity' packages for more information.
 
-Package: kdelibs4c2a-trinity
+Package: tdelibs4c2a-trinity
 Section: libs
 Architecture: any
-Replaces: kdelibs4c2a-kde3 (<< 4:3.5.13)
-Breaks: kdelibs4c2a-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdelibs-data-trinity,
- kdelibs-data-trinity, perl, xbase-clients,
+Replaces: tdelibs4c2a-kde3 (<< 4:3.5.13)
+Breaks: tdelibs4c2a-kde3 (<< 4:3.5.13)
+Depends: ${shlibs:Depends}, tdelibs-data-trinity,
+ tdelibs-data-trinity, perl, xbase-clients,
  launchpad-integration, sudo
 Recommends: xdg-user-dirs
 Suggests: fam, perl-suid
@@ -70,18 +70,18 @@ Description: core libraries and binaries for all TDE applications
  used by all TDE applications. You need these libraries and binaries to
  run TDE applications.
  .
- Several scripts included in kdebase-bin, related to the handling of SMB
+ Several scripts included in tdebase-bin, related to the handling of SMB
  and NFS shares, require the perl-suid package to work properly.
  .
  This package is part of TDE, and a component of the TDE libraries module.
- See the 'kde-trinity' and 'kdelibs-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdelibs-trinity' packages for more information.
 
-Package: kdelibs4-trinity-dev
+Package: tdelibs4-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: kdelibs4-kde3-dev (<< 4:3.5.13)
-Breaks: kdelibs4-kde3-dev (<< 4:3.5.13)
-Depends: kdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
+Replaces: tdelibs4-kde3-dev (<< 4:3.5.13)
+Breaks: tdelibs4-kde3-dev (<< 4:3.5.13)
+Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
@@ -90,38 +90,38 @@ Depends: kdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev,
  libavahi-client-dev (>= 0.4), libtqtinterface-dev,
  gettext-kde
-Provides: kdelibs-trinity-dev
+Provides: tdelibs-trinity-dev
 Description: development files for the TDE core libraries
  This package contains all the headers and other related files needed
  to compile TDE applications, or develop applications which use the
  core TDE libraries.
  .
  This package is part of TDE, and a component of the TDE libraries module.
- See the 'kde-trinity' and 'kdelibs-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdelibs-trinity' packages for more information.
 
-Package: kdelibs4-trinity-doc
+Package: tdelibs4-trinity-doc
 Section: doc
 Architecture: all
-Replaces: kdelibs4-kde3-doc (<< 4:3.5.13)
-Breaks: kdelibs4-kde3-doc (<< 4:3.5.13)
-Provides: kdelibs-trinity-doc
+Replaces: tdelibs4-kde3-doc (<< 4:3.5.13)
+Breaks: tdelibs4-kde3-doc (<< 4:3.5.13)
+Provides: tdelibs-trinity-doc
 Description: developer documentation for the TDE core libraries
  This package contains documentation for the core TDE libraries, of
  use more for developers creating applications which use the core
  TDE libraries, than regular users.
  .
  This package is part of TDE, and a component of the TDE libraries module.
- See the 'kde-trinity' and 'kdelibs-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdelibs-trinity' packages for more information.
 
-Package: kdelibs-trinity-dbg
+Package: tdelibs-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: kdelibs-kde3-dbg (<< 4:3.5.13)
-Breaks: kdelibs-kde3-dbg (<< 4:3.5.13)
+Replaces: tdelibs-kde3-dbg (<< 4:3.5.13)
+Breaks: tdelibs-kde3-dbg (<< 4:3.5.13)
 Priority: extra
-Conflicts: kdelibs4-trinity-dbg, kdelibs4c2-trinity-dbg, kdelibs4c2a-trinity-dbg
-Depends: kdelibs4c2a-trinity (= ${Source-Version}), libtqtinterface-dbg, libc6-dbg [amd64]
-Description: debugging symbols for kdelibs
- This package contains the debugging symbols associated with kdelibs.
- They will automatically be used by gdb for debugging kdelibs-related
+Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg
+Depends: tdelibs4c2a-trinity (= ${Source-Version}), libtqtinterface-dbg, libc6-dbg [amd64]
+Description: debugging symbols for tdelibs
+ This package contains the debugging symbols associated with tdelibs.
+ They will automatically be used by gdb for debugging tdelibs-related
  issues.
diff --git a/ubuntu/maverick/tdelibs/debian/control.in b/ubuntu/maverick/tdelibs/debian/control.in
index b397f308c..11a539ad6 100644
--- a/ubuntu/maverick/tdelibs/debian/control.in
+++ b/ubuntu/maverick/tdelibs/debian/control.in
@@ -1,4 +1,4 @@
-Source: kdelibs
+Source: tdelibs
 Section: libs
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
@@ -15,15 +15,15 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
  libtiff4-dev (>= 3.7.3-1), libavahi-client-dev (>= 0.4),
  libavahi-qt3-dev (>= 0.4), libxml2-dev, libxml2-utils, libxslt1-dev,
  sharutils, texinfo,
- gettext-kde, kdesdk-scripts, lsb-release, base-files, sudo
+ gettext-kde, tdesdk-scripts, lsb-release, base-files, sudo
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11
 Standards-Version: 3.7.2
 
-Package: kdelibs
+Package: tdelibs
 Section: libs
 Architecture: all
-Depends: kdelibs4c2a (>= ${Source-Version}),
- kdelibs-data (>= ${Source-Version})
+Depends: tdelibs4c2a (>= ${Source-Version}),
+ tdelibs-data (>= ${Source-Version})
 Description: core libraries 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,
@@ -34,14 +34,14 @@ Description: core libraries from the official KDE release
  needed by virtually all KDE applications. It does not include
  development files.
 
-Package: kdelibs-data
+Package: tdelibs-data
 Section: libs
 Architecture: all
 Depends: hicolor-icon-theme
-Conflicts: kdelibs4
-Replaces: kdeartwork-style (<< 4:3.4.0), konq-plugins (<< 4:3.4.0),
+Conflicts: tdelibs4
+Replaces: tdeartwork-style (<< 4:3.4.0), konq-plugins (<< 4:3.4.0),
  ksvg (<< 4:3.4.0), kpackage (<< 4:3.4.2), kicker (<< 4:3.5-rc1),
- kttsd (<< 4:3.5-rc1), kdevelop3-data (<< 4:3.3.0), libdjvulibre1,
+ kttsd (<< 4:3.5-rc1), tdevelop3-data (<< 4:3.3.0), libdjvulibre1,
  libdjvulibre15 (<< 3.5.16-2), krita (= 1:1.4.90.1-1), digikam (<< 0.8.1-3),
  kaffeine (<< 0.8.1-3)
 Description: core shared data for all KDE applications
@@ -50,34 +50,34 @@ Description: core shared data for all KDE applications
  KDE applications.
  .
  This package is part of KDE, and a component of the KDE libraries module.
- See the 'kde' and 'kdelibs' packages for more information.
+ See the 'kde' and 'tdelibs' packages for more information.
 
-Package: kdelibs4c2a
+Package: tdelibs4c2a
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, kdelibs-data (>> ${KDE-Version3}),
- kdelibs-data (<< ${KDE-Next-Version3}), perl, xbase-clients,
+Depends: ${shlibs:Depends}, tdelibs-data (>> ${KDE-Version3}),
+ tdelibs-data (<< ${KDE-Next-Version3}), perl, xbase-clients,
  launchpad-integration, sudo
 Suggests: fam, perl-suid
-Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin (<< 4:3.3.3), kdelibs4-dev (<< 4:3.5.7.dfsg.1-6)
-Replaces: kdelibs4, kdelibs4c2, kdeartwork-style (<< 4:3.4.0),
- kcontrol (<< 4:3.4.0), kdelibs-bin (<< 4:3.5.3-1),
- kdelibs4-dev (= 4:3.5.7.dfsg.1-5)
+Conflicts: tdelibs4, tdelibs4c2, tdelibs-bin (<< 4:3.3.3), tdelibs4-dev (<< 4:3.5.7.dfsg.1-6)
+Replaces: tdelibs4, tdelibs4c2, tdeartwork-style (<< 4:3.4.0),
+ kcontrol (<< 4:3.4.0), tdelibs-bin (<< 4:3.5.3-1),
+ tdelibs4-dev (= 4:3.5.7.dfsg.1-5)
 Description: core libraries and binaries for all KDE applications
  This package contains all the shared libraries and common core binaries
  used by all KDE applications. You need these libraries and binaries to
  run KDE applications.
  .
- Several scripts included in kdebase-bin, related to the handling of SMB
+ Several scripts included in tdebase-bin, related to the handling of SMB
  and NFS shares, require the perl-suid package to work properly.
  .
  This package is part of KDE, and a component of the KDE libraries module.
- See the 'kde' and 'kdelibs' packages for more information.
+ See the 'kde' and 'tdelibs' packages for more information.
 
-Package: kdelibs4-dev
+Package: tdelibs4-dev
 Section: libdevel
 Architecture: any
-Depends: kdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
+Depends: tdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
@@ -85,37 +85,37 @@ Depends: kdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev,
  libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev,
  libavahi-client-dev (>= 0.4), libavahi-qt3-dev (>= 0.4),
- gettext-kde, kdesdk-scripts
-Provides: kdelibs-dev
-Replaces: kdebase-dev (<< 4:3.4.0), kdelibs4c2a (<< 4:3.5.7.dfsg.1-5)
+ gettext-kde, tdesdk-scripts
+Provides: tdelibs-dev
+Replaces: tdebase-dev (<< 4:3.4.0), tdelibs4c2a (<< 4:3.5.7.dfsg.1-5)
 Description: development files for the KDE core libraries
  This package contains all the headers and other related files needed
  to compile KDE applications, or develop applications which use the
  core KDE libraries.
  .
  This package is part of KDE, and a component of the KDE libraries module.
- See the 'kde' and 'kdelibs' packages for more information.
+ See the 'kde' and 'tdelibs' packages for more information.
 
-Package: kdelibs4-doc
+Package: tdelibs4-doc
 Section: doc
 Architecture: all
-Provides: kdelibs-doc
+Provides: tdelibs-doc
 Description: developer documentation for the KDE core libraries
  This package contains documentation for the core KDE libraries, of
  use more for developers creating applications which use the core
  KDE libraries, than regular users.
  .
  This package is part of KDE, and a component of the KDE libraries module.
- See the 'kde' and 'kdelibs' packages for more information.
+ See the 'kde' and 'tdelibs' packages for more information.
 
-Package: kdelibs-dbg
+Package: tdelibs-dbg
 Section: libdevel
 Architecture: any
 Priority: extra
-Conflicts: kdelibs4-dbg, kdelibs4c2-dbg, kdelibs4c2a-dbg
-Replaces: kdelibs4-dbg, kdelibs4c2-dbg, kdelibs4c2a-dbg
-Depends: kdelibs4c2a (= ${Source-Version}), qt-x11-free-dbg, libc6-dbg [amd64]
-Description: debugging symbols for kdelibs
- This package contains the debugging symbols associated with kdelibs.
- They will automatically be used by gdb for debugging kdelibs-related
+Conflicts: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs4c2a-dbg
+Replaces: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs4c2a-dbg
+Depends: tdelibs4c2a (= ${Source-Version}), qt-x11-free-dbg, libc6-dbg [amd64]
+Description: debugging symbols for tdelibs
+ This package contains the debugging symbols associated with tdelibs.
+ They will automatically be used by gdb for debugging tdelibs-related
  issues.
diff --git a/ubuntu/maverick/tdelibs/debian/kdelibs4-trinity-doc.install b/ubuntu/maverick/tdelibs/debian/kdelibs4-trinity-doc.install
deleted file mode 100644
index 09f34bbc7..000000000
--- a/ubuntu/maverick/tdelibs/debian/kdelibs4-trinity-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdelibs-apidocs/*
diff --git a/ubuntu/maverick/tdelibs/debian/kdelibs4c2a-trinity.lintian b/ubuntu/maverick/tdelibs/debian/kdelibs4c2a-trinity.lintian
deleted file mode 100644
index 2e0ebfa6c..000000000
--- a/ubuntu/maverick/tdelibs/debian/kdelibs4c2a-trinity.lintian
+++ /dev/null
@@ -1,15 +0,0 @@
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kaddprinterwizard.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_cupsdconf.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_dcopserver.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcmshell.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kbuildsycoca.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kded.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcookiejar.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_klauncher.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kconf_update.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_uiserver.so
-kdelibs4c2a binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
-kdelibs4c2a binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
-kdelibs4c2a binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-kdelibs4c2a binary: setuid-binary opt/trinity/bin/start_kdeinit 4755 root/root
diff --git a/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl b/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
index 1705e7d4f..0d6c5cc92 100644
--- a/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
+++ b/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
@@ -34,7 +34,7 @@ sub prepare
     print "\"POT-Creation-Date: "; printdate( @now ); print "\\n\"\n";
     print "\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n";
     print "\"Last-Translator: FULL NAME <EMAIL\@ADDRESS>\\n\"\n";
-    print "\"Language-Team: LANGUAGE <kde-i18n-doc\@kde.org>\\n\"\n";
+    print "\"Language-Team: LANGUAGE <tde-i18n-doc\@kde.org>\\n\"\n";
     print "\"MIME-Version: 1.0\\n\"\n";
     print "\"Content-Type: text/plain; charset=UTF-8\\n\"\n";
     print "\"Content-Transfer-Encoding: 8bit\\n\"\n";
diff --git a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff
index d5b892428..3a40b1045 100644
--- a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff
+++ b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff
@@ -1,5 +1,5 @@
---- kdelibs/Makefile.am.in	2006-06-26 16:14:54.000000000 +0000
-+++ kdelibs/Makefile.am.in	2006-06-26 16:16:33.000000000 +0000
+--- tdelibs/Makefile.am.in	2006-06-26 16:14:54.000000000 +0000
++++ tdelibs/Makefile.am.in	2006-06-26 16:16:33.000000000 +0000
 @@ -54,10 +54,8 @@
  	find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
  	find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
@@ -7,7 +7,7 @@
 -	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
 -	: > kde.pot ;\
 +	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp;
- 	$(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/kdelibs.pot
+ 	$(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/tdelibs.pot
 -	$(XGETTEXT) common_texts.cpp -o kde.pot
  	rm -f dirs
  
diff --git a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
index b21ebe312..0671ce20e 100644
--- a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
+++ b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
@@ -1,5 +1,5 @@
---- kdelibs/kdecore/kaboutdata.cpp	2006-03-17 10:19:05.000000000 +0000
-+++ kdelibs/kdecore/kaboutdata.cpp	2006-12-05 19:46:12.000000000 +0000
+--- tdelibs/kdecore/kaboutdata.cpp	2006-03-17 10:19:05.000000000 +0000
++++ tdelibs/kdecore/kaboutdata.cpp	2006-12-05 19:46:12.000000000 +0000
 @@ -389,7 +389,7 @@
              "of the translation teams all over the world.</p>"
              "<p>For more information on KDE internationalization "
diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules
index 5ce617371..4cdb2747a 100755
--- a/ubuntu/maverick/tdelibs/debian/rules
+++ b/ubuntu/maverick/tdelibs/debian/rules
@@ -33,40 +33,40 @@ DEB_FIXPERMS_EXCLUDE := \
 	opt/trinity/bin/kpac_dhcp_helper \
 	opt/trinity/bin/start_kdeinit
 
-DEB_DH_STRIP_ARGS  := --dbg-package=kdelibs-trinity-dbg
+DEB_DH_STRIP_ARGS  := --dbg-package=tdelibs-trinity-dbg
 
-DEB_DH_MAKESHLIBS_ARGS_kdelibs4c2a-trinity := -V'kdelibs4c2a-trinity (>= 4:3.5.8-1)'
+DEB_DH_MAKESHLIBS_ARGS_tdelibs4c2a-trinity := -V'tdelibs4c2a-trinity (>= 4:3.5.8-1)'
 
-binary-install/kdelibs-data-trinity::
-	install -p -D -m644 kded/applications.menu debian/kdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu
-	install -p -D -m644 debian/trinitylibs.conf debian/kdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf
-	uudecode debian/icons/aboutkde-kubuntu.png.uu -o debian/kdelibs-data-trinity/opt/trinity/share/apps/kdeui/pics/aboutkde.png
+binary-install/tdelibs-data-trinity::
+	install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu
+	install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf
+	uudecode debian/icons/aboutkde-kubuntu.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/apps/kdeui/pics/aboutkde.png
 
-	uudecode debian/icons/cr16-device-system.png.uu -o debian/kdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/16x16/devices/system.png
-	uudecode debian/icons/cr22-device-system.png.uu -o debian/kdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/22x22/devices/system.png
-	uudecode debian/icons/cr32-device-system.png.uu -o debian/kdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/32x32/devices/system.png
-	uudecode debian/icons/cr48-device-system.png.uu -o debian/kdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/48x48/devices/system.png
-	uudecode debian/icons/cr64-device-system.png.uu -o debian/kdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/64x64/devices/system.png
-	uudecode debian/icons/cr128-device-system.png.uu -o debian/kdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/128x128/devices/system.png
-#	uudecode debian/icons/crsc-device-system.svgz.uu -o debian/kdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/scalable/devices/system.svgz
+	uudecode debian/icons/cr16-device-system.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/16x16/devices/system.png
+	uudecode debian/icons/cr22-device-system.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/22x22/devices/system.png
+	uudecode debian/icons/cr32-device-system.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/32x32/devices/system.png
+	uudecode debian/icons/cr48-device-system.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/48x48/devices/system.png
+	uudecode debian/icons/cr64-device-system.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/64x64/devices/system.png
+	uudecode debian/icons/cr128-device-system.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/128x128/devices/system.png
+#	uudecode debian/icons/crsc-device-system.svgz.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/scalable/devices/system.svgz
 
-	uudecode debian/icons/cr16-action-hibernate.png.uu -o debian/kdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/16x16/actions/hibernate.png
-	uudecode debian/icons/cr22-action-hibernate.png.uu -o debian/kdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/22x22/actions/hibernate.png
-	uudecode debian/icons/cr32-action-hibernate.png.uu -o debian/kdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/32x32/actions/hibernate.png
-	uudecode debian/icons/cr48-action-hibernate.png.uu -o debian/kdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/48x48/actions/hibernate.png
+	uudecode debian/icons/cr16-action-hibernate.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/16x16/actions/hibernate.png
+	uudecode debian/icons/cr22-action-hibernate.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/22x22/actions/hibernate.png
+	uudecode debian/icons/cr32-action-hibernate.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/32x32/actions/hibernate.png
+	uudecode debian/icons/cr48-action-hibernate.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/48x48/actions/hibernate.png
 
-	uudecode debian/icons/cr16-action-suspend.png.uu -o debian/kdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/16x16/actions/suspend.png
-	uudecode debian/icons/cr22-action-suspend.png.uu -o debian/kdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/22x22/actions/suspend.png
-	uudecode debian/icons/cr32-action-suspend.png.uu -o debian/kdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/32x32/actions/suspend.png
-	uudecode debian/icons/cr48-action-suspend.png.uu -o debian/kdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/48x48/actions/suspend.png
+	uudecode debian/icons/cr16-action-suspend.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/16x16/actions/suspend.png
+	uudecode debian/icons/cr22-action-suspend.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/22x22/actions/suspend.png
+	uudecode debian/icons/cr32-action-suspend.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/32x32/actions/suspend.png
+	uudecode debian/icons/cr48-action-suspend.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/48x48/actions/suspend.png
 
 ### 
 
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
-binary-predeb/kdelibs4-trinity-dev::
+binary-predeb/tdelibs4-trinity-dev::
 ifeq (linux,$(DEB_HOST_ARCH_OS))
-	echo "libasound2-trinity-dev=libasound2-trinity-dev" >> debian/kdelibs4-trinity-dev.substvars
+	echo "libasound2-trinity-dev=libasound2-trinity-dev" >> debian/tdelibs4-trinity-dev.substvars
 endif
 
 common-install-prehook-impl::
@@ -76,9 +76,9 @@ common-install-prehook-impl::
 #		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
 #	done
 
-#	msgcat --use-first kde.pot po/kdelibs.pot > kdelibs.pot-merged
-#	mv -f kdelibs.pot-merged po/kdelibs.pot
-	cp -Rp kde.pot po/kdelibs.pot
+#	msgcat --use-first kde.pot po/tdelibs.pot > tdelibs.pot-merged
+#	mv -f tdelibs.pot-merged po/tdelibs.pot
+	cp -Rp kde.pot po/tdelibs.pot
 
 	# generate .po files for .desktop etc files
 	if [ -f debian/kubuntu-desktop-i18n/createdesktop.pl ]; then \
@@ -96,7 +96,7 @@ common-install-prehook-impl::
 	  rm -f LIST; \
 	fi
 
-binary-install/kdelibs4c2a-trinity::
+binary-install/tdelibs4c2a-trinity::
 	mv debian/tmp/opt/trinity/bin/kcmshell debian/tmp/opt/trinity/bin/kcmshell.real
-	install -p -D -m755 debian/tmp/opt/trinity/bin/kcmshell.real debian/kdelibs4c2a-trinity/opt/trinity/bin/kcmshell.real
-	install -p -D -m755 debian/kcmshell debian/kdelibs4c2a-trinity/opt/trinity/bin/kcmshell
+	install -p -D -m755 debian/tmp/opt/trinity/bin/kcmshell.real debian/tdelibs4c2a-trinity/opt/trinity/bin/kcmshell.real
+	install -p -D -m755 debian/kcmshell debian/tdelibs4c2a-trinity/opt/trinity/bin/kcmshell
diff --git a/ubuntu/maverick/tdelibs/debian/kdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index c470aba39..22d939e81 100644
--- a/ubuntu/maverick/tdelibs/debian/kdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
@@ -2091,7 +2091,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/mail_replyall.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/mail_replylist.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/mail_reply.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/mail_send.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/make_kdevelop.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/make_tdevelop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/math_abs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/math_brace.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/math_brackets.png
@@ -2514,7 +2514,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/mail_replyall.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/mail_replylist.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/mail_reply.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/mail_send.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/make_kdevelop.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/make_tdevelop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/math_abs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/math_brace.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/math_brackets.png
@@ -2829,7 +2829,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/help.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/identity.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/indent.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/kde.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/kdevelop_down.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/tdevelop_down.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/knewstuff.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/launch.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/leftjust.png
@@ -2846,7 +2846,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/mail_replyall.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/mail_replylist.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/mail_reply.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/mail_send.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/make_kdevelop.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/make_tdevelop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/math_abs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/math_brace.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/math_brackets.png
diff --git a/ubuntu/maverick/tdelibs/debian/kdelibs-data-trinity.postinst b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.postinst
index f2a8d925b..f2a8d925b 100644
--- a/ubuntu/maverick/tdelibs/debian/kdelibs-data-trinity.postinst
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.postinst
diff --git a/ubuntu/maverick/tdelibs/debian/kdelibs-data-trinity.postrm b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.postrm
index aae9f3600..aae9f3600 100644
--- a/ubuntu/maverick/tdelibs/debian/kdelibs-data-trinity.postrm
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.postrm
diff --git a/ubuntu/maverick/tdelibs/debian/kdelibs-data-trinity.preinst b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.preinst
index 452b17bfc..452b17bfc 100644
--- a/ubuntu/maverick/tdelibs/debian/kdelibs-data-trinity.preinst
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.preinst
diff --git a/ubuntu/maverick/tdelibs/debian/kdelibs-trinity.presubj b/ubuntu/maverick/tdelibs/debian/tdelibs-trinity.presubj
index d87db2dd4..0213d87a4 100644
--- a/ubuntu/maverick/tdelibs/debian/kdelibs-trinity.presubj
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-trinity.presubj
@@ -5,7 +5,7 @@ KDE does not support beeing upgraded while running. If you do so, you may
 encounter weird bugs (empty menus or configuration dialogs e.g.), and even
 crashes.
 
-If you recently upgraded kdelibs and/or kdebase packages, please consider:
+If you recently upgraded tdelibs and/or tdebase packages, please consider:
  * exiting your current KDE session.
  * ensuring that no more KDE process is still running, especially the processes
    named (list beeing non-limitative): dcopserver, kded, ksmserver...
diff --git a/ubuntu/maverick/tdelibs/debian/kdelibs4-trinity-dev.docs b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.docs
index 3d802584c..3d802584c 100644
--- a/ubuntu/maverick/tdelibs/debian/kdelibs4-trinity-dev.docs
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.docs
diff --git a/ubuntu/maverick/tdelibs/debian/kdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
index 10607cdf8..b065921dd 100644
--- a/ubuntu/maverick/tdelibs/debian/kdelibs4-trinity-dev.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -201,7 +201,7 @@ debian/tmp/opt/trinity/include/kdebugclasses.h
 debian/tmp/opt/trinity/include/kdebug.h
 debian/tmp/opt/trinity/include/kdedmodule.h
 debian/tmp/opt/trinity/include/kde_file.h
-debian/tmp/opt/trinity/include/kdelibs_export.h
+debian/tmp/opt/trinity/include/tdelibs_export.h
 debian/tmp/opt/trinity/include/kdemacros.h
 debian/tmp/opt/trinity/include/kde.pot
 debian/tmp/opt/trinity/include/kdeprint/driver.h
diff --git a/ubuntu/maverick/tdelibs/debian/kdelibs4-trinity-dev.manpages b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.manpages
index af14a7e71..af14a7e71 100644
--- a/ubuntu/maverick/tdelibs/debian/kdelibs4-trinity-dev.manpages
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.manpages
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-doc.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-doc.install
new file mode 100644
index 000000000..c45e2a51e
--- /dev/null
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-doc.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdelibs-apidocs/*
diff --git a/ubuntu/maverick/tdelibs/debian/kdelibs4c2a-trinity.docs b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/tdelibs/debian/kdelibs4c2a-trinity.docs
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.docs
diff --git a/ubuntu/maverick/tdelibs/debian/kdelibs4c2a-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
index 6ee941938..6ee941938 100644
--- a/ubuntu/maverick/tdelibs/debian/kdelibs4c2a-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian
new file mode 100644
index 000000000..68997d62e
--- /dev/null
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian
@@ -0,0 +1,15 @@
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kaddprinterwizard.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_cupsdconf.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_dcopserver.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcmshell.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kbuildsycoca.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kded.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcookiejar.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_klauncher.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kconf_update.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_uiserver.so
+tdelibs4c2a binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
+tdelibs4c2a binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
+tdelibs4c2a binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
+tdelibs4c2a binary: setuid-binary opt/trinity/bin/start_kdeinit 4755 root/root
diff --git a/ubuntu/maverick/tdelibs/debian/kdelibs4c2a-trinity.manpages b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
index eba677adb..eba677adb 100644
--- a/ubuntu/maverick/tdelibs/debian/kdelibs4c2a-trinity.manpages
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
diff --git a/ubuntu/maverick/tdelibs/debian/kdelibs4c2a-trinity.postinst b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.postinst
index 6dbf5d9e1..6dbf5d9e1 100644
--- a/ubuntu/maverick/tdelibs/debian/kdelibs4c2a-trinity.postinst
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.postinst
diff --git a/ubuntu/maverick/tdelibs/debian/kdelibs4c2a-trinity.presubj b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.presubj
index d87db2dd4..0213d87a4 100644
--- a/ubuntu/maverick/tdelibs/debian/kdelibs4c2a-trinity.presubj
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.presubj
@@ -5,7 +5,7 @@ KDE does not support beeing upgraded while running. If you do so, you may
 encounter weird bugs (empty menus or configuration dialogs e.g.), and even
 crashes.
 
-If you recently upgraded kdelibs and/or kdebase packages, please consider:
+If you recently upgraded tdelibs and/or tdebase packages, please consider:
  * exiting your current KDE session.
  * ensuring that no more KDE process is still running, especially the processes
    named (list beeing non-limitative): dcopserver, kded, ksmserver...
diff --git a/ubuntu/maverick/tdemultimedia/debian/changelog b/ubuntu/maverick/tdemultimedia/debian/changelog
index 4f4523eb0..37b689f66 100644
--- a/ubuntu/maverick/tdemultimedia/debian/changelog
+++ b/ubuntu/maverick/tdemultimedia/debian/changelog
@@ -1,73 +1,73 @@
-kdemultimedia-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
+tdemultimedia-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdemultimedia-trinity (4:3.5.10-0ubuntu1~intrepid6) intrepid; urgency=low
+tdemultimedia-trinity (4:3.5.10-0ubuntu1~intrepid6) intrepid; urgency=low
 
   * Prevented double kmix startup when kmix and kmix-trinity are both installed
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 15 Apr 2009 15:58:00 -0600
 
-kdemultimedia-trinity (4:3.5.10-0ubuntu1~intrepid5) intrepid; urgency=low
+tdemultimedia-trinity (4:3.5.10-0ubuntu1~intrepid5) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 28 Feb 2009 16:19:00 -0600
 
-kdemultimedia-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
+tdemultimedia-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
-  * Fixed kdemultimedia-trinity-dev package
+  * Fixed tdemultimedia-trinity-dev package
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 27 Nov 2008 03:04:00 -0600
 
-kdemultimedia-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
+tdemultimedia-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
   * SVN import
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 24 Nov 2008 20:18:00 -0600
 
-kdemultimedia (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdemultimedia (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
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:46:47 -0400
 
-kdemultimedia (4:3.5.9-0ubuntu2) hardy; urgency=low
+tdemultimedia (4:3.5.9-0ubuntu2) hardy; urgency=low
 
   * Remove duplicate depends
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 18 Feb 2008 16:16:49 +0000
 
-kdemultimedia (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdemultimedia (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:07 +0000
 
-kdemultimedia (4:3.5.8-1ubuntu3) hardy; urgency=low
+tdemultimedia (4:3.5.8-1ubuntu3) hardy; urgency=low
 
   * Fix build failures with g++-4.3.
 
  -- Matthias Klose <doko@ubuntu.com>  Thu, 31 Jan 2008 19:43:25 +0000
 
-kdemultimedia (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdemultimedia (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 10:16:28 +0000
 
-kdemultimedia (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdemultimedia (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining change:
    - no debian/tmp/usr/lib/mcop/akodeMPEGPlayObject.mcopclass
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:41 +0000
 
-kdemultimedia (4:3.5.8-1) unstable; urgency=low
+tdemultimedia (4:3.5.8-1) unstable; urgency=low
 
   * New upstream release:
     + Patches: removed 11_audiocd_no_-x_in_lame merged upstream.
@@ -75,7 +75,7 @@ kdemultimedia (4:3.5.8-1) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 14 Oct 2007 14:22:15 +0200
 
-kdemultimedia (4:3.5.7-3) unstable; urgency=low
+tdemultimedia (4:3.5.7-3) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -88,25 +88,25 @@ kdemultimedia (4:3.5.7-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 24 Jul 2007 00:28:25 +0200
 
-kdemultimedia (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdemultimedia (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:24 +0100
 
-kdemultimedia (4:3.5.7-2ubuntu2) gutsy; urgency=low
+tdemultimedia (4:3.5.7-2ubuntu2) gutsy; urgency=low
 
   * Fix build errors with g++-4.3. LP: #138595.
 
  -- Matthias Klose <doko@ubuntu.com>  Thu, 13 Sep 2007 01:02:22 +0000
 
-kdemultimedia (4:3.5.7-2ubuntu1) gutsy; urgency=low
+tdemultimedia (4:3.5.7-2ubuntu1) gutsy; urgency=low
 
   * Merge with debian, pick up the FLAC transition
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Tue, 19 Jun 2007 19:31:24 +1000
 
-kdemultimedia (4:3.5.7-2) unstable; urgency=low
+tdemultimedia (4:3.5.7-2) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez and Nacho Barrientos Arias:
   
@@ -115,14 +115,14 @@ kdemultimedia (4:3.5.7-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 06 Jun 2007 15:27:07 +0100
 
-kdemultimedia (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdemultimedia (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * New upstream Version
   * Modify Maintainer value to match Debian-Maintainer-Field Spec
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Tue, 19 Jun 2007 19:30:42 +1000
 
-kdemultimedia (4:3.5.7-1) unstable; urgency=low
+tdemultimedia (4:3.5.7-1) unstable; urgency=low
 
   * New upstream release.
   * juk does not support new tunepimp 0.5. Due to this, Musicbrainz support has
@@ -130,13 +130,13 @@ kdemultimedia (4:3.5.7-1) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Mon, 21 May 2007 15:06:57 +0100
 
-kdemultimedia (4:3.5.6-2ubuntu1) gutsy; urgency=low
+tdemultimedia (4:3.5.6-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 20:32:53 +0100
 
-kdemultimedia (4:3.5.6-2) unstable; urgency=low
+tdemultimedia (4:3.5.6-2) unstable; urgency=low
    
    * Upload to unstable after Etch release.
    * Update Uploaders.
@@ -148,79 +148,79 @@ kdemultimedia (4:3.5.6-2) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 19 Apr 2007 14:56:53 +0100
 
-kdemultimedia (4:3.5.6-1) experimental; urgency=low
+tdemultimedia (4:3.5.6-1) experimental; urgency=low
 
   * New upstream release.
-  * Make kdemultimediadbg depend on kdelibs-dbg to get useful backtraces when
+  * Make tdemultimediadbg depend on tdelibs-dbg to get useful backtraces when
     debugging.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 22 Nov 2006 09:38:49 -0500
 
-kdemultimedia (4:3.5.5-2) unstable; urgency=medium
+tdemultimedia (4:3.5.5-2) unstable; urgency=medium
 
   +++ Changes by Fathi Boudra:
 
   * Remove 11_applications_menu_move patch. We must use applications-merged as
     the default merge directory.
-  * Update kdemultimedia-kappfinder-data.install to install
+  * Update tdemultimedia-kappfinder-data.install to install
     kde-multimedia-music.menu in applications-merged directory.
   * Urgency medium, as the other uploads changing to applications-merged are
     urgency medium, and we should enter Etch with them.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 16 Nov 2006 17:10:17 -0500
 
-kdemultimedia (4:3.5.6-0ubuntu4) feisty; urgency=low
+tdemultimedia (4:3.5.6-0ubuntu4) feisty; urgency=low
 
   * Add kubuntu_04_tunepimp_5.diff, detect tunepimp 0.5
   * Remove Juk's dependency on obsolete package libtunepimp-bin
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 16 Mar 2007 00:44:23 +0000
 
-kdemultimedia (4:3.5.6-0ubuntu3) feisty; urgency=low
+tdemultimedia (4:3.5.6-0ubuntu3) feisty; urgency=low
 
   * Remove obsolete tunepimp-bin build-dep
   * Change Maintainer field
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  9 Mar 2007 14:33:16 +0000
 
-kdemultimedia (4:3.5.6-0ubuntu2) feisty; urgency=low
+tdemultimedia (4:3.5.6-0ubuntu2) feisty; urgency=low
 
   * Add kubuntu_03_kmix_dock_icon_muting.diff for new option
     in kmix to disable sound via middle click on the systray icon
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 26 Jan 2007 02:44:37 +0100
 
-kdemultimedia (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdemultimedia (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:29 +0000
 
-kdemultimedia (4:3.5.5-1ubuntu3) feisty; urgency=low
+tdemultimedia (4:3.5.5-1ubuntu3) feisty; urgency=low
 
   * Rebuild against libtunepimp5
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  8 Dec 2006 10:45:24 +0000
 
-kdemultimedia (4:3.5.5-1ubuntu2) feisty; urgency=low
+tdemultimedia (4:3.5.5-1ubuntu2) feisty; urgency=low
 
   * rebuild with --enable-gcc-hidden-visibility
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 19:39:17 +0000
 
-kdemultimedia (4:3.5.5-1ubuntu1) feisty; urgency=low
+tdemultimedia (4:3.5.5-1ubuntu1) feisty; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Nov 2006 22:52:05 +0000
 
-kdemultimedia (4:3.5.5-1) unstable; urgency=low
+tdemultimedia (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  4 Oct 2006 19:41:39 -0400
 
-kdemultimedia (4:3.5.4-1) unstable; urgency=low
+tdemultimedia (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -228,57 +228,57 @@ kdemultimedia (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 29 Jul 2006 20:17:30 -0400
 
-kdemultimedia (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdemultimedia (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:07 +0000
 
-kdemultimedia (4:3.5.4-0ubuntu5) edgy; urgency=low
+tdemultimedia (4:3.5.4-0ubuntu5) 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
 
-kdemultimedia (4:3.5.4-0ubuntu4) edgy; urgency=low
+tdemultimedia (4:3.5.4-0ubuntu4) edgy; urgency=low
 
   * Rebuild on latest akode, no changes
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  2 Aug 2006 09:58:18 +0000
 
-kdemultimedia (4:3.5.4-0ubuntu3) edgy; urgency=low
+tdemultimedia (4:3.5.4-0ubuntu3) edgy; urgency=low
 
   * Build-dep on libakode-dev (>= 2.0-4ubuntu3) to not bring in libakode-mpeg
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  1 Aug 2006 15:07:13 +0000
 
-kdemultimedia (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdemultimedia (4:3.5.4-0ubuntu2) edgy; urgency=low
 
   * Fix install files of libarts-akode
   * Build-dep on libakode-dev (>= 2.0-4ubuntu2) to not bring in jack
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 30 Jul 2006 16:16:34 +0100
 
-kdemultimedia (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdemultimedia (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:19 +0000
 
-kdemultimedia (4:3.5.3-2ubuntu2) edgy; urgency=low
+tdemultimedia (4:3.5.3-2ubuntu2) edgy; urgency=low
 
   * Rebuild to use correct libqt
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Jul 2006 10:39:14 +0000
 
-kdemultimedia (4:3.5.3-2ubuntu1) edgy; urgency=low
+tdemultimedia (4:3.5.3-2ubuntu1) edgy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Jun 2006 17:25:08 +0000
 
-kdemultimedia (4:3.5.3-2) unstable; urgency=low
+tdemultimedia (4:3.5.3-2) unstable; urgency=low
 
   * KDE_3_5_BRANCH update (up to r552408).
 
@@ -293,7 +293,7 @@ kdemultimedia (4:3.5.3-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 17 Jun 2006 14:27:25 -0400
 
-kdemultimedia (4:3.5.3-1) unstable; urgency=low
+tdemultimedia (4:3.5.3-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -306,7 +306,7 @@ kdemultimedia (4:3.5.3-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  1 Jun 2006 00:07:40 +0200
 
-kdemultimedia (4:3.5.2-2) unstable; urgency=low
+tdemultimedia (4:3.5.2-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -314,23 +314,23 @@ kdemultimedia (4:3.5.2-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 29 Mar 2006 16:08:08 -0500
 
-kdemultimedia (4:3.5.2-1) unstable; urgency=low
+tdemultimedia (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
     + Juk now uses GStreamer 0.10.
 
   +++ Changes by Christopher Martin:
 
-  * Add kdemultimedia-kio-plugins Replaces: kdebase-kio-plugins (<< 4:3.4.0)
+  * Add tdemultimedia-kio-plugins Replaces: tdebase-kio-plugins (<< 4:3.4.0)
     to ensure smooth upgrades (audiocd.docbook moved).
     (Closes: #353806, #353807)
 
   * Fix the placement of libyafcore.so and libyafxplayer.so; they belong in
-    mpeglib, not kdemultimedia-dev.
+    mpeglib, not tdemultimedia-dev.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 29 Mar 2006 11:39:35 -0500
 
-kdemultimedia (4:3.5.1-1) unstable; urgency=low
+tdemultimedia (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -340,7 +340,7 @@ kdemultimedia (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 27 Jan 2006 09:14:40 -0500
 
-kdemultimedia (4:3.5.0-3) unstable; urgency=low
+tdemultimedia (4:3.5.0-3) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -352,7 +352,7 @@ kdemultimedia (4:3.5.0-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  7 Jan 2006 12:04:05 -0500
 
-kdemultimedia (4:3.5.0-2) experimental; urgency=low
+tdemultimedia (4:3.5.0-2) experimental; urgency=low
 
   * Upload to experimental.
 
@@ -365,86 +365,86 @@ kdemultimedia (4:3.5.0-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 21 Dec 2005 19:02:35 -0500
 
-kdemultimedia (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdemultimedia (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * debian/cdbs/kde.mk:
     - added dh_iconcache
 
  -- Daniel Holbach <daniel.holbach@ubuntu.com>  Sun, 21 May 2006 16:33:08 +0200
 
-kdemultimedia (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdemultimedia (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
 
-kdemultimedia (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdemultimedia (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:28 +0000
 
-kdemultimedia (4:3.5.1-0ubuntu3) dapper; urgency=low
+tdemultimedia (4:3.5.1-0ubuntu3) dapper; urgency=low
 
   * Remove GStreamer 0.8 support
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 14 Feb 2006 10:25:01 +0000
 
-kdemultimedia (4:3.5.1-0ubuntu2) dapper; urgency=low
+tdemultimedia (4:3.5.1-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_03_autostart_kdeonly.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  9 Feb 2006 13:00:21 +0000
 
-kdemultimedia (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdemultimedia (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:07 +0000
 
-kdemultimedia (4:3.5.0-0ubuntu2) dapper; urgency=low
+tdemultimedia (4:3.5.0-0ubuntu2) dapper; urgency=low
 
-  * Tighten version of Replaces on kdemultimedia-kfile-plugins
+  * Tighten version of Replaces on tdemultimedia-kfile-plugins
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  6 Jan 2006 18:33:11 +0000
 
-kdemultimedia (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdemultimedia (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:19 +0000
 
-kdemultimedia (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdemultimedia (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Generate .pot files
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 22:58:10 +0000
 
-kdemultimedia (4:3.5-rc1-1ubuntu1) dapper; urgency=low
+tdemultimedia (4:3.5-rc1-1ubuntu1) dapper; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 13 Nov 2005 19:15:18 +0000
 
-kdemultimedia (4:3.5.0-1) alioth; urgency=low
+tdemultimedia (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
 
   +++ Changes by Christopher Martin:
 
-  * aKode has been dropped from kdemultimedia, and is now a separate source
+  * aKode has been dropped from tdemultimedia, and is now a separate source
     package. To use arts with akode, install the libarts1-akode package,
     which contains a plug-in that links the two systems.
 
   * Bump DH_COMPAT to 5. No changes.
 
-  * Add kdemultimedia-dbg, to help track down problems.
+  * Add tdemultimedia-dbg, to help track down problems.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 30 Nov 2005 16:50:14 -0500
 
-kdemultimedia (4:3.4.3-5) unstable; urgency=low
+tdemultimedia (4:3.4.3-5) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -453,9 +453,9 @@ kdemultimedia (4:3.4.3-5) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  7 Dec 2005 15:43:05 -0500
 
-kdemultimedia (4:3.4.3-4) unstable; urgency=low
+tdemultimedia (4:3.4.3-4) unstable; urgency=low
 
-  * Upload to unstable, rebuilding against kdelibs4c2a.
+  * Upload to unstable, rebuilding against tdelibs4c2a.
 
   * KDE_3_4_BRANCH update (up to r484270).
 
@@ -469,7 +469,7 @@ kdemultimedia (4:3.4.3-4) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 30 Nov 2005 02:17:39 +0100
 
-kdemultimedia (4:3.4.3-3) experimental; urgency=low
+tdemultimedia (4:3.4.3-3) experimental; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -479,17 +479,17 @@ kdemultimedia (4:3.4.3-3) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 21 Oct 2005 10:02:42 -0400
 
-kdemultimedia (4:3.4.3-2) experimental; urgency=low
+tdemultimedia (4:3.4.3-2) experimental; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Move libartscontrol .la files from kdemultimedia-dev to artsbuilder,
-    allowing the artsbuilder kicker applet to start without kdemultimedia-dev
+  * Move libartscontrol .la files from tdemultimedia-dev to artsbuilder,
+    allowing the artsbuilder kicker applet to start without tdemultimedia-dev
     being installed. (Closes: #334716)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 20 Oct 2005 09:50:13 -0400
 
-kdemultimedia (4:3.4.3-1) experimental; urgency=low
+tdemultimedia (4:3.4.3-1) experimental; urgency=low
 
   * New upstream release.
 
@@ -501,16 +501,16 @@ kdemultimedia (4:3.4.3-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 16 Oct 2005 11:27:27 -0400
 
-kdemultimedia (4:3.4.2-2) unstable; urgency=low
+tdemultimedia (4:3.4.2-2) unstable; urgency=low
 
   +++ Changes by Adeodato Simó:
 
-  * Build with g++-3.4 on arm, m68k and hppa; kdemultimedia also makes gcc 4.0
+  * Build with g++-3.4 on arm, m68k and hppa; tdemultimedia also makes gcc 4.0
     ICE as described in #323133.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 04 Sep 2005 22:42:25 +0200
 
-kdemultimedia (4:3.4.2-1) unstable; urgency=low
+tdemultimedia (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
   
@@ -531,64 +531,64 @@ kdemultimedia (4:3.4.2-1) unstable; urgency=low
   
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 30 Aug 2005 19:18:45 +0200
 
-kdemultimedia (4:3.4.3-0ubuntu2) dapper; urgency=low
+tdemultimedia (4:3.4.3-0ubuntu2) dapper; urgency=low
 
   * Build with GCC 3.4 on arches which fail using GCC 4.0
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 30 Oct 2005 01:42:26 +0100
 
-kdemultimedia (4:3.4.3-0ubuntu1) breezy; urgency=low
+tdemultimedia (4:3.4.3-0ubuntu1) breezy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  7 Oct 2005 18:45:40 +0000
 
-kdemultimedia (4:3.4.2-0ubuntu1) breezy; urgency=low
+tdemultimedia (4:3.4.2-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Build using unsermake
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 12:37:36 +0000
 
-kdemultimedia (4:3.4.1-0ubuntu1) breezy; urgency=low
+tdemultimedia (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number following KDE 3.4.1 release
   * Add all packages back to meta-package
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed,  1 Jun 2005 00:41:30 +0000
 
-kdemultimedia (4:3.4.1-0pre1ubuntu2) breezy; urgency=low
+tdemultimedia (4:3.4.1-0pre1ubuntu2) breezy; urgency=low
 
   * Add build-dep on automake1.9
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 25 May 2005 23:08:10 +0000
 
-kdemultimedia (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
+tdemultimedia (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
 
   * Sync with Debian
   * Change kubuntu_02_hide_arts_menu_entries.diff to use NoDisplay
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 25 May 2005 12:49:46 +0000
 
-kdemultimedia (4:3.4.1-1) experimental; urgency=low
+tdemultimedia (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
 
-kdemultimedia (4:3.4.0-0ubuntu3) hoary; urgency=low
+tdemultimedia (4:3.4.0-0ubuntu3) hoary; urgency=low
 
   * Add kubuntu_02_hide_arts_menu_entries.diff to hide artsbuilder and artscontrol k-menu entries
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 24 Mar 2005 04:48:58 +0000
 
-kdemultimedia (4:3.4.0-0ubuntu2) hoary; urgency=low
+tdemultimedia (4:3.4.0-0ubuntu2) hoary; urgency=low
 
-  * Remove artsbuilder, kmid, krec depends from kdemultimedia meta-package.
+  * Remove artsbuilder, kmid, krec depends from tdemultimedia meta-package.
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 22:37:33 +0000
 
-kdemultimedia (4:3.4.0-0ubuntu1) hoary; urgency=low
+tdemultimedia (4:3.4.0-0ubuntu1) hoary; urgency=low
 
   * Add patch kubuntu_01_tracksimp_fix.diff to fix 
     slow KAudioCreator problem
@@ -596,16 +596,16 @@ kdemultimedia (4:3.4.0-0ubuntu1) hoary; urgency=low
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 03:02:41 +0000
 
-kdemultimedia (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+tdemultimedia (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
 
   * Sync with Debian
   * Separate akode's mpeg support into new package akode-mpeg.
-  * Remove mpeg dependencies from kdemultimedia metapackage.
+  * Remove mpeg dependencies from tdemultimedia metapackage.
   * Remove noatun and kaboodle from meta-package
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue,  8 Mar 2005 02:13:08 +0000
 
-kdemultimedia (4:3.4.0-0pre2) alioth; urgency=low
+tdemultimedia (4:3.4.0-0pre2) alioth; urgency=low
 
   * New upstream release.
 
@@ -626,13 +626,13 @@ kdemultimedia (4:3.4.0-0pre2) alioth; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * New kdebase-doc-html package, containing doc-base registered HTML
+  * New tdebase-doc-html package, containing doc-base registered HTML
     versions of application handbooks, for users without Konqueror or
     KHelpCenter.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 14 May 2005 13:00:44 -0400
 
-kdemultimedia (4:3.3.2-1ubuntu4) hoary; urgency=low
+tdemultimedia (4:3.3.2-1ubuntu4) hoary; urgency=low
 
   * changed a depends for akode, libflac4 to libflac6 which isnt anymore 
     in archive. Hoary has libflac6 at the moment which comes
@@ -640,23 +640,23 @@ kdemultimedia (4:3.3.2-1ubuntu4) hoary; urgency=low
     
  -- Andreas Mueller <amu@canonical.com>  Sat, 15 Jan 2005 13:25:04 +0100
 
-kdemultimedia (4:3.3.2-1ubuntu3) hoary; urgency=low
+tdemultimedia (4:3.3.2-1ubuntu3) hoary; urgency=low
 
   *  added missing builddepends libxinerama-dev 
 
  -- Andreas Mueller <amu@canonical.com>  Sun, 26 Dec 2004 18:40:55 +0100
 
-kdemultimedia (4:3.3.2-1ubuntu2) hoary; urgency=low
+tdemultimedia (4:3.3.2-1ubuntu2) hoary; urgency=low
 
   * added missing builddepends libxinerama1 
 
  -- Andreas Mueller <amu@canonical.com>  Sun, 26 Dec 2004 03:03:14 +0100
 
-kdemultimedia (4:3.3.2-1ubuntu1) hoary; urgency=low
+tdemultimedia (4:3.3.2-1ubuntu1) hoary; urgency=low
 
   * New upstream release.
   * Remove patches:
-    - 01_kdemultimedia_branch
+    - 01_tdemultimedia_branch
     - 02_autotools_update
     - 05_pedantic-errors
     - 06_xlibs-static-pic
@@ -664,7 +664,7 @@ kdemultimedia (4:3.3.2-1ubuntu1) hoary; urgency=low
 
  -- Chris Halls <chris.halls@credativ.co.uk>  Mon, 13 Dec 2004 13:30:17 +0000
 
-kdemultimedia (4:3.3.2-1) unstable; urgency=low
+tdemultimedia (4:3.3.2-1) unstable; urgency=low
 
   * This upload is compiled against libflac6, so akode 3.3.2 is now
     installable in sid (was broken in experimental). Closes: #295485
@@ -678,7 +678,7 @@ kdemultimedia (4:3.3.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 01 Mar 2005 22:02:05 +0100
 
-kdemultimedia (4:3.3.2-0pre1) experimental; urgency=low
+tdemultimedia (4:3.3.2-0pre1) experimental; urgency=low
 
   * New upstream release.
 
@@ -700,7 +700,7 @@ kdemultimedia (4:3.3.2-0pre1) experimental; urgency=low
 
  -- Adeodato Simó <asp16@alu.ua.es>  Mon, 20 Dec 2004 03:20:59 +0100
 
-kdemultimedia (4:3.3.1-2) unstable; urgency=high
+tdemultimedia (4:3.3.1-2) unstable; urgency=high
 
   * Upload to rebuild against libflac6. Urgency set to high since there are
     packages fixing RC bugs that can't enter sarge due to the transition not
@@ -714,7 +714,7 @@ kdemultimedia (4:3.3.1-2) unstable; urgency=high
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 13 Jan 2005 05:17:03 +0100
 
-kdemultimedia (4:3.3.1-1) unstable; urgency=low
+tdemultimedia (4:3.3.1-1) unstable; urgency=low
 
   * New upstream release.
   * KDE_3_3_BRANCH update.
@@ -732,47 +732,47 @@ kdemultimedia (4:3.3.1-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon,  8 Nov 2004 03:30:00 -0600
 
-kdemultimedia (4:3.3.0-1) unstable; urgency=high
+tdemultimedia (4:3.3.0-1) unstable; urgency=high
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat, 14 Aug 2004 06:00:00 -0500
 
-kdemultimedia (4:3.2.3-1) unstable; urgency=high
+tdemultimedia (4:3.2.3-1) unstable; urgency=high
 
   * New upstream release.
-  * Added libkcddb/configbase.h to kdemultimedia-dev. (Closes: #258649)
+  * Added libkcddb/configbase.h to tdemultimedia-dev. (Closes: #258649)
   * Build-Depends: xlibs-static-pic. (Closes: #260749)
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue,  3 Aug 2004 19:00:00 -0500
 
-kdemultimedia (4:3.2.2-1) unstable; urgency=low
+tdemultimedia (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 02:00:00 -0500
 
-kdemultimedia (4:3.2.1-1) unstable; urgency=low
+tdemultimedia (4:3.2.1-1) unstable; urgency=low
 
   * New upstream release.
   * Updated noatun ogg mimetype entry. (Closes: #235265)
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat,  6 Mar 2004 01:00:00 -0600
 
-kdemultimedia (4:3.2.0-0pre1v1) experimental; urgency=low
+tdemultimedia (4:3.2.0-0pre1v1) experimental; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu, 19 Feb 2004 16:00:00 -0600
 
-kdemultimedia (4:3.1.95-1) unstable; urgency=low
+tdemultimedia (4:3.1.95-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue, 27 Jan 2004 03:00:00 -0600
 
-kdemultimedia (4:3.1.5-1) unstable; urgency=low
+tdemultimedia (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
   * Added libtool arm patch.
@@ -781,16 +781,16 @@ kdemultimedia (4:3.1.5-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue, 13 Jan 2004 18:00:00 -0600
 
-kdemultimedia (4:3.1.4-1) unstable; urgency=low
+tdemultimedia (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
   * Document how to use timidity with kmid. (Closes: #195019)
-  * kaudiocreator Depends kdemultimedia-kio-plugins. (Closes: #196686)
+  * kaudiocreator Depends tdemultimedia-kio-plugins. (Closes: #196686)
   * kaboodle Recommends libarts1-xine. (Closes: #214118)
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon, 05 Jan 2004 19:23:22 -0600
 
-kdemultimedia (4:3.1.2-1.4) unstable; urgency=low
+tdemultimedia (4:3.1.2-1.4) unstable; urgency=low
 
   * NMU
   * Complete patch to stop including <linux/cdrom.h>.  I forgot a few
@@ -801,7 +801,7 @@ kdemultimedia (4:3.1.2-1.4) unstable; urgency=low
 
  -- Petter Reinholdtsen <pere@debian.org>  Wed, 12 Nov 2003 23:04:27 +0100
 
-kdemultimedia (4:3.1.2-1.3) unstable; urgency=low
+tdemultimedia (4:3.1.2-1.3) unstable; urgency=low
 
   * NMU.
   * Stop using <linux/cdrom.h>, and move the parts needed into
@@ -809,7 +809,7 @@ kdemultimedia (4:3.1.2-1.3) unstable; urgency=low
 
  -- Petter Reinholdtsen <pere@debian.org>  Tue, 11 Nov 2003 23:14:06 +0000
 
-kdemultimedia (4:3.1.2-1.2) unstable; urgency=low
+tdemultimedia (4:3.1.2-1.2) unstable; urgency=low
 
   * NMU
   * Fix code errors to get this compiling with gcc 3.3.  Patches in BTS.
@@ -821,34 +821,34 @@ kdemultimedia (4:3.1.2-1.2) unstable; urgency=low
 
  -- Petter Reinholdtsen <pere@debian.org>  Tue, 11 Nov 2003 16:31:46 +0000
 
-kdemultimedia (4:3.1.2-1.1) unstable; urgency=low
+tdemultimedia (4:3.1.2-1.1) unstable; urgency=low
 
   * NMU
   * Fix g++ 3 compile error, patch in bts.  Closes: #203919
 
  -- LaMont Jones <lamont@debian.org>  Wed, 27 Aug 2003 07:11:30 -0600
 
-kdemultimedia (4:3.1.2-1) unstable; urgency=low
+tdemultimedia (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri, 23 May 2003 11:00:00 -0500
 
-kdemultimedia (4:3.1.1-1) unstable; urgency=low
+tdemultimedia (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release. (Closes: #180616)
   * Add 'chmod +x configure' to rules. (Closes: #181205, #181355, #181561)
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed, 12 Mar 2003 13:00:00 -0600
 
-kdemultimedia (4:3.1.0-1) unstable; urgency=low
+tdemultimedia (4:3.1.0-1) unstable; urgency=low
 
   * New Upstream.
   * Redo Debian dir.
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue, 04 Feb 2003 23:00:00 -0600
 
-kdemultimedia (4:2.2.2-8.2) stable-security; urgency=high
+tdemultimedia (4:2.2.2-8.2) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Added special detection routine for big/little endianess on MIPS since
@@ -858,7 +858,7 @@ kdemultimedia (4:2.2.2-8.2) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Wed, 22 Jan 2003 15:00:51 +0100
 
-kdemultimedia (4:2.2.2-8.1) stable-security; urgency=high
+tdemultimedia (4:2.2.2-8.1) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Applied upstream patches to fix several potential vulnerabilities.
@@ -866,43 +866,43 @@ kdemultimedia (4:2.2.2-8.1) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Mon,  6 Jan 2003 08:53:19 +0100
 
-kdemultimedia (4:2.2.2-8) unstable; urgency=high
+tdemultimedia (4:2.2.2-8) unstable; urgency=high
 
   * Updated Build-Depends (Closes: #132015)
   * Actually apply the PowerPC fix that Daniel thought he did.
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed,  6 Mar 2002 14:00:00 -0600
 
-kdemultimedia (4:2.2.2-7) unstable; urgency=high
+tdemultimedia (4:2.2.2-7) unstable; urgency=high
 
   * Changing Maintainer to Chris.
   * De-b0rking PowerPC stuff.
 
  -- Daniel Stone <daniel@sfarc.net>  Wed, 27 Feb 2002 21:35:53 +1100
 
-kdemultimedia (4:2.2.2-6) unstable; urgency=low
+tdemultimedia (4:2.2.2-6) unstable; urgency=low
 
   * Adopting orphaned package; thanks to Ivan for all his work.
     (closes: #127707)
   * debian/control:
-    - Make kdemultimedia-dev depend on libesd0-dev. (closes: #127806)
+    - Make tdemultimedia-dev depend on libesd0-dev. (closes: #127806)
 
  -- Daniel Stone <daniel@sfarc.net>  Fri,  4 Jan 2002 09:28:30 -0500
 
-kdemultimedia (4:2.2.2-5) unstable; urgency=low
+tdemultimedia (4:2.2.2-5) unstable; urgency=low
 
   * Build with new png
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 28 Dec 2001 13:32:00 -0700
 
-kdemultimedia (4:2.2.2-4) unstable; urgency=low
+tdemultimedia (4:2.2.2-4) unstable; urgency=low
 
   * Don't disable the alsa test (Closes: #124132)
-  * Change recommends to depends for kdebase-libs
+  * Change recommends to depends for tdebase-libs
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 16 Dec 2001 04:53:00 -0700
 
-kdemultimedia (4:2.2.2-3) unstable; urgency=low
+tdemultimedia (4:2.2.2-3) unstable; urgency=low
 
   * Build cleanup
   * Documentation updates for freeze
@@ -912,44 +912,44 @@ kdemultimedia (4:2.2.2-3) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 30 Nov 2001 02:30:00 -0700
 
-kdemultimedia (4:2.2.2-2) unstable; urgency=low
+tdemultimedia (4:2.2.2-2) unstable; urgency=low
 
   * Add missing build-depend - libasound2-dev
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 25 Nov 2001 01:53:00 -0700
 
-kdemultimedia (4:2.2.2-1) unstable; urgency=low
+tdemultimedia (4:2.2.2-1) unstable; urgency=low
 
   * New upstream version
   * Change maintainer
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Nov 2001 19:30:00 -0700
 
-kdemultimedia (4:2.2.1-1.4) unstable; urgency=low
+tdemultimedia (4:2.2.1-1.4) unstable; urgency=low
 
   * don't check for auto* as it hoses things
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 08 Oct 2001 19:30:00 -0700
 
-kdemultimedia (4:2.2.1-1.3) unstable; urgency=low
+tdemultimedia (4:2.2.1-1.3) unstable; urgency=low
 
   * Fix configure (Closes: #114577)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 05 Oct 2001 09:35:00 -0700
 
-kdemultimedia (4:2.2.1-1.2) unstable; urgency=low
+tdemultimedia (4:2.2.1-1.2) unstable; urgency=low
 
   * don't worry about automake 1.5
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 03 Oct 2001 09:35:00 -0700
 
-kdemultimedia (4:2.2.1-1.1) unstable; urgency=low
+tdemultimedia (4:2.2.1-1.1) unstable; urgency=low
 
   * Fix conflicts
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 23 Sep 2001 18:51:00 -0700
 
-kdemultimedia (4:2.2.1-1) unstable; urgency=low
+tdemultimedia (4:2.2.1-1) unstable; urgency=low
  
   * New upstream version 2.2.1
   * Change maintainer
@@ -958,7 +958,7 @@ kdemultimedia (4:2.2.1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 25 Aug 2001 14:41:00 -0700
 
-kdemultimedia (4:2.2.0-final-1) unstable; urgency=low
+tdemultimedia (4:2.2.0-final-1) unstable; urgency=low
   
   * New upstream version 2.2
   * Fix build issues (Closes: #107281)
@@ -966,13 +966,13 @@ kdemultimedia (4:2.2.0-final-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 12 Aug 2001 02:03:00 -0700
 
-kdemultimedia (4:2.2.0-0.2beta1-1) unstable; urgency=low
+tdemultimedia (4:2.2.0-0.2beta1-1) unstable; urgency=low
  
   * sync with upstream
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 25 Jul 2001 03:51:00 -0700
 
-kdemultimedia (4:2.2.0-0.1beta1-1) unstable; urgency=low
+tdemultimedia (4:2.2.0-0.1beta1-1) unstable; urgency=low
  
   * sync with upstream
   * More Build-Depends and Depends work
@@ -980,28 +980,28 @@ kdemultimedia (4:2.2.0-0.1beta1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 18 Jul 2001 00:24:00 -0700
 
-kdemultimedia (4:2.2.0-0beta1-3) unstable; urgency=low
+tdemultimedia (4:2.2.0-0beta1-3) unstable; urgency=low
  
   * sync with upstream
   * More alpha build fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 07 Jul 2001 03:40:00 -0700
 
-kdemultimedia (4:2.2.0-0beta1-2) unstable; urgency=low
+tdemultimedia (4:2.2.0-0beta1-2) unstable; urgency=low
  
   * sync with upstream
   * Autobuild for alpha
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 03 Jul 2001 02:25:00 -0700
 
-kdemultimedia (4:2.2.0-0beta1-1) unstable; urgency=low
+tdemultimedia (4:2.2.0-0beta1-1) unstable; urgency=low
  
   * sync with upstream
   * Fix seg (Closes: #102647)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 30 Jun 2001 19:15:00 -0700
 
-kdemultimedia (4:2.2-cvs20010622-1) unstable; urgency=low
+tdemultimedia (4:2.2-cvs20010622-1) unstable; urgency=low
  
   * New upstream pull
   * 2.2 beta1
@@ -1025,7 +1025,7 @@ kdemultimedia (4:2.2-cvs20010622-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
 
-kdemultimedia (4:2.1.1-2) unstable; urgency=low
+tdemultimedia (4:2.1.1-2) unstable; urgency=low
  
   * Update menu bits to include new kde menu removal tag
   * a few upstream fixes
@@ -1034,26 +1034,26 @@ kdemultimedia (4:2.1.1-2) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Apr 2001 15:34:00 -0700
 
-kdemultimedia (4:2.1.1-1.0.1) unstable; urgency=low
+tdemultimedia (4:2.1.1-1.0.1) unstable; urgency=low
  
   * Rebuild with old libc
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 26 Mar 2001 15:44:00 -0700
 
-kdemultimedia (4:2.1.1-1) unstable; urgency=low
+tdemultimedia (4:2.1.1-1) unstable; urgency=low
  
   * New upstream version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Mar 2001 22:07:00 -0700
 
-kdemultimedia (4:2.1.0-2) unstable; urgency=low
+tdemultimedia (4:2.1.0-2) unstable; urgency=low
  
   * More upstream fixes
   * Update shlibs and overrides
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Mar 2001 21:48:00 -0700
 
-kdemultimedia (4:2.1.0-1) unstable; urgency=low
+tdemultimedia (4:2.1.0-1) unstable; urgency=low
  
    * Re-pulling from CVS instead of using the official tarballs.  The
      official tarballs had problems which made it hard to handle patches
@@ -1064,7 +1064,7 @@ kdemultimedia (4:2.1.0-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 01 Mar 2001 01:49:00 -0700
 
-kdemultimedia (4:2.1-final-1) unstable; urgency=low
+tdemultimedia (4:2.1-final-1) unstable; urgency=low
  
   * New upstream version
   * Upping standards version
@@ -1073,7 +1073,7 @@ kdemultimedia (4:2.1-final-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
 
-kdemultimedia (4:2.1-beta2-0128-1) unstable; urgency=low
+tdemultimedia (4:2.1-beta2-0128-1) unstable; urgency=low
  
   * More upstream fixes to noatun
   * Removing old --enable-debug
@@ -1081,7 +1081,7 @@ kdemultimedia (4:2.1-beta2-0128-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 28 Jan 2001 01:42:00 -0700
 
-kdemultimedia (4:2.1-beta2-2) unstable; urgency=low
+tdemultimedia (4:2.1-beta2-2) unstable; urgency=low
  
   * Fixing Build-Depends
   * More upstream fixes for noatun
@@ -1090,13 +1090,13 @@ kdemultimedia (4:2.1-beta2-2) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 24 Jan 2001 00:12:00 -0700
 
-kdemultimedia (4:2.1-beta2-1) unstable; urgency=low
+tdemultimedia (4:2.1-beta2-1) unstable; urgency=low
  
   * New upstream beta
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 22 Jan 2001 01:30:00 -0700
 
-kdemultimedia (4:2.1-20010115-1) unstable; urgency=low
+tdemultimedia (4:2.1-20010115-1) unstable; urgency=low
  
   * More upstream fixes
   * kaiman removed.  (Closes: #77449)
@@ -1104,51 +1104,51 @@ kdemultimedia (4:2.1-20010115-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
 
-kdemultimedia (4:2.1-20010106-1) unstable; urgency=low
+tdemultimedia (4:2.1-20010106-1) unstable; urgency=low
  
   * More upstream fixes
   * More dependency fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 06 Jan 2001 23:16:00 -0700
 
-kdemultimedia (4:2.1-20010101-2) unstable; urgency=low
+tdemultimedia (4:2.1-20010101-2) unstable; urgency=low
  
   * Fixing file placement for noatun
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 04 Jan 2001 11:37:00 -0700
 
-kdemultimedia (4:2.1-20010101-1) unstable; urgency=low
+tdemultimedia (4:2.1-20010101-1) unstable; urgency=low
  
   * More upstream fixes
 	  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Jan 2001 17:00:00 -0700
 
-kdemultimedia (4:2.1-20001218-1) unstable; urgency=low
+tdemultimedia (4:2.1-20001218-1) unstable; urgency=low
  
   * More upstream fixes
-  * More dependency cleanup..we don't need kdebase-libs and arts for 
+  * More dependency cleanup..we don't need tdebase-libs and arts for 
     most of these apps
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Dec 2000 23:00:00 -0700
 
-kdemultimedia (4:2.1-20001216-1) unstable; urgency=low
+tdemultimedia (4:2.1-20001216-1) unstable; urgency=low
  
   * New upstream beta version
   * i18n patch for kaimam applied
   * new noatun package
-  * Migrating mpeglib packages back into kdemultimedia
-  * Adding in missing conflicts for kdemultimedia
+  * Migrating mpeglib packages back into tdemultimedia
+  * Adding in missing conflicts for tdemultimedia
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 16 Dec 2000 18:46:00 -0700
 
-kdemultimedia (4:2.0-final-7) unstable; urgency=low
+tdemultimedia (4:2.0-final-7) unstable; urgency=low
  
   * More upstream fixes
   * Fixing a packaging problem with task package
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 22 Nov 2000 06:16:00 -0700
 
-kdemultimedia (4:2.0-final-6) unstable; urgency=low
+tdemultimedia (4:2.0-final-6) unstable; urgency=low
  
   * More upstream fixes
   * Fixing shlibs
@@ -1158,42 +1158,42 @@ kdemultimedia (4:2.0-final-6) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 21 Nov 2000 08:20:00 -0700
 
-kdemultimedia (4:2.0-final-5) unstable; urgency=low
+tdemultimedia (4:2.0-final-5) unstable; urgency=low
  
   * building with --enable-debug as it seems kmidi croaks if built without
     debug
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 16 Nov 2000 01:10:00 -0700
 
-kdemultimedia (4:2.0-final-4.2) unstable; urgency=low
+tdemultimedia (4:2.0-final-4.2) unstable; urgency=low
  
   * more dependency work
   * fixing build pieces for non-i386 systems
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 12 Nov 2000 03:30:00 -0700
 
-kdemultimedia (4:2.0-final-4.1) unstable; urgency=low
+tdemultimedia (4:2.0-final-4.1) unstable; urgency=low
  
   * minor upstream fixes
   * adding in menu hints
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
 
-kdemultimedia (4:2.0-final-4) unstable; urgency=low
+tdemultimedia (4:2.0-final-4) unstable; urgency=low
  
   * minor upstream fixes
   * more i18n fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 08 Nov 2000 17:30:00 -0700
                                                                                 
-kdemultimedia (4:2.0-final-3.1) unstable; urgency=low
+tdemultimedia (4:2.0-final-3.1) unstable; urgency=low
  
   * minor upstream fixes
   * more work on kmidi, kmid, and kaiman
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 07 Nov 2000 00:30:00 -0700
                                                                                 
-kdemultimedia (4:2.0-final-3) unstable; urgency=low
+tdemultimedia (4:2.0-final-3) unstable; urgency=low
  
   * more upstream fixes
   * Fixes mp3 playing with aRTs (Closes: #76141)
@@ -1202,57 +1202,57 @@ kdemultimedia (4:2.0-final-3) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 04 Nov 2000 23:00:00 -0700
                                                                                 
-kdemultimedia (4:2.0-final-2) unstable; urgency=low
+tdemultimedia (4:2.0-final-2) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
 
-kdemultimedia (4:2.0-final-0) unstable; urgency=low
+tdemultimedia (4:2.0-final-0) unstable; urgency=low
 
   * KDE 2.0
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Oct 2000 00:00:00 -0700
 
-kdemultimedia (4:2.0-20001011-2) unstable; urgency=low
+tdemultimedia (4:2.0-20001011-2) unstable; urgency=low
  
   * Trying to fix up kmidi
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 13 Oct 2000 19:30:00 -0700
                                                                                 
-kdemultimedia (4:2.0-20001011-0) unstable; urgency=low
+tdemultimedia (4:2.0-20001011-0) unstable; urgency=low
  
   * KDE 2.0 RC2
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 12 Oct 2000 06:00:00 -0700
                                                                                 
-kdemultimedia (4:2.0-20001006-0) unstable; urgency=low
+tdemultimedia (4:2.0-20001006-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 06 Oct 2000 18:00:00 -0700
                                                                                 
-kdemultimedia (4:2.0-20001005-0) unstable; urgency=low
+tdemultimedia (4:2.0-20001005-0) unstable; urgency=low
  
   * More upstream fixes
-  * Compiling against non-versioned kdelibs once again
+  * Compiling against non-versioned tdelibs once again
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 05 Oct 2000 15:00:00 -0700
                                                                                 
-kdemultimedia (4:2.0-20001002-0) unstable; urgency=low
+tdemultimedia (4:2.0-20001002-0) unstable; urgency=low
   
   * KDE 2.0 RC1
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Oct 2000 01:30:00 -0700
                                                                                 
-kdemultimedia (4:2.0-20000925-2) unstable; urgency=low
+tdemultimedia (4:2.0-20000925-2) unstable; urgency=low
  
   * More upstream fixes
   * More work on kmidi - Moving timidity patches into the proper dir
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 28 Sep 2000 06:00:00 -0700
 
-kdemultimedia (4:2.0-20000925-0) unstable; urgency=low
+tdemultimedia (4:2.0-20000925-0) unstable; urgency=low
  
   * More upstream fixes
   * Kmid should build properly now
@@ -1260,19 +1260,19 @@ kdemultimedia (4:2.0-20000925-0) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
 
-kdemultimedia (4:2.0-20000920-0) unstable; urgency=low
+tdemultimedia (4: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
 
-kdemultimedia (4:2.0-20000918-0) unstable; urgency=low
+tdemultimedia (4:2.0-20000918-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Sep 2000 22:30:00 -0700
 
-kdemultimedia (4:2.0-20000911-1) unstable; urgency=low
+tdemultimedia (4:2.0-20000911-1) unstable; urgency=low
  
   * Removing aktion from package since it depends on non-free xanim
   * Adding more information to copyright file
@@ -1280,28 +1280,28 @@ kdemultimedia (4:2.0-20000911-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 12 Sep 2000 09:45:00 -0700
 
-kdemultimedia (4:2.0-20000911-0) unstable; urgency=low
+tdemultimedia (4:2.0-20000911-0) unstable; urgency=low
  
   * more upstream fixes
   * More kmidi fixes
-  * Breaking kdemultimedia down
+  * Breaking tdemultimedia down
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 11 Sep 2000 04:30:00 -0700
 
-kdemultimedia (4:2.0-20000909-0) unstable; urgency=low
+tdemultimedia (4:2.0-20000909-0) unstable; urgency=low
 
   * more upstream fixes
   * Not providing TIMIDITY 
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 09 Sep 2000 22:30:00 -0700
 
-kdemultimedia (4:2.0-20000901-0) unstable; urgency=low
+tdemultimedia (4:2.0-20000901-0) unstable; urgency=low
 
   * more upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Sep 2000 16:00:00 -0700
 
-kdemultimedia (4:2.0-20000827-0) experimental; urgency=low
+tdemultimedia (4:2.0-20000827-0) experimental; urgency=low
  
   * more upstream fixes
   * more build fixes 
@@ -1309,133 +1309,133 @@ kdemultimedia (4:2.0-20000827-0) experimental; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 27 Aug 2000 19:30:00 -0700     
 
-kdemultimedia (4:2.0-20000825-1.0) experimental; urgency=low
+tdemultimedia (4:2.0-20000825-1.0) experimental; urgency=low
  
   * Build fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 25 Aug 2000 22:30:00 -0700
 
-kdemultimedia (4:2.0-20000823-1.0) experimental; urgency=low
+tdemultimedia (4: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:00 -0700
                                                                                 
-kdemultimedia (4:2.0-20000820-1.0) experimental; urgency=low
+tdemultimedia (4:2.0-20000820-1.0) experimental; urgency=low
  
   * new cvs version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 20 Aug 2000 17:00:00 -0700
                                                                                 
-kdemultimedia (4:2.0-20000623-1.0) experimental; urgency=low
+tdemultimedia (4:2.0-20000623-1.0) experimental; urgency=low
  
   * new cvs version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 23 Jun 2000 07:10:00 -0700
                                                                                 
-kdemultimedia-cvs (4:2.0-20000521-1.0) experimental; urgency=low
+tdemultimedia-cvs (4:2.0-20000521-1.0) experimental; urgency=low
  
   * new cvs version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 21 May 2000 18:15:00 -0700
 
-kdemultimedia-cvs (4:2.0-20000512-1.1) experimental; urgency=low
+tdemultimedia-cvs (4:2.0-20000512-1.1) experimental; urgency=low
  
   * new cvs version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 12 May 2000 22:00:00 -0700
 
-kdemultimedia-cvs (4:2.0-20000303-1.0) experimental; urgency=low
+tdemultimedia-cvs (4:2.0-20000303-1.0) experimental; urgency=low
  
   * new cvs version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 03 Mar 2000 22:00:00 -0700
 
-kdemultimedia-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+tdemultimedia-cvs (4:2.0-20000302-1.0) experimental; urgency=low
 
   * new cvs version
   * Adding in build-depends
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 29 Feb 2000 22:00:00 -0700
 
-kdemultimedia-cvs (4:2.0-19991001-1) experimental; urgency=low
+tdemultimedia-cvs (4:2.0-19991001-1) experimental; urgency=low
 
   * new version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Oct 1999 14:00:42 -0400
 
-kdemultimedia-cvs (4:2.0-19990822-1) experimental; urgency=low
+tdemultimedia-cvs (4:2.0-19990822-1) experimental; urgency=low
 
   * new version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 22 Aug 1999 08:00:42 -0400
 
-kdemultimedia-cvs (4:2.0-19990626-1) experimental; urgency=low
+tdemultimedia-cvs (4:2.0-19990626-1) experimental; urgency=low
 
   * new version
   * making paths completly configurable via debianrules
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 27 Jun 1999 18:54:42 +0200
 
-kdemultimedia-cvs (4:2.0-19990524-1) experimental; urgency=low
+tdemultimedia-cvs (4:2.0-19990524-1) experimental; urgency=low
 
   * new upstream CVS version 
   * migrating out of /opt to /
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 24 May 1999 07:30:09 -0400
 
-kdemultimedia (4:1.1-19990217-1) unstable; urgency=low
+tdemultimedia (4:1.1-19990217-1) unstable; urgency=low
 
   * new upstream version
 
  -- Stephan Kulow <coolo@kde.org>  Wed, 17 Feb 1999 19:09:42 +0100
 
-kdemultimedia (4:1.1-19990207-3) unstable; urgency=low
+tdemultimedia (4:1.1-19990207-3) unstable; urgency=low
 
   * install kscd setgrp cdrom
 
  -- Stephan Kulow <coolo@kde.org>  Wed, 17 Feb 1999 00:49:47 +0100
 
-kdemultimedia (4:1.1-19990207-2) unstable; urgency=low
+tdemultimedia (4:1.1-19990207-2) unstable; urgency=low
 
   * fixed a bug with the wrong libjpeg version
   * depend on cddb for kscd
 
  -- Stephan Kulow <coolo@kde.org>  Tue,  9 Feb 1999 10:43:44 +0100
 
-kdemultimedia (4:1.1-19990207-1) unstable; urgency=low
+tdemultimedia (4:1.1-19990207-1) unstable; urgency=low
 
   * new upstream version 1.1 and new epoche
 
  -- Stephan Kulow <coolo@kde.org>  Sun,  7 Feb 1999 12:12:59 +0100
 
-kdemultimedia (2:980710-1.0-1) unstable; urgency=low
+tdemultimedia (2:980710-1.0-1) unstable; urgency=low
 
   * new upstream version 1.0
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 12 Jul 1998 10:12:19 +0200
 
-kdemultimedia (2:980419-b4-1) unstable; urgency=low
+tdemultimedia (2:980419-b4-1) unstable; urgency=low
 
   * new upstream version Beta4
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 19 Apr 1998 18:01:56 +0200
 
-kdemultimedia (2:980331-1) frozen; urgency=low
+tdemultimedia (2:980331-1) frozen; urgency=low
 
-  * let it depend on kdebase for the help system
+  * let it depend on tdebase for the help system
   * fixed old fsf-address
   * new upstream version with bugfixes
 
  -- Stephan Kulow <coolo@kde.org>  Tue, 31 Mar 1998 23:17:10 +0200
 
-kdemultimedia (2:980311-2) frozen; urgency=low
+tdemultimedia (2:980311-2) frozen; urgency=low
 
   * new compile cycle with qt-1.33 and libstdc++-2.8
 
  -- Stephan Kulow <coolo@kde.org>  Tue, 24 Mar 1998 21:55:40 +0100
 
-kdemultimedia (2:980311-1) unstable; urgency=low
+tdemultimedia (2:980311-1) unstable; urgency=low
 
   * Initial Release.
 
diff --git a/ubuntu/maverick/tdemultimedia/debian/control b/ubuntu/maverick/tdemultimedia/debian/control
index b89360ccb..4086f0b95 100644
--- a/ubuntu/maverick/tdemultimedia/debian/control
+++ b/ubuntu/maverick/tdemultimedia/debian/control
@@ -1,19 +1,19 @@
-Source: kdemultimedia-trinity
+Source: tdemultimedia-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kdemultimedia-trinity
+Package: tdemultimedia-trinity
 Section: kde
 Architecture: all
-Replaces: kdemultimedia-kde3 (<< 4:3.5.13)
-Breaks: kdemultimedia-kde3 (<< 4:3.5.13)
-Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), kdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), kdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), kdemultimedia-kio-plugins-trinity (>= ${Source-Version}), kmid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version})
-Suggests: kdemultimedia-trinity-doc-html (>= ${Source-Version})
+Replaces: tdemultimedia-kde3 (<< 4:3.5.13)
+Breaks: tdemultimedia-kde3 (<< 4:3.5.13)
+Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), kmid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version})
+Suggests: tdemultimedia-trinity-doc-html (>= ${Source-Version})
 Description: multimedia 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,
@@ -26,25 +26,25 @@ Description: multimedia apps from the official Trinity release
  .
  Homepage: http://www.kde.org/areas/multimedia
 
-Package: kdemultimedia-trinity-dev
+Package: tdemultimedia-trinity-dev
 Section: devel
 Architecture: any
-Replaces: kdemultimedia-kde3-dev (<< 4:3.5.13)
-Breaks: kdemultimedia-kde3-dev (<< 4:3.5.13)
-Depends: kdelibs4-trinity-dev (>= 4:3.5.7), artsbuilder-trinity (= ${Source-Version}), kdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
+Replaces: tdemultimedia-kde3-dev (<< 4:3.5.13)
+Breaks: tdemultimedia-kde3-dev (<< 4:3.5.13)
+Depends: tdelibs4-trinity-dev (>= 4:3.5.7), artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
 Conflicts: libmpeg-trinity-dev
 Description: development files for the Trinity multimedia module
  Development files and headers for the Trinity multimedia module.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
-Package: kdemultimedia-trinity-doc-html
+Package: tdemultimedia-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: kdemultimedia-kde3-doc-html (<< 4:3.5.13)
-Breaks: kdemultimedia-kde3-doc-html (<< 4:3.5.13)
-Suggests: konqueror-trinity | www-browser, kdebase-trinity
+Replaces: tdemultimedia-kde3-doc-html (<< 4:3.5.13)
+Breaks: tdemultimedia-kde3-doc-html (<< 4:3.5.13)
+Suggests: konqueror-trinity | www-browser, tdebase-trinity
 Description: Trinity multimedia documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -57,7 +57,7 @@ Description: Trinity multimedia documentation in HTML format
  KDE multimedia packages.
  .
  This package is part of Trinity, and a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: artsbuilder-trinity
 Section: sound
@@ -70,7 +70,7 @@ Description: synthesizer designer for aRts
  This is the analog Realtime synthesizer's graphical design tool.
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: juk-trinity
 Section: kde
@@ -98,7 +98,7 @@ Description: music organizer and player for Trinity
     with other KDE and X apps
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: kaboodle-trinity
 Section: sound
@@ -113,14 +113,14 @@ Description: light, embedded media player for Trinity
  for KDE. It uses the aRts framework for playing media files.
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: kaudiocreator-trinity
 Section: sound
 Architecture: any
 Replaces: kaudiocreator-kde3 (<< 4:3.5.13)
 Breaks: kaudiocreator-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdemultimedia-kio-plugins-trinity (= ${Source-Version})
+Depends: ${shlibs:Depends}, tdemultimedia-kio-plugins-trinity (= ${Source-Version})
 Recommends: vorbis-tools, flac
 Suggests: lame
 Description: CD ripper and audio encoder frontend for Trinity
@@ -129,37 +129,37 @@ Description: CD ripper and audio encoder frontend for Trinity
  searches CDDB to retrieve the information of the disk.
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
-Package: kdemultimedia-kfile-plugins-trinity
+Package: tdemultimedia-kfile-plugins-trinity
 Section: kde
 Architecture: any
-Replaces: kdemultimedia-kfile-plugins-kde3 (<< 4:3.5.13)
-Breaks: kdemultimedia-kfile-plugins-kde3 (<< 4:3.5.13)
+Replaces: tdemultimedia-kfile-plugins-kde3 (<< 4:3.5.13)
+Breaks: tdemultimedia-kfile-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Description: au/avi/m3u/mp3/ogg/wav plugins for kfile
  au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
-Package: kdemultimedia-kappfinder-data-trinity
+Package: tdemultimedia-kappfinder-data-trinity
 Section: kde
 Architecture: any
-Replaces: kdemultimedia-kappfinder-data-kde3 (<< 4:3.5.13)
-Breaks: kdemultimedia-kappfinder-data-kde3 (<< 4:3.5.13)
+Replaces: tdemultimedia-kappfinder-data-kde3 (<< 4:3.5.13)
+Breaks: tdemultimedia-kappfinder-data-kde3 (<< 4:3.5.13)
 Depends: kappfinder-trinity
 Description: multimedia data for kappfinder-trinity
  This package provides data on multimedia applications for kappfinder-trinity.
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
-Package: kdemultimedia-kio-plugins-trinity
+Package: tdemultimedia-kio-plugins-trinity
 Section: kde
 Architecture: any
-Replaces: kdemultimedia-kio-plugins-kde3 (<< 4:3.5.13)
-Breaks: kdemultimedia-kio-plugins-kde3 (<< 4:3.5.13)
+Replaces: tdemultimedia-kio-plugins-kde3 (<< 4:3.5.13)
+Breaks: tdemultimedia-kio-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Suggests: lame
 Description: enables the browsing of audio CDs under Konqueror
@@ -167,7 +167,7 @@ Description: enables the browsing of audio CDs under Konqueror
  Konqueror and the audiocd:/ URL.
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: kmid-trinity
 Section: sound
@@ -180,7 +180,7 @@ Description: MIDI/karaoke player for Trinity
  This package provides a MIDI and karaoke player for KDE.
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: kmix-trinity
 Section: sound
@@ -194,7 +194,7 @@ Description: sound mixer applet for Trinity
  This package includes KDE's dockable sound mixer applet.
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: krec-trinity
 Section: sound
@@ -207,7 +207,7 @@ Description: sound recorder utility for Trinity
  This is a sound recording utility for Trinity.
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: kscd-trinity
 Section: sound
@@ -220,7 +220,7 @@ Description: audio CD player for Trinity
  This is Trinity's audio CD player.
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: libarts1-akode-trinity
 Section: libs
@@ -232,7 +232,7 @@ Description: akode plugin for aRts
  This package contains akode plugins for aRts.
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information
 
 Package: libarts1-audiofile-trinity
 Section: libs
@@ -244,7 +244,7 @@ Description: audiofile plugin for aRts
  This package contains audiofile plugins for aRts.
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: libarts1-mpeglib-trinity
 Section: libs
@@ -259,7 +259,7 @@ Description: mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
  This is the arts (KDE Sound daemon) plugin.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: libarts1-xine-trinity
 Section: libs
@@ -272,7 +272,7 @@ Description: aRts plugin enabling xine support
  multimedia engine though aRts.
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: libkcddb1-trinity
 Section: libs
@@ -286,7 +286,7 @@ Description: CDDB library for Trinity
  databases, for KDE applications.
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: mpeglib-trinity
 Section: libs
@@ -301,7 +301,7 @@ Description: MP3 and MPEG-1 audio and video library
  and WAV playback
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
 Package: noatun-trinity
 Section: sound
@@ -315,16 +315,16 @@ Description: media player for Trinity
  formats supported by your installation of aRts (including aRts plugins).
  .
  This package is part of Trinity, as a component of the KDE multimedia module.
- See the 'kde-trinity' and 'kdemultimedia-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
-Package: kdemultimedia-trinity-dbg
+Package: tdemultimedia-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: kdemultimedia-kde3-dbg (<< 4:3.5.13)
-Breaks: kdemultimedia-kde3-dbg (<< 4:3.5.13)
+Replaces: tdemultimedia-kde3-dbg (<< 4:3.5.13)
+Breaks: tdemultimedia-kde3-dbg (<< 4:3.5.13)
 Priority: extra
-Depends: kdelibs-trinity-dbg, libkcddb1-trinity (= ${Source-Version})
-Description: debugging symbols for kdemultimedia
- This package contains the debugging symbols associated with kdemultimedia-trinity.
- They will automatically be used by gdb for debugging kdemultimedia-related
+Depends: tdelibs-trinity-dbg, libkcddb1-trinity (= ${Source-Version})
+Description: debugging symbols for tdemultimedia
+ This package contains the debugging symbols associated with tdemultimedia-trinity.
+ They will automatically be used by gdb for debugging tdemultimedia-related
  issues.
diff --git a/ubuntu/maverick/tdemultimedia/debian/control.in b/ubuntu/maverick/tdemultimedia/debian/control.in
index 843f66011..2e7c1c0ba 100644
--- a/ubuntu/maverick/tdemultimedia/debian/control.in
+++ b/ubuntu/maverick/tdemultimedia/debian/control.in
@@ -1,17 +1,17 @@
-Source: kdemultimedia
+Source: tdemultimedia
 Section: kde
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libltdl3-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libltdl3-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev
 Standards-Version: 3.7.2
 
-Package: kdemultimedia
+Package: tdemultimedia
 Section: kde
 Architecture: all
-Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), kdemultimedia-kappfinder-data (>= ${Source-Version}), kdemultimedia-kfile-plugins (>= ${Source-Version}), kdemultimedia-kio-plugins (>= ${Source-Version}), kmid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version})
-Suggests: kdemultimedia-doc-html (>= ${Source-Version})
+Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-kfile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), kmid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version})
+Suggests: tdemultimedia-doc-html (>= ${Source-Version})
 Description: multimedia 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,
@@ -24,22 +24,22 @@ Description: multimedia apps from the official KDE release
  .
  Homepage: http://www.kde.org/areas/multimedia
 
-Package: kdemultimedia-dev
+Package: tdemultimedia-dev
 Section: devel
 Architecture: any
-Depends: kdelibs4-dev (>= 4:3.5.8), artsbuilder (= ${Source-Version}), kdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version})
+Depends: tdelibs4-dev (>= 4:3.5.8), artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version})
 Conflicts: libmpeg-dev
 Replaces: artsbuilder (<< 4:3.0.0), mpeglib (<< 4:3.0.0), noatun (<< 4:3.0.0)
 Description: development files for the KDE multimedia module
  Development files and headers for the KDE multimedia module.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
-Package: kdemultimedia-doc-html
+Package: tdemultimedia-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror | www-browser, kdebase
+Suggests: konqueror | www-browser, tdebase
 Description: KDE multimedia documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -52,19 +52,19 @@ Description: KDE multimedia documentation in HTML format
  KDE multimedia packages.
  .
  This package is part of KDE, and a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
 Package: artsbuilder
 Section: sound
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Replaces: kdebase-data (<< 4:3.3.91), kdemultimedia-dev (<< 4:3.5.0-2)
+Replaces: tdebase-data (<< 4:3.3.91), tdemultimedia-dev (<< 4:3.5.0-2)
 Description: synthesizer designer for aRts
  This is the analog Realtime synthesizer's graphical design tool.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
 Package: juk
 Section: kde
@@ -90,7 +90,7 @@ Description: music organizer and player for KDE
     with other KDE and X apps
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
 Package: kaboodle
 Section: sound
@@ -103,12 +103,12 @@ Description: light, embedded media player for KDE
  for KDE. It uses the aRts framework for playing media files.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
 Package: kaudiocreator
 Section: sound
 Architecture: any
-Depends: ${shlibs:Depends}, kdemultimedia-kio-plugins (= ${Source-Version})
+Depends: ${shlibs:Depends}, tdemultimedia-kio-plugins (= ${Source-Version})
 Recommends: vorbis-tools, flac
 Suggests: lame
 Description: CD ripper and audio encoder frontend for KDE
@@ -117,20 +117,20 @@ Description: CD ripper and audio encoder frontend for KDE
  searches CDDB to retrieve the information of the disk.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
-Package: kdemultimedia-kfile-plugins
+Package: tdemultimedia-kfile-plugins
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kdemultimedia-kio-plugins (<< 4:3.4.1-1)
+Replaces: tdemultimedia-kio-plugins (<< 4:3.4.1-1)
 Description: au/avi/m3u/mp3/ogg/wav plugins for kfile
  au/avi/m3u/mp3/ogg/wav file metainformation plugins for KDE.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
-Package: kdemultimedia-kappfinder-data
+Package: tdemultimedia-kappfinder-data
 Section: kde
 Architecture: any
 Depends: kappfinder
@@ -138,21 +138,21 @@ Description: multimedia data for kappfinder
  This package provides data on multimedia applications for kappfinder.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
-Package: kdemultimedia-kio-plugins
+Package: tdemultimedia-kio-plugins
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: lame
-Conflicts: kdebase-audiolibs (<< 4:3.0.0)
-Replaces: kdebase-audiolibs (<< 4:3.0.0), kdebase-kio-plugins (<< 4:3.4.0)
+Conflicts: tdebase-audiolibs (<< 4:3.0.0)
+Replaces: tdebase-audiolibs (<< 4:3.0.0), tdebase-kio-plugins (<< 4:3.4.0)
 Description: enables the browsing of audio CDs under Konqueror
  This package allow audio CDs to be browsed like a file system using
  Konqueror and the audiocd:/ URL.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
 Package: kmid
 Section: sound
@@ -163,7 +163,7 @@ Description: MIDI/karaoke player for KDE
  This package provides a MIDI and karaoke player for KDE.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
 Package: kmix
 Section: sound
@@ -175,7 +175,7 @@ Description: sound mixer applet for KDE
  This package includes KDE's dockable sound mixer applet.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
 Package: krec
 Section: sound
@@ -186,7 +186,7 @@ Description: sound recorder utility for KDE
  This is a sound recording utility for KDE.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
 Package: kscd
 Section: sound
@@ -197,7 +197,7 @@ Description: audio CD player for KDE
  This is KDE's audio CD player.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
 Package: libarts1-akode
 Section: libs
@@ -208,7 +208,7 @@ Description: akode plugin for aRts
  This package contains akode plugins for aRts.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information
+ See the 'kde' and 'tdemultimedia' packages for more information
 
 Package: libarts1-audiofile
 Section: libs
@@ -218,7 +218,7 @@ Description: audiofile plugin for aRts
  This package contains audiofile plugins for aRts.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
 Package: libarts1-mpeglib
 Section: libs
@@ -233,7 +233,7 @@ Description: mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
  This is the arts (KDE Sound daemon) plugin.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
 Package: libarts1-xine
 Section: libs
@@ -244,7 +244,7 @@ Description: aRts plugin enabling xine support
  multimedia engine though aRts.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
 Package: libkcddb1
 Section: libs
@@ -256,21 +256,21 @@ Description: CDDB library for KDE
  databases, for KDE applications.
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
 Package: mpeglib
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: libarts1-mpeglib (= ${Source-Version})
-Replaces: kdemultimedia-dev (<< 4:3.5.2-1)
+Replaces: tdemultimedia-dev (<< 4:3.5.2-1)
 Description: MP3 and MPEG-1 audio and video library
  mpeglib is a MPEG-1 and MP3 audio and video library. It supports
  MPEG-1 audio (layers 1, 2, 3), MPEG-1 video, MPEG-1 system layer,
  and WAV playback
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
 Package: noatun
 Section: sound
@@ -282,15 +282,15 @@ Description: media player for KDE
  formats supported by your installation of aRts (including aRts plugins).
  .
  This package is part of KDE, as a component of the KDE multimedia module.
- See the 'kde' and 'kdemultimedia' packages for more information.
+ See the 'kde' and 'tdemultimedia' packages for more information.
 
-Package: kdemultimedia-dbg
+Package: tdemultimedia-dbg
 Section: libdevel
 Architecture: any
-Depends: kdelibs-dbg
+Depends: tdelibs-dbg
 Priority: extra
 Depends: libkcddb1 (= ${Source-Version})
-Description: debugging symbols for kdemultimedia
- This package contains the debugging symbols associated with kdemultimedia.
- They will automatically be used by gdb for debugging kdemultimedia-related
+Description: debugging symbols for tdemultimedia
+ This package contains the debugging symbols associated with tdemultimedia.
+ They will automatically be used by gdb for debugging tdemultimedia-related
  issues.
diff --git a/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 b/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1
index c7852c5db..4475e273c 100644
--- a/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1
+++ b/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1
@@ -1,4 +1,4 @@
-.lf 1 info/kdemultimedia.kaboodle.1
+.lf 1 info/tdemultimedia.kaboodle.1
 .TH KABOODLE 1 "May 2003" KDE "KDE Application"
 .SH NAME
 kaboodle \- KDE simple and lean Media Player
@@ -180,7 +180,7 @@ opposite side, etc. For a normal western layout that means that menus
 and tool bars will go from the right edge to the left, the vertical
 scroll bar will be on the left side and so on.
 
-.lf 53 info/kdemultimedia.kaboodle.1
+.lf 53 info/tdemultimedia.kaboodle.1
 .SH ENVIRONMENT
 .lf 1 info/kdeenviron
 .SS "standard KDE environment variables"
@@ -221,7 +221,7 @@ Path to the home directory for the current user.
 .IP KDEHOME
 The KDE per-user setting directory. Default if not specified is
 .I $HOME/.kde
-.lf 55 info/kdemultimedia.kaboodle.1
+.lf 55 info/tdemultimedia.kaboodle.1
 .SH FILES
 .TP
 .I $HOME/.kde/share/config/kaboodlerc
diff --git a/ubuntu/maverick/tdemultimedia/debian/rules b/ubuntu/maverick/tdemultimedia/debian/rules
index a7ec5a104..abe114b59 100755
--- a/ubuntu/maverick/tdemultimedia/debian/rules
+++ b/ubuntu/maverick/tdemultimedia/debian/rules
@@ -21,9 +21,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
 
 DOC_HTML_PRUNE := kcontrol-trinity
 
-DEB_DH_STRIP_ARGS  := --dbg-package=kdemultimedia-trinity-dbg
+DEB_DH_STRIP_ARGS  := --dbg-package=tdemultimedia-trinity-dbg
 
-PACKAGES_WITH_LIBS := artsbuilder-trinity kdemultimedia-kio-plugins-trinity kmid-trinity kmix-trinity krec-trinity \
+PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity kmid-trinity kmix-trinity krec-trinity \
 	libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \
 	libkcddb1-trinity mpeglib-trinity noatun-trinity
 
@@ -33,10 +33,10 @@ DEB_DH_MAKESHLIBS_ARGS_libkcddb1-trinity			:= -V'libkcddb1-trinity (>= 4:3.5.8-1
 DEB_DH_MAKESHLIBS_ARGS_mpeglib-trinity			:= -V'mpeglib-trinity (>= 4:3.5.8-1)'
 DEB_DH_MAKESHLIBS_ARGS_noatun-trinity			:= -V'noatun-trinity (>= 4:3.5.8-1)'
 DEB_DH_MAKESHLIBS_ARGS_libarts1-mpeglib-trinity		:= -V'libarts1-mpeglib-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kdemultimedia-kio-plugins-trinity 	:= -V'kdemultimedia-kio-plugins-trinity (>= 4:3.5.8-1)'
+DEB_DH_MAKESHLIBS_ARGS_tdemultimedia-kio-plugins-trinity 	:= -V'tdemultimedia-kio-plugins-trinity (>= 4:3.5.8-1)'
 
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
-install/kdemultimedia-kappfinder-data-trinity::
-	install -p -D -m644 debian/tmp/etc/xdg/menus/applications-merged/kde-multimedia-music.menu debian/kdemultimedia-kappfinder-data-trinity/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu
+install/tdemultimedia-kappfinder-data-trinity::
+	install -p -D -m644 debian/tmp/etc/xdg/menus/applications-merged/kde-multimedia-music.menu debian/tdemultimedia-kappfinder-data-trinity/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu
diff --git a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-doc-html.doc-base.artsbuilder b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.artsbuilder
index 8919f0010..48208dcd9 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-doc-html.doc-base.artsbuilder
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.artsbuilder
@@ -1,4 +1,4 @@
-Document: kdemultimedia-doc-html-artsbuilder
+Document: tdemultimedia-doc-html-artsbuilder
 Title: Artsbuilder Handbook
 Author: Stefan Westerfeld, Jeff Tranter 
 Abstract: This handbook describes aRts, the Analog Real-time Synthesizer.
diff --git a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-doc-html.doc-base.juk b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.juk
index be4285bc2..1d63a8b50 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-doc-html.doc-base.juk
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.juk
@@ -1,4 +1,4 @@
-Document: kdemultimedia-doc-html-juk
+Document: tdemultimedia-doc-html-juk
 Title: Juk Handbook
 Author: Michael Pyne, Scott Wheeler
 Abstract: Juk is a jukebox, tagger and music collection manager.
diff --git a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-doc-html.doc-base.kaboodle b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kaboodle
index 8065d4733..73c36debf 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-doc-html.doc-base.kaboodle
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kaboodle
@@ -1,4 +1,4 @@
-Document: kdemultimedia-doc-html-kaboodle
+Document: tdemultimedia-doc-html-kaboodle
 Title: Kaboodle Handbook
 Author: The KDE team.
 Abstract: Kaboodle is a one file quick media player for KDE.
diff --git a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid
index 585bae367..3317f0489 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid
@@ -1,4 +1,4 @@
-Document: kdemultimedia-doc-html-kmid
+Document: tdemultimedia-doc-html-kmid
 Title: KMid Handbook
 Author: Antonio Larrosa Jimenez
 Abstract: KMid is a midi/karaoke multimedia player for KDE.
diff --git a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmix b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmix
index 38cf0e713..6aca2e181 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmix
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmix
@@ -1,4 +1,4 @@
-Document: kdemultimedia-doc-html-kmix
+Document: tdemultimedia-doc-html-kmix
 Title: KMix Handbook
 Author: Matt Johnson, Christian Esken, Helio Chissini de Castro,
  Stefan Schimanski, Lauri Watts
diff --git a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-doc-html.doc-base.krec b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.krec
index 9ade1f45e..525a78717 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-doc-html.doc-base.krec
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.krec
@@ -1,4 +1,4 @@
-Document: kdemultimedia-doc-html-krec
+Document: tdemultimedia-doc-html-krec
 Title: KRec Handbook
 Author: Arnold Krille
 Abstract: KRec is a sound recording application for aRts and KDE.
diff --git a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-doc-html.doc-base.kscd b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kscd
index 8900e8712..8eec58fbb 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-doc-html.doc-base.kscd
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kscd
@@ -1,4 +1,4 @@
-Document: kdemultimedia-doc-html-kscd
+Document: tdemultimedia-doc-html-kscd
 Title: KsCD Handbook
 Author: Jonathan Singer, David White, Bernd Johannes Wuebben,
  Dirk Foersterling, Lauri Watts
diff --git a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-doc-html.doc-base.noatun b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.noatun
index 844323147..08444da31 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-doc-html.doc-base.noatun
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.noatun
@@ -1,4 +1,4 @@
-Document: kdemultimedia-doc-html-noatun
+Document: tdemultimedia-doc-html-noatun
 Title: NoAtun Handbook
 Author: Charles Samuels
 Abstract: NoAtun is a fully-featured plugin-based media player for KDE.
diff --git a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-kappfinder-data-trinity.install b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kappfinder-data-trinity.install
index 26d0fa3c8..26d0fa3c8 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-kappfinder-data-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kappfinder-data-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-kfile-plugins-trinity.install b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kfile-plugins-trinity.install
index 422efd2a4..422efd2a4 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-kfile-plugins-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kfile-plugins-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-kio-plugins-trinity.install b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
index 6f28fe72e..6f28fe72e 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-kio-plugins-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-trinity-dev.install b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install
index 343efda6f..343efda6f 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kdemultimedia-trinity-dev.install
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install
diff --git a/ubuntu/maverick/tdenetwork/debian/changelog b/ubuntu/maverick/tdenetwork/debian/changelog
index f7b828757..43b1aadd7 100644
--- a/ubuntu/maverick/tdenetwork/debian/changelog
+++ b/ubuntu/maverick/tdenetwork/debian/changelog
@@ -1,4 +1,4 @@
-kdenetwork-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
+tdenetwork-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
 
   * Repaired pushpin in krdc
   * Changed krdc icon sizes down a step to reduce screen clutter
@@ -6,51 +6,51 @@ kdenetwork-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 12 Dec 2009 16:14:00 -0600
 
-kdenetwork-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
+tdenetwork-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
 
   * Added fullscreen option to krdc in RDP mode
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 11 July 2009 18:01:00 -0600
 
-kdenetwork-trinity (4:3.5.10-0ubuntu1) karmic; urgency=low
+tdenetwork-trinity (4:3.5.10-0ubuntu1) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdenetwork-trinity (4:3.5.10-0ubuntu1~intrepid6) intrepid; urgency=low
+tdenetwork-trinity (4:3.5.10-0ubuntu1~intrepid6) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 18:24:00 -0600
 
-kdenetwork-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
+tdenetwork-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
   * Fixed -dev package
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 30 Dec 2008 12:53:00 -0600
 
-kdenetwork-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
+tdenetwork-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
 
   * Import from SVN
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 30 Nov 2008 21:22:00 -0600
 
-kdenetwork (4:3.5.10-0ubuntu1~hardy2) hardy-backports; urgency=low
+tdenetwork (4:3.5.10-0ubuntu1~hardy2) hardy-backports; urgency=low
 
   * Corrected FTBFS on lpia
 
  -- Michael Casadevall <sonicmctails@gmail.com>  Wed, 10 Sep 2008 20:24:51 -0400
 
-kdenetwork (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdenetwork (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 
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:47:36 -0400
 
-kdenetwork (4:3.5.9-0ubuntu1.1) hardy-proposed; urgency=low
+tdenetwork (4:3.5.9-0ubuntu1.1) hardy-proposed; urgency=low
 
   * Added patch kubuntu_12_fix_latexconvert_dash.diff to fix
     latexconvert dash incompatibility.  Patch backported from
@@ -58,32 +58,32 @@ kdenetwork (4:3.5.9-0ubuntu1.1) hardy-proposed; urgency=low
 
  -- Yuriy Kozlov <yuriy-kozlov@kubuntu.org>  Mon, 14 Jul 2008 16:28:33 -0400
 
-kdenetwork (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdenetwork (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:07 +0000
 
-kdenetwork (4:3.5.8-1ubuntu4) hardy; urgency=low
+tdenetwork (4:3.5.8-1ubuntu4) hardy; urgency=low
 
   * Added patch kubuntu_11_samba_idmap_config.diff. Fixes smb.conf
     breaking when some idmap config settings have upper chars
 
  -- Anthony Mercatante <tonio@kubuntu>  Mon, 14 Jan 2008 15:38:11 +0100
 
-kdenetwork (4:3.5.8-1ubuntu3) hardy; urgency=low
+tdenetwork (4:3.5.8-1ubuntu3) hardy; urgency=low
 
   * Do not install sms files
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 12:51:52 +0000
 
-kdenetwork (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdenetwork (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Remove duplicate patch kubuntu_06_kppp_nozomi.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 10:00:38 +0000
 
-kdenetwork (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdenetwork (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining changes:
    - Uncomment noauth in debian/kppp-options
@@ -91,7 +91,7 @@ kdenetwork (4:3.5.8-1ubuntu1) hardy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:40 +0000
 
-kdenetwork (4:3.5.8-1) unstable; urgency=low
+tdenetwork (4:3.5.8-1) unstable; urgency=low
 
   * New upstream release. (Closes: #444716, #369345)
   * Resync patches. Applied upstream: 01_branch_673108-673109_kopete_webcam_fix 
@@ -102,7 +102,7 @@ kdenetwork (4:3.5.8-1) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 11 Oct 2007 19:38:03 +0200
 
-kdenetwork (4:3.5.7-4) unstable; urgency=low
+tdenetwork (4:3.5.7-4) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -114,7 +114,7 @@ kdenetwork (4:3.5.7-4) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 13 Aug 2007 11:17:43 +0200
 
-kdenetwork (4:3.5.7-3) unstable; urgency=low
+tdenetwork (4:3.5.7-3) unstable; urgency=low
 
   +++ Changes by Sarah Hobbs:
 
@@ -125,26 +125,26 @@ kdenetwork (4:3.5.7-3) unstable; urgency=low
   +++ Changes by Sune Vuorela:
   
   * Update uploaders.
-  * Change kdenetwork meta package to arch: any. FIXME: Hackish. Basically a
+  * Change tdenetwork meta package to arch: any. FIXME: Hackish. Basically a
     workaround that Depends: foo [!s390] doesn't work unless arch any. As this
     is just a empty metapackage, it doesn't hurt that bad.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 21 Jul 2007 01:33:19 +0200
 
-kdenetwork (4:3.5.8-0ubuntu2) gutsy; urgency=low
+tdenetwork (4:3.5.8-0ubuntu2) gutsy; urgency=low
 
   * Added kubuntu_10_hide_share_entries_in_kmenu.diff, hides share
     entries in Kmenu
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 15 Oct 2007 12:07:20 +0200
 
-kdenetwork (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdenetwork (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:23 +0100
 
-kdenetwork (4:3.5.7-2ubuntu2) gutsy; urgency=low
+tdenetwork (4:3.5.7-2ubuntu2) gutsy; urgency=low
 
   * Added 01_branch_kopete-groupchat-history.patch (LP: #94022)
   * Moved rdesktop from suggests to recommends of krdc.  (LP: #51766)
@@ -153,11 +153,11 @@ kdenetwork (4:3.5.7-2ubuntu2) gutsy; urgency=low
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Fri, 14 Sep 2007 01:35:01 +1000
 
-kdenetwork (4:3.5.7-2ubuntu1) gutsy; urgency=low
+tdenetwork (4:3.5.7-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian Unstable
   * Added XS-Vcs-Bzr: https://code.launchpad.net/~kubuntu-
-    members/kdenetwork/debian
+    members/tdenetwork/debian
   * Added 21_fix_krfb_crash.diff. (Closes LP: #52888, 
     KDE Bug #124529)
   * Added 01_branch_673108-673109_kopete_webcam_fix.diff (LP: #89606)
@@ -165,7 +165,7 @@ kdenetwork (4:3.5.7-2ubuntu1) gutsy; urgency=low
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 21 Jul 2007 00:55:12 +1000
 
-kdenetwork (4:3.5.7-2) unstable; urgency=low
+tdenetwork (4:3.5.7-2) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -182,14 +182,14 @@ kdenetwork (4:3.5.7-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 07 Jul 2007 02:10:57 +0200
 
-kdenetwork (4:3.5.7-1ubuntu2) gutsy; urgency=low
+tdenetwork (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
   * Add kubuntu_08_emoticons_editor.diff patch for Kopete emoticons manager LP: 106586
     http://www.kde-look.org/content/show.php/Kopete+Emoticons+Manager?content=54968
 
  -- Breuil Cyril <cyrilbport@gmail.com>  Mon, 21 May 2007 20:06:40 +0200
 
-kdenetwork (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdenetwork (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * New Upstream Version
   * Modify Maintainer value to match Debian-Maintainer-Field Spec
@@ -198,20 +198,20 @@ kdenetwork (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 23 May 2007 15:07:24 +1000
 
-kdenetwork (4:3.5.7-1) unstable; urgency=low
+tdenetwork (4:3.5.7-1) unstable; urgency=low
 
   * New upstream release.
   * Remove patch 21_krfb_httpd_mac_to_unix_endl.diff, merged upstream.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 15 May 2007 21:53:51 +0200
 
-kdenetwork (4:3.5.6-2ubuntu1) gutsy; urgency=low
+tdenetwork (4:3.5.6-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 17:35:18 +0100
 
-kdenetwork (4:3.5.6-2) unstable; urgency=low
+tdenetwork (4:3.5.6-2) unstable; urgency=low
 
   +++ Changes Modestas Vainius:
 
@@ -231,7 +231,7 @@ kdenetwork (4:3.5.6-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 18 Apr 2007 15:54:39 +0100
 
-kdenetwork (4:3.5.6-1) experimental; urgency=low
+tdenetwork (4:3.5.6-1) experimental; urgency=low
 
   * New upstream release.
 
@@ -243,7 +243,7 @@ kdenetwork (4:3.5.6-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 16 Jan 2007 20:07:30 +0100 
 
-kdenetwork (4:3.5.5-4) unstable; urgency=high
+tdenetwork (4:3.5.5-4) unstable; urgency=high
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
@@ -254,18 +254,18 @@ kdenetwork (4:3.5.5-4) unstable; urgency=high
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue,  9 Jan 2007 07:26:45 +0100
 
-kdenetwork (4:3.5.5-3) unstable; urgency=low
+tdenetwork (4:3.5.5-3) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
   * Fixed servers for oftc irc. It is oftc.net instead of oftc.org.
   * Updated icq patch from upstream svn.
-  * Added kdelibs-dbg to kdenetwork-dbg depends, it is needed to get valid
+  * Added tdelibs-dbg to tdenetwork-dbg depends, it is needed to get valid
     backtraces.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 21 Nov 2006 07:16:12 +0100
 
-kdenetwork (4:3.5.6-0ubuntu9) feisty; urgency=low
+tdenetwork (4:3.5.6-0ubuntu9) feisty; urgency=low
 
   * Add kubuntu_07_fileshare.diff:
     - adds dialog when neither SMB nore NFS is detected.
@@ -273,36 +273,36 @@ kdenetwork (4:3.5.6-0ubuntu9) feisty; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 03 Apr 2007 15:25:21 +0100
 
-kdenetwork (4:3.5.6-0ubuntu8) feisty; urgency=low
+tdenetwork (4:3.5.6-0ubuntu8) feisty; urgency=low
 
   * Removed kubuntu_04_kopete_style_contacts.diff, closes Malone #90020
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 15 Mar 2007 12:13:41 +0100
 
-kdenetwork (4:3.5.6-0ubuntu7) feisty; urgency=low
+tdenetwork (4:3.5.6-0ubuntu7) feisty; urgency=low
 
   * Add kubuntu_06_kppp_nozomi.diff from Stephan Hermann <sh@sourcecode.de>
     adds support for nozomi devices
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  5 Mar 2007 10:56:59 +0000
 
-kdenetwork (4:3.5.6-0ubuntu6) feisty; urgency=low
+tdenetwork (4:3.5.6-0ubuntu6) feisty; urgency=low
 
   * Add kubuntu_05_kopete_style_clear_activate_variant.diff, activate
     variants for the kopete theme Clear. Patch from KDE svn.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 21 Jan 2007 00:49:28 +0100
 
-kdenetwork (4:3.5.6-0ubuntu5) feisty; urgency=low
+tdenetwork (4:3.5.6-0ubuntu5) feisty; urgency=low
 
   * Remove sms pluing files, they are not compiled
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 31 Jan 2007 11:05:34 +0000
 
-kdenetwork (4:3.5.6-0ubuntu4) feisty; urgency=low
+tdenetwork (4:3.5.6-0ubuntu4) feisty; urgency=low
 
-  * Made kdenetwork-dev replace kopete-dev (<= 4:3.5.3). Closes #82222
-  * Added various build-deps/deps that were lost from kopete --> kdenetwork
+  * Made tdenetwork-dev replace kopete-dev (<= 4:3.5.3). Closes #82222
+  * Added various build-deps/deps that were lost from kopete --> tdenetwork
     transition
   * Added 12_kopete_strings.diff to fix various spelling errors.  Closes
     #65966
@@ -313,28 +313,28 @@ kdenetwork (4:3.5.6-0ubuntu4) feisty; urgency=low
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 31 Jan 2007 00:00:00 +1100
 
-kdenetwork (4:3.5.6-0ubuntu3) feisty; urgency=low
+tdenetwork (4:3.5.6-0ubuntu3) feisty; urgency=low
 
   * Make kopete replace and conflict with kopete-meanwhile
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 30 Jan 2007 01:19:04 +0000
 
-kdenetwork (4:3.5.6-0ubuntu2) feisty; urgency=low
+tdenetwork (4:3.5.6-0ubuntu2) feisty; urgency=low
 
   * Add kubuntu_04_kopete_style.diff, adds ability to theme
     kopete's contact list.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 26 Jan 2007 02:47:32 +0100
 
-kdenetwork (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdenetwork (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
   * Remove kubuntu_04_ksirc_vulnerability.diff, applied upstream
-  * Build kopete from kdenetwork again
+  * Build kopete from tdenetwork again
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:29 +0000
 
-kdenetwork (4:3.5.5-2ubuntu4) feisty; urgency=low
+tdenetwork (4:3.5.5-2ubuntu4) feisty; urgency=low
 
   * Remove build-dep on libgsmme-dev, failed main inclusion review
   * SECURITY UPDATE: ksirc denial of service vulnerability
@@ -349,26 +349,26 @@ kdenetwork (4:3.5.5-2ubuntu4) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 15 Jan 2007 10:59:50 +0000
 
-kdenetwork (4:3.5.5-2ubuntu3) feisty; urgency=low
+tdenetwork (4:3.5.5-2ubuntu3) feisty; urgency=low
 
   * Change netbase dependency for ktalkd to update-inetd since it's now in
     its own package.
 
  -- Tollef Fog Heen <tfheen@ubuntu.com>  Thu, 14 Dec 2006 11:30:22 +0100
 
-kdenetwork (4:3.5.5-2ubuntu2) feisty; urgency=low
+tdenetwork (4:3.5.5-2ubuntu2) feisty; urgency=low
 
   * rebuild with --enable-gcc-hidden-visibility
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 19:39:17 +0000
 
-kdenetwork (4:3.5.5-2ubuntu1) feisty; urgency=low
+tdenetwork (4:3.5.5-2ubuntu1) feisty; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Nov 2006 22:39:42 +0000
 
-kdenetwork (4:3.5.5-2) unstable; urgency=medium
+tdenetwork (4:3.5.5-2) unstable; urgency=medium
 
   * Add a kwifimanager manpage, thanks to Chris Bier. (Closes: #392878)
 
@@ -381,7 +381,7 @@ kdenetwork (4:3.5.5-2) unstable; urgency=medium
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  2 Nov 2006 18:01:55 -0500
 
-kdenetwork (4:3.5.5-1) unstable; urgency=low
+tdenetwork (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release. Notable updates include Kopete 0.12.2.
     + Fixes kopete: no irc /ignore command. (Closes: #239918)
@@ -411,7 +411,7 @@ kdenetwork (4:3.5.5-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  4 Oct 2006 20:05:23 -0400
 
-kdenetwork (4:3.5.4-2) unstable; urgency=low
+tdenetwork (4:3.5.4-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -421,7 +421,7 @@ kdenetwork (4:3.5.4-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue,  1 Aug 2006 18:04:24 -0400
 
-kdenetwork (4:3.5.4-1) unstable; urgency=low
+tdenetwork (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -434,82 +434,82 @@ kdenetwork (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 29 Jul 2006 21:15:35 -0400
 
-kdenetwork (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdenetwork (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
   * 16_kopete_green_folder.diff removed, merged upstream
 	
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:05 +0000
 
-kdenetwork (4:3.5.4-0ubuntu3) edgy; urgency=low
+tdenetwork (4:3.5.4-0ubuntu3) edgy; urgency=low
 
-  * Removed a bunch of files from debian/kdenetwork-dev.install as we have
-    split the kopete packages, including kopete-dev from kdenetwork
-  * Adjusted debian/control kdenetwork-dev description accordingly.
+  * Removed a bunch of files from debian/tdenetwork-dev.install as we have
+    split the kopete packages, including kopete-dev from tdenetwork
+  * Adjusted debian/control tdenetwork-dev description accordingly.
   * Closes malone 58320
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Mon, 11 Sep 2006 21:39:43 -0500
 
-kdenetwork (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdenetwork (4:3.5.4-0ubuntu2) edgy; urgency=low
 
   [ Jonathan Riddell ]
   * Rebuild with latest cdbs to add gettext domain to .desktop files for
     langpacks-desktopfiles-kde, no source changes
 
   [ Sarah Hobbs ]
-  * Make kdenetwork-dev depend on unversioned kopete-dev
+  * Make tdenetwork-dev depend on unversioned kopete-dev
 
  -- Sarah Hobbs <hobbsee@kubuntu.org>  Tue,  5 Sep 2006 22:53:11 +0000
 
-kdenetwork (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdenetwork (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:19 +0000
 
-kdenetwork (4:3.5.3-1ubuntu6) edgy; urgency=low
+tdenetwork (4:3.5.3-1ubuntu6) edgy; urgency=low
 
   * Uncomment noauth in debian/kppp-options
   * Don't create Kopete package, now a separate release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 24 Jul 2006 16:46:20 +0100
 
-kdenetwork (4:3.5.3-1ubuntu5) edgy; urgency=low
+tdenetwork (4:3.5.3-1ubuntu5) edgy; urgency=low
 
   * Fix path for additional zeroconf files.
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Thu, 20 Jul 2006 17:03:26 +0200
 
-kdenetwork (4:3.5.3-1ubuntu4) edgy; urgency=low
+tdenetwork (4:3.5.3-1ubuntu4) edgy; urgency=low
 
   * Add debian/kubuntu_zeroconf/_{fish,sftp}._tcp to add FISH and sFTP support
     to kdnssd (Closes: Malone 33034).
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Thu, 20 Jul 2006 12:13:01 +0200
 
-kdenetwork (4:3.5.3-1ubuntu3) edgy; urgency=low
+tdenetwork (4:3.5.3-1ubuntu3) edgy; urgency=low
 
   * Remove 12_kopete_meanwhile.diff, meanwhile support is in
     kopete-meanwhile in universe.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Jul 2006 10:33:01 +0000
 
-kdenetwork (4:3.5.3-1ubuntu2) edgy; urgency=low
+tdenetwork (4:3.5.3-1ubuntu2) edgy; urgency=low
 
   * Remove debian/patches/18_meanwhile_gsize.diff, 
     debian/patches/19_meanwhile_gcc41.diff,
     keep meanwhile support separate in kopete-meanwhile
-  * Build-dep on latest kdelibs, fix Qt binary compatibility break
+  * Build-dep on latest tdelibs, fix Qt binary compatibility break
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Jun 2006 16:44:01 +0000
 
-kdenetwork (4:3.5.3-1ubuntu1) edgy; urgency=low
+tdenetwork (4:3.5.3-1ubuntu1) edgy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 27 Jun 2006 17:10:54 +0000
 
-kdenetwork (4:3.5.3-1) unstable; urgency=low
+tdenetwork (4:3.5.3-1) unstable; urgency=low
 
   * New upstream release.
     + fixes a crash in kopete configuration dialog (Closes: #361449)
@@ -520,12 +520,12 @@ kdenetwork (4:3.5.3-1) unstable; urgency=low
 
   +++ Changes by Pierre Habouzit:
 
-  * Add a kopete presubj (kopete is responsible for 50% of the kdenetwork bug
+  * Add a kopete presubj (kopete is responsible for 50% of the tdenetwork bug
     reports) explaining how to get useful backtraces.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  1 Jun 2006 22:34:44 +0200
 
-kdenetwork (4:3.5.2-1) unstable; urgency=low
+tdenetwork (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -540,7 +540,7 @@ kdenetwork (4:3.5.2-1) unstable; urgency=low
  
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 29 Mar 2006 13:20:49 -0500
 
-kdenetwork (4:3.5.1-2) unstable; urgency=low
+tdenetwork (4:3.5.1-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -554,7 +554,7 @@ kdenetwork (4:3.5.1-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  1 Feb 2006 16:31:46 -0500
 
-kdenetwork (4:3.5.1-1) unstable; urgency=low
+tdenetwork (4:3.5.1-1) unstable; urgency=low
 
   +++ Changes by Isaac Clerencia:
 
@@ -576,7 +576,7 @@ kdenetwork (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 26 Jan 2006 20:55:37 -0500
 
-kdenetwork (4:3.5.0-3) unstable; urgency=low
+tdenetwork (4:3.5.0-3) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -586,7 +586,7 @@ kdenetwork (4:3.5.0-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  7 Jan 2006 16:51:25 -0500
 
-kdenetwork (4:3.5.0-2) experimental; urgency=low
+tdenetwork (4:3.5.0-2) experimental; urgency=low
 
   * Upload to experimental.
 
@@ -602,7 +602,7 @@ kdenetwork (4:3.5.0-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 16 Dec 2005 10:35:13 -0500
 
-kdenetwork (4:3.5.0-1) alioth; urgency=low
+tdenetwork (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
 
@@ -614,26 +614,26 @@ kdenetwork (4:3.5.0-1) alioth; urgency=low
 
   * Bump DH_COMPAT to 5. No changes.
 
-  * Add kdenetwork-dbg, to help track down problems.
+  * Add tdenetwork-dbg, to help track down problems.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 30 Nov 2005 00:03:47 -0500
 
-kdenetwork (4:3.4.3-3) unstable; urgency=low
+tdenetwork (4:3.4.3-3) unstable; urgency=low
 
-  * Upload to unstable, rebuilding against kdelibs4c2a.
+  * Upload to unstable, rebuilding against tdelibs4c2a.
 
   * KDE_3_4_BRANCH update (up to r483894).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 28 Nov 2005 17:20:04 +0100
 
-kdenetwork (4:3.5.2-0ubuntu6) dapper; urgency=low
+tdenetwork (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:08 +0200
 
-kdenetwork (4:3.5.2-0ubuntu5) dapper; urgency=low
+tdenetwork (4:3.5.2-0ubuntu5) dapper; urgency=low
 
   * Move libnss-mdns and avahi-daemon to Recommends since we don't want avahi
     installed by default.
@@ -641,91 +641,91 @@ kdenetwork (4:3.5.2-0ubuntu5) dapper; urgency=low
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Thu, 11 May 2006 19:09:40 +0200
 
-kdenetwork (4:3.5.2-0ubuntu4) dapper; urgency=low
+tdenetwork (4:3.5.2-0ubuntu4) dapper; urgency=low
 
   * Add libnss-mdns and avahi-daemon to dependencies for kdnssd package.
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Thu, 11 May 2006 18:52:54 +0200
 
-kdenetwork (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdenetwork (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Add kubuntu_04_kopete_devices.diff to fix devices tab in kopete 
     (Closes: Malone #36800)
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Sat, 22 Apr 2006 10:27:04 +0200
 
-kdenetwork (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdenetwork (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
 
-kdenetwork (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdenetwork (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Remove kubuntu_02_kopete_msn_file_transfer.diff, now upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:31 +0000
 
-kdenetwork (4:3.5.1-0ubuntu3) dapper; urgency=low
+tdenetwork (4:3.5.1-0ubuntu3) dapper; urgency=low
 
   * Add kubuntu_03_ktalk_no_utmp_check.diff to remove utmp check
     utmp is no longer on ubuntu dapper buildds
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 24 Mar 2006 18:51:45 +0000
 
-kdenetwork (4:3.5.1-0ubuntu2) dapper; urgency=low
+tdenetwork (4:3.5.1-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_02_kopete_msn_file_transfer to fix MSN file transfer in Kopete 
     (Closes: KDE Bug #113525)
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Mon,  6 Mar 2006 20:09:30 +0100
 
-kdenetwork (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdenetwork (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:07 +0000
 
-kdenetwork (4:3.5.0-0ubuntu6) dapper; urgency=low
+tdenetwork (4:3.5.0-0ubuntu6) dapper; urgency=low
 
-  * Install kopete/kopeteversion.h in kdenetwork-dev
+  * Install kopete/kopeteversion.h in tdenetwork-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 13 Jan 2006 13:34:42 +0000
 
-kdenetwork (4:3.5.0-0ubuntu5) dapper; urgency=low
+tdenetwork (4:3.5.0-0ubuntu5) dapper; urgency=low
 
-  * Tighten build-dep on kdelibs to 4:3.5.0-0ubuntu9
+  * Tighten build-dep on tdelibs to 4:3.5.0-0ubuntu9
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 18:23:00 +0000
 
-kdenetwork (4:3.5.0-0ubuntu4) dapper; urgency=low
+tdenetwork (4:3.5.0-0ubuntu4) dapper; urgency=low
 
-  * Tighten build-dep on kdelibs to 4:3.5.0-0ubuntu8
+  * Tighten build-dep on tdelibs to 4:3.5.0-0ubuntu8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 15:35:02 +0000
 
-kdenetwork (4:3.5.0-0ubuntu3) dapper; urgency=low
+tdenetwork (4:3.5.0-0ubuntu3) dapper; urgency=low
 
-  * Add kdnssd to kdenetwork meta package
-  * Remove libkdnssd dependency from kdnssd (now in kdelibs)
+  * Add kdnssd to tdenetwork meta package
+  * Remove libkdnssd dependency from kdnssd (now in tdelibs)
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 09:51:13 +0000
 
-kdenetwork (4:3.5.0-0ubuntu2) dapper; urgency=low
+tdenetwork (4:3.5.0-0ubuntu2) dapper; urgency=low
 
   * Add package kdnssd with zeroconf:/ ioslave
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Jan 2006 02:22:49 +0000
 
-kdenetwork (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdenetwork (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:33 +0000
 
-kdenetwork (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdenetwork (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Generate .pot files
@@ -733,7 +733,7 @@ kdenetwork (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 21:10:41 +0000
 
-kdenetwork (4:3.5-rc1-0ubuntu1) dapper; urgency=low
+tdenetwork (4:3.5-rc1-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Update 11_dlopen-xmms.diff
@@ -743,7 +743,7 @@ kdenetwork (4:3.5-rc1-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 12 Nov 2005 19:25:52 +0000
 
-kdenetwork (4:3.4.3-2) experimental; urgency=low
+tdenetwork (4:3.4.3-2) experimental; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -755,7 +755,7 @@ kdenetwork (4:3.4.3-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 21 Oct 2005 08:38:26 -0400
 
-kdenetwork (4:3.4.3-1) experimental; urgency=low
+tdenetwork (4:3.4.3-1) experimental; urgency=low
 
   * New upstream release.
 
@@ -767,7 +767,7 @@ kdenetwork (4:3.4.3-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 16 Oct 2005 13:30:52 -0400
 
-kdenetwork (4:3.4.2-3) unstable; urgency=low
+tdenetwork (4:3.4.2-3) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -791,18 +791,18 @@ kdenetwork (4:3.4.2-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 24 Sep 2005 17:45:23 +0200
 
-kdenetwork (4:3.4.2-2) unstable; urgency=low
+tdenetwork (4:3.4.2-2) unstable; urgency=low
 
   +++ Changes by Luk Claes:
 
   * Updated FSF address.
    
-  * Build with g++-3.4 on arm, m68k and hppa; kdenetwork also makes gcc 4.0 ICE
+  * Build with g++-3.4 on arm, m68k and hppa; tdenetwork also makes gcc 4.0 ICE
     as described in #323133.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  1 Sep 2005 10:46:08 +0200
 
-kdenetwork (4:3.4.2-1) unstable; urgency=low
+tdenetwork (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -817,19 +817,19 @@ kdenetwork (4:3.4.2-1) unstable; urgency=low
   * Remove 07_xlibs-static-pic.diff and the xlibs-static-pic build-dependency,
     and add a build-dependency on libxxf86vm-dev, for the X.Org transition.
 
-  * Add a dependency on perl-suid for kdenetwork-filesharing, since it really
-    does need it to be useful, and kdelibs had its perl-suid dependency
-    weakened for reasons of security. Similarly, change the kdenetwork
-    metapackage's dependency on kdenetwork-filesharing to a Recommends,
+  * Add a dependency on perl-suid for tdenetwork-filesharing, since it really
+    does need it to be useful, and tdelibs had its perl-suid dependency
+    weakened for reasons of security. Similarly, change the tdenetwork
+    metapackage's dependency on tdenetwork-filesharing to a Recommends,
     where it joins lisa and ktald, languishing in ignominious obscurity.
     (Closes: #323064)
 
   * Remove lisa's unnecessary dependency on debconf.
 
-  * kdenetwork-dev: Add a Conflicts with librss1-dev (in addition to the
+  * tdenetwork-dev: Add a Conflicts with librss1-dev (in addition to the
     Replaces) to eliminate potential problems.
 
-  * kdict: Add a missing Replaces for kdebase-data.
+  * kdict: Add a missing Replaces for tdebase-data.
   
   +++ Changes by Luk Claes:
   
@@ -837,45 +837,45 @@ kdenetwork (4:3.4.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 30 Aug 2005 16:40:41 +0200
 
-kdenetwork (4:3.4.91-0ubuntu1) breezy; urgency=low
+tdenetwork (4:3.4.91-0ubuntu1) breezy; urgency=low
 
   * KDE 3.5 beta1
 
  -- Bart Verwilst <bart@verwilst.be>  Sun,  9 Oct 2005 13:18:37 +0000
 
-kdenetwork (4:3.4.3-0ubuntu1) breezy; urgency=low
+tdenetwork (4:3.4.3-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Build with GCC 3.4 on hppa
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  7 Oct 2005 18:14:17 +0000
 
-kdenetwork (4:3.4.2-0ubuntu3) breezy; urgency=low
+tdenetwork (4:3.4.2-0ubuntu3) breezy; urgency=low
 
   * Add kubuntu_03_gadu_offline.diff fixes http://bugs.kde.org/105131
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 19 Sep 2005 16:32:56 +0100
 
-kdenetwork (4:3.4.2-0ubuntu2) breezy; urgency=low
+tdenetwork (4:3.4.2-0ubuntu2) breezy; urgency=low
 
   * Add missing build-depend on unsermake
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 23:19:33 +0000
 
-kdenetwork (4:3.4.2-0ubuntu1) breezy; urgency=low
+tdenetwork (4:3.4.2-0ubuntu1) breezy; urgency=low
 
   * New upstream release.
   * Build using unsermake
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 13:19:02 +0000
 
-kdenetwork (4:3.4.1-0ubuntu4) breezy; urgency=low
+tdenetwork (4:3.4.1-0ubuntu4) breezy; urgency=low
 
   * Add build-depends on libxfixes-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 21 Jul 2005 12:55:05 +0000
 
-kdenetwork (4:3.4.1-0ubuntu3) breezy; urgency=low
+tdenetwork (4:3.4.1-0ubuntu3) breezy; urgency=low
 
   * Rebuild for new libiw
   * Add explicit include to /usr/X11R6/include for Xmu
@@ -884,61 +884,61 @@ kdenetwork (4:3.4.1-0ubuntu3) breezy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 20 Jul 2005 23:31:50 +0000
 
-kdenetwork (4:3.4.1-0ubuntu2) breezy; urgency=low
+tdenetwork (4:3.4.1-0ubuntu2) breezy; urgency=low
 
   * Remove build-dep on xmms
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu,  2 Jun 2005 02:35:10 +0000
 
-kdenetwork (4:3.4.1-0ubuntu1) breezy; urgency=low
+tdenetwork (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number following KDE 3.4.1 release
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed,  1 Jun 2005 00:47:48 +0000
 
-kdenetwork (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
+tdenetwork (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jr@jriddell.org>  Sat, 28 May 2005 23:23:38 +0000
 
-kdenetwork (4:3.4.1-1) experimental; urgency=low
+tdenetwork (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release 
 
   +++ Changes by Christopher Martin:
 
   * Merge librss1-dev and currently unused kopete headers into a general
-    kdenetwork-dev package.
+    tdenetwork-dev package.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
 
-kdenetwork (4:3.4.0-0ubuntu2) hoary; urgency=low
+tdenetwork (4:3.4.0-0ubuntu2) hoary; urgency=low
 
   * Fix kubuntu_01_kmenu_changes.diff
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 17 Mar 2005 02:49:27 +0000
 
-kdenetwork (4:3.4.0-0ubuntu1) hoary; urgency=low
+tdenetwork (4:3.4.0-0ubuntu1) hoary; urgency=low
 
-  * Remove kdict, ksirc from kdenetwork meta-package depends.
+  * Remove kdict, ksirc from tdenetwork meta-package depends.
   * Add kubuntu_01_kmenu_changes.diff patch to tidy up menus.
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 22:45:45 +0000
 
-kdenetwork (4:3.4.0-0pre1ubuntu2) hoary; urgency=low
+tdenetwork (4:3.4.0-0pre1ubuntu2) hoary; urgency=low
 
-  * Add dependency on kdenetwork-kfile-plugins to kdenetwork meta-package.
+  * Add dependency on tdenetwork-kfile-plugins to tdenetwork meta-package.
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue,  8 Mar 2005 13:09:19 +0000
 
-kdenetwork (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+tdenetwork (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jr@jriddell.org>  Mon,  7 Mar 2005 00:17:04 +0000
 
-kdenetwork (4:3.4.0-0pre2) alioth; urgency=low
+tdenetwork (4:3.4.0-0pre2) alioth; urgency=low
 
   * New upstream release.
 
@@ -951,7 +951,7 @@ kdenetwork (4:3.4.0-0pre2) alioth; urgency=low
 
   * Switch to CDBS for packaging.
 
-  * Added new package kdenetwork-kfile-plugins.
+  * Added new package tdenetwork-kfile-plugins.
 
   * ksirc now recommends libio-socket-ssl-perl, needed for SSL IRC servers
    (Closes: #294331)
@@ -960,7 +960,7 @@ kdenetwork (4:3.4.0-0pre2) alioth; urgency=low
 
   * Change kopete's section to kde. (Closes: #292398)
 
-  * New kdenetwork-doc-html package, containing doc-base registered HTML
+  * New tdenetwork-doc-html package, containing doc-base registered HTML
     versions of application handbooks, for users without Konqueror or
     KHelpCenter.
 
@@ -975,7 +975,7 @@ kdenetwork (4:3.4.0-0pre2) alioth; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 22 May 2005 18:45:20 +0200
 
-kdenetwork (4:3.3.2-6) unstable; urgency=high
+tdenetwork (4:3.3.2-6) unstable; urgency=high
 
   +++ Changes by Adeodato Simó:
 
@@ -996,7 +996,7 @@ kdenetwork (4:3.3.2-6) unstable; urgency=high
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 01 Jul 2005 21:34:40 +0200
 
-kdenetwork (4:3.3.2-5) unstable; urgency=high
+tdenetwork (4:3.3.2-5) unstable; urgency=high
 
   * High-urgency upload for sarge targetted RC bugfix.
 
@@ -1009,7 +1009,7 @@ kdenetwork (4:3.3.2-5) unstable; urgency=high
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 24 May 2005 02:25:01 +0200
 
-kdenetwork (4:3.3.2-4) unstable; urgency=high
+tdenetwork (4:3.3.2-4) unstable; urgency=high
 
   * Urgency high for sarge targetted fixes of bugs at severity important.
 
@@ -1028,7 +1028,7 @@ kdenetwork (4:3.3.2-4) unstable; urgency=high
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 20 May 2005 00:55:54 +0200
 
-kdenetwork (4:3.3.2-3) unstable; urgency=high
+tdenetwork (4:3.3.2-3) unstable; urgency=high
 
   * Urgency high because we fix a recently discovered FTBFS that prevents the
     previous medium-urgency upload to migrate to testing. Only debian/control
@@ -1038,7 +1038,7 @@ kdenetwork (4:3.3.2-3) unstable; urgency=high
 
   * xmms-dev has recently moved from depending on xlibs-dev to specifying the
     exact list of development libraries needed (see Bug#302059), which makes
-    kdenetwork fail to build from source now, Add libxtst-dev to Build-Depends.
+    tdenetwork fail to build from source now, Add libxtst-dev to Build-Depends.
     (Closes: #305942)
 
   * Make ksirc recommend libio-socket-ssl-perl, so that SSL connections work.
@@ -1046,7 +1046,7 @@ kdenetwork (4:3.3.2-3) unstable; urgency=high
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 23 Apr 2005 04:51:30 +0200
 
-kdenetwork (4:3.3.2-2) unstable; urgency=medium
+tdenetwork (4:3.3.2-2) unstable; urgency=medium
 
   +++ Changes by Christopher Martin:
 
@@ -1072,7 +1072,7 @@ kdenetwork (4:3.3.2-2) unstable; urgency=medium
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 30 Mar 2005 11:49:58 +0200
 
-kdenetwork (4:3.3.2-1ubuntu1) hoary; urgency=low
+tdenetwork (4:3.3.2-1ubuntu1) hoary; urgency=low
 
   * New upstream release.
   * Remove patches: 02_autotools_update, 05_pedantic-errors,
@@ -1080,7 +1080,7 @@ kdenetwork (4:3.3.2-1ubuntu1) hoary; urgency=low
 
  -- Chris Halls <chris.halls@credativ.co.uk>  Sun, 12 Dec 2004 21:04:59 +0000
 	
-kdenetwork (4:3.3.2-1) unstable; urgency=low
+tdenetwork (4:3.3.2-1) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -1099,7 +1099,7 @@ kdenetwork (4:3.3.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 26 Jan 2005 14:18:56 +0100
 
-kdenetwork (4:3.3.2-0pre1) experimental; urgency=low
+tdenetwork (4:3.3.2-0pre1) experimental; urgency=low
 
   * New upstream release.
 
@@ -1126,22 +1126,22 @@ kdenetwork (4:3.3.2-0pre1) experimental; urgency=low
 
  -- Adeodato Simó <asp16@alu.ua.es>  Tue, 21 Dec 2004 00:13:56 +0100
 
-kdenetwork (4:3.3.1-2) unstable; urgency=low
+tdenetwork (4:3.3.1-2) unstable; urgency=low
 
   * reapply kget patch, Closes: #280616
 
  -- Riku Voipio <riku.voipio@iki.fi>  Fri, 12 Nov 2004 19:41:32 +0000
 
-kdenetwork (4:3.3.1-1) unstable; urgency=low
+tdenetwork (4:3.3.1-1) unstable; urgency=low
 
   * New upstream version
   * krdc now recommends rdesktop. Closes: #271889
 
  -- Riku Voipio <riku.voipio@iki.fi>  Sat,  6 Nov 2004 09:47:50 +0000
 
-kdenetwork (4:3.3.0-2) unstable; urgency=low
+tdenetwork (4:3.3.0-2) unstable; urgency=low
 
-  * New kdenetwork Release Manager
+  * New tdenetwork Release Manager
   * krdc: Conflict with older rdesktop (Closes: #267434)
   * kget: Apply patch from upstream to prevent crashing (Closes: #266553)
   * kopete: Recommend qca-tls (Closes: #266597)
@@ -1150,46 +1150,46 @@ kdenetwork (4:3.3.0-2) unstable; urgency=low
 
  -- Riku Voipio <riku.voipio@iki.fi>  Sat, 28 Aug 2004 17:21:30 +0000
 
-kdenetwork (4:3.3.0-1) unstable; urgency=high
+tdenetwork (4:3.3.0-1) unstable; urgency=high
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat, 14 Aug 2004 18:00:00 -0500
 
-kdenetwork (4:3.2.3-1) unstable; urgency=high
+tdenetwork (4:3.2.3-1) unstable; urgency=high
 
   * New upstream release.
   * Build-Depends: xlibs-static-pic. (Closes: #260748)
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue,  3 Aug 2004 21:00:00 -0500
 
-kdenetwork (4:3.2.2-1) unstable; urgency=low
+tdenetwork (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 04:00:00 -0500
 
-kdenetwork (4:3.2.1-1) unstable; urgency=low
+tdenetwork (4:3.2.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat,  6 Mar 2004 14:00:00 -0600
 
-kdenetwork (4:3.2.0-0pre1v1) experimental; urgency=low
+tdenetwork (4:3.2.0-0pre1v1) experimental; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu, 19 Feb 2004 20:00:00 -0600
 
-kdenetwork (4:3.1.95-1) unstable; urgency=low
+tdenetwork (4:3.1.95-1) unstable; urgency=low
 
   * New upstream release.
   * Build-Conflict with libiw-dev since kwifimanager fails to compile.
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue, 27 Jan 2004 20:00:00 -0600
 
-kdenetwork (4:3.1.5-1) unstable; urgency=low
+tdenetwork (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
   * Added libtool arm patch.
@@ -1204,7 +1204,7 @@ kdenetwork (4:3.1.5-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue, 13 Jan 2004 21:00:00 -0600
 
-kdenetwork (4:3.1.4-1) unstable; urgency=low
+tdenetwork (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
   * Added patch to update autotools files.
@@ -1213,33 +1213,33 @@ kdenetwork (4:3.1.4-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat, 18 Oct 2003 01:00:00 -0500
 
-kdenetwork (4:3.1.3-1) unstable; urgency=low
+tdenetwork (4:3.1.3-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat,  2 Aug 2003 20:00:00 -0500
 
-kdenetwork (4:3.1.2-1) unstable; urgency=low
+tdenetwork (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
   * Change ktalkd user to run as nobody. (Closes: #147762)
 
  -- Christopher L Cheney <ccheney@debian.org>  Sun, 25 May 2003 23:00:00 -0500
 
-kdenetwork (4:3.1.1-1) unstable; urgency=low
+tdenetwork (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed, 12 Mar 2003 15:00:00 -0600
 
-kdenetwork (4:3.1.0-1) unstable; urgency=low
+tdenetwork (4:3.1.0-1) unstable; urgency=low
 
   * New upstream.
   * Redo debian dir.
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue, 04 Feb 2003 12:00:00 -0600
 
-kdenetwork (4:2.2.2-14.6) stable-security; urgency=high
+tdenetwork (4:2.2.2-14.6) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Applied upstream patches to fix several potential vulnerabilities.
@@ -1247,7 +1247,7 @@ kdenetwork (4:2.2.2-14.6) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Mon,  6 Jan 2003 09:11:27 +0100
 
-kdenetwork (4:2.2.2-14.5) stable-security; urgency=high
+tdenetwork (4:2.2.2-14.5) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Rebuilt since the buildd network decided to not build the packages
@@ -1255,7 +1255,7 @@ kdenetwork (4:2.2.2-14.5) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Thu, 12 Dec 2002 09:32:49 +0100
 
-kdenetwork (4:2.2.2-14.4) stable-security; urgency=high
+tdenetwork (4:2.2.2-14.4) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Applied a snipped from upstream's securty patch that wasn't covered
@@ -1263,13 +1263,13 @@ kdenetwork (4:2.2.2-14.4) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Sun, 10 Nov 2002 22:15:17 +0100
 
-kdenetwork (4:2.2.2-14.3) unstable; urgency=high
+tdenetwork (4:2.2.2-14.3) unstable; urgency=high
 
   * Rebuilt for sid
 
  -- Martin Schulze <joey@infodrom.org>  Mon,  4 Nov 2002 22:13:08 +0100
 
-kdenetwork (4:2.2.2-14.2) stable-security; urgency=high
+tdenetwork (4:2.2.2-14.2) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Applied patch from Alexander Neundorf to fix a local root
@@ -1283,21 +1283,21 @@ kdenetwork (4:2.2.2-14.2) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Fri,  1 Nov 2002 18:06:11 +0100
 
-kdenetwork (4:2.2.2-14.1) testing-security; urgency=high
+tdenetwork (4:2.2.2-14.1) testing-security; urgency=high
 
   * Non-maintainer upload by security team
   * Upload to unstable as well
 
  -- Wichert Akkerman <wakkerma@debian.org>  Fri, 12 Jul 2002 22:45:24 +0200
 
-kdenetwork (4:2.2.2-14.0woody1) testing-security; urgency=high
+tdenetwork (4:2.2.2-14.0woody1) testing-security; urgency=high
 
   * NMU by the security team.
     - Fix format string bug (Closes: #147762).
 
  -- Daniel Jacobowitz <dan@debian.org>  Sun,  7 Jul 2002 14:12:03 -0400
 
-kdenetwork (4:2.2.2-14) unstable; urgency=HIGH
+tdenetwork (4:2.2.2-14) unstable; urgency=HIGH
 
   * My last upload as Maintainer. *sniff*
   * Urgency high since this fixes an RC.
@@ -1308,21 +1308,21 @@ kdenetwork (4:2.2.2-14) unstable; urgency=HIGH
 
  -- Daniel Stone <daniel@sfarc.net>  Wed, 27 Feb 2002 17:02:50 +1100
 
-kdenetwork (4:2.2.2-13) unstable; urgency=low
+tdenetwork (4:2.2.2-13) unstable; urgency=low
 
   * debian/control:
     - Build with libpng2. (closes: #127592, #127902)
 
  -- Daniel Stone <daniel@sfarc.net>  Thu, 10 Jan 2002 21:04:59 +1100
 
-kdenetwork (4:2.2.2-12) unstable; urgency=low
+tdenetwork (4:2.2.2-12) unstable; urgency=low
 
   * debian/control:
     - Build with libpng3. 
 
  -- Daniel Stone <daniel@sfarc.net>  Wed,  2 Jan 2002 21:22:22 -0500
 
-kdenetwork (4:2.2.2-11) unstable; urgency=low
+tdenetwork (4:2.2.2-11) unstable; urgency=low
 
   * Another version! Yay! Thanks to Chris "danish" Danis for lending me his
     machine to do a great number of builds on.
@@ -1333,7 +1333,7 @@ kdenetwork (4:2.2.2-11) unstable; urgency=low
 
  -- Daniel Stone <daniel@sfarc.net>  Sun, 30 Dec 2001 07:52:43 -0500
 
-kdenetwork (4:2.2.2-10) unstable; urgency=low
+tdenetwork (4:2.2.2-10) unstable; urgency=low
 
   * kmail/kmmsgbase.cpp, knode/knmime.cpp:
     - Change 'char' to 'signed char' to keep gcc on platforms where char is
@@ -1341,27 +1341,27 @@ kdenetwork (4:2.2.2-10) unstable; urgency=low
 
  -- Daniel Stone <daniel@sfarc.net>  Sat, 29 Dec 2001 05:07:56 -0500
 
-kdenetwork (4:2.2.2-9) unstable; urgency=low
+tdenetwork (4:2.2.2-9) unstable; urgency=low
 
   * debian/control:
     - Fix build dependencies. (closes: #126100)
   * debian/rules:
     - Build with a separate builddir, just to bring it into sync with
-      kdegraphics; according to Eray, it's happier this way, anyway.
+      tdegraphics; according to Eray, it's happier this way, anyway.
 
  -- Daniel Stone <daniel@sfarc.net>  Sun, 23 Dec 2001 11:09:58 -0500
 
-kdenetwork (4:2.2.2-8) unstable; urgency=low
+tdenetwork (4:2.2.2-8) unstable; urgency=low
 
   * Apologies, *really* install the manpages now. I just pushed -7 then
     because SIGILLs are really, really, important, and manpages are trivial. 
 
  -- Daniel Stone <daniel@sfarc.net>  Thu, 20 Dec 2001 15:44:04 +1100
 
-kdenetwork (4:2.2.2-7) unstable; urgency=medium
+tdenetwork (4:2.2.2-7) unstable; urgency=medium
 
   * Build on a different machine. (closes: #123337)
-  * Medium severity because this badly broke every package in kdenetwork.
+  * Medium severity because this badly broke every package in tdenetwork.
   * debian/control:
     - Fix spelling, etc. (closes: #124842, #124846)
   * debian/rules:
@@ -1371,7 +1371,7 @@ kdenetwork (4:2.2.2-7) unstable; urgency=medium
 
  -- Daniel Stone <daniel@sfarc.net>  Tue, 18 Dec 2001 12:29:50 +1100
 
-kdenetwork (4:2.2.2-6) unstable; urgency=medium
+tdenetwork (4:2.2.2-6) unstable; urgency=medium
 
   * debian/klisa.postinst:
     - Fix problem where it wouldn't work if klisa wasn't started.
@@ -1382,7 +1382,7 @@ kdenetwork (4:2.2.2-6) unstable; urgency=medium
 
  -- Daniel Stone <daniel@sfarc.net>  Wed, 12 Dec 2001 15:34:30 +1100
 
-kdenetwork (4:2.2.2-5) unstable; urgency=low
+tdenetwork (4:2.2.2-5) unstable; urgency=low
 
   * debian/control:
     - Conflicts:, Replaces: keystone as it is no longer in the archive,
@@ -1400,7 +1400,7 @@ kdenetwork (4:2.2.2-5) unstable; urgency=low
 
  -- Daniel Stone <daniel@sfarc.net>  Sun,  9 Dec 2001 01:02:42 +1100
 
-kdenetwork (4:2.2.2-4) unstable; urgency=low
+tdenetwork (4:2.2.2-4) unstable; urgency=low
 
   * New maintainer. (closes: #114103)
   * debian/control:
@@ -1424,27 +1424,27 @@ kdenetwork (4:2.2.2-4) unstable; urgency=low
 
  -- Daniel Stone <daniel@sfarc.net>  Fri, 30 Nov 2001 21:41:29 +1100
 
-kdenetwork (4:2.2.2-3) unstable; urgency=low
+tdenetwork (4:2.2.2-3) unstable; urgency=low
 
   * Fix klisa again and properly
   * Add -ffunction-sections to CXXFLAGS for hppa builds
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 30 Nov 2001 01:01:00 -0700
 
-kdenetwork (4:2.2.2-2) unstable; urgency=low
+tdenetwork (4:2.2.2-2) unstable; urgency=low
 
   * Sync with upstream
   * Fix build bits, deps, etc for freeze
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 29 Nov 2001 04:06:00 -0700
 
-kdenetwork (4:2.2.2-1) unstable; urgency=low
+tdenetwork (4:2.2.2-1) unstable; urgency=low
 
   * New upstream version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Nov 2001 23:00:00 -0700
 
-kdenetwork (4:2.2.1-1.6) unstable; urgency=low
+tdenetwork (4:2.2.1-1.6) unstable; urgency=low
 
   * More upstream fixes
   * Build with newer binutils
@@ -1452,7 +1452,7 @@ kdenetwork (4:2.2.1-1.6) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 31 Oct 2001 23:00:00 -0700
 
-kdenetwork (4:2.2.1-1.5) unstable; urgency=low
+tdenetwork (4:2.2.1-1.5) unstable; urgency=low
 
   * More upstream fixes
   * remove automake hacks
@@ -1460,32 +1460,32 @@ kdenetwork (4:2.2.1-1.5) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 26 Oct 2001 13:15:00 -0700
 
-kdenetwork (4:2.2.1-1.4) unstable; urgency=low
+tdenetwork (4:2.2.1-1.4) unstable; urgency=low
 
   * Dont' check for auto* as it hoses things
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 08 Oct 2001 19:34:00 -0700
 
-kdenetwork (4:2.2.1-1.3) unstable; urgency=low
+tdenetwork (4:2.2.1-1.3) unstable; urgency=low
 
   * Fix configure
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 05 Oct 2001 09:42:00 -0700
 
-kdenetwork (4:2.2.1-1.2) unstable; urgency=low
+tdenetwork (4:2.2.1-1.2) unstable; urgency=low
 
   * Don't worry about automake 1.5
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 03 Oct 2001 09:42:00 -0700
 
-kdenetwork (4:2.2.1-1.1) unstable; urgency=low
+tdenetwork (4:2.2.1-1.1) unstable; urgency=low
 
   * Bunch of upstream fixes for kmail and klisa
   * hardcode sendmail instead of mail.local (Closes: #113749)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 28 Sep 2001 04:55:00 -0700
 
-kdenetwork (4:2.2.1-1) unstable; urgency=low
+tdenetwork (4:2.2.1-1) unstable; urgency=low
  
   * New upstream version 2.2.1
   * Change maintainer
@@ -1496,21 +1496,21 @@ kdenetwork (4:2.2.1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 07 Sep 2001 14:46:00 -0700
 
-kdenetwork (4:2.2.0-final-1) unstable; urgency=low
+tdenetwork (4:2.2.0-final-1) unstable; urgency=low
  
   * New upstream version 2.2
   * Add suggests for knewsticker-scripts
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 30 Jul 2001 00:01:00 -0700
 
-kdenetwork (4:2.2.0-0beta1-3) unstable; urgency=low
+tdenetwork (4:2.2.0-0beta1-3) unstable; urgency=low
  
   * Sync with upstream
   * More alpha build fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 07 Jul 2001 03:39:00 -0700
 
-kdenetwork (4:2.2.0-0beta1-2) unstable; urgency=low
+tdenetwork (4:2.2.0-0beta1-2) unstable; urgency=low
  
   * Sync with upstream
   * Spanish Templates (Closes: #103231)
@@ -1518,14 +1518,14 @@ kdenetwork (4:2.2.0-0beta1-2) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Jul 2001 01:43:00 -0700
 
-kdenetwork (4:2.2.0-0beta1-1) unstable; urgency=low
+tdenetwork (4:2.2.0-0beta1-1) unstable; urgency=low
  
   * Fix overwrites (Closes: #102858, #102860)
   * sync with upstream
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 30 Jun 2001 01:43:00 -0700
 
-kdenetwork (4:2.2-cvs20010622-1) unstable; urgency=low
+tdenetwork (4:2.2-cvs20010622-1) unstable; urgency=low
  
   * New upstream CVS pull
   * 2.2 beta1
@@ -1533,7 +1533,7 @@ kdenetwork (4:2.2-cvs20010622-1) unstable; urgency=low
   * Adding in new hint (Closes: #98042)
   * set $HOME in init.d script so that /root/.kde/share/apps/config/lisarc
     is read during bootup if it exists.
-  * 2 new packages kdict and libkdenetwork1
+  * 2 new packages kdict and libtdenetwork1
   * Fixes these problems: 
        korn run command (Closes: #77627)
   * New translations for klisa (Closes: #101016)
@@ -1542,7 +1542,7 @@ kdenetwork (4:2.2-cvs20010622-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Jun 2001 14:39:00 -0700
 
-kdenetwork (4:2.1.1-5) unstable; urgency=low
+tdenetwork (4:2.1.1-5) unstable; urgency=low
  
   * Update menu bits to include new kde menu removal tag
   * more Upstream fixes
@@ -1550,7 +1550,7 @@ kdenetwork (4:2.1.1-5) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Apr 2001 17:40:00 -0700
 
-kdenetwork (4:2.1.1-4) unstable; urgency=low
+tdenetwork (4:2.1.1-4) unstable; urgency=low
  
   * Use tcpwrappers (Closes: #92761)
   * Turn off nmblookup in lisarc by default..this way samba-client isn't
@@ -1559,7 +1559,7 @@ kdenetwork (4:2.1.1-4) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 03 Apr 2001 13:42:00 -0700
 
-kdenetwork (4:2.1.1-3) unstable; urgency=low
+tdenetwork (4:2.1.1-3) unstable; urgency=low
  
   * Change user for ktalkd.tty to root instead of nobody.tty
   * Fix talk problem when specifying tty (Closes: #92646)
@@ -1568,7 +1568,7 @@ kdenetwork (4:2.1.1-3) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 03 Apr 2001 09:56:00 -0700
 
-kdenetwork (4:2.1.1-2) unstable; urgency=low
+tdenetwork (4:2.1.1-2) unstable; urgency=low
  
   * Rebuild with older libc
   * Adding in documentation about kppp and noauth
@@ -1585,7 +1585,7 @@ kdenetwork (4:2.1.1-2) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 26 Mar 2001 17:17:00 -0700
 
-kdenetwork (4:2.1.1-1) unstable; urgency=low
+tdenetwork (4:2.1.1-1) unstable; urgency=low
  
   * New upstream version
   * Add conflict for lisa with xscreensaver (Closes: #90781)
@@ -1593,14 +1593,14 @@ kdenetwork (4:2.1.1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Mar 2001 05:27:00 -0700
 
-kdenetwork (4:2.1.0-1) unstable; urgency=low
+tdenetwork (4:2.1.0-1) unstable; urgency=low
  
    * New upstream CVS pull
    * Updating shlibs
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 10 Mar 2001 05:27:00 -0700
 
-kdenetwork (4:2.1-final-1) unstable; urgency=low
+tdenetwork (4:2.1-final-1) unstable; urgency=low
  
    * New upstream version
    * Upping standards version
@@ -1612,27 +1612,27 @@ kdenetwork (4:2.1-final-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
 
-kdenetwork (4:2.1-beta2-0128-1) unstable; urgency=low
+tdenetwork (4:2.1-beta2-0128-1) unstable; urgency=low
  
    * More upstream fixes
      Fixes length issues with ksirc
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 28 Jan 2001 20:00:00 -0700
 
-kdenetwork (4:2.1-beta2-1) unstable; urgency=low
+tdenetwork (4:2.1-beta2-1) unstable; urgency=low
  
    * New upstream beta
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 22 Jan 2001 01:45:00 -0700
 
-kdenetwork (4:2.1-20010118-1) unstable; urgency=low
+tdenetwork (4:2.1-20010118-1) unstable; urgency=low
  
    * More upstream fixes
    * Fixing knewsticker's section
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 19 Jan 2001 23:30:00 -0700
 
-kdenetwork (4:2.1-20010115-1) unstable; urgency=low
+tdenetwork (4:2.1-20010115-1) unstable; urgency=low
  
    * More upstream fixes
    * New knewsticker package
@@ -1641,14 +1641,14 @@ kdenetwork (4:2.1-20010115-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 15 Jan 2001 01:30:00 -0700
 
-kdenetwork (4:2.1-20010106-1) unstable; urgency=low
+tdenetwork (4:2.1-20010106-1) unstable; urgency=low
  
    * More upstream fixes
    * Upstream fix for kppp (Closes: #80484)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 06 Jan 2001 23:10:00 -0700
 
-kdenetwork (4:2.1-20010101-1) unstable; urgency=low
+tdenetwork (4:2.1-20010101-1) unstable; urgency=low
  
    * More upstream fixes
    * Lets actually set the proper perms for kppp (Closes: #80484)
@@ -1656,21 +1656,21 @@ kdenetwork (4:2.1-20010101-1) unstable; urgency=low
       
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Jan 2001 04:01:00 -0700
 
-kdenetwork (4:2.1-20001219-1) unstable; urgency=low
+tdenetwork (4:2.1-20001219-1) unstable; urgency=low
  
   * More upstream fixes
   * Adding new hints (Closes: #80031, #80071)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Dec 2000 23:30:00 -0700
                                                                                 
-kdenetwork (4:2.1-20001216-1) unstable; urgency=low
+tdenetwork (4:2.1-20001216-1) unstable; urgency=low
  
   * More upstream fixes
-  * Adding in missing conflicts for kdenetwork
+  * Adding in missing conflicts for tdenetwork
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 16 Dec 2000 23:50:00 -0700
 
-kdenetwork (4:2.1-20001213-1) unstable; urgency=low
+tdenetwork (4:2.1-20001213-1) unstable; urgency=low
  
   * New upstream CVS version
   * Build with new libmimelib (Closes: #79595)
@@ -1678,13 +1678,13 @@ kdenetwork (4:2.1-20001213-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 13 Dec 2000 15:00:00 -0700
 
-kdenetwork (4:2.0-final-8) unstable; urgency=low
+tdenetwork (4:2.0-final-8) unstable; urgency=low
  
   * Fixing file conflicts (Closes: #77851)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 23 Nov 2000 16:04:00 -0700
 
-kdenetwork (4:2.0-final-7) unstable; urgency=low
+tdenetwork (4:2.0-final-7) unstable; urgency=low
  
   * Documentation cleanup along with proper upstream changelogs
   * Fixing up build-depends for non x4 ports
@@ -1693,144 +1693,144 @@ kdenetwork (4:2.0-final-7) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 21 Nov 2000 02:30:00 -0700
 
-kdenetwork (4:2.0-final-6) unstable; urgency=low
+tdenetwork (4:2.0-final-6) unstable; urgency=low
  
   * More upstream kmail fixes (Closes: #77340)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 18 Nov 2000 08:45:00 -0700
 
-kdenetwork (4:2.0-final-5) unstable; urgency=low
+tdenetwork (4:2.0-final-5) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 15 Nov 2000 04:45:00 -0700
 
-kdenetwork (4:2.0-final-4.2) unstable; urgency=low
+tdenetwork (4:2.0-final-4.2) unstable; urgency=low
  
   * More upstream fixes
   * Adding in provides for mail and news readers and vnc viewers
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 10 Nov 2000 15:30:00 -0700
 
-kdenetwork (4:2.0-final-4.1) unstable; urgency=low
+tdenetwork (4:2.0-final-4.1) unstable; urgency=low
  
   * More upstream fixes
   * adding in menu hints
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
 
-kdenetwork (4:2.0-final-4) unstable; urgency=low
+tdenetwork (4:2.0-final-4) unstable; urgency=low
  
   * More i18n work
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 08 Nov 2000 17:30:00 -0700
                                                                                 
-kdenetwork (4:2.0-final-3.1) unstable; urgency=low
+tdenetwork (4:2.0-final-3.1) unstable; urgency=low
  
   * Applying ksirc i18n patch
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 05 Nov 2000 23:00:00 -0700
 
-kdenetwork (4:2.0-final-3) unstable; urgency=low
+tdenetwork (4:2.0-final-3) unstable; urgency=low
  
   * more upstream fixes
   * build against new xlibs
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 04 Nov 2000 23:00:00 -0700
                                                                                 
-kdenetwork (4:2.0-final-2) unstable; urgency=low
+tdenetwork (4:2.0-final-2) unstable; urgency=low
 
   * more upstream fixes
-  * fixing up dependencies (adding depends for kdebase-libs)
+  * fixing up dependencies (adding depends for tdebase-libs)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
 
-kdenetwork (4:2.0-final-0) unstable; urgency=low
+tdenetwork (4:2.0-final-0) unstable; urgency=low
  
   * KDE 2.0
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Oct 2000 00:00:00 -0700
                                                                                 
-kdenetwork (4:2.0-20001016-2) unstable; urgency=low
+tdenetwork (4:2.0-20001016-2) unstable; urgency=low
  
   * Applying i18n patch for knode
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 17 Oct 2000 21:00:00 -0700
                                                                                 
-kdenetwork (4:2.0-20001016-0) unstable; urgency=low
+tdenetwork (4:2.0-20001016-0) unstable; urgency=low
 
   * more upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 16 Oct 2000 15:00:00 -0700
 
-kdenetwork (4:2.0-20001013-0) unstable; urgency=low
+tdenetwork (4:2.0-20001013-0) unstable; urgency=low
  
   * More upstream fixes
-  * Adding in dependency for kdebase-libs
+  * Adding in dependency for tdebase-libs
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 14 Oct 2000 02:00:00 -0700
 
-kdenetwork (4:2.0-20001011-0) unstable; urgency=low
+tdenetwork (4:2.0-20001011-0) unstable; urgency=low
  
   * KDE 2.0 RC2
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 12 Oct 2000 06:00:00 -0700
                                                                                 
-kdenetwork (4:2.0-20001006-2) unstable; urgency=low
+tdenetwork (4:2.0-20001006-2) unstable; urgency=low
  
   * Fixing dependency on libmime1 for kmail (Closes: #74304)
-  * Applying kdenetwork-1.94-kmail-i18n-20000924.diff
+  * Applying tdenetwork-1.94-kmail-i18n-20000924.diff
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Oct 2000 03:00:00 -0700
                                                                                 
-kdenetwork (4:2.0-20001006-0) unstable; urgency=low
+tdenetwork (4:2.0-20001006-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 06 Oct 2000 18:00:00 -0700
                                                                                 
-kdenetwork (4:2.0-20001005-0) unstable; urgency=low
+tdenetwork (4:2.0-20001005-0) unstable; urgency=low
  
   * More upstream fixes
-  * Compiling against non-versioned kdelibs once again
+  * Compiling against non-versioned tdelibs once again
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 05 Oct 2000 15:00:00 -0700
                                                                                 
-kdenetwork (4:2.0-20001002-0) unstable; urgency=low
+tdenetwork (4:2.0-20001002-0) unstable; urgency=low
  
   * KDE 2.0 RC1
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Oct 2000 01:30:00 -0700
                                                                                 
-kdenetwork (4:2.0-20000925-2) unstable; urgency=low
+tdenetwork (4:2.0-20000925-2) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 27 Sep 2000 22:00:00 -0700
 
-kdenetwork (4:2.0-20000925-0) unstable; urgency=low
+tdenetwork (4:2.0-20000925-0) unstable; urgency=low
  
   * More upstream fixes
   * Build-depends fixes
-  * Fixing kdenetwork-dev depends (Closes: #72328)
+  * Fixing tdenetwork-dev depends (Closes: #72328)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
 
-kdenetwork (4:2.0-20000920-0) unstable; urgency=low
+tdenetwork (4:2.0-20000920-0) unstable; urgency=low
  
   * More upstream fixes
   * compiling with a --without-ssl for US release
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Sep 2000 20:30:00 -0700
 
-kdenetwork (4:2.0-20000918-0) unstable; urgency=low
+tdenetwork (4:2.0-20000918-0) unstable; urgency=low
  
   * more upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Sep 2000 18:30:00 -0700      
 
-kdenetwork (4:2.0-20000912-0) unstable; urgency=low
+tdenetwork (4:2.0-20000912-0) unstable; urgency=low
  
   * more upstream fixes
   * breaking package into parts
@@ -1838,14 +1838,14 @@ kdenetwork (4:2.0-20000912-0) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 12 Sep 2000 22:30:00 -0700
 
-kdenetwork (4:2.0-20000909-0) unstable; urgency=low
+tdenetwork (4:2.0-20000909-0) unstable; urgency=low
 
   * more upstream fixes
   * Fixing up sections a bit more
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 09 Sep 2000 22:30:00 -0700
 
-kdenetwork (4:2.0-20000827-0) experimental; urgency=low
+tdenetwork (4:2.0-20000827-0) experimental; urgency=low
  
   * Build fixes
   * more upstream fixes
@@ -1853,31 +1853,31 @@ kdenetwork (4:2.0-20000827-0) experimental; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 27 Aug 2000 19:30:00 -0700     
 
-kdenetwork (4:2.0-20000825-0) experimental; urgency=low
+tdenetwork (4:2.0-20000825-0) experimental; urgency=low
  
   * Build fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 25 Aug 2000 22:30:00 -0700
                                                                                 
-kdenetwork (4:2.0-20000823-1.0) experimental; urgency=low
+tdenetwork (4: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:00 -0700
                                                                                
-kdenetwork (4:2.0-20000820-1.0) experimental; urgency=low
+tdenetwork (4:2.0-20000820-1.0) experimental; urgency=low
  
   * New upstream beta version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 20 Aug 2000 09:45:00 -0700
 
-kdenetwork-cvs (4:2.0-20000521-1.0) experimental; urgency=low
+tdenetwork-cvs (4:2.0-20000521-1.0) experimental; urgency=low
  
   * New upstream CVS version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 21 May 2000 02:15:00 -0700
 
-kdenetwork-cvs (4:2.0-20000512-1.2) experimental; urgency=low
+tdenetwork-cvs (4:2.0-20000512-1.2) experimental; urgency=low
  
   * New upstream CVS version
   * Turning on debugging
@@ -1885,162 +1885,162 @@ kdenetwork-cvs (4:2.0-20000512-1.2) experimental; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 12 May 2000 22:00:00 -0700
 
-kdenetwork-cvs (4:2.0-20000308-1.0) experimental; urgency=low
+tdenetwork-cvs (4:2.0-20000308-1.0) experimental; urgency=low
  
   * New upstream CVS version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 08 Mar 2000 22:00:00 -0700
 
-kdenetwork-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+tdenetwork-cvs (4:2.0-20000302-1.0) experimental; urgency=low
 
   * New upstream CVS version
   * Adding in build-depends
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 29 Feb 2000 22:00:00 -0700
 
-kdenetwork-cvs (4:2.0-19991201-1.0) experimental; urgency=low
+tdenetwork-cvs (4:2.0-19991201-1.0) experimental; urgency=low
 
   * New upstream CVS version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 01 Dec 1999 00:10:48 -0400
 
-kdenetwork-cvs (4:2.0-19991004-1) experimental; urgency=low
+tdenetwork-cvs (4:2.0-19991004-1) experimental; urgency=low
 
   * New upstream CVS version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 04 Oct 1999 08:10:48 -0400
 
-kdenetwork-cvs (4:2.0-19991001-1) experimental; urgency=low
+tdenetwork-cvs (4:2.0-19991001-1) experimental; urgency=low
 
   * New upstream CVS version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Oct 1999 08:10:48 -0400
 
-kdenetwork-cvs (4:2.0-19990822-1) experimental; urgency=low
+tdenetwork-cvs (4:2.0-19990822-1) experimental; urgency=low
 
   * New upstream CVS version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 22 Aug 1999 09:30:48 -0400
 
-kdenetwork-cvs (4:2.0-19990719-1) experimental; urgency=low
+tdenetwork-cvs (4:2.0-19990719-1) experimental; urgency=low
 
   * New upstream CVS version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Jul 1999 20:30:48 -0400
 
-kdenetwork-cvs (4:2.0-19990626-2) experimental; urgency=low
+tdenetwork-cvs (4:2.0-19990626-2) experimental; urgency=low
 
   * Seperating out the development files into a -dev pacakge
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 28 Jun 1999 20:30:48 -0400
 
-kdenetwork-cvs (4:2.0-19990626-1) experimental; urgency=low
+tdenetwork-cvs (4:2.0-19990626-1) experimental; urgency=low
 
   * new version
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 27 Jun 1999 21:14:48 +0200
 
-kdenetwork-cvs (4:2.0-19990524-1) experimental; urgency=low
+tdenetwork-cvs (4:2.0-19990524-1) experimental; urgency=low
 
   * new upstream CVS version 
   * migrating out of /opt to /
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 24 May 1999 07:30:09 -0400
 
-kdenetwork (4:1.1-19990222-1) unstable; urgency=low
+tdenetwork (4:1.1-19990222-1) unstable; urgency=low
 
   * new upstream version with fixed pws 
 
  -- Patricia Jung <trish@freiburg.linux.de>  Mon, 22 Feb 1999 23:25:49 +0100 
 
-kdenetwork (4:1.1-19990217-1) unstable; urgency=low
+tdenetwork (4:1.1-19990217-1) unstable; urgency=low
 
   * new upstream version
 
  -- Stephan Kulow <coolo@kde.org>  Wed, 17 Feb 1999 19:09:42 +0100
 
-kdenetwork (4:1.1-19990211-2) unstable; urgency=low
+tdenetwork (4:1.1-19990211-2) unstable; urgency=low
 
   * fixed line numbers in po/hr/kppp.po
 
  -- Patricia Jung <trish@freiburg.linux.de>  Wed, 17 Feb 1999 22:53:57 +0100 
 
-kdenetwork (4:1.1-19990211) unstable; urgency=low
+tdenetwork (4:1.1-19990211) unstable; urgency=low
 
   * adding ksirc back into the distribution after fixing some weired
     things in it
 
  -- Stephan Kulow <coolo@kde.org>  Thu, 11 Feb 1999 22:35:00 +0100
 
-kdenetwork (4:1.1-19990207-2) unstable; urgency=low
+tdenetwork (4:1.1-19990207-2) unstable; urgency=low
 
   * fixed a bug with the wrong libjpeg version
 
  -- Stephan Kulow <coolo@kde.org>  Tue,  9 Feb 1999 10:43:43 +0100
 
-kdenetwork (4:1.1-19990207-1) unstable; urgency=low
+tdenetwork (4:1.1-19990207-1) unstable; urgency=low
 
   * new upstream version 1.1 and new epoche
 
  -- Stephan Kulow <coolo@kde.org>  Sun,  7 Feb 1999 12:12:59 +0100
 
-kdenetwork (2:980710-1.0-1) unstable; urgency=low
+tdenetwork (2:980710-1.0-1) unstable; urgency=low
 
   * new upstream version 1.0
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 12 Jul 1998 10:12:19 +0200
 
-kdenetwork (2:980419-b4-1) unstable; urgency=low
+tdenetwork (2:980419-b4-1) unstable; urgency=low
 
   * new upstream version Beta4
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 19 Apr 1998 17:43:01 +0200
 
-kdenetwork (2:980328-2) frozen; urgency=low
+tdenetwork (2:980328-2) frozen; urgency=low
 
   * added undocumented man page for all binaries
-  * new compile with fixed kdelibs (should be the last time)
+  * new compile with fixed tdelibs (should be the last time)
 
  -- Stephan Kulow <coolo@kde.org>  Sat, 28 Mar 1998 21:33:55 +0100    
 
-kdenetwork (2:980328-1) frozen; urgency=low 
+tdenetwork (2:980328-1) frozen; urgency=low 
 
   * new upstream version with bug fixes
 
  -- Stephan Kulow <coolo@kde.org>  Sat, 28 Mar 1998 21:33:55 +0100
 
-kdenetwork (2:980311-2) frozen; urgency=low
+tdenetwork (2:980311-2) frozen; urgency=low
 
   * new compile cycle with qt-1.33 and libstc++-2.8
 
  -- Stephan Kulow <coolo@kde.org>  Tue, 24 Mar 1998 19:59:56 +0100
 
-kdenetwork (2:980311-1) experimental; urgency=low
+tdenetwork (2:980311-1) experimental; urgency=low
 
   * New upstream release
 
  -- Stephan Kulow <coolo@kde.org>  Thu, 12 Mar 1998 23:21:40 +0100
 
-kdenetwork (980228-1) experimental; urgency=low
+tdenetwork (980228-1) experimental; urgency=low
 
   * New upstream release
 
  -- Stephan Kulow <coolo@kde.org>  Sat, 28 Feb 1998 22:17:39 +0100
 
-kdenetwork (980227-1) experimental; urgency=low
+tdenetwork (980227-1) experimental; urgency=low
 
   * changed maintainer field
   * New upstream release
 
  -- Stephan Kulow <coolo@kde.org>  Sat, 28 Feb 1998 02:28:33 +0100
 
-kdenetwork (1:Beta2-2.1) experimental; urgency=low
+tdenetwork (1:Beta2-2.1) experimental; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Fri,  5 Dec 1997 21:17:07 +0100
 
-kdenetwork (1:Beta2-2) unstable; urgency=low
+tdenetwork (1:Beta2-2) unstable; urgency=low
 
   * changed kmail to use umask(077) ! mailfolders should not be world
     readable ...
@@ -2049,31 +2049,31 @@ kdenetwork (1:Beta2-2) unstable; urgency=low
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun, 30 Nov 1997 17:08:07 +0100
 
-kdenetwork (1:Beta2-1) unstable; urgency=low
+tdenetwork (1:Beta2-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun, 23 Nov 1997 16:07:21 +0100
 
-kdenetwork (1:Beta1.2-2) unstable; urgency=low
+tdenetwork (1:Beta1.2-2) unstable; urgency=low
 
   * new compile cycle with bugfixes.
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun,  9 Nov 1997 19:42:58 +0100
 
-kdenetwork (1:Beta1.2-1) unstable; urgency=low
+tdenetwork (1:Beta1.2-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 27 Oct 1997 11:44:46 +0100
 
-kdenetwork (1:Beta1.1-1) unstable; urgency=low
+tdenetwork (1:Beta1.1-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 20 Oct 1997 11:15:00 +0200
 
-kdenetwork (971019-1) unstable; urgency=low
+tdenetwork (971019-1) unstable; urgency=low
 
   * Initial Release (my old version disapeared from my hard disk ?)
 
diff --git a/ubuntu/maverick/tdenetwork/debian/control b/ubuntu/maverick/tdenetwork/debian/control
index e8b2e8da7..2ede2a525 100644
--- a/ubuntu/maverick/tdenetwork/debian/control
+++ b/ubuntu/maverick/tdenetwork/debian/control
@@ -1,20 +1,20 @@
-Source: kdenetwork-trinity
+Source: tdenetwork-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kdenetwork-trinity
+Package: tdenetwork-trinity
 Section: kde
 Architecture: all
-Replaces: kdenetwork-kde3 (<< 4:3.5.13)
-Breaks: kdenetwork-kde3 (<< 4:3.5.13)
-Depends: dcoprss-trinity (>= ${Source-Version}), kdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), kdnssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version})
-Recommends: kdenetwork-filesharing-trinity (>= ${Source-Version}), ktalkd-trinity (>= ${Source-Version}), lisa-trinity (>= ${Source-Version})
-Suggests: kdenetwork-trinity-doc-html (>= ${Source-Version})
+Replaces: tdenetwork-kde3 (<< 4:3.5.13)
+Breaks: tdenetwork-kde3 (<< 4:3.5.13)
+Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), kdnssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version})
+Recommends: tdenetwork-filesharing-trinity (>= ${Source-Version}), ktalkd-trinity (>= ${Source-Version}), lisa-trinity (>= ${Source-Version})
+Suggests: tdenetwork-trinity-doc-html (>= ${Source-Version})
 Description: network-related 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,
@@ -31,7 +31,7 @@ Replaces: dcoprss-kde3 (<< 4:3.5.13)
 Breaks: dcoprss-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Description: RSS utilities for Trinity
- kdenetwork-dcoprss is a RSS to DCOP bridge, allowing all
+ tdenetwork-dcoprss is a RSS to DCOP bridge, allowing all
  DCOP aware applications to access RSS news feeds. There is also
  a few sample utilities provided.
  .
@@ -39,14 +39,14 @@ Description: RSS utilities for Trinity
  DCOP is the KDE interprocess communication protocol.
  .
  This package is part of Trinity, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
-Package: kdenetwork-trinity-doc-html
+Package: tdenetwork-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: kdenetwork-kde3-doc-html (<< 4:3.5.13)
-Breaks: kdenetwork-kde3-doc-html (<< 4:3.5.13)
-Suggests: konqueror-trinity | www-browser, kdebase-trinity
+Replaces: tdenetwork-kde3-doc-html (<< 4:3.5.13)
+Breaks: tdenetwork-kde3-doc-html (<< 4:3.5.13)
+Suggests: konqueror-trinity | www-browser, tdebase-trinity
 Description: Trinity network documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -59,13 +59,13 @@ Description: Trinity network documentation in HTML format
  KDE network packages.
  .
  This package is part of KDE, and a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
-Package: kdenetwork-kfile-plugins-trinity
+Package: tdenetwork-kfile-plugins-trinity
 Section: kde
 Architecture: any
-Replaces: kdenetwork-kfile-plugins-kde3 (<< 4:3.5.13)
-Breaks: kdenetwork-kfile-plugins-kde3 (<< 4:3.5.13)
+Replaces: tdenetwork-kfile-plugins-kde3 (<< 4:3.5.13)
+Breaks: tdenetwork-kfile-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Enhances: konqueror-trinity
 Description: torrent metainfo plugin for Trinity
@@ -75,13 +75,13 @@ Description: torrent metainfo plugin for Trinity
  dialog in konqueror and other file-handling applications.
  .
  This package is part of Trinity, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
-Package: kdenetwork-filesharing-trinity
+Package: tdenetwork-filesharing-trinity
 Section: net
 Architecture: any
-Replaces: kdenetwork-filesharing-kde3 (<< 4:3.5.13)
-Breaks: kdenetwork-filesharing-kde3 (<< 4:3.5.13)
+Replaces: tdenetwork-filesharing-kde3 (<< 4:3.5.13)
+Breaks: tdenetwork-filesharing-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Recommends: perl-suid
 Description: network filesharing configuration module for Trinity
@@ -89,7 +89,7 @@ Description: network filesharing configuration module for Trinity
  NFS and Samba.
  .
  This package is part of Trinity, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
 Package: kdict-trinity
 Section: net
@@ -106,7 +106,7 @@ Description: dictionary client for Trinity
  basic as well as advanced queries.
  .
  This package is part of Trinity, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
 Package: kget-trinity
 Section: net
@@ -124,7 +124,7 @@ Description: download manager for Trinity
  applications and Netscape.
  .
  This package is part of Trinity, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
 Package: knewsticker-trinity
 Section: kde
@@ -141,7 +141,7 @@ Description: news ticker applet for Trinity
  good news sources which provide such files.
  .
  This package is part of Trinity, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
 Package: kopete-trinity
 Section: kde
@@ -150,7 +150,7 @@ Replaces: kopete-kde3 (<< 4:3.5.13)
 Breaks: kopete-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Recommends: qca-tls
-Suggests: kdeartwork-emoticons-trinity, khelpcenter-trinity, imagemagick, gnupg, gnomemeeting
+Suggests: tdeartwork-emoticons-trinity, khelpcenter-trinity, imagemagick, gnupg, gnomemeeting
 Description: instant messenger for Trinity
  Kopete is an instant messenger program which can communicate with a variety
  of IM systems, such as Yahoo, ICQ, MSN, IRC and Jabber.
@@ -162,7 +162,7 @@ Description: instant messenger for Trinity
  Support for more IM protocols can be added through a plugin system.
  .
  This package is part of Trinity, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
  .
  Homepage: http://kopete.kde.org
 
@@ -180,7 +180,7 @@ Description: public fileserver for Trinity
  designed to be used for sharing files with friends.
  .
  This package is part of Trinity, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
 Package: kppp-trinity
 Section: net
@@ -199,7 +199,7 @@ Description: modem dialer and ppp frontend for Trinity
  track of the time spent online for you.
  .
  This package is part of Trinity, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
 Package: krdc-trinity
 Section: net
@@ -215,7 +215,7 @@ Description: Remote Desktop Connection for Trinity
  Servers using RDP.
  .
  This package is part of Trinity, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
 Package: krfb-trinity
 Section: net
@@ -233,7 +233,7 @@ Description: Desktop Sharing for Trinity
  task.
  .
  This package is part of Trinity, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
 Package: ksirc-trinity
 Section: net
@@ -251,7 +251,7 @@ Description: IRC client for Trinity
  recommended package libio-socket-ssl-perl.
  .
  This package is part of Trinity, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
 Package: ktalkd-trinity
 Section: net
@@ -270,7 +270,7 @@ Description: talk daemon for Trinity
  and shouldn't be run on a multi-user machine.
  .
  This package is part of Trinity, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
 Package: kwifimanager-trinity
 Section: net
@@ -286,7 +286,7 @@ Description: wireless lan manager for Trinity
  wavelan card that uses the wireless extensions interface.
  .
  This package is part of Trinity, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
 Package: librss1-trinity
 Section: libs
@@ -300,21 +300,21 @@ Description: RSS library for Trinity
  automatically when needed.
  .
  This package is part of Trinity, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
-Package: kdenetwork-trinity-dev
+Package: tdenetwork-trinity-dev
 Section: devel
 Architecture: any
-Replaces: kdenetwork-kde3-dev (<< 4:3.5.13)
-Breaks: kdenetwork-kde3-dev (<< 4:3.5.13)
-Depends: kdict-trinity (= ${Source-Version}), kopete-trinity (= ${Source-Version}), ksirc-trinity (= ${Source-Version}), librss1-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
+Replaces: tdenetwork-kde3-dev (<< 4:3.5.13)
+Breaks: tdenetwork-kde3-dev (<< 4:3.5.13)
+Depends: kdict-trinity (= ${Source-Version}), kopete-trinity (= ${Source-Version}), ksirc-trinity (= ${Source-Version}), librss1-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
 Description: development files for the Trinity network module
  This is the development package which contains the headers for the KDE RSS
  library as well as the Kopete chat client, as well as miscellaneous
  development-related files for the KDE network module.
  .
  This package is part of Trinity, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
 Package: lisa-trinity
 Section: net
@@ -328,7 +328,7 @@ Description: LAN information server for Trinity
  but relying only on the TCP/IP protocol.
  .
  This package is part of Trinity, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
 Package: kdnssd-trinity
 Section: net
@@ -343,16 +343,16 @@ Description: Zeroconf support for KDE
  "zeroconf:/" in Konqueror.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
-Package: kdenetwork-trinity-dbg
+Package: tdenetwork-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: kdenetwork-kde3-dbg (<< 4:3.5.13)
-Breaks: kdenetwork-kde3-dbg (<< 4:3.5.13)
+Replaces: tdenetwork-kde3-dbg (<< 4:3.5.13)
+Breaks: tdenetwork-kde3-dbg (<< 4:3.5.13)
 Priority: extra
-Depends: librss1-trinity (= ${Source-Version}), kdelibs-trinity-dbg
-Description: debugging symbols for kdenetwork-trinity
- This package contains the debugging symbols associated with kdenetwork-trinity.
- They will automatically be used by gdb for debugging kdenetwork-related
+Depends: librss1-trinity (= ${Source-Version}), tdelibs-trinity-dbg
+Description: debugging symbols for tdenetwork-trinity
+ This package contains the debugging symbols associated with tdenetwork-trinity.
+ They will automatically be used by gdb for debugging tdenetwork-related
  issues.
diff --git a/ubuntu/maverick/tdenetwork/debian/control.in b/ubuntu/maverick/tdenetwork/debian/control.in
index 58ed972df..9c545a27b 100644
--- a/ubuntu/maverick/tdenetwork/debian/control.in
+++ b/ubuntu/maverick/tdenetwork/debian/control.in
@@ -1,18 +1,18 @@
-Source: kdenetwork
+Source: tdenetwork
 Section: kde
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], libxxf86vm-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], libxxf86vm-dev
 Standards-Version: 3.7.2
 
-Package: kdenetwork
+Package: tdenetwork
 Section: kde
 Architecture: all
-Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kdnssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version})
-Recommends: kdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version})
-Suggests: kdenetwork-doc-html (>= ${Source-Version})
+Depends: dcoprss (>= ${Source-Version}), tdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kdnssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version})
+Recommends: tdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version})
+Suggests: tdenetwork-doc-html (>= ${Source-Version})
 Description: network-related 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,
@@ -27,7 +27,7 @@ Section: net
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: RSS utilities for KDE
- kdenetwork-dcoprss is a RSS to DCOP bridge, allowing all
+ tdenetwork-dcoprss is a RSS to DCOP bridge, allowing all
  DCOP aware applications to access RSS news feeds. There is also
  a few sample utilities provided.
  .
@@ -35,12 +35,12 @@ Description: RSS utilities for KDE
  DCOP is the KDE interprocess communication protocol.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
-Package: kdenetwork-doc-html
+Package: tdenetwork-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror | www-browser, kdebase
+Suggests: konqueror | www-browser, tdebase
 Description: KDE network documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -53,9 +53,9 @@ Description: KDE network documentation in HTML format
  KDE network packages.
  .
  This package is part of KDE, and a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
-Package: kdenetwork-kfile-plugins
+Package: tdenetwork-kfile-plugins
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -67,9 +67,9 @@ Description: torrent metainfo plugin for KDE
  dialog in konqueror and other file-handling applications.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
-Package: kdenetwork-filesharing
+Package: tdenetwork-filesharing
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, perl-suid
@@ -79,7 +79,7 @@ Description: network filesharing configuration module for KDE
  NFS and Samba.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
 Package: kdict
 Section: net
@@ -87,7 +87,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
 Provides: dict-client
-Replaces: kdebase-data (<< 4:3.4.0)
+Replaces: tdebase-data (<< 4:3.4.0)
 Description: dictionary client for KDE
  KDict is an advanced KDE graphical client for the DICT Protocol, with full
  Unicode support. It enables you to search through dictionary databases for a
@@ -95,7 +95,7 @@ Description: dictionary client for KDE
  basic as well as advanced queries.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
 Package: kget
 Section: net
@@ -111,7 +111,7 @@ Description: download manager for KDE
  applications and Netscape.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
 Package: knewsticker
 Section: kde
@@ -126,14 +126,14 @@ Description: news ticker applet for KDE
  good news sources which provide such files.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
 Package: kopete
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: qca-tls
-Suggests: kdeartwork-emoticons, khelpcenter, imagemagick, gnupg, gnomemeeting
+Suggests: tdeartwork-emoticons, khelpcenter, imagemagick, gnupg, gnomemeeting
 Replaces: konversation (<= 0.14.0-4), sim (<= 0.9.3-2)
 Description: instant messenger for KDE
  Kopete is an instant messenger program which can communicate with a variety
@@ -146,7 +146,7 @@ Description: instant messenger for KDE
  Support for more IM protocols can be added through a plugin system.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
  .
  Homepage: http://kopete.kde.org
 
@@ -162,7 +162,7 @@ Description: public fileserver for KDE
  designed to be used for sharing files with friends.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
 Package: kppp
 Section: net
@@ -179,7 +179,7 @@ Description: modem dialer and ppp frontend for KDE
  track of the time spent online for you.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
 Package: krdc
 Section: net
@@ -193,7 +193,7 @@ Description: Remote Desktop Connection for KDE
  Servers using RDP.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
 Package: krfb
 Section: net
@@ -209,7 +209,7 @@ Description: Desktop Sharing for KDE
  task.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
 Package: ksirc
 Section: net
@@ -225,7 +225,7 @@ Description: IRC client for KDE
  recommended package libio-socket-ssl-perl.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
 Package: ktalkd
 Section: net
@@ -244,7 +244,7 @@ Description: talk daemon for KDE
  and shouldn't be run on a multi-user machine.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
 Package: kwifimanager
 Section: net
@@ -258,7 +258,7 @@ Description: wireless lan manager for KDE
  wavelan card that uses the wireless extensions interface.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
 Package: librss1
 Section: libs
@@ -270,12 +270,12 @@ Description: RSS library for KDE
  automatically when needed.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
-Package: kdenetwork-dev
+Package: tdenetwork-dev
 Section: devel
 Architecture: any
-Depends: kdict (= ${Source-Version}), kopete (= ${Source-Version}), ksirc (= ${Source-Version}), librss1 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: kdict (= ${Source-Version}), kopete (= ${Source-Version}), ksirc (= ${Source-Version}), librss1 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
 Replaces: librss1-dev, kdict (<< 4:3.5.0-3)
 Conflicts: librss1-dev
 Description: development files for the KDE network module
@@ -284,7 +284,7 @@ Description: development files for the KDE network module
  development-related files for the KDE network module.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
 Package: lisa
 Section: net
@@ -297,7 +297,7 @@ Description: LAN information server for KDE
  but relying only on the TCP/IP protocol.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
 Package: kdnssd
 Section: net
@@ -310,14 +310,14 @@ Description: Zeroconf support for KDE
  "zeroconf:/" in Konqueror.
  .
  This package is part of KDE, as a component of the KDE network module.
- See the 'kde' and 'kdenetwork' packages for more information.
+ See the 'kde' and 'tdenetwork' packages for more information.
 
-Package: kdenetwork-dbg
+Package: tdenetwork-dbg
 Section: libdevel
 Architecture: any
 Priority: extra
-Depends: librss1 (= ${Source-Version}), kdelibs-dbg
-Description: debugging symbols for kdenetwork
- This package contains the debugging symbols associated with kdenetwork.
- They will automatically be used by gdb for debugging kdenetwork-related
+Depends: librss1 (= ${Source-Version}), tdelibs-dbg
+Description: debugging symbols for tdenetwork
+ This package contains the debugging symbols associated with tdenetwork.
+ They will automatically be used by gdb for debugging tdenetwork-related
  issues.
diff --git a/ubuntu/maverick/tdenetwork/debian/copyright b/ubuntu/maverick/tdenetwork/debian/copyright
index 810eb4b73..1bcb3d62c 100644
--- a/ubuntu/maverick/tdenetwork/debian/copyright
+++ b/ubuntu/maverick/tdenetwork/debian/copyright
@@ -23,7 +23,7 @@ headings and other identifying marks.
 
 
 kit, kmail, kmailcvt, knode, korn, kppp, kcmtalkd,
-ktalkdlg, lisa, libkdenetwork, mimelib
+ktalkdlg, lisa, libtdenetwork, mimelib
 --------------------------------------------------
 GPL
 
diff --git a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.presubj b/ubuntu/maverick/tdenetwork/debian/kopete-trinity.presubj
index d852c6c0d..b818709fb 100644
--- a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.presubj
+++ b/ubuntu/maverick/tdenetwork/debian/kopete-trinity.presubj
@@ -6,8 +6,8 @@ When you report a kopete crash, it is important to provide:
    you have activated, the precises circumstances of the bug...)
  * a useful backtrace of the crash
 
-To produce useful backtraces you must have qt-x11-free-dbg, kdelibs-dbg,
-and kdenetwork-dbg installed. kdebase-dbg may also be useful. A backtrace
+To produce useful backtraces you must have qt-x11-free-dbg, tdelibs-dbg,
+and tdenetwork-dbg installed. tdebase-dbg may also be useful. A backtrace
 full of "(no debugging symbols found)" is useless.
 
 A bug that is not reproducible, or that lacks the necessary backtrace, will
diff --git a/ubuntu/maverick/tdenetwork/debian/rules b/ubuntu/maverick/tdenetwork/debian/rules
index fc8885101..90babf808 100755
--- a/ubuntu/maverick/tdenetwork/debian/rules
+++ b/ubuntu/maverick/tdenetwork/debian/rules
@@ -26,7 +26,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
-DEB_DH_STRIP_ARGS  := --dbg-package=kdenetwork-trinity-dbg
+DEB_DH_STRIP_ARGS  := --dbg-package=tdenetwork-trinity-dbg
 
 PACKAGES_WITH_LIBS := librss1-trinity kopete-trinity ksirc-trinity kwifimanager-trinity
 
diff --git a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.kdict b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kdict
index 65fd0a42e..7d68d39ea 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.kdict
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kdict
@@ -1,4 +1,4 @@
-Document: kdenetwork-doc-html-kdict
+Document: tdenetwork-doc-html-kdict
 Title: KDict Handbook
 Author: Christian Gebauer
 Abstract: KDict is a graphical client for the DICT protocol. It enables you
diff --git a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.kget b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kget
index 788d1df3b..69371bfcc 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.kget
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kget
@@ -1,4 +1,4 @@
-Document: kdenetwork-doc-html-kget
+Document: tdenetwork-doc-html-kget
 Title: KGet Handbook
 Author: Jonathan E. Drews
 Abstract: KGet allows you to group and manage downloads.
diff --git a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.knewsticker b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.knewsticker
index 7a7d07afd..246e1b35e 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.knewsticker
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.knewsticker
@@ -1,4 +1,4 @@
-Document: kdenetwork-doc-html-knewsticker
+Document: tdenetwork-doc-html-knewsticker
 Title: KNewsTicker Handbook
 Author: Frerich Raabe, Jonathan Singer
 Abstract: KNewsTicker is a news ticker applet for the KDE panel.
diff --git a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.kopete b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kopete
index c2fd82677..1eaf82262 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.kopete
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kopete
@@ -1,4 +1,4 @@
-Document: kdenetwork-doc-html-kopete
+Document: tdenetwork-doc-html-kopete
 Title: Kopete Handbook
 Author: Will Stephenson, Matt Rogers
 Abstract: Kopete is KDE's is multi-protocol instant messenger client.
diff --git a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.kpf b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kpf
index 717def1c4..91f5ba58f 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.kpf
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kpf
@@ -1,4 +1,4 @@
-Document: kdenetwork-doc-html-kpf
+Document: tdenetwork-doc-html-kpf
 Title: Kpf Handbook
 Author: Rik Hemsley
 Abstract: Kpf allows you to share files over a network.
diff --git a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.kppp b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kppp
index cc8a115eb..5b12b8945 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.kppp
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kppp
@@ -1,4 +1,4 @@
-Document: kdenetwork-doc-html-kppp
+Document: tdenetwork-doc-html-kppp
 Title: KPPP Handbook
 Author: Lauri Watts
 Abstract: KPPP is a dialer and front end for pppd, allowing for interactive
diff --git a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.krdc b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.krdc
index 1143049bf..477aeadac 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.krdc
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.krdc
@@ -1,4 +1,4 @@
-Document: kdenetwork-doc-html-krdc
+Document: tdenetwork-doc-html-krdc
 Title: Krdc Handbook
 Author: Brad Hards
 Abstract: Krdc is a client application that allows you to view or even control
diff --git a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.krfb b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.krfb
index bfdb6efb6..a19f09e05 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.krfb
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.krfb
@@ -1,4 +1,4 @@
-Document: kdenetwork-doc-html-krfb
+Document: tdenetwork-doc-html-krfb
 Title: Krfb Handbook
 Author: Brad Hards
 Abstract: Krfb is a server application that allows you to share your current
diff --git a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.ksirc b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.ksirc
index 2e2b3762d..fda21368e 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.ksirc
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.ksirc
@@ -1,4 +1,4 @@
-Document: kdenetwork-doc-html-ksirc
+Document: tdenetwork-doc-html-ksirc
 Title: KsIRC Handbook
 Author: Andrew Stanley-Jones, Philip Rodrigues
 Abstract: KsIRC is the default KDE IRC client.
diff --git a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.ktalkd b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.ktalkd
index 07ef7607c..52d412b7c 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.ktalkd
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.ktalkd
@@ -1,4 +1,4 @@
-Document: kdenetwork-doc-html-ktalkd
+Document: tdenetwork-doc-html-ktalkd
 Title: Ktalkd Handbook
 Author: David Faure
 Abstract: Ktalkd is an enhanced talk daemon - a program to handle incoming
diff --git a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.kwifimanager b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kwifimanager
index c04014345..5985de443 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.kwifimanager
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kwifimanager
@@ -1,4 +1,4 @@
-Document: kdenetwork-doc-html-kwifimanager
+Document: tdenetwork-doc-html-kwifimanager
 Title: KWiFiManager Handbook
 Author: Stefan Winter
 Abstract: The KWiFiMananger suite can be used to configure and monitor
diff --git a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.lisa b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.lisa
index 4561963c9..87459627b 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdenetwork-doc-html.doc-base.lisa
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.lisa
@@ -1,4 +1,4 @@
-Document: kdenetwork-doc-html-lisa
+Document: tdenetwork-doc-html-lisa
 Title: Lisa Handbook
 Author: Alexander Neundorf
 Abstract: Lisa is intended to provide a kind of Network Neighborhood, but
diff --git a/ubuntu/maverick/tdenetwork/debian/kdenetwork-filesharing-trinity.install b/ubuntu/maverick/tdenetwork/debian/tdenetwork-filesharing-trinity.install
index 4b0e9f5b9..4b0e9f5b9 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdenetwork-filesharing-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-filesharing-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/kdenetwork-kfile-plugins-trinity.install b/ubuntu/maverick/tdenetwork/debian/tdenetwork-kfile-plugins-trinity.install
index b32a36440..b32a36440 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdenetwork-kfile-plugins-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-kfile-plugins-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/kdenetwork-trinity-dev.install b/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install
index eee07ec44..eee07ec44 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdenetwork-trinity-dev.install
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install
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"\
diff --git a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.README.Debian
index d9a31b41e..522b2eb7f 100644
--- a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.README.Debian
@@ -3,6 +3,6 @@ Cervisia for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdesdk-doc-html.
+web browser, see the package tdesdk-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdesdk/debian/changelog b/ubuntu/maverick/tdesdk/debian/changelog
index e78025460..e041b19d5 100644
--- a/ubuntu/maverick/tdesdk/debian/changelog
+++ b/ubuntu/maverick/tdesdk/debian/changelog
@@ -1,80 +1,80 @@
-kdesdk-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
+tdesdk-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdesdk-trinity (4:3.5.10-0ubuntu1~intrepid5) intrepid; urgency=low
+tdesdk-trinity (4:3.5.10-0ubuntu1~intrepid5) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 02 March 2009 21:41:00 -0600
 
-kdesdk-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
+tdesdk-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
   * SVN import
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 28 Nov 2008 12:28:00 -0600
 
-kdesdk (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdesdk (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * Upstream bug fix release (LP: #261366)
-    - Bump build-dep versions for kdelibs4-dev, kdepim-dev, libkcal2-dev,
+    - Bump build-dep versions for tdelibs4-dev, tdepim-dev, libkcal2-dev,
       and libktnef1-dev to 3.5.10 
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:52:27 -0400
 
-kdesdk (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdesdk (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:08 +0000
 
-kdesdk (4:3.5.8-1ubuntu7) hardy; urgency=low
+tdesdk (4:3.5.8-1ubuntu7) hardy; urgency=low
 
   * Rebuild to get rid of libdb4.4.
 
  -- Matthias Klose <doko@ubuntu.com>  Mon, 04 Feb 2008 20:41:27 +0000
 
-kdesdk (4:3.5.8-1ubuntu6) hardy; urgency=low
+tdesdk (4:3.5.8-1ubuntu6) hardy; urgency=low
 
   * Add desktop i18n scripts to /usr/lib/kubuntu-desktop-i18n/
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Dec 2007 16:41:08 +0000
 
-kdesdk (4:3.5.8-1ubuntu5) hardy; urgency=low
+tdesdk (4:3.5.8-1ubuntu5) hardy; urgency=low
 
-  * Build-dep on kdepim 3.5.7enterprise20070926-1ubuntu4
+  * Build-dep on tdepim 3.5.7enterprise20070926-1ubuntu4
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 23 Nov 2007 14:50:30 +0000
 
-kdesdk (4:3.5.8-1ubuntu4) hardy; urgency=low
+tdesdk (4:3.5.8-1ubuntu4) hardy; urgency=low
 
   * Downgrade build-dep version of libktnef1-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 23 Nov 2007 11:27:44 +0000
 
-kdesdk (4:3.5.8-1ubuntu3) hardy; urgency=low
+tdesdk (4:3.5.8-1ubuntu3) hardy; urgency=low
 
   * Downgrade libkcal2-dev dependency to 3.5.8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 15:11:08 +0000
 
-kdesdk (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdesdk (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
-  * Downgrade kdepim dependency to 3.5.7
+  * Downgrade tdepim dependency to 3.5.7
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 11:03:22 +0000
 
-kdesdk (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdesdk (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, no changes except LP translations patch
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:47 +0000
 
-kdesdk (4:3.5.8-1) unstable; urgency=low
+tdesdk (4:3.5.8-1) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
   
@@ -89,19 +89,19 @@ kdesdk (4:3.5.8-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 15 Oct 2007 16:17:11 +0200
 
-kdesdk (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdesdk (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:27 +0100
 
-kdesdk (4:3.5.7-2ubuntu1) gutsy; urgency=low
+tdesdk (4:3.5.7-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian for new Umbrello upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 27 Jul 2007 13:36:44 +0100
 
-kdesdk (4:3.5.7-3) unstable; urgency=low
+tdesdk (4:3.5.7-3) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -116,20 +116,20 @@ kdesdk (4:3.5.7-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 23 Jul 2007 23:27:56 +0200
 
-kdesdk (4:3.5.7-2) unstable; urgency=low
+tdesdk (4:3.5.7-2) unstable; urgency=low
 
   * Install new images in kompare documentation. Thanks to Jonathan Riddell 
     for the pointer.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 23 May 2007 22:03:38 +0100
 
-kdesdk (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdesdk (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * Merge with Debian for new upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 May 2007 17:42:32 +0100
 
-kdesdk (4:3.5.7-1) unstable; urgency=low
+tdesdk (4:3.5.7-1) unstable; urgency=low
 
   * New upstream release. (Closes: #421918, #417309)
 
@@ -141,32 +141,32 @@ kdesdk (4:3.5.7-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 16 May 2007 16:08:05 +0100
 
-kdesdk (4:3.5.6-2ubuntu1) gutsy; urgency=low
+tdesdk (4:3.5.6-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 20:32:57 +0100
 
-kdesdk (4:3.5.6-2) unstable; urgency=low
+tdesdk (4:3.5.6-2) unstable; urgency=low
 
   * Upload to unstable after Etch release.
 
   +++ Changes by Sune Vuorela:
 
   * Promote graphviz from kcachegrind Suggests to Recommends. (Closes: #407043)
-  * Don't install the licensecheck script in kdesdk. The devscripts package
-    has taken it and is working actively on it. Let kdesdk-scripts suggest
+  * Don't install the licensecheck script in tdesdk. The devscripts package
+    has taken it and is working actively on it. Let tdesdk-scripts suggest
     devscripts instead. (Closes: #420154)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 23 Apr 2007 11:53:44 +0100
 
-kdesdk (4:3.5.6-1) experimental; urgency=low
+tdesdk (4:3.5.6-1) experimental; urgency=low
 
   * New upstream release.
   
   +++ Changes by Josh Metzler:
 
-  * Make kdesdk-dbg depend on kdelibs-dbg to get useful backtraces when
+  * Make tdesdk-dbg depend on tdelibs-dbg to get useful backtraces when
     debugging.
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
@@ -176,27 +176,27 @@ kdesdk (4:3.5.6-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 18 Jan 2007 18:32:21 +0100
 
-kdesdk (4:3.5.5-3) unstable; urgency=low
+tdesdk (4:3.5.5-3) unstable; urgency=low
 
   * Update automake 1.10 support patch as cdbs runs patch with -p1 before -p0
     and patches the wrong file. (Closes: #396985)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 16 Nov 2006 17:01:23 -0500
 
-kdesdk (4:3.5.6-0ubuntu2) feisty; urgency=low
+tdesdk (4:3.5.6-0ubuntu2) feisty; urgency=low
 
   * Added kubuntu_01_umbrello_1.5.61.diff, brings Umbrello up to 1.5.61 release
 
  -- Juan Carlos G. Torres <jucato@kubuntu.org>  Fri, 30 Mar 2007 22:57:02 +0800
 
-kdesdk (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdesdk (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
   * Remove 07_support_automake1-10_in_template.diff, applied upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:31 +0000
 
-kdesdk (4:3.5.5-3ubuntu2) feisty; urgency=low
+tdesdk (4:3.5.5-3ubuntu2) feisty; urgency=low
 
   * Merge back Ubuntu changes
    - build with --enable-gcc-hidden-visibility
@@ -206,13 +206,13 @@ kdesdk (4:3.5.5-3ubuntu2) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 24 Nov 2006 12:36:00 +0000
 
-kdesdk (4:3.5.5-3ubuntu1) feisty; urgency=low
+tdesdk (4:3.5.5-3ubuntu1) feisty; urgency=low
 
   * Fake sync.
 
  -- Scott James Remnant <scott@ubuntu.com>  Fri, 24 Nov 2006 11:13:09 +0000
 
-kdesdk (4:3.5.5-2) unstable; urgency=low
+tdesdk (4:3.5.5-2) unstable; urgency=low
 
   +++ Changes by Fathi Boudra:
 
@@ -222,15 +222,15 @@ kdesdk (4:3.5.5-2) unstable; urgency=low
   +++ Changes by Sune Vuorela:
 
   * Add support for automake 1.10 to kapptemplate. (Closes: #396985)
-  * Add Suggests: kdelibs4-doc to kunittest. kdelibs4-doc contains kunittest
+  * Add Suggests: tdelibs4-doc to kunittest. tdelibs4-doc contains kunittest
     documentation. (Closes: #386040)
   * Don't install /usr/bin/kunittest and /usr/bin/kunittest_debughelper. These
     are not useful without the dcopperl bindings which are not built in the
-    Debian kdebindings packages. (Closes: #386039)
+    Debian tdebindings packages. (Closes: #386039)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 14 Nov 2006 17:34:11 -0500
 
-kdesdk (4:3.5.5-1) unstable; urgency=low
+tdesdk (4:3.5.5-1) unstable; urgency=low
 
   [ Debian Qt/KDE Maintainers ]
   * New upstream release.
@@ -250,7 +250,7 @@ kdesdk (4:3.5.5-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 10 Oct 2006 00:53:47 +0200
 
-kdesdk (4:3.5.4-1) unstable; urgency=low
+tdesdk (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
     + Contains up-to-date KDE admin dir in kapptemplate. This includes
@@ -266,26 +266,26 @@ kdesdk (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 26 Aug 2006 13:20:23 -0400
 
-kdesdk (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdesdk (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:07 +0000
 
-kdesdk (4:3.5.4-0ubuntu4) edgy; urgency=low
+tdesdk (4:3.5.4-0ubuntu4) edgy; urgency=low
 
   * Rebuild with latest cdbs to add gettext domain to .desktop files for
     langpacks-desktopfiles-kde, no source changes
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Sep 2006 22:53:11 +0000
 
-kdesdk (4:3.5.4-0ubuntu3) edgy; urgency=low
+tdesdk (4:3.5.4-0ubuntu3) edgy; urgency=low
 
   * Remove broken kolf rules from debian/desktop-i18n/findfiles
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 30 Aug 2006 16:44:06 +0000
 
-kdesdk (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdesdk (4:3.5.4-0ubuntu2) edgy; urgency=low
 
   * Add desktop i18n scripts to /usr/lib/kubuntu-desktop-i18n/
     for building packages, see 
@@ -293,32 +293,32 @@ kdesdk (4:3.5.4-0ubuntu2) edgy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  2 Aug 2006 10:42:16 +0000
 
-kdesdk (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdesdk (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:19 +0000
 
-kdesdk (4:3.5.3-1ubuntu3) edgy; urgency=low
+tdesdk (4:3.5.3-1ubuntu3) edgy; urgency=low
 
-  * Build-dep on kdepim-dev 3.5.3-2ubuntu3 to avoid libfam.la breakage
+  * Build-dep on tdepim-dev 3.5.3-2ubuntu3 to avoid libfam.la breakage
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Jul 2006 15:20:07 +0000
 
-kdesdk (4:3.5.3-1ubuntu2) edgy; urgency=low
+tdesdk (4:3.5.3-1ubuntu2) edgy; urgency=low
 
   * Rebuild without lifam.la, no changes
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 12 Jul 2006 10:42:52 +0000
 
-kdesdk (4:3.5.3-1ubuntu1) edgy; urgency=low
+tdesdk (4:3.5.3-1ubuntu1) edgy; urgency=low
 
   * New upstream release
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Jul 2006 16:03:08 +0000
 
-kdesdk (4:3.5.2-1) unstable; urgency=low
+tdesdk (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -326,17 +326,17 @@ kdesdk (4:3.5.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 30 Mar 2006 08:43:32 -0500
 
-kdesdk (4:3.5.1-1) unstable; urgency=low
+tdesdk (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
 
   +++ Changes by Christopher Martin:
 
-  * Allow kdesvn-kio-plugins to satisfy kdesdk's dependencies instead of
-    kdesdk-kio-plugins, since it is a replacement for kdesdk-kio-plugins
+  * Allow tdesvn-kio-plugins to satisfy tdesdk's dependencies instead of
+    tdesdk-kio-plugins, since it is a replacement for tdesdk-kio-plugins
     and provides equivalent functionality. (Closes: #347903)
 
-  * Eliminate libcvsservice0's Recommends on kdelibs-bin.
+  * Eliminate libcvsservice0's Recommends on tdelibs-bin.
 
   * Upload to unstable.
 
@@ -346,7 +346,7 @@ kdesdk (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  2 Feb 2006 11:06:25 -0500
 
-kdesdk (4:3.5.0-3) unstable; urgency=low
+tdesdk (4:3.5.0-3) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -356,7 +356,7 @@ kdesdk (4:3.5.0-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 12 Jan 2006 20:12:15 -0500
 
-kdesdk (4:3.5.0-2) experimental; urgency=low
+tdesdk (4:3.5.0-2) experimental; urgency=low
 
   * Upload to experimental.
 
@@ -373,39 +373,39 @@ kdesdk (4:3.5.0-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 21 Dec 2005 08:28:13 -0500
 
-kdesdk (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdesdk (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Edit debian/cdbs/debian-qt-kde.mk to use dh_iconcache
 
  -- Gauvain Pocentek <gauvainpocentek@ubuntu.com>  Tue, 23 May 2006 19:34:53 +0200
 
-kdesdk (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdesdk (4:3.5.2-0ubuntu2) dapper; urgency=low
 
   * Edit debian/cdbs/kde.mk to generate .po files
   * Edit debian/cdbs/kde.mk to mark .po files as UTF-8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Apr 2006 16:29:18 +0100
 
-kdesdk (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdesdk (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:31 +0000
 
-kdesdk (4:3.5.1-0ubuntu3) dapper; urgency=low
+tdesdk (4:3.5.1-0ubuntu3) dapper; urgency=low
 
   * Remove build-dep on libdb4.x, correct versin will be
     brought in by other packages
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 21 Feb 2006 14:55:07 +0000
 
-kdesdk (4:3.5.1-0ubuntu2) dapper; urgency=low
+tdesdk (4:3.5.1-0ubuntu2) dapper; urgency=low
 
   * Don't use GCC 3.4 on hppa
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Feb 2006 12:03:17 +0000
 
-kdesdk (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdesdk (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Update Replaces on libcvsservice0 for cervisia
@@ -413,29 +413,29 @@ kdesdk (4:3.5.1-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:07 +0000
 
-kdesdk (4:3.5.0-1ubuntu1) dapper; urgency=low
+tdesdk (4:3.5.0-1ubuntu1) dapper; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  8 Dec 2005 17:54:03 +0000
 
-kdesdk (4:3.5.0-1) alioth; urgency=low
+tdesdk (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
 
   +++ Changes by Christopher Martin:
 
-  * Add a kdesdk-dbg package for helping to trace problems.
+  * Add a tdesdk-dbg package for helping to trace problems.
 
-  * New packages: kunittest, and kdesdk-kio-plugins, which splits
-    out the svn ioslave from kdesdk-misc.
+  * New packages: kunittest, and tdesdk-kio-plugins, which splits
+    out the svn ioslave from tdesdk-misc.
 
   * Re-libtoolize. This fixes GNU/kFreeBSD, and prunes poxml's
     excessive dependencies. (Closes: #327706, #329902)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue,  6 Dec 2005 13:10:37 -0500
 
-kdesdk (4:3.4.3-1) unstable; urgency=low
+tdesdk (4:3.4.3-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -446,48 +446,48 @@ kdesdk (4:3.4.3-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon,  5 Dec 2005 07:23:04 -0500
 
-kdesdk (4:3.5.0-0ubuntu2) dapper; urgency=low
+tdesdk (4:3.5.0-0ubuntu2) dapper; urgency=low
 
   * Change libdb4.2 build-dep to libdb4.3
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  8 Dec 2005 02:48:59 +0000
 
-kdesdk (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdesdk (4:3.5.0-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Remove GCC 3.4 on hppa
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Dec 2005 12:28:57 +0000
 
-kdesdk (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdesdk (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * Sync with Debian
   * New upstream pre-release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 Nov 2005 15:00:05 +0000
 
-kdesdk (4:3.4.2-2.1) unstable; urgency=medium
+tdesdk (4:3.4.2-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
   * Build-dep on g++-3.4 on arm, hppa and m68k (closes:#330934). 
 
  -- Luk Claes <luk@debian.org>  Sat,  1 Oct 2005 20:21:41 +0200
 
-kdesdk (4:3.4.2-2) unstable; urgency=low
+tdesdk (4:3.4.2-2) unstable; urgency=low
 
   * Built against libfam-dev, not libgamin-dev (closes: #326547).
   * Updated overrides files to account for kdeinit black magic.
 
  -- Ben Burton <bab@debian.org>  Sun,  4 Sep 2005 10:58:17 +1000
 
-kdesdk (4:3.4.2-1) unstable; urgency=low
+tdesdk (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
   * First g++-4 upload to sid.
   * Adjusted build-dependencies and shlibs files for the C++ ABI transition.
     Note that the libcvsservice0 package name does not need to change.
   * Updated FSF address in the copyright file.
-  * Changed the conflicts on kdevelop3-plugins to a versioned replaces as
+  * Changed the conflicts on tdevelop3-plugins to a versioned replaces as
     described in the changelog for 4:3.4.0-0pre2.
   * Removed redundant xlibs-dev recommendation from kapptemplate.
   * Adjusted Ivan's changelog entry from 29 Feb 2001 to 01 Mar 2001 so the
@@ -497,68 +497,68 @@ kdesdk (4:3.4.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun,  4 Sep 2005 01:14:27 +1000
 
-kdesdk (4:3.4.3-0ubuntu1) breezy; urgency=low
+tdesdk (4:3.4.3-0ubuntu1) breezy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat,  8 Oct 2005 21:59:11 +0000
 
-kdesdk (4:3.4.2-0ubuntu2) breezy; urgency=low
+tdesdk (4:3.4.2-0ubuntu2) breezy; urgency=low
 
-  * Add missing files to libcvsserver0, kdesdk-scripts and kompare.
+  * Add missing files to libcvsserver0, tdesdk-scripts and kompare.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 28 Jul 2005 17:55:43 +0000
 
-kdesdk (4:3.4.2-0ubuntu1) breezy; urgency=low
+tdesdk (4:3.4.2-0ubuntu1) breezy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 16:25:16 +0000
 
-kdesdk (4:3.4.1-0ubuntu5) breezy; urgency=low
+tdesdk (4:3.4.1-0ubuntu5) breezy; urgency=low
 
   * Rebuild for removed libXcursor.la and libXrender.la
-    and tighten kdelibs dependency.
+    and tighten tdelibs dependency.
 
  -- Jonathan Riddell <jr@jriddell.org>  Sun, 24 Jul 2005 23:54:37 +0000
 
-kdesdk (4:3.4.1-0ubuntu4) breezy; urgency=low
+tdesdk (4:3.4.1-0ubuntu4) breezy; urgency=low
 
   * Add build-depend on libxi-dev
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 30 Jun 2005 13:42:22 +0000
 
-kdesdk (4:3.4.1-0ubuntu3) breezy; urgency=low
+tdesdk (4:3.4.1-0ubuntu3) breezy; urgency=low
 
-  * Add version to kdesdk-misc conflict on kdevelop3-plugins
+  * Add version to tdesdk-misc conflict on tdevelop3-plugins
 
  -- Jonathan Riddell <jr@jriddell.org>  Mon,  6 Jun 2005 22:45:10 +0000
 
-kdesdk (4:3.4.1-0ubuntu2) breezy; urgency=low
+tdesdk (4:3.4.1-0ubuntu2) breezy; urgency=low
 
   * Add libkdeinit_cvsservice.so to libcvsservice0.install
   * Add cervisia.so and libkdeinit_cervisia.so to cervisia.install
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu,  2 Jun 2005 01:33:59 +0000
 
-kdesdk (4:3.4.1-0ubuntu1) breezy; urgency=low
+tdesdk (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number following KDE 3.4.1 release
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed,  1 Jun 2005 00:56:16 +0000
 
-kdesdk (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+tdesdk (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 26 May 2005 16:34:06 +0000
 
-kdesdk (4:3.4.0-0pre2) unstable; urgency=low
+tdesdk (4:3.4.0-0pre2) unstable; urgency=low
 
   * Merge in recent packaging changes from the 3.3 branch.
-  * Introduce a temporary conflicts against kdevelop3-plugins, which provides
-    a copy of the subversion I/O slave taken from kdesdk-misc.  This will be
-    removed once kdevelop has been rebuilt against KDE 3.4 (without the
+  * Introduce a temporary conflicts against tdevelop3-plugins, which provides
+    a copy of the subversion I/O slave taken from tdesdk-misc.  This will be
+    removed once tdevelop has been rebuilt against KDE 3.4 (without the
     subversion I/O slave), and a versioned replaces will be put in place
     instead.
   * Now that KDE has moved to subversion, disable cvs-clean in debian/rules
@@ -566,11 +566,11 @@ kdesdk (4:3.4.0-0pre2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 14 May 2005 19:20:58 +1000
 
-kdesdk (4:3.4.0-0pre1) unstable; urgency=low
+tdesdk (4:3.4.0-0pre1) unstable; urgency=low
 
   * New major upstream release.
-  * Note that although libktnef.la has moved from kdepim-dev to libktnef1-dev,
-    a build-dependency on kdepim-dev is still required for some header files.
+  * Note that although libktnef.la has moved from tdepim-dev to libktnef1-dev,
+    a build-dependency on tdepim-dev is still required for some header files.
   * Removed cvs dependency from cervisia, since this comes indirectly through
     libcvsservice0 anyway.  Updated the cvs dependency for libcvsservice
     to require cvs (>= 1.11), as cervisia used to when it handled cvs itself.
@@ -578,38 +578,38 @@ kdesdk (4:3.4.0-0pre1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Fri, 25 Mar 2005 12:56:49 +1100
 
-kdesdk (4:3.4.0-0ubuntu5) hoary; urgency=low
+tdesdk (4:3.4.0-0ubuntu5) hoary; urgency=low
 
   * Update cdbs/kde.mk
 
  -- Jonathan Riddell <jr@jriddell.org>  Tue, 29 Mar 2005 22:58:09 +0000
 
-kdesdk (4:3.4.0-0ubuntu4) hoary; urgency=low
+tdesdk (4:3.4.0-0ubuntu4) hoary; urgency=low
 
   * Add paths.diff
 
  -- Jonathan Riddell <jr@jriddell.org>  Mon, 28 Mar 2005 23:01:12 +0000
 
-kdesdk (4:3.4.0-0ubuntu3) hoary; urgency=low
+tdesdk (4:3.4.0-0ubuntu3) hoary; urgency=low
 
   * added empty empty patches 
 
  -- Andreas Mueller <amu@ubuntu.com>  Wed, 23 Mar 2005 10:46:56 +0000
 
-kdesdk (4:3.4.0-0ubuntu2) hoary; urgency=low
+tdesdk (4:3.4.0-0ubuntu2) hoary; urgency=low
 
   * fixed broken patchdir
   * added KDE branch patches   
 
  -- Andreas Mueller <amu@ubuntu.com>  Tue, 22 Mar 2005 20:57:56 +0000
 
-kdesdk (4:3.4.0-0ubuntu1) hoary; urgency=low
+tdesdk (4:3.4.0-0ubuntu1) hoary; urgency=low
 
   * New upstream release.
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 17 Mar 2005 04:18:57 +0000
 
-kdesdk (4:3.3.2-3) unstable; urgency=high
+tdesdk (4:3.3.2-3) unstable; urgency=high
 
   * Fresh pull from KDE_3_3_BRANCH for recent bugfixes.
   * Many thanks to upstream who have relicensed cervisia under the GPL
@@ -622,12 +622,12 @@ kdesdk (4:3.3.2-3) unstable; urgency=high
 
  -- Ben Burton <bab@debian.org>  Thu, 31 Mar 2005 19:59:13 +1000
 
-kdesdk (4:3.3.2-2) unstable; urgency=high
+tdesdk (4:3.3.2-2) unstable; urgency=high
 
   * Fixed drag-and-drop problems in umbrello that can cause a real and/or
     apparent loss of data (closes: #296433).
   * Patched kbabel spell-check-as-you-go to use checkWord() instead of check(),
-    which seems to protect it from the kdelibs crash described in #289646.
+    which seems to protect it from the tdelibs crash described in #289646.
   * Added the full text of the GFDL to debian/copyright, since all of the
     docbook documentation is under this license.
   * Added a note to README.Debian in the poxml package regarding the
@@ -636,10 +636,10 @@ kdesdk (4:3.3.2-2) unstable; urgency=high
 
  -- Ben Burton <bab@debian.org>  Thu, 24 Mar 2005 07:59:47 +1100
 
-kdesdk (4:3.3.2-1) unstable; urgency=low
+tdesdk (4:3.3.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
-  * Rebuilt against libkcal2a and reversioned kdepim-dev and libkcal2-dev
+  * Rebuilt against libkcal2a and reversioned tdepim-dev and libkcal2-dev
     build-depends to >= 4:3.3.2 accordingly (closes: #291592).
   * Fixed setupGUI() typo in kapptemplate (part of #289304).
   * Added a README.Debian for poxml that outlines the available binaries
@@ -649,9 +649,9 @@ kdesdk (4:3.3.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 22 Jan 2005 07:29:29 +1100
 
-kdesdk (4:3.3.1-2) unstable; urgency=medium
+tdesdk (4:3.3.1-2) unstable; urgency=medium
 
-  * Build-depends on kdepim-dev (>= 4:3.3.1), which provides libktnef.la.
+  * Build-depends on tdepim-dev (>= 4:3.3.1), which provides libktnef.la.
     When building against libkcal2-dev (>= 4:3.3.1), libktnef.la is needed
     at link time.
   * Also changed libkcal2-dev in the build-depends to the versioned
@@ -659,7 +659,7 @@ kdesdk (4:3.3.1-2) unstable; urgency=medium
 
  -- Ben Burton <bab@debian.org>  Thu,  9 Dec 2004 08:16:17 +1100
 
-kdesdk (4:3.3.1-1) unstable; urgency=medium
+tdesdk (4:3.3.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.
   * Build-conflicts with autoconf2.13, which does not play well with
@@ -669,7 +669,7 @@ kdesdk (4:3.3.1-1) unstable; urgency=medium
 
  -- Ben Burton <bab@debian.org>  Thu, 28 Oct 2004 19:03:02 +1000
 
-kdesdk (4:3.3.0-1) unstable; urgency=low
+tdesdk (4:3.3.0-1) unstable; urgency=low
 
   * New upstream release.
   * New package kcachegrind-converters.  These foreign format converters
@@ -678,36 +678,36 @@ kdesdk (4:3.3.0-1) unstable; urgency=low
     for debian are now installed in /usr/lib/kmtrace, not in /usr/lib as
     is done upstream.
   * Versioned libqt3-mt-dev build-depends is no longer necessary since
-    kdelibs4-dev already forces Qt 3.3.
-  * Made libcvsservice-dev depend on kdelibs4-dev.
+    tdelibs4-dev already forces Qt 3.3.
+  * Made libcvsservice-dev depend on tdelibs4-dev.
   * Removed python dependency from poxml, since all apps are now compiled
     binaries.
-  * Added a sample kde-buildrc to the kdesdk-scripts documentation.
+  * Added a sample kde-buildrc to the tdesdk-scripts documentation.
 
  -- Ben Burton <bab@debian.org>  Fri, 15 Oct 2004 09:55:26 +1000
 
-kdesdk (4:3.2.3-2) unstable; urgency=low
+tdesdk (4:3.2.3-2) unstable; urgency=low
 
   * Fixed C++ code generator to use keyword "virtual" when declaring
     abstract operations (closes: #255552).
 
  -- Ben Burton <bab@debian.org>  Thu, 24 Jun 2004 08:35:22 +1000
 
-kdesdk (4:3.2.3-1) unstable; urgency=low
+tdesdk (4:3.2.3-1) unstable; urgency=low
 
   * New upstream bugfix release.
-  * Rebuilt against STL-enabled Qt and corresponding kdelibs.
+  * Rebuilt against STL-enabled Qt and corresponding tdelibs.
   * Added manpages for cvs2dist and build-progress.sh.
   * Use real paths for doc-base entries instead of symlinked paths
     (closes: #247690).
-  * Suggests (konqueror | www-browser) for kdesdk-doc-html instead of
+  * Suggests (konqueror | www-browser) for tdesdk-doc-html instead of
     just www-browser.
   * KBabel catalogue manager no longer opens spurious empty windows
     (closes: #237031).
 
  -- Ben Burton <bab@debian.org>  Wed, 16 Jun 2004 08:41:42 +1000
 
-kdesdk (4:3.2.2-1) unstable; urgency=low
+tdesdk (4:3.2.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
   * Add Conflicts/Replaces for umbrello-manual (closes: #237173).
@@ -716,45 +716,45 @@ kdesdk (4:3.2.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Tue, 16 Mar 2004 09:15:01 +1100
 
-kdesdk (4:3.2.1-1) unstable; urgency=low
+tdesdk (4:3.2.1-1) unstable; urgency=low
 
   * First KDE 3.2 upload to sid.
 
  -- Ben Burton <bab@debian.org>  Sun,  7 Mar 2004 17:42:59 +1100
 
-kdesdk (4:3.2.0-2) experimental; urgency=low
+tdesdk (4:3.2.0-2) experimental; urgency=low
 
   * First KDE 3.2 upload to experimental.
   * Sync from KDE_3_2_BRANCH for recent bugfixes.
-  * Using versioned dependencies for the kdesdk metapackage.
+  * Using versioned dependencies for the tdesdk metapackage.
 
  -- Ben Burton <bab@debian.org>  Mon, 23 Feb 2004 08:14:22 +1100
 
-kdesdk (4:3.2.0-1) unstable; urgency=low
+tdesdk (4:3.2.0-1) unstable; urgency=low
 
   * New upstream release.
   * Many thanks to Ralf Nolden for all his help with packaging KDE 3.2.
   * Thanks to Robert Lemmen for previous packaging work on umbrello and
     to Philipp Frauenfelder for previous packaging work on kcachegrind.
   * New binary packages kcachegrind, kuiviewer and umbrello.
-  * Created a new package kdesdk-doc-html for HTML documentation.
+  * Created a new package tdesdk-doc-html for HTML documentation.
 
  -- Ben Burton <bab@debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
 
-kdesdk (4:3.1.5-1) unstable; urgency=low
+tdesdk (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <bab@debian.org>  Sun, 18 Jan 2004 12:55:12 +1100
 
-kdesdk (4:3.1.4-3) unstable; urgency=low
+tdesdk (4:3.1.4-3) unstable; urgency=low
 
   * New pull from BRANCH; includes bugfixes for kbabel and kompare.
   * Fixed freeze in KBabel spellcheck (closes: #209397).
 
  -- Ben Burton <bab@debian.org>  Fri, 12 Dec 2003 10:42:10 +1100
 
-kdesdk (4:3.1.4-2) unstable; urgency=low
+tdesdk (4:3.1.4-2) unstable; urgency=low
 
   * Patched split2po to handle entities inside attributes correctly;
     thanks to Denis Barbier (closes: #213036).
@@ -764,14 +764,14 @@ kdesdk (4:3.1.4-2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Tue, 14 Oct 2003 16:26:05 +1000
 
-kdesdk (4:3.1.4-1) unstable; urgency=low
+tdesdk (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
   * Bumped standards-version to 3.6.1.
 
  -- Ben Burton <bab@debian.org>  Mon, 29 Sep 2003 15:08:53 +1000
 
-kdesdk (4:3.1.3-2) unstable; urgency=low
+tdesdk (4:3.1.3-2) unstable; urgency=low
 
   * Rebuilt against Qt 3.2 so kbabel no longer crashes (closes: #208509).
   * Added versioned build-depends on libqt3-mt-dev (>= 3:3.2.1).
@@ -779,7 +779,7 @@ kdesdk (4:3.1.3-2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Fri,  5 Sep 2003 12:07:17 +1000
 
-kdesdk (4:3.1.3-1) unstable; urgency=low
+tdesdk (4:3.1.3-1) unstable; urgency=low
 
   * New upstream release.
   * Split menu titles into title/longtitle.
@@ -787,7 +787,7 @@ kdesdk (4:3.1.3-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Wed, 13 Aug 2003 11:02:26 +1000
 
-kdesdk (4:3.1.2-1) unstable; urgency=low
+tdesdk (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
   * Build-depends on flex-old instead of flex (closes: #193871).
@@ -796,7 +796,7 @@ kdesdk (4:3.1.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun,  1 Jun 2003 14:15:47 +1000
 
-kdesdk (4:3.1.1-1) unstable; urgency=low
+tdesdk (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release.
   * Removed binary package kmtrace which claims not to work with
@@ -804,7 +804,7 @@ kdesdk (4:3.1.1-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 22 Mar 2003 16:18:51 +1100
 
-kdesdk (4:3.1.0-5) unstable; urgency=low
+tdesdk (4:3.1.0-5) unstable; urgency=low
 
   * Renamed symbolmatch to kmmatch and kdefixincludes to fixkdeincludes;
     these will be the upstream names in KDE 3.2.
@@ -812,25 +812,25 @@ kdesdk (4:3.1.0-5) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Mon, 17 Mar 2003 08:35:19 +1100
 
-kdesdk (4:3.1.0-4) unstable; urgency=low
+tdesdk (4:3.1.0-4) unstable; urgency=low
 
   * Updated admin/ so that kapptemplate's admin/ works with the new Qt
     packaging style.
 
  -- Ben Burton <bab@debian.org>  Wed, 12 Mar 2003 13:28:16 +1100
 
-kdesdk (4:3.1.0-3) unstable; urgency=low
+tdesdk (4:3.1.0-3) unstable; urgency=low
 
   * Changed /usr/bin/match to /usr/bin/symbolmatch to avoid filename
     conflicts (closes: #181840).
   * Build-depends on libqt3-compat-headers for now until obsolete
-    #includes are removed from both kdesdk and kdelibs.
+    #includes are removed from both tdesdk and tdelibs.
   * Added patch to work around flex's namespace problems until the
     flex package is fixed.
 
  -- Ben Burton <bab@debian.org>  Tue, 25 Feb 2003 11:50:26 +1100
 
-kdesdk (4:3.1.0-2) unstable; urgency=low
+tdesdk (4:3.1.0-2) unstable; urgency=low
 
   * First Trinity upload to debian (closes: #167062).
   * Rolled the epoch to aid upgrades from the unofficial repository on
@@ -838,16 +838,16 @@ kdesdk (4:3.1.0-2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun,  2 Feb 2003 19:40:16 +1100
 
-kdesdk (3.1.0-1) unstable; urgency=low
+tdesdk (3.1.0-1) unstable; urgency=low
 
   * New upstream release.
-  * Merged kdepalettes package into kdesdk-misc.
+  * Merged kdepalettes package into tdesdk-misc.
   * Installs shell completion controls.
   * Replaced the old kde-devel-emacs.el with the new kde-emacs.el.
 
  -- Ben Burton <bab@debian.org>  Mon, 18 Nov 2002 14:15:59 +1100
 
-kdesdk (3.0.9-1) unstable; urgency=low
+tdesdk (3.0.9-1) unstable; urgency=low
 
   * New upstream release.
   * Built with g++-3.2.
@@ -855,7 +855,7 @@ kdesdk (3.0.9-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Tue, 22 Oct 2002 11:57:39 +1000
 
-kdesdk (3.0.8-1) unstable; urgency=low
+tdesdk (3.0.8-1) unstable; urgency=low
 
   * New upstream release.
   * Moved to Chris Cheney's style of debian/rules.
@@ -864,7 +864,7 @@ kdesdk (3.0.8-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sun, 22 Sep 2002 17:57:55 +1000
 
-kdesdk (3.0.3-2) unstable; urgency=low
+tdesdk (3.0.3-2) unstable; urgency=low
 
   * Rename static kmtrace library to libktrace_s.a.
   * Install vim helper file.
@@ -872,13 +872,13 @@ kdesdk (3.0.3-2) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sat,  7 Sep 2002 19:03:33 +1000
 
-kdesdk (3.0.3-1) unstable; urgency=low
+tdesdk (3.0.3-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Thu, 15 Aug 2002 13:22:22 +1000
 
-kdesdk (3.0.2-2) unstable; urgency=low
+tdesdk (3.0.2-2) unstable; urgency=low
 
   * Build-depends on automake1.5.
   * Install cvschanged.
@@ -886,69 +886,69 @@ kdesdk (3.0.2-2) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sat,  6 Jul 2002 14:58:13 +1000
 
-kdesdk (3.0.2-1) unstable; urgency=low
+tdesdk (3.0.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Thu,  4 Jul 2002 19:36:49 +1000
 
-kdesdk (3.0.1-1) unstable; urgency=low
+tdesdk (3.0.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Mon, 13 May 2002 03:15:24 +1000
 
-kdesdk (2.2.2-7) unstable; urgency=low
+tdesdk (2.2.2-7) unstable; urgency=low
 
-  * kdesdk-scripts recommends gawk for kdekillall (closes: Bug#156109).
+  * tdesdk-scripts recommends gawk for kdekillall (closes: Bug#156109).
 
  -- Ben Burton <benb@acm.org>  Sat, 10 Aug 2002 14:25:35 +1000
 
-kdesdk (2.2.2-6) unstable; urgency=low
+tdesdk (2.2.2-6) unstable; urgency=low
 
-  * Emptied kdesdk-scripts.links instead of removing it so the diff works
+  * Emptied tdesdk-scripts.links instead of removing it so the diff works
     correctly (closes: Bug#154803).
 
  -- Ben Burton <benb@acm.org>  Fri,  2 Aug 2002 14:28:27 +1000
 
-kdesdk (2.2.2-5) unstable; urgency=low
+tdesdk (2.2.2-5) unstable; urgency=low
 
   * Fixed manpage section for kdelnk2desktop.py.1 (closes: #148371).
 
  -- Ben Burton <benb@acm.org>  Sat,  6 Jul 2002 14:02:27 +1000
 
-kdesdk (2.2.2-4) unstable; urgency=low
+tdesdk (2.2.2-4) unstable; urgency=low
 
-  * Package kspy depends on kdelibs-dev (closes: Bug#150707).
+  * Package kspy depends on tdelibs-dev (closes: Bug#150707).
 
  -- Ben Burton <benb@acm.org>  Sun, 23 Jun 2002 13:02:06 +1000
 
-kdesdk (2.2.2-3) unstable; urgency=low
+tdesdk (2.2.2-3) unstable; urgency=low
 
   * Fixed gcc3 build (closes: Bug#138177).
 
  -- Ben Burton <benb@acm.org>  Tue, 19 Mar 2002 17:01:44 +1100
 
-kdesdk (2.2.2-2) unstable; urgency=low
+tdesdk (2.2.2-2) unstable; urgency=low
 
   * Moved kspy.h to /usr/include/kde (closes: Bug#122448, Bug#122449).
 
  -- Ben Burton <benb@acm.org>  Thu,  6 Dec 2001 09:50:47 -0600
 
-kdesdk (2.2.2-1) unstable; urgency=low
+tdesdk (2.2.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Wed,  7 Nov 2001 10:49:53 -0600
 
-kdesdk (2.2.1-4) unstable; urgency=low
+tdesdk (2.2.1-4) unstable; urgency=low
 
   * Uses automake again to solve new alpha problems.
   * Updated to reflect new python policy.
 
  -- Ben Burton <benb@acm.org>  Tue,  6 Nov 2001 23:51:27 -0600
 
-kdesdk (2.2.1-3) unstable; urgency=low
+tdesdk (2.2.1-3) unstable; urgency=low
 
   * Builds with automake 1.5.
   * Installs .py.1 man pages in the correct locations (requires newer
@@ -956,23 +956,23 @@ kdesdk (2.2.1-3) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Thu, 11 Oct 2001 15:31:32 -0500
 
-kdesdk (2.2.1-2) unstable; urgency=low
+tdesdk (2.2.1-2) unstable; urgency=low
 
   * Updated parameters for alpha build (closes: Bug#113110).
 
  -- Ben Burton <benb@acm.org>  Sat, 22 Sep 2001 12:00:37 -0500
 
-kdesdk (2.2.1-1) unstable; urgency=low
+tdesdk (2.2.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Fri, 31 Aug 2001 21:08:56 -0500
 
-kdesdk (2.2.0-final-1) unstable; urgency=low
+tdesdk (2.2.0-final-1) unstable; urgency=low
 
   * New upstream release.
   * Generating HTML docs for users who can't view KDE docbook files.
-  * Build-Depends: requires newer kdelibs-dev for working meinproc.
+  * Build-Depends: requires newer tdelibs-dev for working meinproc.
   * Suggests: konqueror for packages with docs to view through khelpcenter.
   * Reinstating doc-base entries.
   * Bumped standards-version to 3.5.6.
@@ -980,54 +980,54 @@ kdesdk (2.2.0-final-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sun, 29 Jul 2001 17:48:59 +1000
 
-kdesdk (2.2-beta1-4) unstable; urgency=low
+tdesdk (2.2-beta1-4) unstable; urgency=low
 
   * Builds on alpha.
 
  -- Ben Burton <benb@acm.org>  Sun, 29 Jul 2001 00:20:23 +1000
 
-kdesdk (2.2-beta1-3) unstable; urgency=low
+tdesdk (2.2-beta1-3) unstable; urgency=low
 
-  * Build-Depends: added version to kdebase-dev (closes: Bug#103514).
+  * Build-Depends: added version to tdebase-dev (closes: Bug#103514).
 
  -- Ben Burton <benb@acm.org>  Wed,  4 Jul 2001 11:41:50 -0500
 
-kdesdk (2.2-beta1-2) unstable; urgency=low
+tdesdk (2.2-beta1-2) unstable; urgency=low
 
-  * Build-Depends: added kdebase-dev (closes: Bug#103255).
+  * Build-Depends: added tdebase-dev (closes: Bug#103255).
   * Build-Depends: changed libdb-dev back to libdb2-dev since libdb3-dev
     doesn't work.
 
  -- Ben Burton <benb@acm.org>  Mon,  2 Jul 2001 22:15:53 -0500
 
-kdesdk (2.2-beta1-1) unstable; urgency=low
+tdesdk (2.2-beta1-1) unstable; urgency=low
 
   * New upstream release.
-  * Added packages kdesdk-doc, kspy and poxml.
+  * Added packages tdesdk-doc, kspy and poxml.
   * Build-Depends: added uic.
 
  -- Ben Burton <benb@acm.org>  Sun, 17 Jun 2001 14:44:38 -0500
 
-kdesdk (2.1.1-8) unstable; urgency=low
+tdesdk (2.1.1-8) unstable; urgency=low
 
   * Added arm/m68k to the libtool linux arch list (closes: Bug#99498).
 
  -- Ben Burton <benb@acm.org>  Fri,  1 Jun 2001 18:29:27 -0500
 
-kdesdk (2.1.1-7) unstable; urgency=low
+tdesdk (2.1.1-7) unstable; urgency=low
 
   * Build-Depends: replaced libdb2-dev with libdb-dev; removed sed
     which is build-essential.
-  * Changed kdesdk to Architecture: any to please the autobuilders.
+  * Changed tdesdk to Architecture: any to please the autobuilders.
   * Minor cosmetic changes.
 
  -- Ben Burton <benb@acm.org>  Thu, 31 May 2001 12:21:41 -0500
 
-kdesdk (2.1.1-6) unstable; urgency=low
+tdesdk (2.1.1-6) unstable; urgency=low
 
-  * Added man pages for kdesdk-scripts (closes: Bug#92451).
+  * Added man pages for tdesdk-scripts (closes: Bug#92451).
   * Added gdb macros and emacs helper files.
-  * Added suggestions and recommendations for kdesdk-scripts
+  * Added suggestions and recommendations for tdesdk-scripts
     to satisfy requirements of individual scripts.
   * Fixed location of KDE docs in /usr/bin/kdedoc.
   * Fixed location of Qt docs in /usr/bin/qtdoc.
@@ -1036,7 +1036,7 @@ kdesdk (2.1.1-6) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sun, 29 Apr 2001 15:52:54 -0500
 
-kdesdk (2.1.1-5) unstable; urgency=low
+tdesdk (2.1.1-5) unstable; urgency=low
  
   * Updated Standards-Version to 3.5.2.
   * Added kderemove="1" to the debian menu items.
@@ -1044,44 +1044,44 @@ kdesdk (2.1.1-5) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Fri, 27 Apr 2001 14:56:02 -0500
 
-kdesdk (2.1.1-4) unstable; urgency=low
+tdesdk (2.1.1-4) unstable; urgency=low
 
-  * Ensures /usr/bin/extractrc is installed (needed by kdevelop) and
-    conflicts with earlier versions of kdevelop (which provided its own
+  * Ensures /usr/bin/extractrc is installed (needed by tdevelop) and
+    conflicts with earlier versions of tdevelop (which provided its own
     /usr/bin/extractrc).
 
  -- Ben Burton <benb@acm.org>  Thu,  5 Apr 2001 15:19:13 -0500
 
-kdesdk (2.1.1-3) unstable; urgency=low
+tdesdk (2.1.1-3) unstable; urgency=low
 
   * Added man page for /usr/bin/extractmsg (closes: Bug#92450).
   * Tidied up various other man pages.
   * Build-Depends: now requires version (>> 3.0.0) of debhelper.
-  * Added Suggests: kdebase to packages kbabel, kexample.
+  * Added Suggests: tdebase to packages kbabel, kexample.
   * Replaced gimp, xpaint with gimp | xpaint in Suggests: for kdepalettes.
   * Upgraded to debian/rules DH_COMPAT=3 and removed postinst scripts.
   * Rebuilt using correct gcc/libc6 packages.
 
  -- Ben Burton <benb@acm.org>  Sun,  1 Apr 2001 22:30:27 -0500
 
-kdesdk (2.1.1-2) unstable; urgency=low
+tdesdk (2.1.1-2) unstable; urgency=low
 
   * Build-Depends: Added libdb2-dev (closes: Bug#92174).
-  * Conflicts (kexample): Added kdesdk-scripts (<< 2.1.1-1)
+  * Conflicts (kexample): Added tdesdk-scripts (<< 2.1.1-1)
     (closes: Bug#92432).
 
  -- Ben Burton <benb@acm.org>  Sun,  1 Apr 2001 11:59:48 -0500
 
-kdesdk (2.1.1-1) unstable; urgency=low
+tdesdk (2.1.1-1) unstable; urgency=low
 
   * New upstream sources.
   * Adopted by Ben Burton <benb@acm.org> (closes: Bug#84531).
-  * Added packages kdesdk, kapptemplate, kdepalettes.
-  * Split kexample from package kdesdk-scripts into a new package.
+  * Added packages tdesdk, kapptemplate, kdepalettes.
+  * Split kexample from package tdesdk-scripts into a new package.
   * Changed some package architectures to all.
   * Build-Depends: Removed autoconf and gettext which are redundant;
     required version (>> 2.0.0) of debhelper; added sed.
-  * Removed all Suggests: kdebase flags.
+  * Removed all Suggests: tdebase flags.
   * Completely reworked debian/rules.
   * Added a mime type for kbabel.
   * Added various man pages.
@@ -1093,26 +1093,26 @@ kdesdk (2.1.1-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Mon, 26 Mar 2001 09:10:56 -0600
 
-kdesdk (2.1.0-1) unstable; urgency=low
+tdesdk (2.1.0-1) unstable; urgency=low
  
   * New upstream CVS pull
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Mar 2001 02:00:00 -0700
 
-kdesdk (2.1-final-1.1) unstable; urgency=low
+tdesdk (2.1-final-1.1) unstable; urgency=low
 
   * Fix for doc link (Closes: #84075)
   * Fix the description of kbabel (Closes: #84078)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 01 Mar 2001 00:10:00 -0700
 
-kdesdk (2.1-final-1) unstable; urgency=low
+tdesdk (2.1-final-1) unstable; urgency=low
  
   * New upstream version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:00:00 +0100
 
-kdesdk (2.1-beta2-2) unstable; urgency=low
+tdesdk (2.1-beta2-2) unstable; urgency=low
 
   * Closes: #83652.
   * Package maintaner change.
@@ -1120,7 +1120,7 @@ kdesdk (2.1-beta2-2) unstable; urgency=low
 
  -- Mariusz Przygodzki <dune@home.pl>  Sat, 27 Jan 2001 17:18:53 +0100
 
-kdesdk (2.1-beta2-1) unstable; urgency=low
+tdesdk (2.1-beta2-1) unstable; urgency=low
  
   * New upstream beta
  
diff --git a/ubuntu/maverick/tdesdk/debian/control b/ubuntu/maverick/tdesdk/debian/control
index cd3d6c8fa..308320f7c 100644
--- a/ubuntu/maverick/tdesdk/debian/control
+++ b/ubuntu/maverick/tdesdk/debian/control
@@ -1,23 +1,23 @@
-Source: kdesdk-trinity
+Source: tdesdk-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
 Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk,
- gettext, pkg-config, kdelibs4-trinity-dev (>= 4:3.5.10), binutils-dev, bison, flex,
- kdepim-trinity-dev (>= 4:3.5.10), libapr1-dev, libkcal2-trinity-dev (>= 4:3.5.10),
+ gettext, pkg-config, tdelibs4-trinity-dev (>= 4:3.5.10), binutils-dev, bison, flex,
+ tdepim-trinity-dev (>= 4:3.5.10), libapr1-dev, libkcal2-trinity-dev (>= 4:3.5.10),
  libktnef1-trinity-dev (>= 4:3.5.10), libsvn-dev, libdb-dev,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kdesdk-trinity
+Package: tdesdk-trinity
 Architecture: all
 Section: kde
-Replaces: kdesdk-kde3 (<< 4:3.5.13)
-Breaks: kdesdk-kde3 (<< 4:3.5.13)
-Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), kcachegrind-trinity (>= ${Source-Version}), kdesdk-kfile-plugins-trinity (>= ${Source-Version}), kdesdk-kio-plugins-trinity (>= ${Source-Version}) | kdesvn-kio-plugins-trinity, kdesdk-misc-trinity (>= ${Source-Version}), kdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
-Suggests: kcachegrind-converters-trinity, kbabel-trinity-dev, kdesdk-trinity-doc-html
+Replaces: tdesdk-kde3 (<< 4:3.5.13)
+Breaks: tdesdk-kde3 (<< 4:3.5.13)
+Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), kcachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
+Suggests: kcachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html
 Description: software development kit from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -27,12 +27,12 @@ Description: software development kit from the official Trinity release
  This metapackage includes the Trinity Software Development Kit, a collection
  of applications and tools useful for developing KDE applications.
 
-Package: kdesdk-trinity-doc-html
+Package: tdesdk-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: kdesdk-kde3-doc-html (<< 4:3.5.13)
-Breaks: kdesdk-kde3-doc-html (<< 4:3.5.13)
-Suggests: konqueror-trinity | www-browser, kdesdk-trinity
+Replaces: tdesdk-kde3-doc-html (<< 4:3.5.13)
+Breaks: tdesdk-kde3-doc-html (<< 4:3.5.13)
+Suggests: konqueror-trinity | www-browser, tdesdk-trinity
 Description: Trinity Software Development Kit documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -45,7 +45,7 @@ Description: Trinity Software Development Kit documentation in HTML format
  KDE SDK packages.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: cervisia-trinity
 Architecture: any
@@ -53,7 +53,7 @@ Section: devel
 Replaces: cervisia-kde3 (<< 4:3.5.13)
 Breaks: cervisia-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter-trinity, kdesdk-trinity-doc-html
+Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
 Conflicts: cervisia
 Description: a graphical CVS front end for Trinity
  Cervisia is a KDE-based graphical front end for the CVS client.
@@ -65,7 +65,7 @@ Description: a graphical CVS front end for Trinity
  with the commit dialog.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kapptemplate-trinity
 Architecture: all
@@ -73,7 +73,7 @@ Section: devel
 Replaces: kapptemplate-kde3 (<< 4:3.5.13)
 Breaks: kapptemplate-kde3 (<< 4:3.5.13)
 Conflicts: kapptemplate
-Recommends: automake1.9 | automaken, kdelibs4-trinity-dev (>= 4:3.5.8)
+Recommends: automake1.9 | automaken, tdelibs4-trinity-dev (>= 4:3.5.8)
 Description: creates a framework to develop a Trinity application
  KAppTemplate is a shell script that will create the necessary
  framework to develop various KDE applications.  It takes care of the
@@ -81,7 +81,7 @@ Description: creates a framework to develop a Trinity application
  what the code typically looks like.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kbabel-trinity
 Architecture: any
@@ -91,7 +91,7 @@ Breaks: kbabel-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Conflicts: kbabel
 Recommends: gettext
-Suggests: khelpcenter-trinity, kdesdk-trinity-doc-html
+Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
 Description: PO-file editing suite for Trinity
  This is a suite of programs for editing gettext message files (PO-files).
  It is designed to help you translate fast and consistently.
@@ -104,14 +104,14 @@ Description: PO-file editing suite for Trinity
  for common translations.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kbabel-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: kbabel-kde3-dev (<< 4:3.5.13)
 Breaks: kbabel-kde3-dev (<< 4:3.5.13)
-Depends: kbabel-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kbabel-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
 Conflicts: kbabel
 Description: PO-file editing suite for Trinity (development files)
  This is a suite of programs for editing gettext message files (PO-files).
@@ -127,7 +127,7 @@ Description: PO-file editing suite for Trinity (development files)
  This package contains the KBabel development files.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kbugbuster-trinity
 Architecture: any
@@ -143,7 +143,7 @@ Description: a front end for the Trinity bug tracking system
  variety of options for searching through reports.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kcachegrind-trinity
 Architecture: any
@@ -153,7 +153,7 @@ Breaks: kcachegrind-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Conflicts: kcachegrind
 Recommends: valgrind-callgrind-trinity | valgrind-calltree-trinity, graphviz
-Suggests: kcachegrind-converters-trinity, khelpcenter-trinity, kdesdk-trinity-doc-html
+Suggests: kcachegrind-converters-trinity, khelpcenter-trinity, tdesdk-trinity-doc-html
 Description: visualisation tool for valgrind profiling output
  KCachegrind is a visualisation tool for the profiling data generated
  by calltree, a profiling skin for valgrind.  Applications can be
@@ -164,7 +164,7 @@ Description: visualisation tool for valgrind profiling output
  can be found in the kcachegrind-converters package.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kcachegrind-converters-trinity
 Architecture: all
@@ -184,32 +184,32 @@ Description: format converters for KCachegrind profiling visualisation tool
  and plugin architectures are supported.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: kdesdk-kfile-plugins-trinity
+Package: tdesdk-kfile-plugins-trinity
 Architecture: any
 Section: kde
-Replaces: kdesdk-kfile-plugins-kde3 (<< 4:3.5.13)
-Breaks: kdesdk-kfile-plugins-kde3 (<< 4:3.5.13)
+Replaces: tdesdk-kfile-plugins-kde3 (<< 4:3.5.13)
+Breaks: tdesdk-kfile-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
-Conflicts: kdesdk-kfile-plugins
+Conflicts: tdesdk-kfile-plugins
 Description: Trinity file dialog plugins for software development files
  This is a collection of plugins for the KDE file dialog.  These plugins
  extend the file dialog to offer advanced meta-information for source files,
  patch files and Qt Linguist data.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: kdesdk-misc-trinity
+Package: tdesdk-misc-trinity
 Architecture: any
 Section: devel
-Replaces: kdesdk-misc-kde3 (<< 4:3.5.13)
-Breaks: kdesdk-misc-kde3 (<< 4:3.5.13)
+Replaces: tdesdk-misc-kde3 (<< 4:3.5.13)
+Breaks: tdesdk-misc-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Recommends: libqt3-mt-dev | libqt3-dev
 Suggests: gimp | xpaint
-Conflicts: kdepalettes-trinity (<= 4:3.1.0-1), scheck-trinity (<< 4:3.2.0-0), kdesdk-misc
+Conflicts: kdepalettes-trinity (<= 4:3.1.0-1), scheck-trinity (<< 4:3.2.0-0), tdesdk-misc
 Description: various goodies from the Trinity Software Development Kit
  This package contains miscellaneous goodies provided with the official
  KDE release to assist with KDE software development.
@@ -221,16 +221,16 @@ Description: various goodies from the Trinity Software Development Kit
   - a KDE address book plugin that reads the list of KDE CVS accounts.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: kdesdk-scripts-trinity
+Package: tdesdk-scripts-trinity
 Architecture: all
 Section: devel
-Replaces: kdesdk-scripts-kde3 (<< 4:3.5.13)
-Breaks: kdesdk-scripts-kde3 (<< 4:3.5.13)
+Replaces: tdesdk-scripts-kde3 (<< 4:3.5.13)
+Breaks: tdesdk-scripts-kde3 (<< 4:3.5.13)
 Depends: ${perl:Depends}, python
 Recommends: automake1.9 | automaken, cvs, gawk
-Suggests: khelpcenter-trinity, kdesdk-trinity-doc-html, dmalloc, gdb, kdelibs4-trinity-doc, qt3-doc, valgrind, devscripts
+Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html, dmalloc, gdb, tdelibs4-trinity-doc, qt3-doc, valgrind, devscripts
 Enhances: kate-trinity
 Description: a set of useful development scripts for Trinity
  This package contains a number of scripts which can be used to help in
@@ -245,7 +245,7 @@ Description: a set of useful development scripts for Trinity
   - valgrind error suppressions for KDE apps.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kmtrace-trinity
 Architecture: any
@@ -259,7 +259,7 @@ Description: a Trinity memory leak tracer
  "mtrace" functionality.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kompare-trinity
 Architecture: any
@@ -275,14 +275,14 @@ Description: a Trinity GUI for viewing differences between files
  file and/or blend a diff file back into the original documents.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kspy-trinity
 Architecture: any
 Section: devel
 Replaces: kspy-kde3 (<< 4:3.5.13)
 Breaks: kspy-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: ${shlibs:Depends}, tdelibs4-trinity-dev (>= 4:3.5.8)
 Conflicts: kspy
 Description: examines the internal state of a Qt/KDE app
  KSpy is a tiny library which can be used to graphically display
@@ -297,7 +297,7 @@ Description: examines the internal state of a Qt/KDE app
  See /usr/share/doc/kspy/README for usage instructions.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kuiviewer-trinity
 Architecture: any
@@ -315,7 +315,7 @@ Description: viewer for Qt Designer user interface files
  The Qt Designer itself is in the package qt3-designer.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: libcvsservice0-trinity
 Architecture: any
@@ -333,14 +333,14 @@ Description: DCOP service for accessing CVS repositories
  DCOP is the Desktop Communication Protocol used throughout KDE.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: libcvsservice-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: libcvsservice-kde3-dev (<< 4:3.5.13)
 Breaks: libcvsservice-kde3-dev (<< 4:3.5.13)
-Depends: libcvsservice0-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libcvsservice0-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
 Conflicts: libcvsservice-dev
 Description: development files for CVS DCOP service
  The library libcvsservice provides a DCOP service for accessing and
@@ -352,7 +352,7 @@ Description: development files for CVS DCOP service
  Development files for libcvsservice are included in this package.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: poxml-trinity
 Architecture: any
@@ -369,7 +369,7 @@ Description: tools for using PO-files to translate DocBook XML files
  manipulating DocBook XML files, PO-files and PO-template files.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: umbrello-trinity
 Architecture: any
@@ -377,7 +377,7 @@ Section: devel
 Replaces: umbrello-kde3 (<< 4:3.5.13)
 Breaks: umbrello-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter-trinity, kdesdk-trinity-doc-html
+Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
 Conflicts: umbrello-manual-trinity (<< 20040311), umbrello
 Description: UML modelling tool and code generator
  Umbrello UML Modeller is a Unified Modelling Language editor for KDE.
@@ -390,22 +390,22 @@ Description: UML modelling tool and code generator
  diagrams and deployment diagrams.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: kdesdk-kio-plugins-trinity
+Package: tdesdk-kio-plugins-trinity
 Architecture: any
 Section: devel
-Replaces: kdesdk-kio-plugins-kde3 (<< 4:3.5.13)
-Breaks: kdesdk-kio-plugins-kde3 (<< 4:3.5.13)
+Replaces: tdesdk-kio-plugins-kde3 (<< 4:3.5.13)
+Breaks: tdesdk-kio-plugins-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, subversion
-Conflicts: kdesdk-kio-plugins
+Conflicts: tdesdk-kio-plugins
 Description: subversion ioslave for Trinity
  This package provides easy access to remote SVN repositories from within
  Konqueror, and KDE generally, by browsing them as if they were a
  filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
 Package: kunittest-trinity
 Architecture: any
@@ -414,7 +414,7 @@ Replaces: kunittest-kde3 (<< 4:3.5.13)
 Breaks: kunittest-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Conflicts: kunittest
-Suggests: kdelibs4-trinity-doc
+Suggests: tdelibs4-trinity-doc
 Description: unit testing library for Trinity
  KUnitTest is a small library that facilitates the writing of tests for
  KDE developers. There are two ways to use the KUnitTest library. One is
@@ -423,17 +423,17 @@ Description: unit testing library for Trinity
  libraries to create your own testing application.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
- See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: kdesdk-trinity-dbg
+Package: tdesdk-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: kdesdk-kde3-dbg (<< 4:3.5.13)
-Breaks: kdesdk-kde3-dbg (<< 4:3.5.13)
+Replaces: tdesdk-kde3-dbg (<< 4:3.5.13)
+Breaks: tdesdk-kde3-dbg (<< 4:3.5.13)
 Priority: extra
-Depends: kdelibs-trinity-dbg, libcvsservice-trinity-dev (= ${Source-Version}), kbabel-trinity-dev (= ${Source-Version})
-Conflicts: kdesdk-dbg
-Description: debugging symbols for kdesdk-trinity
- This package contains the debugging symbols associated with kdesdk-trinity.
- They will automatically be used by gdb for debugging kdesdk-related
+Depends: tdelibs-trinity-dbg, libcvsservice-trinity-dev (= ${Source-Version}), kbabel-trinity-dev (= ${Source-Version})
+Conflicts: tdesdk-dbg
+Description: debugging symbols for tdesdk-trinity
+ This package contains the debugging symbols associated with tdesdk-trinity.
+ They will automatically be used by gdb for debugging tdesdk-related
  issues.
diff --git a/ubuntu/maverick/tdesdk/debian/control.in b/ubuntu/maverick/tdesdk/debian/control.in
index 3a8aa1ced..c70b772a1 100644
--- a/ubuntu/maverick/tdesdk/debian/control.in
+++ b/ubuntu/maverick/tdesdk/debian/control.in
@@ -1,20 +1,20 @@
-Source: kdesdk
+Source: tdesdk
 Section: kde
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk,
- gettext, pkg-config, kdelibs4-dev (>= 4:3.5.8), binutils-dev, bison, flex,
- kdepim-dev (>= 4:3.5.8), libapr1-dev, libkcal2-dev (>= 4:3.5.8),
+ gettext, pkg-config, tdelibs4-dev (>= 4:3.5.8), binutils-dev, bison, flex,
+ tdepim-dev (>= 4:3.5.8), libapr1-dev, libkcal2-dev (>= 4:3.5.8),
  libktnef1-dev (>= 4:3.5.8), libsvn-dev
 Standards-Version: 3.7.2
 
-Package: kdesdk
+Package: tdesdk
 Architecture: all
 Section: kde
-Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), kcachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version})
-Suggests: kcachegrind-converters, kbabel-dev, kdesdk-doc-html
+Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), kcachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version})
+Suggests: kcachegrind-converters, kbabel-dev, tdesdk-doc-html
 Description: software development kit from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -24,10 +24,10 @@ Description: software development kit from the official KDE release
  This metapackage includes the KDE Software Development Kit, a collection
  of applications and tools useful for developing KDE applications.
 
-Package: kdesdk-doc-html
+Package: tdesdk-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror | www-browser, kdesdk
+Suggests: konqueror | www-browser, tdesdk
 Replaces: cervisia (<< 4:3.2.0), kbabel (<< 4:3.2.0), kbugbuster (<< 4:3.2.0), kompare (<< 4:3.2.0)
 Description: KDE Software Development Kit documentation in HTML format
  By default the modules provided by KDE only provide their documentation
@@ -41,13 +41,13 @@ Description: KDE Software Development Kit documentation in HTML format
  KDE SDK packages.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: cervisia
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter, kdesdk-doc-html
+Suggests: khelpcenter, tdesdk-doc-html
 Description: a graphical CVS front end for KDE
  Cervisia is a KDE-based graphical front end for the CVS client.
  .
@@ -58,12 +58,12 @@ Description: a graphical CVS front end for KDE
  with the commit dialog.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kapptemplate
 Architecture: all
 Section: devel
-Recommends: automake1.9 | automaken, kdelibs4-dev (>= 4:3.5.8)
+Recommends: automake1.9 | automaken, tdelibs4-dev (>= 4:3.5.8)
 Description: creates a framework to develop a KDE application
  KAppTemplate is a shell script that will create the necessary
  framework to develop various KDE applications.  It takes care of the
@@ -71,14 +71,14 @@ Description: creates a framework to develop a KDE application
  what the code typically looks like.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kbabel
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
 Recommends: gettext
-Suggests: khelpcenter, kdesdk-doc-html
+Suggests: khelpcenter, tdesdk-doc-html
 Description: PO-file editing suite for KDE
  This is a suite of programs for editing gettext message files (PO-files).
  It is designed to help you translate fast and consistently.
@@ -91,12 +91,12 @@ Description: PO-file editing suite for KDE
  for common translations.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kbabel-dev
 Architecture: any
 Section: libdevel
-Depends: kbabel (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: kbabel (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
 Replaces: kbabel (<< 4:3.0.8-0)
 Description: PO-file editing suite for KDE (development files)
  This is a suite of programs for editing gettext message files (PO-files).
@@ -112,7 +112,7 @@ Description: PO-file editing suite for KDE (development files)
  This package contains the KBabel development files.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kbugbuster
 Architecture: any
@@ -125,14 +125,14 @@ Description: a front end for the KDE bug tracking system
  variety of options for searching through reports.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kcachegrind
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
 Recommends: valgrind-callgrind | valgrind-calltree, graphviz
-Suggests: kcachegrind-converters, khelpcenter, kdesdk-doc-html
+Suggests: kcachegrind-converters, khelpcenter, tdesdk-doc-html
 Description: visualisation tool for valgrind profiling output
  KCachegrind is a visualisation tool for the profiling data generated
  by calltree, a profiling skin for valgrind.  Applications can be
@@ -143,7 +143,7 @@ Description: visualisation tool for valgrind profiling output
  can be found in the kcachegrind-converters package.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kcachegrind-converters
 Architecture: all
@@ -160,9 +160,9 @@ Description: format converters for KCachegrind profiling visualisation tool
  and plugin architectures are supported.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
-Package: kdesdk-kfile-plugins
+Package: tdesdk-kfile-plugins
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
@@ -172,16 +172,16 @@ Description: KDE file dialog plugins for software development files
  patch files and Qt Linguist data.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
-Package: kdesdk-misc
+Package: tdesdk-misc
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
 Recommends: libqt3-mt-dev | libqt3-dev
 Suggests: gimp | xpaint
 Conflicts: kdepalettes (<= 4:3.1.0-1), scheck (<< 4:3.2.0-0)
-Replaces: kdepalettes (<= 4:3.1.0-1), scheck (<< 4:3.2.0-0), kdevelop3-plugins (<= 4:3.2.0-3)
+Replaces: kdepalettes (<= 4:3.1.0-1), scheck (<< 4:3.2.0-0), tdevelop3-plugins (<= 4:3.2.0-3)
 Description: various goodies from the KDE Software Development Kit
  This package contains miscellaneous goodies provided with the official
  KDE release to assist with KDE software development.
@@ -193,16 +193,16 @@ Description: various goodies from the KDE Software Development Kit
   - a KDE address book plugin that reads the list of KDE CVS accounts.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
-Package: kdesdk-scripts
+Package: tdesdk-scripts
 Architecture: all
 Section: devel
 Depends: ${perl:Depends}, python
 Recommends: automake1.9 | automaken, cvs, gawk
-Suggests: khelpcenter, kdesdk-doc-html, dmalloc, gdb, kdelibs4-doc, qt3-doc, valgrind, devscripts
+Suggests: khelpcenter, tdesdk-doc-html, dmalloc, gdb, tdelibs4-doc, qt3-doc, valgrind, devscripts
 Enhances: kate
-Replaces: kdevelop (<< 1:1.4.0-3.2)
+Replaces: tdevelop (<< 1:1.4.0-3.2)
 Description: a set of useful development scripts for KDE
  This package contains a number of scripts which can be used to help in
  developing KDE-based applications.  Many of these scripts however are
@@ -216,7 +216,7 @@ Description: a set of useful development scripts for KDE
   - valgrind error suppressions for KDE apps.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kmtrace
 Architecture: any
@@ -227,7 +227,7 @@ Description: a KDE memory leak tracer
  "mtrace" functionality.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kompare
 Architecture: any
@@ -240,12 +240,12 @@ Description: a KDE GUI for viewing differences between files
  file and/or blend a diff file back into the original documents.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kspy
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, kdelibs4-dev (>= 4:3.5.8)
+Depends: ${shlibs:Depends}, tdelibs4-dev (>= 4:3.5.8)
 Description: examines the internal state of a Qt/KDE app
  KSpy is a tiny library which can be used to graphically display
  the QObjects in use by a Qt/KDE app.  In addition to the object tree,
@@ -259,7 +259,7 @@ Description: examines the internal state of a Qt/KDE app
  See /usr/share/doc/kspy/README for usage instructions.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kuiviewer
 Architecture: any
@@ -274,7 +274,7 @@ Description: viewer for Qt Designer user interface files
  The Qt Designer itself is in the package qt3-designer.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: libcvsservice0
 Architecture: any
@@ -290,12 +290,12 @@ Description: DCOP service for accessing CVS repositories
  DCOP is the Desktop Communication Protocol used throughout KDE.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: libcvsservice-dev
 Architecture: any
 Section: libdevel
-Depends: libcvsservice0 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: libcvsservice0 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
 Replaces: cervisia (<< 4:3.2.0)
 Description: development files for CVS DCOP service
  The library libcvsservice provides a DCOP service for accessing and
@@ -307,7 +307,7 @@ Description: development files for CVS DCOP service
  Development files for libcvsservice are included in this package.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: poxml
 Architecture: any
@@ -321,13 +321,13 @@ Description: tools for using PO-files to translate DocBook XML files
  manipulating DocBook XML files, PO-files and PO-template files.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: umbrello
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter, kdesdk-doc-html
+Suggests: khelpcenter, tdesdk-doc-html
 Conflicts: umbrello-manual (<< 20040311)
 Replaces: umbrello-manual (<< 20040311)
 Description: UML modelling tool and code generator
@@ -341,26 +341,26 @@ Description: UML modelling tool and code generator
  diagrams and deployment diagrams.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
-Package: kdesdk-kio-plugins
+Package: tdesdk-kio-plugins
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, subversion
-Replaces: kdesdk-misc (<< 4:3.5.0)
+Replaces: tdesdk-misc (<< 4:3.5.0)
 Description: subversion ioslave for KDE
  This package provides easy access to remote SVN repositories from within
  Konqueror, and KDE generally, by browsing them as if they were a
  filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
 Package: kunittest
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Suggests: kdelibs4-doc
+Suggests: tdelibs4-doc
 Description: unit testing library for KDE
  KUnitTest is a small library that facilitates the writing of tests for
  KDE developers. There are two ways to use the KUnitTest library. One is
@@ -369,14 +369,14 @@ Description: unit testing library for KDE
  libraries to create your own testing application.
  .
  This package is part of KDE, and a component of the KDE SDK module.
- See the 'kde' and 'kdesdk' packages for more information.
+ See the 'kde' and 'tdesdk' packages for more information.
 
-Package: kdesdk-dbg
+Package: tdesdk-dbg
 Section: libdevel
 Architecture: any
 Priority: extra
-Depends: kdelibs-dbg, libcvsservice-dev (= ${Source-Version}), kbabel-dev (= ${Source-Version})
-Description: debugging symbols for kdesdk
- This package contains the debugging symbols associated with kdesdk.
- They will automatically be used by gdb for debugging kdesdk-related
+Depends: tdelibs-dbg, libcvsservice-dev (= ${Source-Version}), kbabel-dev (= ${Source-Version})
+Description: debugging symbols for tdesdk
+ This package contains the debugging symbols associated with tdesdk.
+ They will automatically be used by gdb for debugging tdesdk-related
  issues.
diff --git a/ubuntu/maverick/tdesdk/debian/copyright b/ubuntu/maverick/tdesdk/debian/copyright
index 57c7c1593..ca64fadb8 100644
--- a/ubuntu/maverick/tdesdk/debian/copyright
+++ b/ubuntu/maverick/tdesdk/debian/copyright
@@ -9,7 +9,7 @@ It was downloaded from: http://www.kde.org/download
 
 Upstream authors:
 
-  Note that kdesdk has many contributers beyond those listed below.
+  Note that tdesdk has many contributers beyond those listed below.
 
   Cervisia: Bernd Gehrmann <bernd@mail.berlios.de>,
       Christian Loose <christian.loose@kdemail.net>,
diff --git a/ubuntu/maverick/tdesdk/debian/desktop-i18n/createdesktop.pl b/ubuntu/maverick/tdesdk/debian/desktop-i18n/createdesktop.pl
index 1705e7d4f..0d6c5cc92 100644
--- a/ubuntu/maverick/tdesdk/debian/desktop-i18n/createdesktop.pl
+++ b/ubuntu/maverick/tdesdk/debian/desktop-i18n/createdesktop.pl
@@ -34,7 +34,7 @@ sub prepare
     print "\"POT-Creation-Date: "; printdate( @now ); print "\\n\"\n";
     print "\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n";
     print "\"Last-Translator: FULL NAME <EMAIL\@ADDRESS>\\n\"\n";
-    print "\"Language-Team: LANGUAGE <kde-i18n-doc\@kde.org>\\n\"\n";
+    print "\"Language-Team: LANGUAGE <tde-i18n-doc\@kde.org>\\n\"\n";
     print "\"MIME-Version: 1.0\\n\"\n";
     print "\"Content-Type: text/plain; charset=UTF-8\\n\"\n";
     print "\"Content-Transfer-Encoding: 8bit\\n\"\n";
diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/kbabel-trinity.README.Debian
index f4eb38546..d54016dfa 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/kbabel-trinity.README.Debian
@@ -3,6 +3,6 @@ KBabel for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdesdk-doc-html.
+web browser, see the package tdesdk-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.README.Debian
index 3b9a9f290..25ddc2247 100644
--- a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.README.Debian
@@ -3,6 +3,6 @@ KCachegrind for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdesdk-doc-html.
+web browser, see the package tdesdk-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sat, 31 Jan 2004 12:08:48 +1100
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-misc-trinity.links b/ubuntu/maverick/tdesdk/debian/kdesdk-misc-trinity.links
deleted file mode 100644
index 160cea338..000000000
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-misc-trinity.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/kdepalettes/README usr/share/doc/kdesdk-misc/README.palettes
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.lintian b/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.lintian
deleted file mode 100644
index 97dd13989..000000000
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.lintian
+++ /dev/null
@@ -1,3 +0,0 @@
-# The syntax error is just perlpod docs appearing after the script exits.
-kdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
-kdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
diff --git a/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1 b/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1
index 3b942804f..943f2c4d5 100644
--- a/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1
+++ b/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1
@@ -52,7 +52,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdesdk-doc-html\fP and read this documentation in HTML format from
+\fItdesdk-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/kde/HTML/en/kbabel/\fP.
 .SH AUTHOR
 KBabel was written by Matthias Kiefer <kiefer@kde.org>,
diff --git a/ubuntu/maverick/tdesdk/debian/man/cheatmake.1 b/ubuntu/maverick/tdesdk/debian/man/cheatmake.1
index 8aa455f27..dcb8768ab 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cheatmake.1
+++ b/ubuntu/maverick/tdesdk/debian/man/cheatmake.1
@@ -53,16 +53,16 @@ the simpler variable OBJ_SUBDIR should be used.
 .TP
 OBJ_SUBDIR
 Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fIkdesdk\fP
-and the build directory is \fIkdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
+source directory.  For instance, if the source directory is \fItdesdk\fP
+and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
 should be set to \fIobj-i386-linux\fP.
 .TP
 OBJ_REPLACEMENT
 A \fBsed\fP expression that is used to transform the source directory
 into the build directory.
-For instance, if the source directory is \fI~/src/kdesdk\fP and the
-build directory is \fI~/src/kdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#kdesdk#kdesdk-obj#\fP.
+For instance, if the source directory is \fI~/src/tdesdk\fP and the
+build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
+be set to \fIs#tdesdk#tdesdk-obj#\fP.
 .SH SEE ALSO
 .BR make (1).
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdesdk/debian/man/create_makefile.1 b/ubuntu/maverick/tdesdk/debian/man/create_makefile.1
index c8d888e7f..96c9523c0 100644
--- a/ubuntu/maverick/tdesdk/debian/man/create_makefile.1
+++ b/ubuntu/maverick/tdesdk/debian/man/create_makefile.1
@@ -50,16 +50,16 @@ the simpler variable OBJ_SUBDIR should be used.
 .TP
 OBJ_SUBDIR
 Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fIkdesdk\fP
-and the build directory is \fIkdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
+source directory.  For instance, if the source directory is \fItdesdk\fP
+and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
 should be set to \fIobj-i386-linux\fP.
 .TP
 OBJ_REPLACEMENT
 A \fBsed\fP expression that is used to transform the source directory
 into the build directory.
-For instance, if the source directory is \fI~/src/kdesdk\fP and the
-build directory is \fI~/src/kdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#kdesdk#kdesdk-obj#\fP.
+For instance, if the source directory is \fI~/src/tdesdk\fP and the
+build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
+be set to \fIs#tdesdk#tdesdk-obj#\fP.
 .SH SEE ALSO
 .BR create_makefiles (1).
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdesdk/debian/man/create_makefiles.1 b/ubuntu/maverick/tdesdk/debian/man/create_makefiles.1
index 62ab39cfd..5a9f57ade 100644
--- a/ubuntu/maverick/tdesdk/debian/man/create_makefiles.1
+++ b/ubuntu/maverick/tdesdk/debian/man/create_makefiles.1
@@ -44,16 +44,16 @@ the simpler variable OBJ_SUBDIR should be used.
 .TP
 OBJ_SUBDIR
 Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fIkdesdk\fP
-and the build directory is \fIkdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
+source directory.  For instance, if the source directory is \fItdesdk\fP
+and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
 should be set to \fIobj-i386-linux\fP.
 .TP
 OBJ_REPLACEMENT
 A \fBsed\fP expression that is used to transform the source directory
 into the build directory.
-For instance, if the source directory is \fI~/src/kdesdk\fP and the
-build directory is \fI~/src/kdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#kdesdk#kdesdk-obj#\fP.
+For instance, if the source directory is \fI~/src/tdesdk\fP and the
+build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
+be set to \fIs#tdesdk#tdesdk-obj#\fP.
 .SH SEE ALSO
 .BR create_makefile (1).
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvs2dist.1 b/ubuntu/maverick/tdesdk/debian/man/cvs2dist.1
index 3c971c734..514fd6131 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvs2dist.1
+++ b/ubuntu/maverick/tdesdk/debian/man/cvs2dist.1
@@ -53,7 +53,7 @@ download, build and install.
 .PP
 By default, cvs2dist automatically tries to check out all translations
 of strings and documentation from the corresponding parts of the
-\fIkde-i18n\fP CVS module and include them in the final packages.
+\fItde-i18n\fP CVS module and include them in the final packages.
 This can be suppressed or modified using the options \-\-no-i18n or
 \-\-no-i18n-lang.
 .PP
@@ -173,7 +173,7 @@ The following example creates packages of the kolf picture plugin from
 the CVS source tree currently checked out in \fI/sources\fP.
 .PP
 .RS
-\fIexample$\fP cvs2dist /sources/kdegames kolf/objects/picture
+\fIexample$\fP cvs2dist /sources/tdegames kolf/objects/picture
 \-n kolf-picture \-v 0.9 \-r "kolf/game.h" \-\-log ~/tmp/extra-file
 .RE
 .PP
diff --git a/ubuntu/maverick/tdesdk/debian/man/findmissingcrystal.1 b/ubuntu/maverick/tdesdk/debian/man/findmissingcrystal.1
index f780c3ad0..46c479bb4 100644
--- a/ubuntu/maverick/tdesdk/debian/man/findmissingcrystal.1
+++ b/ubuntu/maverick/tdesdk/debian/man/findmissingcrystal.1
@@ -27,9 +27,9 @@ in the given KDE module and determines which Crystal icons from that
 module are identical to the old KDE Classic hicolor icons.
 .PP
 This script \fBmust\fP be run from the top-level directory of a KDE source
-tree (i.e., the directory containing \fIkdelibs\fP, \fIkdebase\fP, etc.).
+tree (i.e., the directory containing \fItdelibs\fP, \fItdebase\fP, etc.).
 It is assumed that \fImodule\fP is a top-level module in the source tree,
-and it is also assumed that the source tree contains the \fIkdeartwork\fP
+and it is also assumed that the source tree contains the \fItdeartwork\fP
 module (which contains the old hicolor icons).
 .PP
 For each Crystal icon in the given module, a message will be output
diff --git a/ubuntu/maverick/tdesdk/debian/man/kbabel.1 b/ubuntu/maverick/tdesdk/debian/man/kbabel.1
index f6f5d201b..a54fbea55 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kbabel.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kbabel.1
@@ -60,7 +60,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdesdk-doc-html\fP and read this documentation in HTML format from
+\fItdesdk-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/kde/HTML/en/kbabel/\fP.
 .SH AUTHOR
 KBabel was written by Matthias Kiefer <kiefer@kde.org>,
diff --git a/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1 b/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1
index bedbd4fb0..7fbfff0d2 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1
@@ -52,7 +52,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdesdk-doc-html\fP and read this documentation in HTML format from
+\fItdesdk-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/kde/HTML/en/kbabel/\fP.
 .SH AUTHOR
 KBabel was written by Matthias Kiefer <kiefer@kde.org>,
diff --git a/ubuntu/maverick/tdesdk/debian/man/kcachegrind.1 b/ubuntu/maverick/tdesdk/debian/man/kcachegrind.1
index 4f7db6435..ce3296b8c 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kcachegrind.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kcachegrind.1
@@ -58,7 +58,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdesdk-doc-html\fP and read this documentation in HTML format from
+\fItdesdk-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/kde/HTML/en/kcachegrind/\fP.
 .SH AUTHOR
 KCachegrind was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
diff --git a/ubuntu/maverick/tdesdk/debian/man/kdedoc.1 b/ubuntu/maverick/tdesdk/debian/man/kdedoc.1
index 684a6ad47..0f62e55e1 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kdedoc.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kdedoc.1
@@ -23,7 +23,7 @@ kdedoc \- view documentation for a KDE class
 .SH DESCRIPTION
 \fBkdedoc\fP opens the documentation for the KDE class \fIclassname\fP
 in kfm/konqueror.  Note that the class name is case sensitive.  It is
-assumed that you have the kdelibs documentation installed.
+assumed that you have the tdelibs documentation installed.
 .PP
 This utility is part of the KDE Software Development Kit.
 .SH EXAMPLES
@@ -33,7 +33,7 @@ To bring up help on the class KAboutDialog:
 kdedoc KAboutDialog
 .RE
 .SH DEBIAN USERS
-The kdelibs documentation is in the Debian package \fIkdelibs4-doc\fP,
+The tdelibs documentation is in the Debian package \fItdelibs4-doc\fP,
 which will need to be installed.
 .SH SEE ALSO
 .BR qtdoc (1).
diff --git a/ubuntu/maverick/tdesdk/debian/man/kdemangen.pl.1 b/ubuntu/maverick/tdesdk/debian/man/kdemangen.pl.1
index 0570f4f5c..7d658a855 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kdemangen.pl.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kdemangen.pl.1
@@ -40,7 +40,7 @@ This utility will only work for a full KDE application that uses
 KCmdLineArgs (which most full KDE applications do).
 .SH EXAMPLE
 .RS
-cd /path/to/kde/srcs/kdeedu/debian
+cd /path/to/kde/srcs/tdeedu/debian
 .br
 kdemangen /usr/bin/kstars > kstars.1
 .RE
diff --git a/ubuntu/maverick/tdesdk/debian/man/makeobj.1 b/ubuntu/maverick/tdesdk/debian/man/makeobj.1
index 48f8d0adb..6af366855 100644
--- a/ubuntu/maverick/tdesdk/debian/man/makeobj.1
+++ b/ubuntu/maverick/tdesdk/debian/man/makeobj.1
@@ -46,16 +46,16 @@ the simpler variable OBJ_SUBDIR should be used.
 .TP
 OBJ_SUBDIR
 Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fIkdesdk\fP
-and the build directory is \fIkdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
+source directory.  For instance, if the source directory is \fItdesdk\fP
+and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
 should be set to \fIobj-i386-linux\fP.
 .TP
 OBJ_REPLACEMENT
 A \fBsed\fP expression that is used to transform the source directory
 into the build directory.
-For instance, if the source directory is \fI~/src/kdesdk\fP and the
-build directory is \fI~/src/kdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#src/kdesdk#src/kdesdk-obj#\fP.
+For instance, if the source directory is \fI~/src/tdesdk\fP and the
+build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
+be set to \fIs#src/tdesdk#src/tdesdk-obj#\fP.
 .SH SEE ALSO
 .BR make (1),
 .BR sed (1).
diff --git a/ubuntu/maverick/tdesdk/debian/man/package_crystalsvg.1 b/ubuntu/maverick/tdesdk/debian/man/package_crystalsvg.1
index 64e0f888c..0b0e97c5e 100644
--- a/ubuntu/maverick/tdesdk/debian/man/package_crystalsvg.1
+++ b/ubuntu/maverick/tdesdk/debian/man/package_crystalsvg.1
@@ -28,7 +28,7 @@ contain \fIFILES\fP (describing the contents of the tarball and which
 KDE modules/paths they were copied from) as well as some other bits and
 pieces.
 .PP
-Note that you must at least have kdelibs checked out for this utility to
+Note that you must at least have tdelibs checked out for this utility to
 run.
 .PP
 The final tarball will be created in the current working directory.
diff --git a/ubuntu/maverick/tdesdk/debian/man/pruneemptydirs.1 b/ubuntu/maverick/tdesdk/debian/man/pruneemptydirs.1
index 93c33cea9..b6875d861 100644
--- a/ubuntu/maverick/tdesdk/debian/man/pruneemptydirs.1
+++ b/ubuntu/maverick/tdesdk/debian/man/pruneemptydirs.1
@@ -48,16 +48,16 @@ the simpler variable OBJ_SUBDIR should be used.
 .TP
 OBJ_SUBDIR
 Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fIkdesdk\fP
-and the build directory is \fIkdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
+source directory.  For instance, if the source directory is \fItdesdk\fP
+and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
 should be set to \fIobj-i386-linux\fP.
 .TP
 OBJ_REPLACEMENT
 A \fBsed\fP expression that is used to transform the source directory
 into the build directory.
-For instance, if the source directory is \fI~/src/kdesdk\fP and the
-build directory is \fI~/src/kdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#kdesdk#kdesdk-obj#\fP.
+For instance, if the source directory is \fI~/src/tdesdk\fP and the
+build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
+be set to \fIs#tdesdk#tdesdk-obj#\fP.
 .SH AUTHOR
 pruneemptydirs was written by David Faure <faure@kde.org>.
 .br
diff --git a/ubuntu/maverick/tdesdk/debian/man/umbrello.1 b/ubuntu/maverick/tdesdk/debian/man/umbrello.1
index c39f72cf3..9034cabea 100644
--- a/ubuntu/maverick/tdesdk/debian/man/umbrello.1
+++ b/ubuntu/maverick/tdesdk/debian/man/umbrello.1
@@ -43,7 +43,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdesdk-doc-html\fP and read this documentation in HTML format from
+\fItdesdk-doc-html\fP and read this documentation in HTML format from
 \fI/usr/share/doc/kde/HTML/en/umbrello/\fP.
 .SH AUTHOR
 Umbrello was written by Paul Hensgen <phensgen@users.sourceforge.net> and
diff --git a/ubuntu/maverick/tdesdk/debian/not-installed.list b/ubuntu/maverick/tdesdk/debian/not-installed.list
index f801ede2f..77ec5e17d 100644
--- a/ubuntu/maverick/tdesdk/debian/not-installed.list
+++ b/ubuntu/maverick/tdesdk/debian/not-installed.list
@@ -7,7 +7,7 @@ This is deliberate.
 /usr/bin/kunittest
 /usr/bin/kunittest_debughelper
  - These are not useful without the dcopperl bindings which are not built
-   in the Debian kdebindings packages.
+   in the Debian tdebindings packages.
 
 /usr/bin/licensecheck
 and the associated manpage
diff --git a/ubuntu/maverick/tdesdk/debian/rules b/ubuntu/maverick/tdesdk/debian/rules
index 15d420b54..fc163e6d7 100755
--- a/ubuntu/maverick/tdesdk/debian/rules
+++ b/ubuntu/maverick/tdesdk/debian/rules
@@ -12,7 +12,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
 
 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
-DEB_DH_STRIP_ARGS := --dbg-package=kdesdk-trinity-dbg
+DEB_DH_STRIP_ARGS := --dbg-package=tdesdk-trinity-dbg
 
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
@@ -35,38 +35,38 @@ DEB_INSTALL_CHANGELOGS_kcachegrind-trinity := kcachegrind/ChangeLog
 DEB_INSTALL_CHANGELOGS_kompare-trinity := kompare/ChangeLog
 DEB_INSTALL_CHANGELOGS_umbrello-trinity := umbrello/ChangeLog
 
-binary-install/kdesdk-scripts-trinity::
-	mv -f debian/kdesdk-scripts-trinity/usr/share/man/pl/man1/kdemangen.1 \
-		debian/kdesdk-scripts-trinity/usr/share/man/man1/kdemangen.pl.1
-	mv -f debian/kdesdk-scripts-trinity/usr/share/man/pl/man1/png2mng.1 \
-		debian/kdesdk-scripts-trinity/usr/share/man/man1/png2mng.pl.1
-	mv -f debian/kdesdk-scripts-trinity/usr/share/man/py/man1/kdelnk2desktop.1 \
-		debian/kdesdk-scripts-trinity/usr/share/man/man1/kdelnk2desktop.py.1
-	mv -f debian/kdesdk-scripts-trinity/usr/share/man/py/man1/zonetab2pot.1 \
-		debian/kdesdk-scripts-trinity/usr/share/man/man1/zonetab2pot.py.1
-	mv -f debian/kdesdk-scripts-trinity/usr/share/man/sh/man1/build-progress.1 \
-		debian/kdesdk-scripts-trinity/usr/share/man/man1/build-progress.sh.1
-	mv -f debian/kdesdk-scripts-trinity/opt/trinity/bin/svn-clean \
-		debian/kdesdk-scripts-trinity/opt/trinity/bin/svn-clean-kde
-	mv -f debian/kdesdk-scripts-trinity/opt/trinity/bin/svnversions \
-		debian/kdesdk-scripts-trinity/opt/trinity/bin/svnversion-kde
-	rm -rf debian/kdesdk-scripts-trinity/opt/share/man/pl
-	rm -rf debian/kdesdk-scripts-trinity/opt/share/man/py
-	rm -rf debian/kdesdk-scripts-trinity/opt/share/man/sh
+binary-install/tdesdk-scripts-trinity::
+	mv -f debian/tdesdk-scripts-trinity/usr/share/man/pl/man1/kdemangen.1 \
+		debian/tdesdk-scripts-trinity/usr/share/man/man1/kdemangen.pl.1
+	mv -f debian/tdesdk-scripts-trinity/usr/share/man/pl/man1/png2mng.1 \
+		debian/tdesdk-scripts-trinity/usr/share/man/man1/png2mng.pl.1
+	mv -f debian/tdesdk-scripts-trinity/usr/share/man/py/man1/kdelnk2desktop.1 \
+		debian/tdesdk-scripts-trinity/usr/share/man/man1/kdelnk2desktop.py.1
+	mv -f debian/tdesdk-scripts-trinity/usr/share/man/py/man1/zonetab2pot.1 \
+		debian/tdesdk-scripts-trinity/usr/share/man/man1/zonetab2pot.py.1
+	mv -f debian/tdesdk-scripts-trinity/usr/share/man/sh/man1/build-progress.1 \
+		debian/tdesdk-scripts-trinity/usr/share/man/man1/build-progress.sh.1
+	mv -f debian/tdesdk-scripts-trinity/opt/trinity/bin/svn-clean \
+		debian/tdesdk-scripts-trinity/opt/trinity/bin/svn-clean-kde
+	mv -f debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversions \
+		debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversion-kde
+	rm -rf debian/tdesdk-scripts-trinity/opt/share/man/pl
+	rm -rf debian/tdesdk-scripts-trinity/opt/share/man/py
+	rm -rf debian/tdesdk-scripts-trinity/opt/share/man/sh
 	install -p -D -m644 scripts/kde-buildrc \
-		debian/kdesdk-scripts-trinity/opt/trinity/share/doc/kdesdk-scripts-trinity/kde-buildrc.example
+		debian/tdesdk-scripts-trinity/opt/trinity/share/doc/tdesdk-scripts-trinity/kde-buildrc.example
 
-binary-install/kdesdk-misc-trinity::
+binary-install/tdesdk-misc-trinity::
 	install -p -D -m644 kdeaccounts-plugin/README \
-		debian/kdesdk-misc-trinity/opt/trinity/share/doc/kdesdk-misc/README.kdeaccounts-plugin
+		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kdeaccounts-plugin
 	install -p -D -m644 kioslave/svn/AUTHORS \
-		debian/kdesdk-misc-trinity/opt/trinity/share/doc/kdesdk-misc/AUTHORS.kioslave-svn
+		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/AUTHORS.kioslave-svn
 	install -p -D -m644 kioslave/svn/README \
-		debian/kdesdk-misc-trinity/opt/trinity/share/doc/kdesdk-misc/README.kioslave-svn
+		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kioslave-svn
 	install -p -D -m644 kprofilemethod/README \
-		debian/kdesdk-misc-trinity/opt/trinity/share/doc/kdesdk-misc/README.kprofilemethod
+		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kprofilemethod
 	install -p -D -m644 scheck/README \
-		debian/kdesdk-misc-trinity/opt/trinity/share/doc/kdesdk-misc/README.scheck
+		debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.scheck
 
 binary-install/kapptemplate-trinity::
 	rm -f debian/kapptemplate-trinity/opt/trinity/share/apps/kapptemplate/admin/*.cdbs-orig
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-doc-html.doc-base.cervisia b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.cervisia
index eb8e39df2..bc24f7dc3 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-doc-html.doc-base.cervisia
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.cervisia
@@ -1,4 +1,4 @@
-Document: kdesdk-doc-html-cervisia
+Document: tdesdk-doc-html-cervisia
 Title: Cervisia Manual
 Author: Bernd Gehrmann <bernd@mail.berlios.de> and Carlos Woelz <carloswoelz@imap-mail.com>
 Abstract: Cervisia provides a graphical view of CVS.
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-doc-html.doc-base.kbabel b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kbabel
index e65a793da..c02ae546a 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-doc-html.doc-base.kbabel
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kbabel
@@ -1,4 +1,4 @@
-Document: kdesdk-doc-html-kbabel
+Document: tdesdk-doc-html-kbabel
 Title: KBabel Handbook
 Author: Matthias Kiefer <matthias.kiefer@gmx.de>, Stanislav Visnovsky <visnovsky@kde.org>
 Abstract: KBabel is a suite of an advanced and easy to use PO-file
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kcachegrind
index d105a0bc8..1ce09cab0 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kcachegrind
@@ -1,4 +1,4 @@
-Document: kdesdk-doc-html-kcachegrind
+Document: tdesdk-doc-html-kcachegrind
 Title: KCachegrind Handbook
 Author: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
 Abstract: KCachegrind is a profile data visualization tool, written
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-doc-html.doc-base.umbrello b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.umbrello
index 22e6a2404..2d10a317c 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-doc-html.doc-base.umbrello
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.umbrello
@@ -1,4 +1,4 @@
-Document: kdesdk-doc-html-umbrello
+Document: tdesdk-doc-html-umbrello
 Title: Umbrello UML Modeller Handbook
 Author: Paul Hensgen and the Umbrello UML Modeller Authors
 Abstract: Umbrello UML Modeller helps the software development process
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-kfile-plugins-trinity.install b/ubuntu/maverick/tdesdk/debian/tdesdk-kfile-plugins-trinity.install
index 1ffa48c57..1ffa48c57 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-kfile-plugins-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-kfile-plugins-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-kio-plugins-trinity.docs b/ubuntu/maverick/tdesdk/debian/tdesdk-kio-plugins-trinity.docs
index bd4b4c270..bd4b4c270 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-kio-plugins-trinity.docs
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-kio-plugins-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-kio-plugins-trinity.install b/ubuntu/maverick/tdesdk/debian/tdesdk-kio-plugins-trinity.install
index f3f70394c..f3f70394c 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-kio-plugins-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-kio-plugins-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-misc-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.README.Debian
index 03a08c2d0..4fd8618d0 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-misc-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.README.Debian
@@ -1,7 +1,7 @@
 KDE Software Development Kit for Debian
 ---------------------------------------
 
-The kdesdk-misc package includes palettes for both the Gimp and Xpaint
+The tdesdk-misc package includes palettes for both the Gimp and Xpaint
 that match the KDE standard colour palette.  They may be useful for
 designing themes and icons.
 
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-misc-trinity.install b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install
index cc229ce19..cc229ce19 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-misc-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.links b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.links
new file mode 100644
index 000000000..156dabdf4
--- /dev/null
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.links
@@ -0,0 +1 @@
+usr/share/kdepalettes/README usr/share/doc/tdesdk-misc/README.palettes
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.README.Debian
index 7d0a6714d..ec8ff7295 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.README.Debian
@@ -1,14 +1,14 @@
-kdesdk-scripts for Debian
+tdesdk-scripts for Debian
 -------------------------
 
 Debugger macros:
 
   Some handy gdb macros (such as for printing QStrings from gdb)
-  have been placed in /usr/share/kdesdk-scripts/kde-devel-gdb.
+  have been placed in /usr/share/tdesdk-scripts/kde-devel-gdb.
 
   To use them, add this line to your ~/.gdbinit :
 
-    source /usr/share/kdesdk-scripts/kde-devel-gdb
+    source /usr/share/tdesdk-scripts/kde-devel-gdb
 
 Editor helper files:
 
@@ -17,30 +17,30 @@ Editor helper files:
 
   To use the vim helper file, add this line to your ~/.vimrc :
 
-    source /usr/share/kdesdk-scripts/kde-devel-vim.vim
+    source /usr/share/tdesdk-scripts/kde-devel-vim.vim
 
   To use the emacs helper files, add these lines to your ~/.emacs (with
   your real name and email address substituted as appropriate):
 
-    (add-to-list 'load-path "/usr/share/emacs/site-lisp/kdesdk-scripts")
+    (add-to-list 'load-path "/usr/share/emacs/site-lisp/tdesdk-scripts")
     (require 'kde-emacs)
 
     (setq kde-full-name "Your Name")
     (setq kde-email "Your Email")
 
-  See the file /usr/share/emacs/site-lisp/kdesdk-scripts/kde-emacs.el for
+  See the file /usr/share/emacs/site-lisp/tdesdk-scripts/kde-emacs.el for
   further information regarding emacs.
 
 Shell completion controls:
 
-  Completion controls are provided in /usr/share/kdesdk-scripts/completions/
+  Completion controls are provided in /usr/share/tdesdk-scripts/completions/
   for a variety of shells.
 
   To enable completion controls for zsh, you need to add the following
   lines to your ~/.zshrc :
 
     # Add the KDE completion controls to the zsh function path.
-    set -A fpath $fpath /usr/share/kdesdk-scripts/completions/zsh
+    set -A fpath $fpath /usr/share/tdesdk-scripts/completions/zsh
 
     # Initialise the zsh completion system.
     autoload -U compinit
@@ -49,7 +49,7 @@ Shell completion controls:
   To enable completion controls for bash, you must source each of the bash
   completion files from your ~/.bashrc .  A sample ~/.bashrc line is:
 
-    . /usr/share/kdesdk-scripts/completions/bash/dcop
+    . /usr/share/tdesdk-scripts/completions/bash/dcop
 
 Valgrind error suppressions:
 
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.docs b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.docs
index 490ab041d..490ab041d 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.docs
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.install b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.install
index 79b90254c..8b7f3c79f 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.install
@@ -38,7 +38,7 @@ debian/tmp/opt/trinity/bin/svn2dist
 debian/tmp/opt/trinity/bin/svnrevertlast
 debian/tmp/opt/trinity/bin/svnforwardport
 debian/tmp/opt/trinity/bin/nonsvnlist
-debian/tmp/opt/trinity/bin/kdesvn-build
+debian/tmp/opt/trinity/bin/tdesvn-build
 debian/tmp/opt/trinity/bin/svnlastlog
 debian/tmp/opt/trinity/bin/svnversions
 debian/tmp/opt/trinity/bin/create_svnignore
@@ -49,21 +49,21 @@ debian/tmp/opt/trinity/bin/svnbackport
 debian/tmp/opt/trinity/bin/svngettags
 debian/tmp/opt/trinity/bin/svnchangesince
 debian/tmp/opt/trinity/bin/svn-clean
-debian/tmp/opt/trinity/share/apps/katepart/syntax/kdesvn-buildrc.xml
+debian/tmp/opt/trinity/share/apps/katepart/syntax/tdesvn-buildrc.xml
 debian/tmp/opt/trinity/share/man/man1/cvsblame.1
 debian/tmp/opt/trinity/share/man/man1/cvsversion.1
 debian/tmp/opt/trinity/share/man/man1/kde-build.1
 debian/tmp/opt/trinity/share/man/man1/includemocs.1
 debian/tmp/opt/trinity/share/man/man1/noncvslist.1
-debian/tmp/opt/trinity/share/man/man1/kdesvn-build.1
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesvn-build/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesvn-build/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesvn-build/index.docbook
-scripts/kde-devel-gdb /opt/trinity/share/kdesdk-scripts
-scripts/kde-devel-vim.vim /opt/trinity/share/kdesdk-scripts
-scripts/kde-emacs/*.el /opt/trinity/share/emacs/site-lisp/kdesdk-scripts
+debian/tmp/opt/trinity/share/man/man1/tdesvn-build.1
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesvn-build/common
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesvn-build/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesvn-build/index.docbook
+scripts/kde-devel-gdb /opt/trinity/share/tdesdk-scripts
+scripts/kde-devel-vim.vim /opt/trinity/share/tdesdk-scripts
+scripts/kde-emacs/*.el /opt/trinity/share/emacs/site-lisp/tdesdk-scripts
 scripts/kde.supp /opt/trinity/lib/valgrind
-scripts/completions /opt/trinity/share/kdesdk-scripts
+scripts/completions /opt/trinity/share/tdesdk-scripts
 
 debian/desktop-i18n/createdesktop.pl /opt/trinity/lib/kubuntu-desktop-i18n/
 debian/desktop-i18n/findfiles /opt/trinity/lib/kubuntu-desktop-i18n/
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.lintian b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.lintian
new file mode 100644
index 000000000..e3136bc9c
--- /dev/null
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.lintian
@@ -0,0 +1,3 @@
+# The syntax error is just perlpod docs appearing after the script exits.
+tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
+tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.manpages b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.manpages
index 07337e200..07337e200 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-scripts-trinity.manpages
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.manpages
diff --git a/ubuntu/maverick/tdesdk/debian/kdesdk-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/tdesdk-trinity.README.Debian
index 65a65a833..2f53456c9 100644
--- a/ubuntu/maverick/tdesdk/debian/kdesdk-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-trinity.README.Debian
@@ -1,11 +1,11 @@
 KDE Software Development Kit for Debian
 ---------------------------------------
 
-Package kdesdk is a metapackage that depends on the core components of
+Package tdesdk is a metapackage that depends on the core components of
 the KDE Software Development Kit and suggests the remaining components.
 
 Some applications provide documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdesdk-doc-html.
+web browser, see the package tdesdk-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/umbrello-trinity.README.Debian
index 0ba895e00..c151a589b 100644
--- a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.README.Debian
+++ b/ubuntu/maverick/tdesdk/debian/umbrello-trinity.README.Debian
@@ -3,6 +3,6 @@ Umbrello for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdesdk-doc-html.
+web browser, see the package tdesdk-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sat, 31 Jan 2004 12:08:48 +1100
diff --git a/ubuntu/maverick/tdetoys/debian/amor-trinity.README.Debian b/ubuntu/maverick/tdetoys/debian/amor-trinity.README.Debian
index 5572b0856..1473c9b12 100644
--- a/ubuntu/maverick/tdetoys/debian/amor-trinity.README.Debian
+++ b/ubuntu/maverick/tdetoys/debian/amor-trinity.README.Debian
@@ -3,6 +3,6 @@ AMOR for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdetoys-doc-html.
+web browser, see the package tdetoys-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdetoys/debian/changelog b/ubuntu/maverick/tdetoys/debian/changelog
index b10216451..8db640fcb 100644
--- a/ubuntu/maverick/tdetoys/debian/changelog
+++ b/ubuntu/maverick/tdetoys/debian/changelog
@@ -1,48 +1,48 @@
-kdetoys-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
+tdetoys-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdetoys-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
+tdetoys-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 01 March 2009 13:35:00 -0600
 
-kdetoys-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
+tdetoys-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
 
   * Import from SVN
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 27 Nov 2008 20:01:00 -0600
 
-kdetoys (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdetoys (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
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:53:15 -0400
 
-kdetoys (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdetoys (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:08 +0000
 
-kdetoys (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdetoys (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 09:43:07 +0000
 
-kdetoys (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdetoys (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, no changes except LP translations patch in debian/patches/common
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:39 +0000
 
-kdetoys (4:3.5.8-1) unstable; urgency=low
+tdetoys (4:3.5.8-1) unstable; urgency=low
 
   * New upstream release.
   * Implement the use of uploaders.mk and update uploaders.
@@ -54,7 +54,7 @@ kdetoys (4:3.5.8-1) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 11 Oct 2007 07:31:15 +0200
 
-kdetoys (4:3.5.7-2) unstable; urgency=low
+tdetoys (4:3.5.7-2) unstable; urgency=low
 
   * Fixing typo in amor menu. Thanks to Bill Allombert for his hard work in
     Debian menus file. (Closes: #428528)
@@ -63,20 +63,20 @@ kdetoys (4:3.5.7-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 13 Jun 2007 01:32:10 +0200
 
-kdetoys (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdetoys (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:22 +0100
 
-kdetoys (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdetoys (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * New Upstream Version
   * Modify Maintainer value to match Debian-Maintainer-Field Spec
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 23 May 2007 15:28:10 +1000
 
-kdetoys (4:3.5.7-1) unstable; urgency=low
+tdetoys (4:3.5.7-1) unstable; urgency=low
 
   * New upstream release. 
 
@@ -87,19 +87,19 @@ kdetoys (4:3.5.7-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 16 May 2007 00:58:34 +0100
 
-kdetoys (4:3.5.6-2ubuntu1) gutsy; urgency=low
+tdetoys (4:3.5.6-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 15:56:21 +0100
 
-kdetoys (4:3.5.6-2) unstable; urgency=low
+tdetoys (4:3.5.6-2) unstable; urgency=low
 
   * Upload to unstable after Etch release.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 18 Apr 2007 15:21:25 +0100
 
-kdetoys (4:3.5.6-1) experimental; urgency=low
+tdetoys (4:3.5.6-1) experimental; urgency=low
 
   * New upstream release.
 
@@ -110,7 +110,7 @@ kdetoys (4:3.5.6-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 17 Jan 2007 18:16:41 +0200
 
-kdetoys (4:3.5.5-3) unstable; urgency=medium
+tdetoys (4:3.5.5-3) unstable; urgency=medium
 
   +++ Changes by Modestas Vainius:
   * Previous revision didn't add Lithuania to the country list as it was
@@ -125,7 +125,7 @@ kdetoys (4:3.5.5-3) unstable; urgency=medium
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 30 Dec 2006 20:28:47 +0200
 
-kdetoys (4:3.5.5-2) unstable; urgency=low
+tdetoys (4:3.5.5-2) unstable; urgency=low
 
   * Add Lithuania to the country list of kweather. Add weather stations
     that are available in Lithuania:
@@ -134,37 +134,37 @@ kdetoys (4:3.5.5-2) unstable; urgency=low
     - Siauliai Intl./Mil. (EYSA) as "Siauliai"
     - Palanga Intl. (EYPA) as "Palanga"
     Thanks to Modestas Vainius.
-  * Make kdetoys-dbg depend on kdelibs-dbg to get useful backtraces when
+  * Make tdetoys-dbg depend on tdelibs-dbg to get useful backtraces when
     debugging.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 07 Dec 2006 19:03:17 +0100
 
 
-kdetoys (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdetoys (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:29 +0000
 
-kdetoys (4:3.5.5-1ubuntu2) feisty; urgency=low
+tdetoys (4:3.5.5-1ubuntu2) feisty; urgency=low
 
   * rebuild with --enable-gcc-hidden-visibility
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 19:39:17 +0000
 
-kdetoys (4:3.5.5-1ubuntu1) feisty; urgency=low
+tdetoys (4:3.5.5-1ubuntu1) feisty; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Nov 2006 22:31:57 +0000
 
-kdetoys (4:3.5.5-1) unstable; urgency=low
+tdetoys (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  4 Oct 2006 20:13:46 -0400
 
-kdetoys (4:3.5.4-1) unstable; urgency=low
+tdetoys (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -172,38 +172,38 @@ kdetoys (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 29 Jul 2006 20:57:12 -0400
 
-kdetoys (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdetoys (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:08 +0000
 
-kdetoys (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdetoys (4:3.5.4-0ubuntu2) 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
 
-kdetoys (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdetoys (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:19 +0000
 
-kdetoys (4:3.5.3-1ubuntu2) edgy; urgency=low
+tdetoys (4:3.5.3-1ubuntu2) edgy; urgency=low
 
-  * Rebuild on latest kdelibs, fix Qt binary compatibility break
+  * Rebuild on latest tdelibs, fix Qt binary compatibility break
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Jun 2006 16:39:33 +0000
 
-kdetoys (4:3.5.3-1ubuntu1) edgy; urgency=low
+tdetoys (4:3.5.3-1ubuntu1) edgy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 27 Jun 2006 16:59:57 +0000
 
-kdetoys (4:3.5.3-1) unstable; urgency=low
+tdetoys (4:3.5.3-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -211,7 +211,7 @@ kdetoys (4:3.5.3-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun,  4 Jun 2006 17:30:43 -0400
 
-kdetoys (4:3.5.2-1) unstable; urgency=low
+tdetoys (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -219,7 +219,7 @@ kdetoys (4:3.5.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 29 Mar 2006 13:02:24 -0500
 
-kdetoys (4:3.5.1-1) unstable; urgency=low
+tdetoys (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -229,7 +229,7 @@ kdetoys (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 29 Jan 2006 10:23:36 -0500
 
-kdetoys (4:3.5.0-3) unstable; urgency=low
+tdetoys (4:3.5.0-3) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -239,7 +239,7 @@ kdetoys (4:3.5.0-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  7 Jan 2006 17:22:51 -0500
 
-kdetoys (4:3.5.0-2) experimental; urgency=low
+tdetoys (4:3.5.0-2) experimental; urgency=low
 
   * Upload to experimental.
 
@@ -252,58 +252,58 @@ kdetoys (4:3.5.0-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 16 Dec 2005 10:26:27 -0500
 
-kdetoys (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdetoys (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * debian/cdbs/kde.mk:
     - added dh_iconcache.
 
  -- Daniel Holbach <daniel.holbach@ubuntu.com>  Sun, 21 May 2006 16:40:00 +0200
 
-kdetoys (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdetoys (4:3.5.2-0ubuntu2) dapper; urgency=low
 
   * Edit kde.mk to mark .po files as UTF-8 
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Apr 2006 19:04:06 +0100
 
-kdetoys (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdetoys (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:29 +0000
 
-kdetoys (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdetoys (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:07 +0000
 
-kdetoys (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdetoys (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:29:12 +0000
 
-kdetoys (4:3.5-rc2-0ubuntu2) dapper; urgency=low
+tdetoys (4:3.5-rc2-0ubuntu2) dapper; urgency=low
 
   * Ensure patches are not applies before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 26 Nov 2005 16:38:57 +0000
 
-kdetoys (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdetoys (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Generate .pot files
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 22 Nov 2005 15:23:19 +0000
 
-kdetoys (4:3.5-rc1-1ubuntu1) dapper; urgency=low
+tdetoys (4:3.5-rc1-1ubuntu1) dapper; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 13 Nov 2005 16:02:53 +0000
 
-kdetoys (4:3.5.0-1) alioth; urgency=low
+tdetoys (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
 
@@ -314,26 +314,26 @@ kdetoys (4:3.5.0-1) alioth; urgency=low
 
   * Bump DH_COMPAT to 5. No changes.
 
-  * Add kdetoys-dbg, to help track down problems.
+  * Add tdetoys-dbg, to help track down problems.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 30 Nov 2005 14:13:02 -0500
 
-kdetoys (4:3.4.3-1) experimental; urgency=low
+tdetoys (4:3.4.3-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 16 Oct 2005 14:12:55 -0400
 
-kdetoys (4:3.4.2-2) unstable; urgency=low
+tdetoys (4:3.4.2-2) unstable; urgency=low
 
   +++ Changes by Luk Claes:
   
-  * Build with g++-3.4 on arm, m68k and hppa; kdetoys triggers the same gcc 4.0
+  * Build with g++-3.4 on arm, m68k and hppa; tdetoys triggers the same gcc 4.0
     ICE as arts does.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri,  2 Sep 2005 20:18:02 +0200
 
-kdetoys (4:3.4.2-1) unstable; urgency=low
+tdetoys (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -345,45 +345,45 @@ kdetoys (4:3.4.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  1 Sep 2005 16:40:50 +0200
 
-kdetoys (4:3.4.1-1) experimental; urgency=low
+tdetoys (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
 
-kdetoys (4:3.4.3-0ubuntu2) breezy; urgency=low
+tdetoys (4:3.4.3-0ubuntu2) breezy; urgency=low
 
   * Do not try to install missing man pages
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun,  9 Oct 2005 17:28:15 +0100
 
-kdetoys (4:3.4.3-0ubuntu1) breezy; urgency=low
+tdetoys (4:3.4.3-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Build with GCC 3.4 on hppa etc
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  7 Oct 2005 20:03:45 +0000
 
-kdetoys (4:3.4.2-0ubuntu1) breezy; urgency=low
+tdetoys (4:3.4.2-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Build using unsermake
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 16:25:41 +0000
 
-kdetoys (4:3.4.1-0ubuntu1) breezy; urgency=low
+tdetoys (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number following KDE 3.4.1 release
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed,  1 Jun 2005 00:58:08 +0000
 
-kdetoys (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
+tdetoys (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 26 May 2005 13:05:48 +0000
 
-kdetoys (4:3.4.0-0pre1) alioth; urgency=low
+tdetoys (4:3.4.0-0pre1) alioth; urgency=low
 
   * New upstream release.
 
@@ -393,14 +393,14 @@ kdetoys (4:3.4.0-0pre1) alioth; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  5 Mar 2005 22:58:44 -0500 
 
-kdetoys (4:3.3.2-3) unstable; urgency=low
+tdetoys (4:3.3.2-3) unstable; urgency=low
 
   * Added the full text of the GFDL to debian/copyright, since all of the
     docbook documentation is under this license.
 
  -- Ben Burton <bab@debian.org>  Fri, 25 Mar 2005 19:07:39 +1100
 
-kdetoys (4:3.3.2-2) unstable; urgency=medium
+tdetoys (4:3.3.2-2) unstable; urgency=medium
 
   * Changed kteatime to depend on kicker instead of just recommending it.
   * Made it clearer that kteatime is a KDE systray applet that will probably
@@ -410,20 +410,20 @@ kdetoys (4:3.3.2-2) unstable; urgency=medium
 
  -- Ben Burton <bab@debian.org>  Sun,  6 Feb 2005 17:51:59 +1100
 
-kdetoys (4:3.3.2-1) unstable; urgency=medium
+tdetoys (4:3.3.2-1) unstable; urgency=medium
 
   * New upstream bugfix release.
 
  -- Ben Burton <bab@debian.org>  Mon, 17 Jan 2005 08:53:18 +1100
 
-kdetoys (4:3.3.1-2) unstable; urgency=medium
+tdetoys (4:3.3.1-2) unstable; urgency=medium
 
   * Build-conflicts with autoconf2.13, which does not play well with
     Makefile.common (closes: #277629).
 
  -- Ben Burton <bab@debian.org>  Thu, 28 Oct 2004 19:03:02 +1000
 
-kdetoys (4:3.3.1-1) unstable; urgency=medium
+tdetoys (4:3.3.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.
   * KWorldClock applet unbroken (closes: #276891).  This required a further
@@ -431,7 +431,7 @@ kdetoys (4:3.3.1-1) unstable; urgency=medium
 
  -- Ben Burton <bab@debian.org>  Thu, 21 Oct 2004 09:23:15 +1000
 
-kdetoys (4:3.3.0-1) unstable; urgency=low
+tdetoys (4:3.3.0-1) unstable; urgency=low
 
   * New upstream release.
   * Fixed incorrect kweather sunset time (closes: #243840).
@@ -439,50 +439,50 @@ kdetoys (4:3.3.0-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 16 Oct 2004 14:09:26 +1000
 
-kdetoys (4:3.2.3-3) unstable; urgency=low
+tdetoys (4:3.2.3-3) unstable; urgency=low
 
   * Patched kweather so that the correct timezone is used for "last updated"
     when the network is down (closes: #254159).
 
  -- Ben Burton <bab@debian.org>  Tue,  6 Jul 2004 22:54:39 +1000
 
-kdetoys (4:3.2.3-2) unstable; urgency=low
+tdetoys (4:3.2.3-2) unstable; urgency=low
 
   * Patched ktux so that it always uses the entire window / screen, not just
     the top left corner (closes: #234850).
 
  -- Ben Burton <bab@debian.org>  Tue,  6 Jul 2004 09:20:47 +1000
 
-kdetoys (4:3.2.3-1) unstable; urgency=low
+tdetoys (4:3.2.3-1) unstable; urgency=low
 
   * New upstream bugfix release.
   * Don't abuse conflicts (use replaces instead where this is more proper).
-  * Suggests (konqueror | www-browser) for kdetoys-doc-html instead of
+  * Suggests (konqueror | www-browser) for tdetoys-doc-html instead of
     just www-browser.
 
  -- Ben Burton <bab@debian.org>  Tue, 15 Jun 2004 08:38:18 +1000
 
-kdetoys (4:3.2.2-1) unstable; urgency=low
+tdetoys (4:3.2.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
 
  -- Ben Burton <bab@debian.org>  Sat, 24 Apr 2004 08:53:43 +1000
 
-kdetoys (4:3.2.1-1) unstable; urgency=low
+tdetoys (4:3.2.1-1) unstable; urgency=low
 
   * First KDE 3.2 upload to sid.
 
  -- Ben Burton <bab@debian.org>  Sun,  7 Mar 2004 17:42:59 +1100
 
-kdetoys (4:3.2.0-2) experimental; urgency=low
+tdetoys (4:3.2.0-2) experimental; urgency=low
 
   * First KDE 3.2 upload to experimental.
   * Sync from KDE_3_2_BRANCH for recent bugfixes.
-  * Using versioned dependencies for the kdetoys metapackage.
+  * Using versioned dependencies for the tdetoys metapackage.
 
  -- Ben Burton <bab@debian.org>  Mon, 23 Feb 2004 08:14:22 +1100
 
-kdetoys (4:3.2.0-1) unstable; urgency=low
+tdetoys (4:3.2.0-1) unstable; urgency=low
 
   * New upstream release.
   * Many thanks to Ralf Nolden for all his help with packaging KDE 3.2.
@@ -490,39 +490,39 @@ kdetoys (4:3.2.0-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
 
-kdetoys (4:3.1.5-2) unstable; urgency=low
+tdetoys (4:3.1.5-2) unstable; urgency=low
 
   * Revert unintentional maintainer change that appeared in 4:3.1.5-1.
 
  -- Ben Burton <bab@debian.org>  Sun, 18 Jan 2004 21:48:10 +1100
 
-kdetoys (4:3.1.5-1) unstable; urgency=low
+tdetoys (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <bab@debian.org>  Sun, 18 Jan 2004 12:55:12 +1100
 
-kdetoys (4:3.1.4-3) unstable; urgency=low
+tdetoys (4:3.1.4-3) unstable; urgency=low
 
   * Backported kteatime tooltip fix from HEAD (closes: #202206).
 
  -- Ben Burton <bab@debian.org>  Wed, 15 Oct 2003 11:45:08 +1000
 
-kdetoys (4:3.1.4-2) unstable; urgency=low
+tdetoys (4:3.1.4-2) unstable; urgency=low
 
   * Updated amor description and man page to note that it works with window
     managers other than kwin (closes: #213488).
 
  -- Ben Burton <bab@debian.org>  Mon, 13 Oct 2003 00:55:42 +1000
 
-kdetoys (4:3.1.4-1) unstable; urgency=low
+tdetoys (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
   * Bumped standards-version to 3.6.1.
 
  -- Ben Burton <bab@debian.org>  Mon, 29 Sep 2003 15:08:53 +1000
 
-kdetoys (4:3.1.3-1) unstable; urgency=low
+tdetoys (4:3.1.3-1) unstable; urgency=low
 
   * New upstream release.
   * Split debian menu titles into title/longtitle.
@@ -530,7 +530,7 @@ kdetoys (4:3.1.3-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Wed, 13 Aug 2003 11:02:26 +1000
 
-kdetoys (4:3.1.2-1) unstable; urgency=low
+tdetoys (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
   * Debian menu pixmaps no longer use a restricted colour map.
@@ -538,7 +538,7 @@ kdetoys (4:3.1.2-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun,  1 Jun 2003 14:15:47 +1000
 
-kdetoys (4:3.1.1-1) unstable; urgency=low
+tdetoys (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release.
   * Removed alpha compile flags.
@@ -546,7 +546,7 @@ kdetoys (4:3.1.1-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sat, 22 Mar 2003 16:18:51 +1100
 
-kdetoys (4:3.1.0-2) unstable; urgency=low
+tdetoys (4:3.1.0-2) unstable; urgency=low
 
   * First Trinity upload to debian!
   * KTeaTime now supports custom tasks (closes: #141942).
@@ -554,13 +554,13 @@ kdetoys (4:3.1.0-2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun,  2 Feb 2003 19:40:16 +1100
 
-kdetoys (4:3.1.0-1) unstable; urgency=low
+tdetoys (4:3.1.0-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <bab@debian.org>  Mon, 18 Nov 2002 14:15:59 +1100
 
-kdetoys (4:3.0.9-1) unstable; urgency=low
+tdetoys (4:3.0.9-1) unstable; urgency=low
 
   * New upstream release.
   * Built with g++-3.2.
@@ -568,7 +568,7 @@ kdetoys (4:3.0.9-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Tue, 22 Oct 2002 11:57:39 +1000
 
-kdetoys (4:3.0.8-1) unstable; urgency=low
+tdetoys (4:3.0.8-1) unstable; urgency=low
 
   * New upstream release.
   * Moved to Chris Cheney's style of debian/rules.
@@ -576,85 +576,85 @@ kdetoys (4:3.0.8-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sun, 22 Sep 2002 17:57:55 +1000
 
-kdetoys (4:3.0.3-1) unstable; urgency=low
+tdetoys (4:3.0.3-1) unstable; urgency=low
 
   * New upstream release.
   * Build-depends on automake1.5.
 
  -- Ben Burton <benb@acm.org>  Thu, 15 Aug 2002 13:22:22 +1000
 
-kdetoys (4:3.0.2-1) unstable; urgency=low
+tdetoys (4:3.0.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Thu,  4 Jul 2002 19:36:49 +1000
 
-kdetoys (4:3.0.1-1) unstable; urgency=low
+tdetoys (4:3.0.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Tue, 14 May 2002 00:09:38 +1000
 
-kdetoys (4:2.2.2-4) unstable; urgency=low
+tdetoys (4:2.2.2-4) unstable; urgency=low
 
   * Fixed HTML documentation conflicts.
 
  -- Ben Burton <benb@acm.org>  Tue,  2 Apr 2002 00:26:51 +1000
 
-kdetoys (4:2.2.2-3) unstable; urgency=low
+tdetoys (4:2.2.2-3) unstable; urgency=low
 
   * Incorporated new KDE_2_2_BRANCH patches.
 
  -- Ben Burton <benb@acm.org>  Sat, 23 Feb 2002 16:42:17 +1100
 
-kdetoys (4:2.2.2-2) unstable; urgency=low
+tdetoys (4:2.2.2-2) unstable; urgency=low
 
   * Moved AmorIface.h to /usr/include/kde (closes: Bug#122447).
 
  -- Ben Burton <benb@acm.org>  Sun,  9 Dec 2001 09:07:02 -0600
 
-kdetoys (4:2.2.2-1) unstable; urgency=low
+tdetoys (4:2.2.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Wed,  7 Nov 2001 10:49:53 -0600
 
-kdetoys (4:2.2.1-4) unstable; urgency=low
+tdetoys (4:2.2.1-4) unstable; urgency=low
 
   * Uses automake again to solve new alpha problems.
   * Removed redundant uic from build-depends.
 
  -- Ben Burton <benb@acm.org>  Tue,  6 Nov 2001 23:51:27 -0600
 
-kdetoys (4:2.2.1-3) unstable; urgency=low
+tdetoys (4:2.2.1-3) unstable; urgency=low
 
   * Builds with automake 1.5.
-  * kdetoys-doc-html now conflicts with old kdetoys binaries that provided
+  * tdetoys-doc-html now conflicts with old tdetoys binaries that provided
     their own HTML docs (closes: Bug#115104).
   * Installs .pl.1 man pages in the correct locations (requires newer
     debhelper).
 
  -- Ben Burton <benb@acm.org>  Thu, 11 Oct 2001 15:31:32 -0500
 
-kdetoys (4:2.2.1-2) unstable; urgency=low
+tdetoys (4:2.2.1-2) unstable; urgency=low
 
   * Updated parameters for alpha build (closes: Bug#113126).
 
  -- Ben Burton <benb@acm.org>  Sat, 22 Sep 2001 12:00:37 -0500
 
-kdetoys (4:2.2.1-1) unstable; urgency=low
+tdetoys (4:2.2.1-1) unstable; urgency=low
 
   * New upstream release.
   * Fixed doc-base entries to refer to real directories instead of symlinks.
 
  -- Ben Burton <benb@acm.org>  Fri, 31 Aug 2001 21:08:56 -0500
 
-kdetoys (4:2.2.0-final-1) unstable; urgency=low
+tdetoys (4:2.2.0-final-1) unstable; urgency=low
 
   * New upstream release.
-  * Added package kdetoys-doc-html.
+  * Added package tdetoys-doc-html.
   * Added suggests: konqueror to packages including docbook documentation.
-  * Build-Depends: requires newer kdelibs-dev for working meinproc; added uic.
+  * Build-Depends: requires newer tdelibs-dev for working meinproc; added uic.
   * Linking /usr/share/apps/kworldwatch to /usr/share/apps/kworldclock.
   * Ensures .bz2 files are not being compressed.
   * Bumped standards-version to 3.5.6.
@@ -662,26 +662,26 @@ kdetoys (4:2.2.0-final-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sun, 29 Jul 2001 17:48:59 +1000
 
-kdetoys (4:2.2-beta1-3) unstable; urgency=low
+tdetoys (4:2.2-beta1-3) unstable; urgency=low
 
-  * Rebuilt with newer kdelibs (closes: #107001).
+  * Rebuilt with newer tdelibs (closes: #107001).
 
  -- Ben Burton <benb@acm.org>  Tue, 31 Jul 2001 01:17:51 +1000
 
-kdetoys (4:2.2-beta1-2) unstable; urgency=low
+tdetoys (4:2.2-beta1-2) unstable; urgency=low
 
   * Builds on alpha.
 
  -- Ben Burton <benb@acm.org>  Sun, 29 Jul 2001 00:20:23 +1000
 
-kdetoys (4:2.2-beta1-1) unstable; urgency=low
+tdetoys (4:2.2-beta1-1) unstable; urgency=low
 
   * New upstream version (closes: #88610, #99059, #99060).
   * Adopted by Ben Burton <benb@acm.org> (closes: #89596).
   * Added package fifteenapplet.
   * Renamed package kworldwatch to kworldclock.
   * Removed redundancies in build-depends.
-  * Changed Depends: kdebase to Recommends: kdebase for panel and systray
+  * Changed Depends: tdebase to Recommends: tdebase for panel and systray
     applets.
   * Updated descriptions (closes: #93817, #93818, #93820, #93821).
   * Added man pages.
@@ -690,7 +690,7 @@ kdetoys (4:2.2-beta1-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sat, 23 Jun 2001 12:32:11 -0500
 
-kdetoys (4:2.1.1-2.1) unstable; urgency=low
+tdetoys (4:2.1.1-2.1) unstable; urgency=low
  
   * NMU
   * Fixing build-depends
@@ -698,245 +698,245 @@ kdetoys (4:2.1.1-2.1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 28 Apr 2001 03:34:00 -0700
  
-kdetoys (4:2.1.1-2) unstable; urgency=low
+tdetoys (4:2.1.1-2) unstable; urgency=low
  
   * NMU
   * Update menu entries with new kde menu tag
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 09 Apr 2001 02:40:00 -0700
  
-kdetoys (4:2.1.1-1.0.1) unstable; urgency=low
+tdetoys (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 02:31:00 -0700
  
-kdetoys (4:2.1.1-1) unstable; urgency=low
+tdetoys (4:2.1.1-1) unstable; urgency=low
  
   * New upstream version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Mar 2001 02:31:00 -0700
 
-kdetoys (4:2.1-final-1) unstable; urgency=low
+tdetoys (4:2.1-final-1) unstable; urgency=low
  
   * New upstream version
   * Upping standards version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
 
-kdetoys (4:2.1-beta2-1) unstable; urgency=low
+tdetoys (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
 
-kdetoys (4:2.1-20010106-1) unstable; urgency=low
+tdetoys (4:2.1-20010106-1) unstable; urgency=low
  
   * New upstream cvs version
   * build-depends and depends updates
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 06 Jan 2001 23:30:00 -0700
 
-kdetoys (4:2.1-20010101-1) unstable; urgency=low
+tdetoys (4:2.1-20010101-1) unstable; urgency=low
  
   * New upstream cvs version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Jan 2001 15:00:00 -0700
 
-kdetoys (4:2.1-20001221-1) unstable; urgency=low
+tdetoys (4:2.1-20001221-1) unstable; urgency=low
  
   * New upstream cvs version
-  * Adding in missing conflicts for kdetoys
+  * Adding in missing conflicts for tdetoys
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 21 Dec 2000 02:44:00 -0700
 
-kdetoys (4:2.0-final-7) unstable; urgency=low
+tdetoys (4:2.0-final-7) unstable; urgency=low
  
   * Fixing problem with eyesapplet's so link (Closes: #77709)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 22 Nov 2000 05:10:00 -0700
 
-kdetoys (4:2.0-final-6) unstable; urgency=low
+tdetoys (4:2.0-final-6) unstable; urgency=low
  
   * More dependency cleanup
   * rebuild rules script
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 21 Nov 2000 07:44:00 -0700
 
-kdetoys (4:2.0-final-5) unstable; urgency=low
+tdetoys (4:2.0-final-5) unstable; urgency=low
  
   * Upstream documentation updates
   * More dependency cleanup
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 18 Nov 2000 04:20:00 -0700
 
-kdetoys (4:2.0-final-4) unstable; urgency=low
+tdetoys (4:2.0-final-4) unstable; urgency=low
  
   * more upstream fixes
   * adding in menu hints
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
 
-kdetoys (4:2.0-final-3) unstable; urgency=low
+tdetoys (4:2.0-final-3) unstable; urgency=low
  
   * more upstream fixes
   * build against new xlibs
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 04 Nov 2000 23:00:00 -0700
                                                                                 
-kdetoys (4:2.0-final-2) unstable; urgency=low
+tdetoys (4:2.0-final-2) unstable; urgency=low
  
   * more upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
 
-kdetoys (4:2.0-final-0) unstable; urgency=low
+tdetoys (4:2.0-final-0) unstable; urgency=low
 
   * KDE 2.0
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Oct 2000 00:00:00 -0700
 
-kdetoys (4:2.0-20001011-0) unstable; urgency=low
+tdetoys (4:2.0-20001011-0) unstable; urgency=low
  
   * KDE 2.0 RC2
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 12 Oct 2000 06:00:00 -0700
                                                                                 
-kdetoys (4:2.0-20001006-0) unstable; urgency=low
+tdetoys (4:2.0-20001006-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 06 Oct 2000 22:00:00 -0700
                                                                                 
-kdetoys (4:2.0-20001005-0) unstable; urgency=low
+tdetoys (4:2.0-20001005-0) unstable; urgency=low
  
   * More upstream fixes
-  * Compiling against non-versioned kdelibs again
+  * Compiling against non-versioned tdelibs again
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 05 Oct 2000 15:00:00 -0700
                                                                                 
-kdetoys (4:2.0-20001002-0) unstable; urgency=low
+tdetoys (4:2.0-20001002-0) unstable; urgency=low
  
   * KDE 2.0 RC1
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Oct 2000 01:30:00 -0700
                                                                                 
-kdetoys (4:2.0-20000925-2) unstable; urgency=low
+tdetoys (4:2.0-20000925-2) unstable; urgency=low
 
   * More upstream fixes
   * Clean build against new libc package
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 26 Sep 2000 22:30:00 -0700
 
-kdetoys (4:2.0-20000925-0) unstable; urgency=low
+tdetoys (4:2.0-20000925-0) unstable; urgency=low
  
   * More upstream fixes
   * Build-Depends fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
 
-kdetoys (4:2.0-20000920-0) unstable; urgency=low
+tdetoys (4:2.0-20000920-0) unstable; urgency=low
  
   * More upstream fixes
   * Breaking down into individual packages
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Sep 2000 23:00:00 -0700
 
-kdetoys (4:2.0-20000918-0) unstable; urgency=low
+tdetoys (4:2.0-20000918-0) unstable; urgency=low
  
   * More upstream fixes
   * Fixing odd description (Closes: #71542)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Sep 2000 22:00:00 -0700      
 
-kdetoys (4:2.0-20000909-0) unstable; urgency=low
+tdetoys (4:2.0-20000909-0) unstable; urgency=low
 
   * More upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 09 Sep 2000 22:00:00 -0700
 
-kdetoys (4:2.0-20000901-0) unstable; urgency=low
+tdetoys (4:2.0-20000901-0) unstable; urgency=low
  
   * More upstream fixes
   * Merging package fixes with upstream cvs
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Sep 2000 17:00:00 -0700
                                                                                
-kdetoys (4:2.0-20000825-0) experimental; urgency=low
+tdetoys (4:2.0-20000825-0) experimental; urgency=low
  
   * KDE 2.0 beta 4
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 25 Aug 2000 22:30:00 -0700
                                                                                 
-kdetoys (4:2.0-20000820-1.0) experimental; urgency=low
+tdetoys (4:2.0-20000820-1.0) experimental; urgency=low
  
   * New upstream beta version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 20 Aug 2000 17:00:00 -0700
 
-kdetoys (4:2.0-20000524-1.0) experimental; urgency=low
+tdetoys (4:2.0-20000524-1.0) experimental; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 24 May 2000 04:15:00 -0700
                                                                                 
-kdetoys-cvs (4:2.0-20000521-1.0) experimental; urgency=low
+tdetoys-cvs (4:2.0-20000521-1.0) experimental; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 21 May 2000 18:15:00 -0700
 
-kdetoys-cvs (4:2.0-20000512-1.1) experimental; urgency=low
+tdetoys-cvs (4:2.0-20000512-1.1) experimental; urgency=low
  
   * new cvs version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 12 May 2000 22:00:00 -0700
 
-kdetoys-cvs (4:2.0-20000308-1.0) experimental; urgency=low
+tdetoys-cvs (4:2.0-20000308-1.0) experimental; urgency=low
  
   * new cvs version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 08 Mar 2000 22:00:00 -0700
 
-kdetoys-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+tdetoys-cvs (4:2.0-20000302-1.0) experimental; urgency=low
 
   * new cvs version
   * Adding in build-depends
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 29 Feb 2000 22:00:00 -0700
 
-kdetoys-cvs (4:2.0-19991001-1) experimental; urgency=low
+tdetoys-cvs (4:2.0-19991001-1) experimental; urgency=low
 
   * new version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Oct 1999 14:30:31 -0400
 
-kdetoys-cvs (4:2.0-19990822-1) experimental; urgency=low
+tdetoys-cvs (4:2.0-19990822-1) experimental; urgency=low
 
   * new version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 22 Aug 1999 08:52:31 -0400
 
-kdetoys-cvs (4:2.0-19990626) experimental; urgency=low
+tdetoys-cvs (4:2.0-19990626) experimental; urgency=low
 
   * new version 
   * install into /opt/kde
 
  -- Stephan Kulow <coolo@kde.org>  Sat, 26 Jun 1999 18:52:31 +0200
 
-kdetoys-cvs (4:2.0-19990524-1) experimental; urgency=low
+tdetoys-cvs (4:2.0-19990524-1) experimental; urgency=low
 
   * migrating out of /opt to /
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 24 May 1999 07:22:51 -0400
 
-kdetoys (4:1.1-19990217-1) unstable; urgency=low
+tdetoys (4:1.1-19990217-1) unstable; urgency=low
 
   * new upstream version
 
  -- Stephan Kulow <coolo@kde.org>  Wed, 17 Feb 1999 19:09:43 +0100
 
-kdetoys (4:1.1_19990207-1) unstable; urgency=low
+tdetoys (4:1.1_19990207-1) unstable; urgency=low
 
   * new upstream version 1.1 and new epoche
 
diff --git a/ubuntu/maverick/tdetoys/debian/control b/ubuntu/maverick/tdetoys/debian/control
index c89bb7701..7255a132c 100644
--- a/ubuntu/maverick/tdetoys/debian/control
+++ b/ubuntu/maverick/tdetoys/debian/control
@@ -1,19 +1,19 @@
-Source: kdetoys-trinity
+Source: tdetoys-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev (>= 4:3.5.10), gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kdetoys-trinity
+Package: tdetoys-trinity
 Architecture: all
 Section: kde
-Replaces: kdetoys-kde3 (<< 4:3.5.13)
-Breaks: kdetoys-kde3 (<< 4:3.5.13)
+Replaces: tdetoys-kde3 (<< 4:3.5.13)
+Breaks: tdetoys-kde3 (<< 4:3.5.13)
 Depends: amor-trinity (>= ${Source-Version}), eyesapplet-trinity (>= ${Source-Version}), fifteenapplet-trinity (>= ${Source-Version}), kmoon-trinity (>= ${Source-Version}), kodo-trinity (>= ${Source-Version}), kteatime-trinity (>= ${Source-Version}), ktux-trinity (>= ${Source-Version}), kweather-trinity (>= ${Source-Version}), kworldclock-trinity (>= ${Source-Version})
-Suggests: kdetoys-trinity-doc-html (>= ${Source-Version})
+Suggests: tdetoys-trinity-doc-html (>= ${Source-Version})
 Description: toys 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,
@@ -23,12 +23,12 @@ Description: toys from the official Trinity release
  This metapackage includes a collection of toys and fun extras provided
  with the official release of Trinity.
 
-Package: kdetoys-trinity-doc-html
+Package: tdetoys-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: kdetoys-kde3-doc-html (<< 4:3.5.13)
-Breaks: kdetoys-kde3-doc-html (<< 4:3.5.13)
-Suggests: konqueror-trinity | www-browser, kdetoys-trinity
+Replaces: tdetoys-kde3-doc-html (<< 4:3.5.13)
+Breaks: tdetoys-kde3-doc-html (<< 4:3.5.13)
+Suggests: konqueror-trinity | www-browser, tdetoys-trinity
 Description: Trinity toys documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -41,7 +41,7 @@ Description: Trinity toys documentation in HTML format
  KDE toys packages.
  .
  This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: amor-trinity
 Architecture: any
@@ -51,7 +51,7 @@ Breaks: amor-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Recommends: kwin-trinity
 Suggests: khelpcenter-trinity
-Conflicts: task-kdetoys-trinity
+Conflicts: task-tdetoys-trinity
 Description: a Trinity creature for your desktop
  AMOR stands for Amusing Misuse Of Resources. It provides several different
  characters who prance around your X screen doing tricks and giving you tips.
@@ -60,7 +60,7 @@ Description: a Trinity creature for your desktop
  KDE window manager) and Metacity (a GTK2 window manager) are supported.
  .
  This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: eyesapplet-trinity
 Architecture: any
@@ -69,13 +69,13 @@ Replaces: eyesapplet-kde3 (<< 4:3.5.13)
 Breaks: eyesapplet-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Recommends: kicker-trinity
-Conflicts: task-kdetoys-trinity
+Conflicts: task-tdetoys-trinity
 Description: eyes applet for Trinity
  An applet for the KDE panel containing a pair of eyes that follow your mouse
  around the screen.
  .
  This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: fifteenapplet-trinity
 Architecture: any
@@ -90,7 +90,7 @@ Description: fifteen pieces puzzle for Trinity
  moving them around.
  .
  This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: kmoon-trinity
 Architecture: any
@@ -100,12 +100,12 @@ Breaks: kmoon-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Recommends: kicker-trinity
 Suggests: khelpcenter-trinity
-Conflicts: task-kdetoys-trinity
+Conflicts: task-tdetoys-trinity
 Description: moon phase indicator for Trinity
  An applet for the KDE panel that displays the current phase of the moon.
  .
  This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: kodo-trinity
 Architecture: any
@@ -114,14 +114,14 @@ Replaces: kodo-kde3 (<< 4:3.5.13)
 Breaks: kodo-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Conflicts: task-kdetoys-trinity
+Conflicts: task-tdetoys-trinity
 Description: mouse odometer for Trinity
  KOdometer measures your desktop mileage. It tracks the movement of your mouse
  pointer across your desktop and renders it in inches/feet/miles! It can
  do cm/metres/km too. Its most exciting feature is the tripometer.
  .
  This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: kteatime-trinity
 Architecture: any
@@ -130,7 +130,7 @@ Replaces: kteatime-kde3 (<< 4:3.5.13)
 Breaks: kteatime-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, kicker-trinity
 Suggests: khelpcenter-trinity
-Conflicts: task-kdetoys-trinity
+Conflicts: task-tdetoys-trinity
 Description: Trinity utility for making a fine cup of tea
  KTeaTime is a handy timer for steeping tea. No longer will you have to
  guess at how long it takes for your tea to be ready. Simply select the
@@ -144,7 +144,7 @@ Description: Trinity utility for making a fine cup of tea
  possible that KTeaTime will not work on your system.
  .
  This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: ktux-trinity
 Architecture: any
@@ -153,12 +153,12 @@ Replaces: ktux-kde3 (<< 4:3.5.13)
 Breaks: ktux-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Suggests: kwin-trinity
-Conflicts: task-kdetoys-trinity
+Conflicts: task-tdetoys-trinity
 Description: Tux screensaver for Trinity
  A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE).
  .
  This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: kweather-trinity
 Architecture: any
@@ -178,7 +178,7 @@ Description: weather display applet for Trinity
  Konqueror's sidebar and Kontact's summary page.
  .
  This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
 
 Package: kworldclock-trinity
 Architecture: any
@@ -186,8 +186,8 @@ Section: games
 Replaces: kworldclock-kde3 (<< 4:3.5.13)
 Breaks: kworldclock-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
-Suggests: kdeartwork-misc-trinity, kicker-trinity, kdesktop-trinity, khelpcenter-trinity
-Conflicts: task-kdetoys-trinity, kworldwatch-trinity (<= 4:2.2-beta1-1)
+Suggests: tdeartwork-misc-trinity, kicker-trinity, kdesktop-trinity, khelpcenter-trinity
+Conflicts: task-tdetoys-trinity, kworldwatch-trinity (<= 4:2.2-beta1-1)
 Provides: kworldwatch-trinity
 Description: earth watcher for Trinity
  Displays where in the world it is light and dark depending on time, as
@@ -195,19 +195,19 @@ Description: earth watcher for Trinity
  This can be run standalone, as an applet in the KDE panel or as a
  desktop background.
  .
- Additional kworldclock themes are available in the kdeartwork-misc package.
+ Additional kworldclock themes are available in the tdeartwork-misc package.
  .
  This package is part of Trinity, and a component of the KDE toys module.
- See the 'kde-trinity' and 'kdetoys-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdetoys-trinity' packages for more information.
 
-Package: kdetoys-trinity-dbg
+Package: tdetoys-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: kdetoys-kde3-dbg (<< 4:3.5.13)
-Breaks: kdetoys-kde3-dbg (<< 4:3.5.13)
-Depends: kdelibs-trinity-dbg
+Replaces: tdetoys-kde3-dbg (<< 4:3.5.13)
+Breaks: tdetoys-kde3-dbg (<< 4:3.5.13)
+Depends: tdelibs-trinity-dbg
 Priority: extra
-Description: debugging symbols for kdetoys-trinity
- This package contains the debugging symbols associated with kdetoys-trinity.
- They will automatically be used by gdb for debugging kdetoys-related
+Description: debugging symbols for tdetoys-trinity
+ This package contains the debugging symbols associated with tdetoys-trinity.
+ They will automatically be used by gdb for debugging tdetoys-related
  issues.
diff --git a/ubuntu/maverick/tdetoys/debian/control.in b/ubuntu/maverick/tdetoys/debian/control.in
index 5ba950042..0540c794a 100644
--- a/ubuntu/maverick/tdetoys/debian/control.in
+++ b/ubuntu/maverick/tdetoys/debian/control.in
@@ -1,17 +1,17 @@
-Source: kdetoys
+Source: tdetoys
 Section: kde
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, kdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils
 Standards-Version: 3.7.2
 
-Package: kdetoys
+Package: tdetoys
 Architecture: all
 Section: kde
 Depends: amor (>= ${Source-Version}), eyesapplet (>= ${Source-Version}), fifteenapplet (>= ${Source-Version}), kmoon (>= ${Source-Version}), kodo (>= ${Source-Version}), kteatime (>= ${Source-Version}), ktux (>= ${Source-Version}), kweather (>= ${Source-Version}), kworldclock (>= ${Source-Version})
-Suggests: kdetoys-doc-html (>= ${Source-Version})
+Suggests: tdetoys-doc-html (>= ${Source-Version})
 Description: toys from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -21,10 +21,10 @@ Description: toys from the official KDE release
  This metapackage includes a collection of toys and fun extras provided
  with the official release of KDE.
 
-Package: kdetoys-doc-html
+Package: tdetoys-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror | www-browser, kdetoys
+Suggests: konqueror | www-browser, tdetoys
 Replaces: amor (<< 4:2.2.0-0), kmoon (<< 4:2.2.0-0), kodo (<< 4:2.2.0-0), kteatime (<< 4:2.2.0-0), kweather (<< 4:3.0.0-0), kworldclock (<< 4:2.2.0-0)
 Description: KDE toys documentation in HTML format
  By default the modules provided by KDE only provide their documentation
@@ -38,7 +38,7 @@ Description: KDE toys documentation in HTML format
  KDE toys packages.
  .
  This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'kdetoys' packages for more information.
+ See the 'kde' and 'tdetoys' packages for more information.
 
 Package: amor
 Architecture: any
@@ -46,8 +46,8 @@ Section: games
 Depends: ${shlibs:Depends}
 Recommends: kwin
 Suggests: khelpcenter
-Conflicts: task-kdetoys
-Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
+Conflicts: task-tdetoys
+Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
 Description: a KDE creature for your desktop
  AMOR stands for Amusing Misuse Of Resources. It provides several different
  characters who prance around your X screen doing tricks and giving you tips.
@@ -56,21 +56,21 @@ Description: a KDE creature for your desktop
  KDE window manager) and Metacity (a GTK2 window manager) are supported.
  .
  This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'kdetoys' packages for more information.
+ See the 'kde' and 'tdetoys' packages for more information.
 
 Package: eyesapplet
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
 Recommends: kicker
-Conflicts: task-kdetoys
-Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
+Conflicts: task-tdetoys
+Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
 Description: eyes applet for KDE
  An applet for the KDE panel containing a pair of eyes that follow your mouse
  around the screen.
  .
  This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'kdetoys' packages for more information.
+ See the 'kde' and 'tdetoys' packages for more information.
 
 Package: fifteenapplet
 Architecture: any
@@ -83,7 +83,7 @@ Description: fifteen pieces puzzle for KDE
  moving them around.
  .
  This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'kdetoys' packages for more information.
+ See the 'kde' and 'tdetoys' packages for more information.
 
 Package: kmoon
 Architecture: any
@@ -91,36 +91,36 @@ Section: kde
 Depends: ${shlibs:Depends}
 Recommends: kicker
 Suggests: khelpcenter
-Conflicts: task-kdetoys
-Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
+Conflicts: task-tdetoys
+Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
 Description: moon phase indicator for KDE
  An applet for the KDE panel that displays the current phase of the moon.
  .
  This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'kdetoys' packages for more information.
+ See the 'kde' and 'tdetoys' packages for more information.
 
 Package: kodo
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Conflicts: task-kdetoys
-Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
+Conflicts: task-tdetoys
+Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
 Description: mouse odometer for KDE
  KOdometer measures your desktop mileage. It tracks the movement of your mouse
  pointer across your desktop and renders it in inches/feet/miles! It can
  do cm/metres/km too. Its most exciting feature is the tripometer.
  .
  This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'kdetoys' packages for more information.
+ See the 'kde' and 'tdetoys' packages for more information.
 
 Package: kteatime
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, kicker
 Suggests: khelpcenter
-Conflicts: task-kdetoys
-Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
+Conflicts: task-tdetoys
+Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
 Description: KDE utility for making a fine cup of tea
  KTeaTime is a handy timer for steeping tea. No longer will you have to
  guess at how long it takes for your tea to be ready. Simply select the
@@ -134,20 +134,20 @@ Description: KDE utility for making a fine cup of tea
  possible that KTeaTime will not work on your system.
  .
  This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'kdetoys' packages for more information.
+ See the 'kde' and 'tdetoys' packages for more information.
 
 Package: ktux
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
 Suggests: kwin
-Conflicts: task-kdetoys
-Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
+Conflicts: task-tdetoys
+Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
 Description: Tux screensaver for KDE
  A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE).
  .
  This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'kdetoys' packages for more information.
+ See the 'kde' and 'tdetoys' packages for more information.
 
 Package: kweather
 Architecture: any
@@ -165,15 +165,15 @@ Description: weather display applet for KDE
  Konqueror's sidebar and Kontact's summary page.
  .
  This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'kdetoys' packages for more information.
+ See the 'kde' and 'tdetoys' packages for more information.
 
 Package: kworldclock
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Suggests: kdeartwork-misc, kicker, kdesktop, khelpcenter
-Conflicts: task-kdetoys, kworldwatch (<= 4:2.2-beta1-1)
-Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys, kworldwatch (<= 4:2.2-beta1-1)
+Suggests: tdeartwork-misc, kicker, kdesktop, khelpcenter
+Conflicts: task-tdetoys, kworldwatch (<= 4:2.2-beta1-1)
+Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys, kworldwatch (<= 4:2.2-beta1-1)
 Provides: kworldwatch
 Description: earth watcher for KDE
  Displays where in the world it is light and dark depending on time, as
@@ -181,17 +181,17 @@ Description: earth watcher for KDE
  This can be run standalone, as an applet in the KDE panel or as a
  desktop background.
  .
- Additional kworldclock themes are available in the kdeartwork-misc package.
+ Additional kworldclock themes are available in the tdeartwork-misc package.
  .
  This package is part of KDE, and a component of the KDE toys module.
- See the 'kde' and 'kdetoys' packages for more information.
+ See the 'kde' and 'tdetoys' packages for more information.
 
-Package: kdetoys-dbg
+Package: tdetoys-dbg
 Section: libdevel
 Architecture: any
-Depends: kdelibs-dbg
+Depends: tdelibs-dbg
 Priority: extra
-Description: debugging symbols for kdetoys
- This package contains the debugging symbols associated with kdetoys.
- They will automatically be used by gdb for debugging kdetoys-related
+Description: debugging symbols for tdetoys
+ This package contains the debugging symbols associated with tdetoys.
+ They will automatically be used by gdb for debugging tdetoys-related
  issues.
diff --git a/ubuntu/maverick/tdetoys/debian/kmoon-trinity.README.Debian b/ubuntu/maverick/tdetoys/debian/kmoon-trinity.README.Debian
index 3c73a9827..b57e946fe 100644
--- a/ubuntu/maverick/tdetoys/debian/kmoon-trinity.README.Debian
+++ b/ubuntu/maverick/tdetoys/debian/kmoon-trinity.README.Debian
@@ -3,6 +3,6 @@ KMoon for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdetoys-doc-html.
+web browser, see the package tdetoys-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sat, 31 Jan 2004 12:08:48 +1100
diff --git a/ubuntu/maverick/tdetoys/debian/kodo-trinity.README.Debian b/ubuntu/maverick/tdetoys/debian/kodo-trinity.README.Debian
index 39b677649..089f5e120 100644
--- a/ubuntu/maverick/tdetoys/debian/kodo-trinity.README.Debian
+++ b/ubuntu/maverick/tdetoys/debian/kodo-trinity.README.Debian
@@ -3,6 +3,6 @@ KOdometer for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdetoys-doc-html.
+web browser, see the package tdetoys-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdetoys/debian/kteatime-trinity.README.Debian b/ubuntu/maverick/tdetoys/debian/kteatime-trinity.README.Debian
index 972e574e3..36dae62f2 100644
--- a/ubuntu/maverick/tdetoys/debian/kteatime-trinity.README.Debian
+++ b/ubuntu/maverick/tdetoys/debian/kteatime-trinity.README.Debian
@@ -11,6 +11,6 @@ HTML Documentation:
 
   This application provides documentation in a docbook format that the KDE
   Help Centre can display.  For HTML documentation that can be read in any
-  web browser, see the package kdetoys-doc-html.
+  web browser, see the package tdetoys-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sun,  6 Feb 2005 17:51:59 +1100
diff --git a/ubuntu/maverick/tdetoys/debian/kweather-trinity.README.Debian b/ubuntu/maverick/tdetoys/debian/kweather-trinity.README.Debian
index 815ca9c50..466b880d0 100644
--- a/ubuntu/maverick/tdetoys/debian/kweather-trinity.README.Debian
+++ b/ubuntu/maverick/tdetoys/debian/kweather-trinity.README.Debian
@@ -3,6 +3,6 @@ KWeather for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdetoys-doc-html.
+web browser, see the package tdetoys-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sat, 31 Jan 2004 12:08:48 +1100
diff --git a/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.README.Debian b/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.README.Debian
index 4824666ae..e1ffc4599 100644
--- a/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.README.Debian
+++ b/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.README.Debian
@@ -3,6 +3,6 @@ KWorldClock for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdetoys-doc-html.
+web browser, see the package tdetoys-doc-html.
 
  -- Ben Burton <bab@debian.org>, Sat, 16 Oct 2004 14:09:26 +1000
diff --git a/ubuntu/maverick/tdetoys/debian/man/amor-trinity.1 b/ubuntu/maverick/tdetoys/debian/man/amor-trinity.1
index f5451d833..9fec8d958 100644
--- a/ubuntu/maverick/tdetoys/debian/man/amor-trinity.1
+++ b/ubuntu/maverick/tdetoys/debian/man/amor-trinity.1
@@ -40,7 +40,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdetoys-doc-html\fP and read this documentation in HTML format from
+\fItdetoys-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/amor/\fP.
 .SH AUTHOR
 AMOR was written by Martin R. Jones <mjones@kde.org> and
diff --git a/ubuntu/maverick/tdetoys/debian/man/kodo-trinity.1 b/ubuntu/maverick/tdetoys/debian/man/kodo-trinity.1
index 7f87b3dce..9efd2f8f8 100644
--- a/ubuntu/maverick/tdetoys/debian/man/kodo-trinity.1
+++ b/ubuntu/maverick/tdetoys/debian/man/kodo-trinity.1
@@ -38,7 +38,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdetoys-doc-html\fP and read this documentation in HTML format from
+\fItdetoys-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kodo/\fP.
 .SH AUTHOR
 KOdometer was written by Armen Nakashian <armen@tourismo.com> and
diff --git a/ubuntu/maverick/tdetoys/debian/man/kteatime-trinity.1 b/ubuntu/maverick/tdetoys/debian/man/kteatime-trinity.1
index faedbb64d..a9f4478eb 100644
--- a/ubuntu/maverick/tdetoys/debian/man/kteatime-trinity.1
+++ b/ubuntu/maverick/tdetoys/debian/man/kteatime-trinity.1
@@ -39,7 +39,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdetoys-doc-html\fP and read this documentation in HTML format from
+\fItdetoys-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kteatime/\fP.
 .SH AUTHOR
 KTeaTime was written by Matthias Hoelzer-Kluepfel <hoelzer@kde.org> and
diff --git a/ubuntu/maverick/tdetoys/debian/man/kweatherreport-trinity.1 b/ubuntu/maverick/tdetoys/debian/man/kweatherreport-trinity.1
index 1fa3a5887..d2add1667 100644
--- a/ubuntu/maverick/tdetoys/debian/man/kweatherreport-trinity.1
+++ b/ubuntu/maverick/tdetoys/debian/man/kweatherreport-trinity.1
@@ -46,7 +46,7 @@ directly into konqueror or you can run `\fIkhelpcenter help:/kweather/\fP'
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdetoys-doc-html\fP and read this documentation in HTML format from
+\fItdetoys-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kweather/\fP.
 .SH AUTHOR
 KWeather was written by Ian Reinhart Geiser <geiseri@kde.org>,
diff --git a/ubuntu/maverick/tdetoys/debian/man/kweatherservice-trinity.1 b/ubuntu/maverick/tdetoys/debian/man/kweatherservice-trinity.1
index 289ff9517..39fd549b9 100644
--- a/ubuntu/maverick/tdetoys/debian/man/kweatherservice-trinity.1
+++ b/ubuntu/maverick/tdetoys/debian/man/kweatherservice-trinity.1
@@ -43,7 +43,7 @@ directly into konqueror or you can run `\fIkhelpcenter help:/kweather/\fP'
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdetoys-doc-html\fP and read this documentation in HTML format from
+\fItdetoys-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kweather/\fP.
 .SH AUTHOR
 KWeather was written by Ian Reinhart Geiser <geiseri@kde.org>,
diff --git a/ubuntu/maverick/tdetoys/debian/man/kworldclock-trinity.1 b/ubuntu/maverick/tdetoys/debian/man/kworldclock-trinity.1
index 4aa3cd811..f383c5b86 100644
--- a/ubuntu/maverick/tdetoys/debian/man/kworldclock-trinity.1
+++ b/ubuntu/maverick/tdetoys/debian/man/kworldclock-trinity.1
@@ -60,7 +60,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdetoys-doc-html\fP and read this documentation in HTML format from
+\fItdetoys-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kworldclock/\fP.
 .SH AUTHOR
 KWorldClock was written by Matthias Hoelzer-Kluepfel <hoelzer@kde.org>
diff --git a/ubuntu/maverick/tdetoys/debian/rules b/ubuntu/maverick/tdetoys/debian/rules
index db356ba14..29a5978c3 100755
--- a/ubuntu/maverick/tdetoys/debian/rules
+++ b/ubuntu/maverick/tdetoys/debian/rules
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
 
-DEB_DH_STRIP_ARGS  := --dbg-package=kdetoys-trinity-dbg
+DEB_DH_STRIP_ARGS  := --dbg-package=tdetoys-trinity-dbg
 
 DEB_INSTALL_CHANGELOGS_kodo-trinity := kodo/ChangeLog
 DEB_INSTALL_CHANGELOGS_kteatime-trinity := kteatime/ChangeLog
diff --git a/ubuntu/maverick/tdetoys/debian/kdetoys-doc-html.doc-base.amor b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.amor
index 74dde755b..f8f0260a3 100644
--- a/ubuntu/maverick/tdetoys/debian/kdetoys-doc-html.doc-base.amor
+++ b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.amor
@@ -1,4 +1,4 @@
-Document: kdetoys-doc-html-amor
+Document: tdetoys-doc-html-amor
 Title: AMOR Handbook
 Author: Karl Garrison <karl@indy.rr.com>
 Abstract: AMOR is a small animation which sits on top of your active window.
diff --git a/ubuntu/maverick/tdetoys/debian/kdetoys-doc-html.doc-base.kmoon b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kmoon
index 6f047d736..8dd4b68cd 100644
--- a/ubuntu/maverick/tdetoys/debian/kdetoys-doc-html.doc-base.kmoon
+++ b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kmoon
@@ -1,4 +1,4 @@
-Document: kdetoys-doc-html-kmoon
+Document: tdetoys-doc-html-kmoon
 Title: KMoon Handbook
 Author: Pam Roberts <pamroberts@blueyonde.co.uk>
 Abstract: KMoon is an applet that shows the current phase of the moon.
diff --git a/ubuntu/maverick/tdetoys/debian/kdetoys-doc-html.doc-base.kodo b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kodo
index 675330450..6fcc75e2b 100644
--- a/ubuntu/maverick/tdetoys/debian/kdetoys-doc-html.doc-base.kodo
+++ b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kodo
@@ -1,4 +1,4 @@
-Document: kdetoys-doc-html-kodo
+Document: tdetoys-doc-html-kodo
 Title: KOdometer Handbook
 Author: Armen Nakashian <armen@tourismo.com>
 Abstract: KOdometer is a little gadget to measure your desktop mileage.
diff --git a/ubuntu/maverick/tdetoys/debian/kdetoys-doc-html.doc-base.kteatime b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kteatime
index b5d0a0b64..1425d8d02 100644
--- a/ubuntu/maverick/tdetoys/debian/kdetoys-doc-html.doc-base.kteatime
+++ b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kteatime
@@ -1,4 +1,4 @@
-Document: kdetoys-doc-html-kteatime
+Document: tdetoys-doc-html-kteatime
 Title: KTeaTime Handbook
 Author: Michael Korman <michael.korman@uconn.edu>
 Abstract: This Handbook describes KTeaTime, the KDE Tea Cooker.
diff --git a/ubuntu/maverick/tdetoys/debian/kdetoys-doc-html.doc-base.kweather b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kweather
index 2c8cf6b3d..82a9ab993 100644
--- a/ubuntu/maverick/tdetoys/debian/kdetoys-doc-html.doc-base.kweather
+++ b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kweather
@@ -1,4 +1,4 @@
-Document: kdetoys-doc-html-kweather
+Document: tdetoys-doc-html-kweather
 Title: KWeather Handbook
 Abstract: KWeather is an application that can display your area's current
  weather.  It provides a panel applet as well as a weather service that
diff --git a/ubuntu/maverick/tdetoys/debian/kdetoys-doc-html.doc-base.kworldclock b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kworldclock
index 3f95381b8..a2a57f683 100644
--- a/ubuntu/maverick/tdetoys/debian/kdetoys-doc-html.doc-base.kworldclock
+++ b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kworldclock
@@ -1,4 +1,4 @@
-Document: kdetoys-doc-html-kworldclock
+Document: tdetoys-doc-html-kworldclock
 Title: KWorldClock Handbook
 Author: Brad Hards
 Abstract: KWorldClock is an application that shows which parts of the world
diff --git a/ubuntu/maverick/tdetoys/debian/kdetoys-trinity.README.Debian b/ubuntu/maverick/tdetoys/debian/tdetoys-trinity.README.Debian
index 5dd67c1e8..35fef25d1 100644
--- a/ubuntu/maverick/tdetoys/debian/kdetoys-trinity.README.Debian
+++ b/ubuntu/maverick/tdetoys/debian/tdetoys-trinity.README.Debian
@@ -1,11 +1,11 @@
 KDE Toys for Debian
 -------------------
 
-Package kdetoys is a metapackage that depends on the full set of toys
+Package tdetoys is a metapackage that depends on the full set of toys
 provided with the official release of KDE.
 
 Each application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdetoys-doc-html.
+web browser, see the package tdetoys-doc-html.
 
  -- Ben Burton <bab@debian.org>, Mon, 12 May 2003 12:29:39 +1000
diff --git a/ubuntu/maverick/tdeutils/debian/changelog b/ubuntu/maverick/tdeutils/debian/changelog
index 0835dfb62..b3d3af82b 100644
--- a/ubuntu/maverick/tdeutils/debian/changelog
+++ b/ubuntu/maverick/tdeutils/debian/changelog
@@ -1,56 +1,56 @@
-kdeutils-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
+tdeutils-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
 
   * Fixed Ark crash
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 03 Dec 2009 02:00:00 -0600
 
-kdeutils-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
+tdeutils-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdeutils-trinity (4:3.5.10-0ubuntu1~intrepid4) intrepid; urgency=low
+tdeutils-trinity (4:3.5.10-0ubuntu1~intrepid4) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 01 March 2009 17:29:00 -0600
 
-kdeutils-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
+tdeutils-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
   * SVN import
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 27 Sep 2008 20:25:00 -0600
 
-kdeutils (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdeutils (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
-    - Bump version of build-dep on kdelibs4-dev, kdebase-dev, and
+    - Bump version of build-dep on tdelibs4-dev, tdebase-dev, and
       libkonq4-dev to 3.5.10
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:18:37 -0400
 
-kdeutils (4:3.5.9-0ubuntu3) hardy; urgency=low
+tdeutils (4:3.5.9-0ubuntu3) hardy; urgency=low
 
   * Edited debian/patches/kubuntu_14_kmilo_powermanager.diff:
     Brightness, suspend and hibernate events removed. (LP: #151444)
 
  -- Andreas Wenning <awen@awen.dk>  Fri, 21 Mar 2008 03:44:17 +0100
 
-kdeutils (4:3.5.9-0ubuntu2) hardy; urgency=low
+tdeutils (4:3.5.9-0ubuntu2) hardy; urgency=low
 
   * Fix build-failure in patch 14_kmilo_actions.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 03 Mar 2008 11:12:36 +0000
 
-kdeutils (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdeutils (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:08 +0000
 
-kdeutils (4:3.5.8-1ubuntu7) hardy; urgency=low
+tdeutils (4:3.5.8-1ubuntu7) hardy; urgency=low
 
   * debian/patches/kubuntu_14_kmilo_powermanager.diff:
     Added Brightness Down & Up key actions (DCOP call to Guidance
@@ -59,46 +59,46 @@ kdeutils (4:3.5.8-1ubuntu7) hardy; urgency=low
 
  -- Luka Renko <lure@ubuntu.com>  Sun, 10 Feb 2008 20:45:42 +0100
 
-kdeutils (4:3.5.8-1ubuntu6) hardy; urgency=low
+tdeutils (4:3.5.8-1ubuntu6) hardy; urgency=low
 
   * Rebuild against latest libqt3-mt
 
  -- Anthony Mercatante <tonio@kubuntu>  Thu, 24 Jan 2008 15:00:58 +0100
 
-kdeutils (4:3.5.8-1ubuntu5) hardy; urgency=low
+tdeutils (4:3.5.8-1ubuntu5) hardy; urgency=low
 
   * kgpg: Add depend on konsole
 
  -- Terence Simpson <stdin@stdin.me.uk>  Tue, 08 Jan 2008 13:18:21 +0000
 
-kdeutils (4:3.5.8-1ubuntu4) hardy; urgency=low
+tdeutils (4:3.5.8-1ubuntu4) hardy; urgency=low
 
   * Add kubuntu_18_kmilo_rear_speakers_volume.diff from X2B to correctly
     adjust volume for surround sound speaker systems
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Dec 2007 12:12:48 +0000
 
-kdeutils (4:3.5.8-1ubuntu3) hardy; urgency=low
+tdeutils (4:3.5.8-1ubuntu3) hardy; urgency=low
 
   * Rebuild for libsnmp10 -> libsnmp15 transition.
   * s/developers/Developers/ for the Maintainer field.
 
  -- Steve Kowalik <stevenk@ubuntu.com>  Mon, 10 Dec 2007 20:31:22 +1100
 
-kdeutils (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdeutils (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 10:55:31 +0000
 
-kdeutils (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdeutils (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining change
    - Add package kmilo-legacy
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:45 +0000
 
-kdeutils (4:3.5.8-1) unstable; urgency=low
+tdeutils (4:3.5.8-1) unstable; urgency=low
 
   * Implement the use of uploaders.mk and update control.
 
@@ -111,61 +111,61 @@ kdeutils (4:3.5.8-1) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 14 Oct 2007 12:52:24 +0200
 
-kdeutils (4:3.5.7-3) unstable; urgency=low
+tdeutils (4:3.5.7-3) unstable; urgency=low
 
   * New patch for 16_klaptopdaemon_lock_and_hibernate, take 3. Thanks to Raul 
     again. (Closes: #416824)
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 03 Jul 2007 15:58:20 +0200
 
-kdeutils (4:3.5.7-2) unstable; urgency=low
+tdeutils (4:3.5.7-2) unstable; urgency=low
 
   * Redone patch 16_klaptopdaemon_lock_and_hibernate. Thanks to Raúl Sánchez 
     Siles again. (Closes: #416824)
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Mon, 18 Jun 2007 21:38:07 +0200
 
-kdeutils (4:3.5.8-0ubuntu2) hardy; urgency=low
+tdeutils (4:3.5.8-0ubuntu2) hardy; urgency=low
 
   * Added kubuntu_17_zoo_extraction_fix.diff, fixes zoo extraction
     support. Patch from SVN
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 25 Oct 2007 15:41:44 +0200
 
-kdeutils (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdeutils (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:26 +0100
 
-kdeutils (4:3.5.7-1ubuntu4) gutsy; urgency=low
+tdeutils (4:3.5.7-1ubuntu4) gutsy; urgency=low
 
   * debian/control: drop xmms-dev to allow xmms to move to universe, adjust
    maintainer field.
 
  -- Kees Cook <kees@ubuntu.com>  Thu, 21 Jun 2007 13:59:49 -0700
 
-kdeutils (4:3.5.7-1ubuntu3) gutsy; urgency=low
+tdeutils (4:3.5.7-1ubuntu3) gutsy; urgency=low
 
   * Added kubuntu_16_ark_utf8.diff
     Fixed encoding issue opening rar and zip files.
 
  -- Anthony Mercatante <tonio@kubuntu.com>  Thu, 14 Jun 2007 13:17:22 +0200
 
-kdeutils (4:3.5.7-1ubuntu2) gutsy; urgency=low
+tdeutils (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
   * Added the compact look kmilo patch kubuntu_15_kmilo_compact_look.diff from
     http://blog.guillermoamaral.com/2007/04/14/patch-kde-kmilo-compact-dialog/
 
  -- Ryan Kavanagh <ryanakca@kubuntu.com>  Sat, 26 May 2007 11:04:06 -0400
 
-kdeutils (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdeutils (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * Merge with Debian for new upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 May 2007 16:45:43 +0100
 
-kdeutils (4:3.5.7-1) unstable; urgency=low
+tdeutils (4:3.5.7-1) unstable; urgency=low
 
   * New upstream release:
     + Adapt patch 15 about klaptop daemon filenames.
@@ -174,14 +174,14 @@ kdeutils (4:3.5.7-1) unstable; urgency=low
 
  -- Sune Vuorela <debian@pusling.com>  Tue, 15 May 2007 21:31:36 +0200
 
-kdeutils (4:3.5.6-2ubuntu1) gutsy; urgency=low
+tdeutils (4:3.5.6-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
   * Remaining changes in KUBUNTU-DEBIAN-DIFFERENCES
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 20:32:55 +0100
 
-kdeutils (4:3.5.6-2) unstable; urgency=low
+tdeutils (4:3.5.6-2) unstable; urgency=low
 
    * Upload to unstable after Etch release.
 
@@ -191,16 +191,16 @@ kdeutils (4:3.5.6-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 23 Apr 2007 16:20:48 +0100
 
-kdeutils (4:3.5.6-1) experimental; urgency=low
+tdeutils (4:3.5.6-1) experimental; urgency=low
 
   * New upstream release.
   * Update Uploaders.
-  * Make kdeutils-dbg depend on kdelibs-dbg to get useful backtraces when
+  * Make tdeutils-dbg depend on tdelibs-dbg to get useful backtraces when
     debugging.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 17 Jan 2007 00:16:21 +0100
 
-kdeutils (4:3.5.5-2) unstable; urgency=medium
+tdeutils (4:3.5.5-2) unstable; urgency=medium
 
   +++ Changes by Fathi Boudra:
 
@@ -221,7 +221,7 @@ kdeutils (4:3.5.5-2) unstable; urgency=medium
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 14 Nov 2006 17:32:12 -0500
 
-kdeutils (4:3.5.6-0ubuntu2) feisty; urgency=low
+tdeutils (4:3.5.6-0ubuntu2) feisty; urgency=low
 
   * Added kubuntu_14_kmilo_powermanager.diff: 
     Implement keyboard shortcuts for laptop keys (Battery, Suspend,
@@ -229,7 +229,7 @@ kdeutils (4:3.5.6-0ubuntu2) feisty; urgency=low
 
  -- Luka Renko <lure@ubuntu.com>  Sun,  4 Feb 2007 20:57:29 +0100
 
-kdeutils (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdeutils (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
   * Remove patches applied upstream
@@ -238,33 +238,33 @@ kdeutils (4:3.5.6-0ubuntu1) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:30 +0000
 
-kdeutils (4:3.5.5-1ubuntu4) feisty; urgency=low
+tdeutils (4:3.5.5-1ubuntu4) feisty; urgency=low
 
   * Remove kmilo.install.powerpc, fix build failure, it isn't
     needed since we don't use pbbuttons
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 15 Jan 2007 20:22:42 +0000
 
-kdeutils (4:3.5.5-1ubuntu3) feisty; urgency=low
+tdeutils (4:3.5.5-1ubuntu3) feisty; urgency=low
 
   * Rebuild for python2.5 as the default python version.
 
  -- Matthias Klose <doko@ubuntu.com>  Mon, 15 Jan 2007 17:57:17 +0000
 
-kdeutils (4:3.5.5-1ubuntu2) feisty; urgency=low
+tdeutils (4:3.5.5-1ubuntu2) feisty; urgency=low
 
   * Removed ark_part.desktop from ark.install
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 04 Dec 2006 22:53:32 +0200
 
-kdeutils (4:3.5.5-1ubuntu1) feisty; urgency=low
+tdeutils (4:3.5.5-1ubuntu1) feisty; urgency=low
 
   * Merge with Debian
   * Compile with --enable-gcc-hidden-visibility
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 20:41:48 +0000
 
-kdeutils (4:3.5.5-1) unstable; urgency=low
+tdeutils (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
     + Fixes kcalc: Alt-H does not select hex. (Closes: #272026)
@@ -278,11 +278,11 @@ kdeutils (4:3.5.5-1) unstable; urgency=low
     actually looks for. (Closes: #381696)
 
   * Allow kpowersave, an alternative to klaptopdaemon, to satisfy the Depends
-    of kdeutils. (Closes: #382545)
+    of tdeutils. (Closes: #382545)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  4 Oct 2006 20:39:27 -0400
 
-kdeutils (4:3.5.4-1) unstable; urgency=low
+tdeutils (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -296,19 +296,19 @@ kdeutils (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 29 Jul 2006 21:01:40 -0400
 
-kdeutils (4:3.5.5-0ubuntu3) feisty; urgency=low
+tdeutils (4:3.5.5-0ubuntu3) feisty; urgency=low
 
   * Upgrade kubuntu_13_ark_part.diff for better 7z integration
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri,  20 Oct 2006 18:50:05 +0200
 
-kdeutils (4:3.5.5-0ubuntu2) edgy; urgency=low
+tdeutils (4:3.5.5-0ubuntu2) edgy; urgency=low
 
   * Add kubuntu_13_ark_part.diff, fixes ark kpart
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue,  11 Oct 2006 13:42:05 +0200
 
-kdeutils (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdeutils (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
   * kubuntu_12_kmilo_actions.diff updated
@@ -316,14 +316,14 @@ kdeutils (4:3.5.5-0ubuntu1) edgy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:05 +0000
 
-kdeutils (4:3.5.4-0ubuntu5) edgy; urgency=low
+tdeutils (4:3.5.4-0ubuntu5) edgy; urgency=low
 
   * Rebuild with latest cdbs to add gettext domain to .desktop files for
     langpacks-desktopfiles-kde, no source changes
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Sep 2006 22:53:11 +0000
 
-kdeutils (4:3.5.4-0ubuntu4) edgy; urgency=low
+tdeutils (4:3.5.4-0ubuntu4) edgy; urgency=low
 
   * Added kubuntu_13_downgrade_kwallet to avoid bug #57696, downgrading
     kwalletmanager to 3.5.2, This bug has been reported on KDE 2 month
@@ -336,13 +336,13 @@ kdeutils (4:3.5.4-0ubuntu4) edgy; urgency=low
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 26 Aug 2006 11:43:28 +0200
 
-kdeutils (4:3.5.4-0ubuntu3) edgy; urgency=low
+tdeutils (4:3.5.4-0ubuntu3) edgy; urgency=low
 
-  * Removed ubuntu.xmodmap from kmilo (moved to kdebase package)
+  * Removed ubuntu.xmodmap from kmilo (moved to tdebase package)
 
  -- Luka Renko <lure@ubuntu.com>  Sun, 20 Aug 2006 12:15:28 +0200
 
-kdeutils (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdeutils (4:3.5.4-0ubuntu2) edgy; urgency=low
 
    [ Jonathan Riddell ]
    * Create package kmilo-legacy for all the non-generic KMilo plugins
@@ -353,19 +353,19 @@ kdeutils (4:3.5.4-0ubuntu2) edgy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  4 Aug 2006 16:59:19 +0000
 
-kdeutils (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdeutils (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:20 +0000
 
-kdeutils (4:3.5.3-1ubuntu1) edgy; urgency=low
+tdeutils (4:3.5.3-1ubuntu1) edgy; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  3 Jul 2006 20:57:29 +0000
 
-kdeutils (4:3.5.3-1) unstable; urgency=low
+tdeutils (4:3.5.3-1) unstable; urgency=low
 
   * New upstream release.
     + Fixes kregexpeditor crash when editing Pos (or Neg) Look Ahead.
@@ -389,7 +389,7 @@ kdeutils (4:3.5.3-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun,  4 Jun 2006 16:47:31 -0400
 
-kdeutils (4:3.5.2-1) unstable; urgency=low
+tdeutils (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -404,7 +404,7 @@ kdeutils (4:3.5.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 29 Mar 2006 19:16:13 -0500
 
-kdeutils (4:3.5.1-2) unstable; urgency=low
+tdeutils (4:3.5.1-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -417,7 +417,7 @@ kdeutils (4:3.5.1-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  8 Feb 2006 20:12:20 -0500
 
-kdeutils (4:3.5.1-1) unstable; urgency=low
+tdeutils (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -427,7 +427,7 @@ kdeutils (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 27 Jan 2006 11:56:34 -0500
 
-kdeutils (4:3.5.0-3) unstable; urgency=low
+tdeutils (4:3.5.0-3) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -437,7 +437,7 @@ kdeutils (4:3.5.0-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  7 Jan 2006 17:19:54 -0500
 
-kdeutils (4:3.5.0-2) experimental; urgency=low
+tdeutils (4:3.5.0-2) experimental; urgency=low
 
   * Upload to experimental.
 
@@ -450,118 +450,118 @@ kdeutils (4:3.5.0-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 18 Dec 2005 18:53:11 -0500
  
-kdeutils (4:3.5.2-0ubuntu8) dapper; urgency=low
+tdeutils (4:3.5.2-0ubuntu8) dapper; urgency=low
 
   * debian/cdbs/kde.mk:
     - added dh_iconcache.
 
  -- Daniel Holbach <daniel.holbach@ubuntu.com>  Sun, 21 May 2006 16:42:11 +0200
 
-kdeutils (4:3.5.2-0ubuntu7) dapper; urgency=low
+tdeutils (4:3.5.2-0ubuntu7) dapper; urgency=low
 
   * Add kubuntu_11_suspend2.diff fixing suspect2 detection,
     closes Malone #41926
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  1 May 2006 17:27:21 +0100
 
-kdeutils (4:3.5.2-0ubuntu6) dapper; urgency=low
+tdeutils (4:3.5.2-0ubuntu6) dapper; urgency=low
 
   * Fix ksim.install for removed .desktop file 
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  1 May 2006 16:09:05 +0100
 
-kdeutils (4:3.5.2-0ubuntu5) dapper; urgency=low
+tdeutils (4:3.5.2-0ubuntu5) dapper; urgency=low
 
   * Add kubuntu_10_show_ksim.diff
     Closes malone #40113
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 29 Apr 2006 15:40:37 +0100
 
-kdeutils (4:3.5.2-0ubuntu4) dapper; urgency=low
+tdeutils (4:3.5.2-0ubuntu4) 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:31 +0100
 
-kdeutils (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdeutils (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Install klaptop_acpi_helper setuid root so it can be used by default
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 18 Apr 2006 16:52:49 +0100
 
-kdeutils (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdeutils (4:3.5.2-0ubuntu2) dapper; urgency=low
 
   * Remove xmms build-dep
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 30 Mar 2006 19:14:56 +0100
 
-kdeutils (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdeutils (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:31 +0000
 
-kdeutils (4:3.5.1-0ubuntu2) dapper; urgency=low
+tdeutils (4:3.5.1-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_09_hide_ark_part.diff, hide the mostly unused Ark part
     things open in Ark proper by default anyway
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Feb 2006 15:50:17 +0000
 
-kdeutils (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdeutils (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Build-dep on libsnmp5-dev | libsnmp9-dev for backports
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:07 +0000
 
-kdeutils (4:3.5.0-0ubuntu4) dapper; urgency=low
+tdeutils (4:3.5.0-0ubuntu4) dapper; urgency=low
 
   * Add kubuntu_08_kwallermanager_menu_tidy.diff to 
     remove KWallet from menu (can be launched from systray)
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 18 Jan 2006 15:20:43 +0000
 
-kdeutils (4:3.5.0-0ubuntu3) dapper; urgency=low
+tdeutils (4:3.5.0-0ubuntu3) dapper; urgency=low
 
   * Rebuild because libXft.la is gone
 
  -- Stephan Hermann <sh@sourcecode.de>  Sat, 14 Jan 2006 15:52:30 +0100
 
-kdeutils (4:3.5.0-0ubuntu2) dapper; urgency=low
+tdeutils (4:3.5.0-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_07_tidy_messages.diff to rm generated 
     tips.cpp file
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  8 Dec 2005 03:02:34 +0000
 
-kdeutils (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdeutils (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:29:24 +0000
 
-kdeutils (4:3.5-rc2-0ubuntu2) dapper; urgency=low
+tdeutils (4:3.5-rc2-0ubuntu2) dapper; urgency=low
 
   * Build-dep on libsnmp9-dev not libsnmp5-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 26 Nov 2005 17:41:10 +0000
 
-kdeutils (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdeutils (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Generate .pot files
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 22:51:19 +0000
 
-kdeutils (4:3.5-rc1-1ubuntu1) dapper; urgency=low
+tdeutils (4:3.5-rc1-1ubuntu1) dapper; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 14 Nov 2005 01:18:32 +0000
 
-kdeutils (4:3.5.0-1) alioth; urgency=low
+tdeutils (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
 
@@ -570,7 +570,7 @@ kdeutils (4:3.5.0-1) alioth; urgency=low
   * New package: superkaramba. It is no longer an independent source package,
     but has been merged in KDE.
 
-  * Also add a kdeutils-doc package, containing the superkaramba and kcalc
+  * Also add a tdeutils-doc package, containing the superkaramba and kcalc
     API documentation.
 
   * Improve ark's description by referring to it as a _graphical_ archiving
@@ -578,13 +578,13 @@ kdeutils (4:3.5.0-1) alioth; urgency=low
 
   * Bump DH_COMPAT to 5. No changes.
 
-  * Add kdeutils-dbg, to help track down problems.
+  * Add tdeutils-dbg, to help track down problems.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 30 Nov 2005 09:34:21 -0500
 
-kdeutils (4:3.4.3-2) unstable; urgency=low
+tdeutils (4:3.4.3-2) unstable; urgency=low
 
-  * Upload to unstable, rebuilding against kdelibs4c2a.
+  * Upload to unstable, rebuilding against tdelibs4c2a.
 
   +++ Changes by Christopher Martin:
 
@@ -593,7 +593,7 @@ kdeutils (4:3.4.3-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  1 Dec 2005 12:03:16 +0100
 
-kdeutils (4:3.4.3-1) experimental; urgency=low
+tdeutils (4:3.4.3-1) experimental; urgency=low
 
   * New upstream release.
 
@@ -605,7 +605,7 @@ kdeutils (4:3.4.3-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 16 Oct 2005 09:50:15 -0400
 
-kdeutils (4:3.4.2-3) unstable; urgency=low
+tdeutils (4:3.4.2-3) unstable; urgency=low
 
   +++ Changes by Adeodato Simó:
 
@@ -613,18 +613,18 @@ kdeutils (4:3.4.2-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 14 Sep 2005 11:59:43 +0200
 
-kdeutils (4:3.4.2-2) unstable; urgency=low
+tdeutils (4:3.4.2-2) unstable; urgency=low
 
   +++ Changes by Luk Claes:
 
-  * Build with g++-3.4 on arm, m68k and hppa; kdeutils triggers the same gcc 4.0
+  * Build with g++-3.4 on arm, m68k and hppa; tdeutils triggers the same gcc 4.0
     ICE as arts does.
   
   * Update FSF's address
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 10 Sep 2005 21:31:16 +0000
 
-kdeutils (4:3.4.2-1) unstable; urgency=low
+tdeutils (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -646,26 +646,26 @@ kdeutils (4:3.4.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun,  3 Jul 2005 21:25:30 +0200
 
-kdeutils (4:3.4.3-0ubuntu2) dapper; urgency=low
+tdeutils (4:3.4.3-0ubuntu2) dapper; urgency=low
 
   * Add missing build-depends
 
  -- LaMont Jones <lamont@ubuntu.com>  Tue,  1 Nov 2005 14:49:18 -0700
 
-kdeutils (4:3.4.3-0ubuntu1) breezy; urgency=low
+tdeutils (4:3.4.3-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Build with GCC 3.4 on hppa
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  7 Oct 2005 19:57:56 +0000
 
-kdeutils (4:3.4.2-0ubuntu3) breezy; urgency=low
+tdeutils (4:3.4.2-0ubuntu3) breezy; urgency=low
 
   * Fix kubuntu_04_use_pmi.diff, call suspend on suspend not hibernate
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  5 Oct 2005 01:31:31 +0100
 
-kdeutils (4:3.4.2-0ubuntu2) breezy; urgency=low
+tdeutils (4:3.4.2-0ubuntu2) breezy; urgency=low
 
   * Add kubuntu_03_klaptopdaemon_35.diff make klaptopdaemon use scripts 
     instead of /proc directly
@@ -677,41 +677,41 @@ kdeutils (4:3.4.2-0ubuntu2) breezy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 29 Sep 2005 17:11:22 +0100
 
-kdeutils (4:3.4.2-0ubuntu1) breezy; urgency=low
+tdeutils (4:3.4.2-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Build using unsermake
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 16:26:03 +0000
 
-kdeutils (4:3.4.1-0ubuntu1) breezy; urgency=low
+tdeutils (4:3.4.1-0ubuntu1) breezy; urgency=low
 
   * Update version number following KDE 3.4.1 release
   * Add all packages back to meta-package
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed,  1 Jun 2005 01:00:54 +0000
 
-kdeutils (4:3.4.1-0pre1ubuntu2) breezy; urgency=low
+tdeutils (4:3.4.1-0pre1ubuntu2) breezy; urgency=low
 
   * Remove powerpc kmilo module from kmilo.install.powerpc until
     pbbuttonsd-dev is in main
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 26 May 2005 18:18:31 +0000
 
-kdeutils (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
+tdeutils (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
 
   * Sync with Debian, remove build-dep on pbbuttonsd-dev and tpctl
     until they are in main
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu, 26 May 2005 13:29:29 +0000
 
-kdeutils (4:3.4.1-1) experimental; urgency=low
+tdeutils (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
 
-kdeutils (4:3.4.0-0pre1) alioth; urgency=low
+tdeutils (4:3.4.0-0pre1) alioth; urgency=low
 
   * New upstream release.
 
@@ -727,7 +727,7 @@ kdeutils (4:3.4.0-0pre1) alioth; urgency=low
 
   * [debian/control] upgrade packages descriptions.
 
-  * New kdeutils-doc-html package, containing doc-base registered HTML versions
+  * New tdeutils-doc-html package, containing doc-base registered HTML versions
     of application handbooks, for users without Konqueror or KHelpCenter.
 
   +++ Changes by Adeodato Simó:
@@ -737,7 +737,7 @@ kdeutils (4:3.4.0-0pre1) alioth; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon,  4 Apr 2005 16:41:47 +0200
 
-kdeutils (4:3.3.2-2) unstable; urgency=low
+tdeutils (4:3.3.2-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -751,7 +751,7 @@ kdeutils (4:3.3.2-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 03 Mar 2005 17:49:31 +0100
 
-kdeutils (4:3.3.2-1) unstable; urgency=low
+tdeutils (4:3.3.2-1) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -762,7 +762,7 @@ kdeutils (4:3.3.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 26 Jan 2005 17:23:10 +0100
 
-kdeutils (4:3.3.2-0pre1) experimental; urgency=low
+tdeutils (4:3.3.2-0pre1) experimental; urgency=low
 
   * New upstream release:
     - khexedit sorts numerically the 'Occurrence' and 'Percentage' columns in
@@ -777,7 +777,7 @@ kdeutils (4:3.3.2-0pre1) experimental; urgency=low
 
  -- Christopher Martin <chrsmrtn@freeshell.org>  Thu, 16 Dec 2004 15:26:40 -0500
 
-kdeutils (4:3.3.1-1) unstable; urgency=low
+tdeutils (4:3.3.1-1) unstable; urgency=low
 
   * New upstream release.
   * KDE_3_3_BRANCH update.
@@ -786,26 +786,26 @@ kdeutils (4:3.3.1-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon,  8 Nov 2004 14:30:00 -0600
 
-kdeutils (4:3.3.0-1) unstable; urgency=high
+tdeutils (4:3.3.0-1) unstable; urgency=high
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat, 14 Aug 2004 23:00:00 -0500
 
-kdeutils (4:3.2.3-1) unstable; urgency=high
+tdeutils (4:3.2.3-1) unstable; urgency=high
 
   * New upstream release.
   * Added kgpg Depends: gnupg. (Closes: #252132)
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed,  4 Aug 2004 01:00:00 -0500
 
-kdeutils (4:3.2.2-2) unstable; urgency=high
+tdeutils (4:3.2.2-2) unstable; urgency=high
 
   * KDE_3_2_BRANCH pbuttonsd fix. (Closes: #245820)
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon, 26 Apr 2004 21:00:00 -0500
 
-kdeutils (4:3.2.2-1) unstable; urgency=low
+tdeutils (4:3.2.2-1) unstable; urgency=low
 
   * New upstream release.
   * Added Build-Depends: pbbuttonsd-dev [powerpc]. (Closes: #242291)
@@ -813,27 +813,27 @@ kdeutils (4:3.2.2-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri, 16 Apr 2004 20:00:00 -0500
 
-kdeutils (4:3.2.1-1) unstable; urgency=low
+tdeutils (4:3.2.1-1) unstable; urgency=low
 
   * New upstream release.
   * Added ark/kedit mime nametemplate support. (Closes: #235217)
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat,  6 Mar 2004 18:00:00 -0600
 
-kdeutils (4:3.2.0-0pre1v1) experimental; urgency=low
+tdeutils (4:3.2.0-0pre1v1) experimental; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri, 20 Feb 2004 04:00:00 -0600
 
-kdeutils (4:3.1.95-1) unstable; urgency=low
+tdeutils (4:3.1.95-1) unstable; urgency=low
 
   * New upstream release.
   * Apple Powerbook buttons are not supported due to pbbuttons missing from sid.
 
  -- Christopher L Cheney <ccheney@debian.org>  Fri, 30 Jan 2004 14:00:00 -0600
 
-kdeutils (4:3.1.5-1) unstable; urgency=low
+tdeutils (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
   * Added libtool arm patch.
@@ -841,7 +841,7 @@ kdeutils (4:3.1.5-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed, 14 Jan 2004 03:00:00 -0600
 
-kdeutils (4:3.1.4-1) unstable; urgency=low
+tdeutils (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
   * Added patch to update autotools files.
@@ -850,34 +850,34 @@ kdeutils (4:3.1.4-1) unstable; urgency=low
 
  -- Christopher L Cheney <ccheney@debian.org>  Sat, 18 Oct 2003 04:00:00 -0500
 
-kdeutils (4:3.1.3-1) unstable; urgency=low
+tdeutils (4:3.1.3-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Christopher L Cheney <ccheney@debian.org>  Mon,  4 Aug 2003 00:00:00 -0500
 
-kdeutils (4:3.1.2-1) unstable; urgency=low
+tdeutils (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
   * Update ark Suggests to arj (Closes: #188409)
 
  -- Christopher L Cheney <ccheney@debian.org>  Sun, 25 May 2003 13:00:00 -0500
 
-kdeutils (4:3.1.1-1) unstable; urgency=low
+tdeutils (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release.
   * Add 'chmod +x configure' to rules. (Closes: #181358)
 
  -- Christopher L Cheney <ccheney@debian.org>  Wed, 12 Mar 2003 12:00:00 -0600
 
-kdeutils (4:3.1.0-1) unstable; urgency=low
+tdeutils (4:3.1.0-1) unstable; urgency=low
 
   * New upstream.
   * Redo debian dir.
 
  -- Christopher L Cheney <ccheney@debian.org>  Tue, 04 Feb 2003 22:00:00 -0600
 
-kdeutils (4:2.2.2-9.2) stable-security; urgency=high
+tdeutils (4:2.2.2-9.2) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Added special detection routine for big/little endianess on MIPS since
@@ -887,7 +887,7 @@ kdeutils (4:2.2.2-9.2) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Sat, 18 Jan 2003 20:27:49 +0100
 
-kdeutils (4:2.2.2-9.1) stable-security; urgency=high
+tdeutils (4:2.2.2-9.1) stable-security; urgency=high
 
   * Non-maintainer upload by the Security Team
   * Applied upstream patches to fix several potential vulnerabilities.
@@ -895,14 +895,14 @@ kdeutils (4:2.2.2-9.1) stable-security; urgency=high
 
  -- Martin Schulze <joey@infodrom.org>  Mon,  6 Jan 2003 21:04:20 +0100
 
-kdeutils (4:2.2.2-9) unstable; urgency=low
+tdeutils (4:2.2.2-9) unstable; urgency=low
 
   * Change Maintainer to Chris.
   * Fix PowerPC problems.
 
  -- Daniel Stone <daniel@sfarc.net>  Wed, 27 Feb 2002 22:22:08 +1100
 
-kdeutils (4:2.2.2-8) unstable; urgency=low
+tdeutils (4:2.2.2-8) unstable; urgency=low
 
   * Oh, I so desperately enjoy fixing these grave-severity s390
     char-isn't-always-signed-you-dickhead bugs.
@@ -911,13 +911,13 @@ kdeutils (4:2.2.2-8) unstable; urgency=low
 
  -- Daniel Stone <daniel@sfarc.net>  Sun, 30 Dec 2001 07:56:15 -0500
 
-kdeutils (4:2.2.2-7) unstable; urgency=low
+tdeutils (4:2.2.2-7) unstable; urgency=low
 
   * Build against a post-Stone Age version of libstdc++. (closes: #125868)
 
  -- Daniel Stone <daniel@sfarc.net>  Thu, 20 Dec 2001 14:10:19 +1100
 
-kdeutils (4:2.2.2-6) unstable; urgency=low
+tdeutils (4:2.2.2-6) unstable; urgency=low
 
   * New maintainer. (closes: #114104) 
   * debian/{ark,kab,karm,kcalc,kcharselect,kdepasswd,kdf,kedit,kfind,kfloppy,
@@ -928,14 +928,14 @@ kdeutils (4:2.2.2-6) unstable; urgency=low
 
  -- Daniel Stone <daniel@sfarc.net>  Fri, 30 Nov 2001 21:59:49 +1100
 
-kdeutils (4:2.2.2-5) unstable; urgency=low
+tdeutils (4:2.2.2-5) unstable; urgency=low
 
   * Fix autobuild
   * This is why I should test it on alpha before uploading...
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 30 Nov 2001 01:12:00 -0700
 
-kdeutils (4:2.2.2-4) unstable; urgency=low
+tdeutils (4:2.2.2-4) unstable; urgency=low
 
   * Sync with upstream
   * Update documentation for freeze
@@ -944,13 +944,13 @@ kdeutils (4:2.2.2-4) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 29 Nov 2001 04:30:00 -0700
 
-kdeutils (4:2.2.2-3) unstable; urgency=low
+tdeutils (4:2.2.2-3) unstable; urgency=low
 
   * Fix Flags for alpha
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 28 Nov 2001 00:15:00 -0700
 
-kdeutils (4:2.2.2-2) unstable; urgency=low
+tdeutils (4:2.2.2-2) unstable; urgency=low
 
   * Autobuild fix for alpha
   * Hey!  let's put the headers in the right place!  Can't believe I missed
@@ -958,38 +958,38 @@ kdeutils (4:2.2.2-2) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 27 Nov 2001 01:56:00 -0700
 
-kdeutils (4:2.2.2-1) unstable; urgency=low
+tdeutils (4:2.2.2-1) unstable; urgency=low
 
   * New upstream version
   
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Nov 2001 23:05:00 -0700
 
-kdeutils (4:2.2.1-1.4) unstable; urgency=low
+tdeutils (4:2.2.1-1.4) unstable; urgency=low
 
   * This *should* fix the autobuild problems for alpha
   * Cleanup overrides
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 12 Oct 2001 23:05:00 -0700
 
-kdeutils (4:2.2.1-1.3) unstable; urgency=low
+tdeutils (4:2.2.1-1.3) unstable; urgency=low
 
   * Don't search for auto* as it hoses things
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 08 Oct 2001 19:36:00 -0700
 
-kdeutils (4:2.2.1-1.2) unstable; urgency=low
+tdeutils (4:2.2.1-1.2) unstable; urgency=low
 
   * Fix configure (Closes: #114580)
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 05 Oct 2001 14:51:00 -0700
 
-kdeutils (4:2.2.1-1.1) unstable; urgency=low
+tdeutils (4:2.2.1-1.1) unstable; urgency=low
 
   * Don't use automake since it's hosed
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 03 Oct 2001 14:51:00 -0700
 
-kdeutils (4:2.2.1-1) unstable; urgency=low
+tdeutils (4:2.2.1-1) unstable; urgency=low
  
   * New upstream version 2.2.1
   * Change maintainer
@@ -998,34 +998,34 @@ kdeutils (4:2.2.1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 07 Sep 2001 14:51:00 -0700
 
-kdeutils (4:2.2.0-final-1) unstable; urgency=low
+tdeutils (4:2.2.0-final-1) unstable; urgency=low
  
   * New upstream version 2.2
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 30 Jul 2001 00:01:00 -0700
 
-kdeutils (4:2.2.0-0.1beta1-1) unstable; urgency=low
+tdeutils (4:2.2.0-0.1beta1-1) unstable; urgency=low
  
   * Sync with upstream
   * More gcc3 fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 26 Jul 2001 20:22:00 -0700
 
-kdeutils (4:2.2.0-0beta1-3) unstable; urgency=low
+tdeutils (4:2.2.0-0beta1-3) unstable; urgency=low
  
   * Sync with upstream
   * More alpha fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 07 Jul 2001 03:44:00 -0700
 
-kdeutils (4:2.2.0-0beta1-2) unstable; urgency=low
+tdeutils (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:37:00 -0700
 
-kdeutils (4:2.2.0-0beta1-1) unstable; urgency=low
+tdeutils (4:2.2.0-0beta1-1) unstable; urgency=low
  
   * Sync with upstream
   * Fix ktimer description (Closes: #102939)
@@ -1033,7 +1033,7 @@ kdeutils (4:2.2.0-0beta1-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 30 Jun 2001 20:30:00 -0700
 
-kdeutils (4:2.2-cvs20010622-1) unstable; urgency=low
+tdeutils (4:2.2-cvs20010622-1) unstable; urgency=low
  
   * New upstream cvs pull
   * 2.2 beta 1
@@ -1045,26 +1045,26 @@ kdeutils (4:2.2-cvs20010622-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
 
-kdeutils (4:2.1.1-2) unstable; urgency=low
+tdeutils (4:2.1.1-2) unstable; urgency=low
  
   * Update menu bits to include new kde menu remval tag
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Apr 2001 17:48:00 -0700
 
-kdeutils (4:2.1.1-1.0.1) unstable; urgency=low
+tdeutils (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 15:13:00 -0700
 
-kdeutils (4:2.1.1-1) unstable; urgency=low
+tdeutils (4:2.1.1-1) unstable; urgency=low
  
   * New upstream version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Mar 2001 15:13:00 -0700
 
-kdeutils (4:2.1.0-2) unstable; urgency=low
+tdeutils (4:2.1.0-2) unstable; urgency=low
  
   * Fix kfloppy by switching from fdformat to superformat...it now at least
     formats. 
@@ -1072,52 +1072,52 @@ kdeutils (4:2.1.0-2) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 12 Mar 2001 15:13:00 -0700
 
-kdeutils (4:2.1.0-1) unstable; urgency=low
+tdeutils (4:2.1.0-1) unstable; urgency=low
  
   * New upstream CVS pull
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 08 Mar 2001 02:03:00 -0700
 
-kdeutils (4:2.1-final-1) unstable; urgency=low
+tdeutils (4:2.1-final-1) unstable; urgency=low
  
   * New upstream version
   * Upping standards version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
 
-kdeutils (4:2.1-beta2-0128-1) unstable; urgency=low
+tdeutils (4:2.1-beta2-0128-1) unstable; urgency=low
  
   * kdf re-added
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 29 Jan 2001 10:46:00 -0700
 
-kdeutils (4:2.1-beta2-1) unstable; urgency=low
+tdeutils (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
 
-kdeutils (4:2.1-20010115-1) unstable; urgency=low
+tdeutils (4:2.1-20010115-1) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
 
-kdeutils (4:2.1-20010106-1) unstable; urgency=low
+tdeutils (4:2.1-20010106-1) unstable; urgency=low
  
   * More upstream fixes
   * Updating/fixing depends and build-depends
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 06 Jan 2001 23:30:00 -0700
 
-kdeutils (4:2.1-20010101-1) unstable; urgency=low
+tdeutils (4:2.1-20010101-1) unstable; urgency=low
  
   * More upstream fixes
         
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Jan 2001 17:11:00 -0700
 	 
-kdeutils (4:2.1-20001218-1) unstable; urgency=low
+tdeutils (4:2.1-20001218-1) unstable; urgency=low
  
   * More upstream fixes
   * Removing extra mime files (Closes: #79887)
@@ -1125,26 +1125,26 @@ kdeutils (4:2.1-20001218-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Dec 2000 09:55:00 -0700
 
-kdeutils (4:2.1-20001216-1) unstable; urgency=low
+tdeutils (4:2.1-20001216-1) unstable; urgency=low
  
   * More upstream fixes
-  * Adding in missing conflicts for kdeutils
+  * Adding in missing conflicts for tdeutils
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 16 Dec 2000 23:55:00 -0700
 
-kdeutils (4:2.1-20001213-1) unstable; urgency=low
+tdeutils (4:2.1-20001213-1) unstable; urgency=low
  
   * New upstream beta version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 13 Dec 2000 18:00:00 -0700
 
-kdeutils (4:2.0-final-7) unstable; urgency=low
+tdeutils (4:2.0-final-7) unstable; urgency=low
  
   * Fixing package confliction (Closes: #77670)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 21 Nov 2000 17:00:00 -0700
 
-kdeutils (4:2.0-final-6) unstable; urgency=low
+tdeutils (4:2.0-final-6) unstable; urgency=low
  
   * more upstream fixes
   * build-depends cleanup
@@ -1152,20 +1152,20 @@ kdeutils (4:2.0-final-6) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 21 Nov 2000 07:30:00 -0700
 
-kdeutils (4:2.0-final-5) unstable; urgency=low
+tdeutils (4:2.0-final-5) unstable; urgency=low
  
   * more upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 18 Nov 2000 06:30:00 -0700
 
-kdeutils (4:2.0-final-4) unstable; urgency=low
+tdeutils (4:2.0-final-4) unstable; urgency=low
  
   * more upstream fixes
   * adding in menu hints
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
 
-kdeutils (4:2.0-final-3) unstable; urgency=low
+tdeutils (4:2.0-final-3) unstable; urgency=low
  
   * more upstream fixes
   * mime entry fixes (again)
@@ -1173,58 +1173,58 @@ kdeutils (4:2.0-final-3) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 04 Nov 2000 23:00:00 -0700
                                                                                 
-kdeutils (4:2.0-final-2) unstable; urgency=low
+tdeutils (4:2.0-final-2) unstable; urgency=low
  
   * more upstream fixes
   * mime entry fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
                                                                                 
-kdeutils (4:2.0-final-0) unstable; urgency=low
+tdeutils (4:2.0-final-0) unstable; urgency=low
  
   * KDE 2.0
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Oct 2000 00:00:00 -0700
                                                                                 
-kdeutils (4:2.0-20001016-0) unstable; urgency=low
+tdeutils (4:2.0-20001016-0) unstable; urgency=low
 
   * more upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 16 Oct 2000 15:00:00 -0700
 
-kdeutils (4:2.0-20001011-0) unstable; urgency=low
+tdeutils (4:2.0-20001011-0) unstable; urgency=low
  
   * KDE 2.0 RC2
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 12 Oct 2000 06:00:00 -0700
                                                                                 
-kdeutils (4:2.0-20001006-0) unstable; urgency=low
+tdeutils (4:2.0-20001006-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 06 Oct 2000 15:00:00 -0700
                                                                                 
-kdeutils (4:2.0-20001005-0) unstable; urgency=low
+tdeutils (4:2.0-20001005-0) unstable; urgency=low
  
   * More upstream fixes
-  * Compiling against non-versioned kdelibs again
+  * Compiling against non-versioned tdelibs again
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 05 Oct 2000 15:00:00 -0700
                                                                                 
-kdeutils (4:2.0-20001002-0) unstable; urgency=low
+tdeutils (4:2.0-20001002-0) unstable; urgency=low
  
   * KDE 2.0 RC1
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Oct 2000 01:30:00 -0700
                                                                                 
-kdeutils (4:2.0-20000925-2) unstable; urgency=low
+tdeutils (4:2.0-20000925-2) unstable; urgency=low
 
   * More upstream fixes
   * Clean build against new libc
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 26 Sep 2000 23:30:00 -0700
 
-kdeutils (4:2.0-20000925-0) unstable; urgency=low
+tdeutils (4:2.0-20000925-0) unstable; urgency=low
  
   * More upstream fixes
   * Build-Depends fixes
@@ -1232,25 +1232,25 @@ kdeutils (4:2.0-20000925-0) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
 
-kdeutils (4:2.0-20000920-2) unstable; urgency=low
+tdeutils (4:2.0-20000920-2) unstable; urgency=low
  
   * Removing kdessh and setting proper depends for ark
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 21 Sep 2000 17:30:00 -0700
 
-kdeutils (4:2.0-20000920-0) unstable; urgency=low
+tdeutils (4: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
 
-kdeutils (4:2.0-20000918-0) unstable; urgency=low
+tdeutils (4:2.0-20000918-0) unstable; urgency=low
  
   * More upstream fixes
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Sep 2000 23:00:00 -0700      
 
-kdeutils (4:2.0-20000912-0) unstable; urgency=low
+tdeutils (4:2.0-20000912-0) unstable; urgency=low
  
   * More upstream fixes
   * Fixing old confliction/dependency loop
@@ -1258,19 +1258,19 @@ kdeutils (4:2.0-20000912-0) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 12 Sep 2000 23:00:00 -0700
 
-kdeutils (4:2.0-20000909-0) unstable; urgency=low
+tdeutils (4:2.0-20000909-0) unstable; urgency=low
 
   * More upstream fixes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 09 Sep 2000 22:00:00 -0700
 
-kdeutils (4:2.0-20000907-2) unstable; urgency=low
+tdeutils (4:2.0-20000907-2) unstable; urgency=low
  
   * Removing -dev package since it's empty...arggg
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 08 Sep 2000 01:00:00 -0700
 
-kdeutils (4:2.0-20000907-0) unstable; urgency=low
+tdeutils (4:2.0-20000907-0) unstable; urgency=low
  
   * More upstream fixes
   * More package work
@@ -1278,287 +1278,287 @@ kdeutils (4:2.0-20000907-0) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 07 Sep 2000 04:30:00 -0700
                                                                                
-kdeutils (4:2.0-20000825-0) experimental; urgency=low
+tdeutils (4:2.0-20000825-0) experimental; urgency=low
  
   * KDE 2.0 beta 4
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 25 Aug 2000 22:30:00 -0700
                                                                                 
-kdeutils (4:2.0-20000820-1.0) experimental; urgency=low
+tdeutils (4:2.0-20000820-1.0) experimental; urgency=low
  
   * new beta version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 20 Aug 2000 09:45:00 -0700
                                                                                 
-kdeutils-cvs (4:2.0-20000521-1.0) experimental; urgency=low
+tdeutils-cvs (4:2.0-20000521-1.0) experimental; urgency=low
  
   * new CVS version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 21 May 2000 18:15:00 -0700
                                                                                 
-kdeutils-cvs (4:2.0-20000512-1.1) experimental; urgency=low
+tdeutils-cvs (4:2.0-20000512-1.1) experimental; urgency=low
  
   * new CVS version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 12 May 2000 22:00:00 -0700
 
-kdeutils-cvs (4:2.0-20000308-1.0) experimental; urgency=low
+tdeutils-cvs (4:2.0-20000308-1.0) experimental; urgency=low
  
   * new CVS version
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 08 Mar 2000 22:00:00 -0700
 
-kdeutils-cvs (4:2.0-20000306-1.0) experimental; urgency=low
+tdeutils-cvs (4:2.0-20000306-1.0) experimental; urgency=low
 
   * new CVS version
   * Adding in build-depends
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 06 Mar 2000 22:00:00 -0700
 
-kdeutils-cvs (4:2.0-19991117-1.0) experimental; urgency=low
+tdeutils-cvs (4:2.0-19991117-1.0) experimental; urgency=low
 
   * new CVS version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 17 Nov 1999 10:45:00 -0400
 
-kdeutils-cvs (4:2.0-19991008-1) experimental; urgency=low
+tdeutils-cvs (4:2.0-19991008-1) experimental; urgency=low
 
   * new CVS version
   * Fixing up dependencies
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 08 Oct 1999 12:45:00 -0400
 
-kdeutils-cvs (4:2.0-19990825-1) experimental; urgency=low
+tdeutils-cvs (4:2.0-19990825-1) experimental; urgency=low
 
   * new version
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 25 Aug 1999 08:00:48 -0400
 
-kdeutils-cvs (4:2.0-19990626-1) experimental; urgency=low
+tdeutils-cvs (4:2.0-19990626-1) experimental; urgency=low
 
   * new version
 
  -- Stephan Kulow <coolo@kde.org>  Sat, 26 Jun 1999 20:39:48 +0200
 
-kdeutils-cvs (4:2.0-19990524-1) experimental; urgency=low
+tdeutils-cvs (4:2.0-19990524-1) experimental; urgency=low
 
   * migrating from /opt to /
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 24 May 1999 07:22:51 -0400
 
-kdeutils (4:1.1-19990217-1) unstable; urgency=low
+tdeutils (4:1.1-19990217-1) unstable; urgency=low
 
   * new upstream version
 
  -- Stephan Kulow <coolo@kde.org>  Wed, 17 Feb 1999 19:09:43 +0100
 
-kdeutils (4:1.1-19990207-2) unstable; urgency=low
+tdeutils (4:1.1-19990207-2) unstable; urgency=low
 
   * fixed a bug with the wrong libjpeg version
 
  -- Stephan Kulow <coolo@kde.org>  Tue,  9 Feb 1999 10:43:44 +0100
 
-kdeutils (4:1.1-19990207-1) unstable; urgency=low
+tdeutils (4:1.1-19990207-1) unstable; urgency=low
 
   * new upstream version 1.1 and new epoche
 
  -- Stephan Kulow <coolo@kde.org>  Sun,  7 Feb 1999 12:12:59 +0100
 
-kdeutils (2:980710-1.0-1) unstable; urgency=low
+tdeutils (2:980710-1.0-1) unstable; urgency=low
 
   * new upstream version 1.0
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 12 Jul 1998 10:12:20 +0200
 
-kdeutils (2:980419-b4-1) unstable; urgency=low
+tdeutils (2:980419-b4-1) unstable; urgency=low
 
   * new upstream version Beta4
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 19 Apr 1998 15:24:47 +0200
 
-kdeutils (2:980312-6) frozen; urgency=low
+tdeutils (2:980312-6) frozen; urgency=low
 
-  * new frozen compile with latest fixed kdelibs. This time from CVS
+  * new frozen compile with latest fixed tdelibs. This time from CVS
 
  -- Stephan Kulow <coolo@kde.org>  Fri,  3 Apr 1998 15:10:54 +0200
 
-kdeutils (2:980312-5) frozen; urgency=low
+tdeutils (2:980312-5) frozen; urgency=low
 
   * don't compile kcalc with long double
 
  -- Stephan Kulow <coolo@kde.org>  Thu, 26 Mar 1998 14:35:59 +0100
 
-kdeutils (2:980312-4) frozen; urgency=low
+tdeutils (2:980312-4) frozen; urgency=low
 
   * new compile cycle with qt-1.33 and libstdc++-2.8
 
  -- Stephan Kulow <coolo@kde.org>  Tue, 24 Mar 1998 20:49:33 +0100
 
-kdeutils (2:980312-3) unstable; urgency=low
+tdeutils (2:980312-3) unstable; urgency=low
 
   * changed the maintainer field. I have missed this one ;(
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 15 Mar 1998 20:51:08 +0100
 
-kdeutils (2:980312-2) unstable; urgency=low
+tdeutils (2:980312-2) unstable; urgency=low
 
   * fixed typo in the Description
 
  -- Stephan Kulow <coolo@kde.org>  Sun, 15 Mar 1998 20:05:47 +0100
 
-kdeutils (2:980312-1) experimental; urgency=low
+tdeutils (2:980312-1) experimental; urgency=low
 
   * New upstream release
 
  -- Stephan Kulow <coolo@kde.org>  Thu, 12 Mar 1998 23:27:36 +0100
 
-kdeutils (980227-1) experimental; urgency=low
+tdeutils (980227-1) experimental; urgency=low
 
   * New upstream release
 
  -- Stephan Kulow <coolo@kde.org>  Fri, 27 Feb 1998 22:03:42 +0100
 
-kdeutils (1:Beta2-2.1) experimental; urgency=low
+tdeutils (1:Beta2-2.1) experimental; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Fri,  5 Dec 1997 21:16:47 +0100
 
-kdeutils (1:Beta2-2) unstable; urgency=low
+tdeutils (1:Beta2-2) unstable; urgency=low
 
   * removed virtual package names.
   * fixed kcalc (compiling with long double breaks somewhere).
 
  -- Andreas Jellinghaus <aj@debian.org>  Sat, 29 Nov 1997 14:37:17 +0100
 
-kdeutils (1:Beta2-1) unstable; urgency=low
+tdeutils (1:Beta2-1) unstable; urgency=low
 
   * new upstream version
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun, 23 Nov 1997 16:02:18 +0100
 
-kdeutils (1:Beta1.2-2) unstable; urgency=low
+tdeutils (1:Beta1.2-2) unstable; urgency=low
 
   * added /usr/bin/editor divertion
   * now remove inst-apps file.
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun,  9 Nov 1997 17:44:32 +0100
 
-kdeutils (1:Beta1.2-1) unstable; urgency=low
+tdeutils (1:Beta1.2-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 27 Oct 1997 11:23:49 +0100
 
-kdeutils (1:Beta1.1-1) unstable; urgency=low
+tdeutils (1:Beta1.1-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 20 Oct 1997 12:32:06 +0200
 
-kdeutils (971019-1) unstable; urgency=low
+tdeutils (971019-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 13 Oct 1997 08:29:18 +0200
 
-kdeutils (971013-1) unstable; urgency=low
+tdeutils (971013-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 13 Oct 1997 08:29:18 +0200
 
-kdeutils (971009-1) unstable; urgency=low
+tdeutils (971009-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Thu,  9 Oct 1997 10:57:54 +0200
 
-kdeutils (971008-1) unstable; urgency=low
+tdeutils (971008-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Wed,  8 Oct 1997 10:14:01 +0200
 
-kdeutils (971006-2) unstable; urgency=low
+tdeutils (971006-2) unstable; urgency=low
 
   * daily recompile of everything.
 
  -- Andreas Jellinghaus <aj@debian.org>  Tue,  7 Oct 1997 12:51:04 +0200
 
-kdeutils (971006-1) unstable; urgency=low
+tdeutils (971006-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon,  6 Oct 1997 09:30:04 +0200
 
-kdeutils (971005-1) unstable; urgency=low
+tdeutils (971005-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun,  5 Oct 1997 17:38:07 +0200
 
-kdeutils (971002-2) unstable; urgency=low
+tdeutils (971002-2) unstable; urgency=low
 
   * daily recompile of everything.
 
  -- Andreas Jellinghaus <aj@debian.org>  Fri,  3 Oct 1997 10:38:16 +0200
 
-kdeutils (971002-1) unstable; urgency=low
+tdeutils (971002-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Thu,  2 Oct 1997 08:57:52 +0200
 
-kdeutils (970930-1) unstable; urgency=low
+tdeutils (970930-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Tue, 30 Sep 1997 11:59:53 +0200
 
-kdeutils (970929-1) unstable; urgency=low
+tdeutils (970929-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 29 Sep 1997 09:45:28 +0200
 
-kdeutils (970926-1) unstable; urgency=low
+tdeutils (970926-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Fri, 26 Sep 1997 08:12:07 +0200
 
-kdeutils (970925-1) unstable; urgency=low
+tdeutils (970925-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Thu, 25 Sep 1997 08:09:30 +0200
 
-kdeutils (970922-3) unstable; urgency=low
+tdeutils (970922-3) unstable; urgency=low
 
   * daily recompile of everything.
 
  -- Andreas Jellinghaus <aj@debian.org>  Wed, 24 Sep 1997 11:46:00 +0200
 
-kdeutils (970922-2) unstable; urgency=low
+tdeutils (970922-2) unstable; urgency=low
 
   * daily recompile of everything.
 
  -- Andreas Jellinghaus <aj@debian.org>  Tue, 23 Sep 1997 09:47:14 +0200
 
-kdeutils (970922-1) unstable; urgency=low
+tdeutils (970922-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Mon, 22 Sep 1997 09:49:29 +0200
 
-kdeutils (970921-1) unstable; urgency=low
+tdeutils (970921-1) unstable; urgency=low
 
   * New upstream release
 
  -- Andreas Jellinghaus <aj@debian.org>  Sun, 21 Sep 1997 13:58:12 +0200
 
-kdeutils (970920-1) unstable; urgency=low
+tdeutils (970920-1) unstable; urgency=low
 
   * Initial Release.
 
diff --git a/ubuntu/maverick/tdeutils/debian/control b/ubuntu/maverick/tdeutils/debian/control
index 4647ea143..c33bf1354 100644
--- a/ubuntu/maverick/tdeutils/debian/control
+++ b/ubuntu/maverick/tdeutils/debian/control
@@ -1,20 +1,20 @@
-Source: kdeutils-trinity
+Source: tdeutils-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), kdebase-trinity-dev (>= 4:3.5.10), libkonq4-trinity-dev (>= 4:3.5.10), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
-Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-trinity-doc
+Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), tdebase-trinity-dev (>= 4:3.5.10), libkonq4-trinity-dev (>= 4:3.5.10), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
 Standards-Version: 3.8.4
 
-Package: kdeutils-trinity
+Package: tdeutils-trinity
 Section: kde
 Architecture: all
-Replaces: kdeutils-kde3 (<< 4:3.5.13)
-Breaks: kdeutils-kde3 (<< 4:3.5.13)
+Replaces: tdeutils-kde3 (<< 4:3.5.13)
+Breaks: tdeutils-kde3 (<< 4:3.5.13)
 Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), kwalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
-Suggests: kdeutils-trinity-doc-html (>= ${Source-Version})
+Suggests: tdeutils-trinity-doc-html (>= ${Source-Version})
 Description: general purpose utilities from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -24,24 +24,24 @@ Description: general purpose utilities from the official Trinity release
  This metapackage includes a collection of general purpose utilities 
  provided with the official release of Trinity.
 
-Package: kdeutils-trinity-doc
+Package: tdeutils-trinity-doc
 Section: doc
 Architecture: all
-Replaces: kdeutils-kde3-doc (<< 4:3.5.13)
-Breaks: kdeutils-kde3-doc (<< 4:3.5.13)
+Replaces: tdeutils-kde3-doc (<< 4:3.5.13)
+Breaks: tdeutils-kde3-doc (<< 4:3.5.13)
 Description: developer documentation for the KDE utilities module
  This package contains documentation for the KDE utilities module, of
  use more for developers creating applications than regular users.
  .
  This package is part of Trinity, and a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
-Package: kdeutils-trinity-doc-html
+Package: tdeutils-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: kdeutils-kde3-doc-html (<< 4:3.5.13)
-Breaks: kdeutils-kde3-doc-html (<< 4:3.5.13)
-Suggests: konqueror-trinity | www-browser, kdebase-trinity
+Replaces: tdeutils-kde3-doc-html (<< 4:3.5.13)
+Breaks: tdeutils-kde3-doc-html (<< 4:3.5.13)
+Suggests: konqueror-trinity | www-browser, tdebase-trinity
 Description: Trinity utilities documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -54,20 +54,20 @@ Description: Trinity utilities documentation in HTML format
  KDE utilities packages.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
-Package: kdeutils-trinity-dev
+Package: tdeutils-trinity-dev
 Section: utils
 Architecture: any
-Replaces: kdeutils-kde3-dev (<< 4:3.5.13)
-Breaks: kdeutils-kde3-dev (<< 4:3.5.13)
-Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
+Replaces: tdeutils-kde3-dev (<< 4:3.5.13)
+Breaks: tdeutils-kde3-dev (<< 4:3.5.13)
+Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
 Description: development files for the Trinity utilities module
- This package contains development files needed to compile kdeutils
+ This package contains development files needed to compile tdeutils
  applications.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: ark-trinity
 Section: utils
@@ -90,7 +90,7 @@ Description: graphical archiving tool for Trinity
  package.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kcalc-trinity
 Section: utils
@@ -109,7 +109,7 @@ Description: calculator for Trinity
   * configurable precision, and number of digits after the period
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kcharselect-trinity
 Section: utils
@@ -122,7 +122,7 @@ Description: character selector for Trinity
  A character set selector for KDE.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kdelirc-trinity
 Section: utils
@@ -135,7 +135,7 @@ Description: infrared control for Trinity
  This is a frontend for the LIRC suite to use infrared devices with KDE.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kdessh-trinity
 Section: kde
@@ -147,7 +147,7 @@ Description: ssh frontend for Trinity
  This package contains KDE's frontend for ssh.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kdf-trinity
 Section: utils
@@ -163,7 +163,7 @@ Description: disk space utility for Trinity
  in a file manager.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kedit-trinity
 Section: editors
@@ -181,7 +181,7 @@ Description: basic text editor for Trinity
  reasonably fast start.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kfloppy-trinity
 Section: utils
@@ -195,7 +195,7 @@ Description: floppy formatter for KDE
  to format 3.5" and 5.25" floppy disks.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kgpg-trinity
 Section: kde
@@ -220,7 +220,7 @@ Description: GnuPG frontend for Trinity
    * decrypting clipboard contents, including integration with Klipper
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: khexedit-trinity
 Section: utils
@@ -235,7 +235,7 @@ Description: Trinity hex editor
  support and other powerful features.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kjots-trinity
 Section: utils
@@ -249,7 +249,7 @@ Description: note taking utility for Trinity
  program included in the tkgoodstuff package.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: klaptopdaemon-trinity
 Section: kde
@@ -263,7 +263,7 @@ Description: battery monitoring and management for laptops using KDE
  power management, for laptops, from within KDE.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kmilo-trinity
 Section: utils
@@ -279,7 +279,7 @@ Description:  laptop special keys support for Trinity
  with special keys.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kmilo-legacy-trinity
 Section: utils
@@ -297,7 +297,7 @@ Description:  non-standard plugins for KMilo
  plugin, if you need this package please file a bug.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kregexpeditor-trinity
 Section: kde
@@ -311,7 +311,7 @@ Description: graphical regular expression editor plugin for Trinity
  with KDE. It let you draw your regular expression in an unambiguous way.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: ksim-trinity
 Section: utils
@@ -326,7 +326,7 @@ Description: system information monitor for Trinity
  connections, power, etc.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: ktimer-trinity
 Section: utils
@@ -341,7 +341,7 @@ Description: timer utility for Trinity
  command execution.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: kwalletmanager-trinity
 Section: utils
@@ -356,7 +356,7 @@ Description: wallet manager for Trinity
  keeps a master password to all wallets.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
 Package: superkaramba-trinity
 Section: kde
@@ -380,16 +380,16 @@ Description: a program based on karamba improving the eyecandy of KDE
   * Display information from the internet, such as weather and headlines.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
- See the 'kde-trinity' and 'kdeutils-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
-Package: kdeutils-trinity-dbg
+Package: tdeutils-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: kdeutils-kde3-dbg (<< 4:3.5.13)
-Breaks: kdeutils-kde3-dbg (<< 4:3.5.13)
-Depends: kdelibs-trinity-dbg
+Replaces: tdeutils-kde3-dbg (<< 4:3.5.13)
+Breaks: tdeutils-kde3-dbg (<< 4:3.5.13)
+Depends: tdelibs-trinity-dbg
 Priority: extra
-Description: debugging symbols for kdeutils-trinity
- This package contains the debugging symbols associated with kdeutils-trinity.
- They will automatically be used by gdb for debugging kdeutils-related
+Description: debugging symbols for tdeutils-trinity
+ This package contains the debugging symbols associated with tdeutils-trinity.
+ They will automatically be used by gdb for debugging tdeutils-related
  issues.
diff --git a/ubuntu/maverick/tdeutils/debian/control.in b/ubuntu/maverick/tdeutils/debian/control.in
index e6b817419..7c4c2b3cc 100644
--- a/ubuntu/maverick/tdeutils/debian/control.in
+++ b/ubuntu/maverick/tdeutils/debian/control.in
@@ -1,18 +1,18 @@
-Source: kdeutils
+Source: tdeutils
 Section: kde
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), kdebase-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils
-Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), tdebase-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils
+Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, tdelibs4-doc
 Standards-Version: 3.7.2
 
-Package: kdeutils
+Package: tdeutils
 Section: kde
 Architecture: all
 Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), kwalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version})
-Suggests: kdeutils-doc-html (>= ${Source-Version})
+Suggests: tdeutils-doc-html (>= ${Source-Version})
 Description: general purpose utilities from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -22,7 +22,7 @@ Description: general purpose utilities from the official KDE release
  This metapackage includes a collection of general purpose utilities 
  provided with the official release of KDE.
 
-Package: kdeutils-doc
+Package: tdeutils-doc
 Section: doc
 Architecture: all
 Description: developer documentation for the KDE utilities module
@@ -30,12 +30,12 @@ Description: developer documentation for the KDE utilities module
  use more for developers creating applications than regular users.
  .
  This package is part of KDE, and a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
-Package: kdeutils-doc-html
+Package: tdeutils-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror | www-browser, kdebase
+Suggests: konqueror | www-browser, tdebase
 Description: KDE utilities documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -48,18 +48,18 @@ Description: KDE utilities documentation in HTML format
  KDE utilities packages.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
-Package: kdeutils-dev
+Package: tdeutils-dev
 Section: utils
 Architecture: any
-Depends: ark (= ${Source-Version}), kcalc (= ${Source-Version}), kdelirc (= ${Source-Version}), kedit (= ${Source-Version}), khexedit (= ${Source-Version}), klaptopdaemon (= ${Source-Version}), kmilo (= ${Source-Version}), kregexpeditor (= ${Source-Version}), ksim (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: ark (= ${Source-Version}), kcalc (= ${Source-Version}), kdelirc (= ${Source-Version}), kedit (= ${Source-Version}), khexedit (= ${Source-Version}), klaptopdaemon (= ${Source-Version}), kmilo (= ${Source-Version}), kregexpeditor (= ${Source-Version}), ksim (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
 Description: development files for the KDE utilities module
- This package contains development files needed to compile kdeutils
+ This package contains development files needed to compile tdeutils
  applications.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: ark
 Section: utils
@@ -67,7 +67,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: ncompress, unzip, zip, zoo, bzip2, p7zip-full
 Suggests: khelpcenter, rar, unrar | unrar-free
-Replaces: kdebase-data (<< 4:3.3.91)
+Replaces: tdebase-data (<< 4:3.3.91)
 Description: graphical archiving tool for KDE
  Ark is a graphical program for managing various archive formats within the
  KDE environment. Archives can be viewed, extracted, created and modified
@@ -81,14 +81,14 @@ Description: graphical archiving tool for KDE
  package.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: kcalc
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Replaces: kdebase-data (<< 4:3.3.91)
+Replaces: tdebase-data (<< 4:3.3.91)
 Description: calculator for KDE
  KCalc is KDE's scientific calculator.
  .
@@ -99,7 +99,7 @@ Description: calculator for KDE
   * configurable precision, and number of digits after the period
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: kcharselect
 Section: utils
@@ -110,7 +110,7 @@ Description: character selector for KDE
  A character set selector for KDE.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: kdelirc
 Section: utils
@@ -121,7 +121,7 @@ Description: infrared control for KDE
  This is a frontend for the LIRC suite to use infrared devices with KDE.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: kdessh
 Section: kde
@@ -131,7 +131,7 @@ Description: ssh frontend for KDE
  This package contains KDE's frontend for ssh.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: kdf
 Section: utils
@@ -145,7 +145,7 @@ Description: disk space utility for KDE
  in a file manager.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: kedit
 Section: editors
@@ -161,7 +161,7 @@ Description: basic text editor for KDE
  reasonably fast start.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: kfloppy
 Section: utils
@@ -173,7 +173,7 @@ Description: floppy formatter for KDE
  to format 3.5" and 5.25" floppy disks.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: kgpg
 Section: kde
@@ -196,7 +196,7 @@ Description: GnuPG frontend for KDE
    * decrypting clipboard contents, including integration with Klipper
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: khexedit
 Section: utils
@@ -209,7 +209,7 @@ Description: KDE hex editor
  support and other powerful features.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: kjots
 Section: utils
@@ -221,7 +221,7 @@ Description: note taking utility for KDE
  program included in the tkgoodstuff package.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: klaptopdaemon
 Section: kde
@@ -233,7 +233,7 @@ Description: battery monitoring and management for laptops using KDE
  power management, for laptops, from within KDE.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: kmilo
 Section: utils
@@ -247,7 +247,7 @@ Description:  laptop special keys support for KDE
  with special keys.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: kregexpeditor
 Section: kde
@@ -259,7 +259,7 @@ Description: graphical regular expression editor plugin for KDE
  with KDE. It let you draw your regular expression in an unambiguous way.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: ksim
 Section: utils
@@ -272,7 +272,7 @@ Description: system information monitor for KDE
  connections, power, etc.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: ktimer
 Section: utils
@@ -285,7 +285,7 @@ Description: timer utility for KDE
  command execution.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: kwalletmanager
 Section: utils
@@ -298,7 +298,7 @@ Description: wallet manager for KDE
  keeps a master password to all wallets.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
 Package: superkaramba
 Section: kde
@@ -320,14 +320,14 @@ Description: a program based on karamba improving the eyecandy of KDE
   * Display information from the internet, such as weather and headlines.
  .
  This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ See the 'kde' and 'tdeutils' packages for more information.
 
-Package: kdeutils-dbg
+Package: tdeutils-dbg
 Section: libdevel
 Architecture: any
-Depends: kdelibs-dbg
+Depends: tdelibs-dbg
 Priority: extra
-Description: debugging symbols for kdeutils
- This package contains the debugging symbols associated with kdeutils.
- They will automatically be used by gdb for debugging kdeutils-related
+Description: debugging symbols for tdeutils
+ This package contains the debugging symbols associated with tdeutils.
+ They will automatically be used by gdb for debugging tdeutils-related
  issues.
diff --git a/ubuntu/maverick/tdeutils/debian/kdeutils-trinity-doc.install b/ubuntu/maverick/tdeutils/debian/kdeutils-trinity-doc.install
deleted file mode 100644
index 5c6e032ad..000000000
--- a/ubuntu/maverick/tdeutils/debian/kdeutils-trinity-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeutils*-apidocs/* /opt/trinity/share/doc/kde/HTML/en/kdeutils-apidocs
diff --git a/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1 b/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1
index bc0fb442b..af601f877 100644
--- a/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1
+++ b/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1
@@ -1,4 +1,4 @@
-.lf 1 info/kdeutils.kcharselect.1
+.lf 1 info/tdeutils.kcharselect.1
 .TH KCHARSELECT 1 "May 2003" KDE "KDE Application"
 .SH NAME
 kcharselect \- KDE Character Selector
@@ -179,7 +179,7 @@ opposite side, etc. For a normal western layout that means that menus
 and tool bars will go from the right edge to the left, the vertical
 scroll bar will be on the left side and so on.
 
-.lf 48 info/kdeutils.kcharselect.1
+.lf 48 info/tdeutils.kcharselect.1
 .SH ENVIRONMENT
 .lf 1 info/kdeenviron
 .SS "standard KDE environment variables"
@@ -220,7 +220,7 @@ Path to the home directory for the current user.
 .IP KDEHOME
 The KDE per-user setting directory. Default if not specified is
 .I $HOME/.kde
-.lf 50 info/kdeutils.kcharselect.1
+.lf 50 info/tdeutils.kcharselect.1
 .SH FILES
 .TP
 .I $HOME/.kde/share/config/kcharselectrc
diff --git a/ubuntu/maverick/tdeutils/debian/rules b/ubuntu/maverick/tdeutils/debian/rules
index f4ba23952..f7cd135a4 100755
--- a/ubuntu/maverick/tdeutils/debian/rules
+++ b/ubuntu/maverick/tdeutils/debian/rules
@@ -18,7 +18,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
 
 DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselect-trinity ksim-trinity
 
-DEB_DH_STRIP_ARGS  := --exclude=examples --dbg-package=kdeutils-trinity-dbg
+DEB_DH_STRIP_ARGS  := --exclude=examples --dbg-package=tdeutils-trinity-dbg
 
 PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity
 
diff --git a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.ark b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.ark
index 83279525d..0e97619df 100644
--- a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.ark
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.ark
@@ -1,4 +1,4 @@
-Document: kdeutils-doc-html-ark
+Document: tdeutils-doc-html-ark
 Title: Ark Handbook
 Author: Matt Johnston, Henrique Pinto
 Abstract: Ark is an archive manager for KDE
diff --git a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.irkick b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.irkick
index c1fdb5773..d092a6895 100644
--- a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.irkick
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.irkick
@@ -1,4 +1,4 @@
-Document: kdeutils-doc-html-irkick
+Document: tdeutils-doc-html-irkick
 Title: IRKick: The KDE LIRC Server Handbook
 Author: Gav Wood
 Abstract: KDE LIRC is the infrastructure for the KDE's Infrared Remote
diff --git a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kcalc b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcalc
index 1cc1db808..d256e4ec2 100644
--- a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kcalc
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcalc
@@ -1,4 +1,4 @@
-Document: kdeutils-doc-html-kcalc
+Document: tdeutils-doc-html-kcalc
 Title: KCalc Handbook
 Author: Bernd Johannes Wuebben, Pamela Roberts
 Abstract: KCalc is a scientific calculator for KDE
diff --git a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kcmlirc b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcmlirc
index b07391ec0..8bfe05da5 100644
--- a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kcmlirc
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcmlirc
@@ -1,4 +1,4 @@
-Document: kdeutils-doc-html-kcmlirc
+Document: tdeutils-doc-html-kcmlirc
 Title: KDE Infrared Remote Control Configuration
 Author: Gav Wood
 Abstract: The infrastructure for the KDE's Infrared Remote Control functionality.
diff --git a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kdf b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kdf
index 77f18cf1a..f6899de71 100644
--- a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kdf
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kdf
@@ -1,4 +1,4 @@
-Document: kdeutils-doc-html-kdf
+Document: tdeutils-doc-html-kdf
 Title: KDiskFree Handbook
 Author: Jonathan Singer, Michael Kropfberger
 Abstract: KDiskFree displays available file devices, along with information about them.
diff --git a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kedit b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kedit
index 69c6cbeee..602125435 100644
--- a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kedit
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kedit
@@ -1,4 +1,4 @@
-Document: kdeutils-doc-html-kedit
+Document: tdeutils-doc-html-kedit
 Title: KEdit Handbook
 Author: Thad McGinnis
 Abstract: KEdit is a simple text editor for KDE
diff --git a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kfloppy b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kfloppy
index ccbe98bed..8aab12e6f 100644
--- a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kfloppy
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kfloppy
@@ -1,4 +1,4 @@
-Document: kdeutils-doc-html-kfloppy
+Document: tdeutils-doc-html-kfloppy
 Title: KFloppy Formatter Handbook
 Author: Thad McGinnis
 Abstract: KFloppy Formatter is a utility that provides a straightforward
diff --git a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kgpg b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kgpg
index 2e2369bec..47c588ed3 100644
--- a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kgpg
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kgpg
@@ -1,4 +1,4 @@
-Document: kdeutils-doc-html-kgpg
+Document: tdeutils-doc-html-kgpg
 Title: KGPG Handbook
 Author: Jean-Baptiste Mardelle
 Abstract: KGPG is a simple graphical interface for GnuPG
diff --git a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.khexedit b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.khexedit
index ae7447747..8ffc260a1 100644
--- a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.khexedit
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.khexedit
@@ -1,4 +1,4 @@
-Document: kdeutils-doc-html-khexedit
+Document: tdeutils-doc-html-khexedit
 Title: KHexEdit Handbook
 Author: Jonathan Singer
 Abstract: KHexEdit is a hexadecimal editor for KDE
diff --git a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kjots b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kjots
index 7b485b8cf..94c1e3117 100644
--- a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kjots
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kjots
@@ -1,4 +1,4 @@
-Document: kdeutils-doc-html-kjots
+Document: tdeutils-doc-html-kjots
 Title: KJots Handbook
 Author: Matt Johnston
 Abstract: KJots is a small program which is handy for keeping miscellaneous notes.
diff --git a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kregexpeditor b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kregexpeditor
index b0eb1fade..82c7f091c 100644
--- a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kregexpeditor
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kregexpeditor
@@ -1,4 +1,4 @@
-Document: kdeutils-doc-html-kregexpeditor
+Document: tdeutils-doc-html-kregexpeditor
 Title: The Regular Expression Editor Manual
 Author: Jesper K. Pedersen
 Abstract: This Handbook describes the Regular Expression Editor widget
diff --git a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kwallet b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet
index 294aa088d..f80266346 100644
--- a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.kwallet
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet
@@ -1,4 +1,4 @@
-Document: kdeutils-doc-html-kwallet
+Document: tdeutils-doc-html-kwallet
 Title: KWallet Handbook
 Author: George Staikos, Lauri Watts
 Abstract: The wallet subsytem provides a convenient and secure way to manage all your passwords.
diff --git a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.superkaramba b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.superkaramba
index ffba16b9f..1ae06caa7 100644
--- a/ubuntu/maverick/tdeutils/debian/kdeutils-doc-html.doc-base.superkaramba
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.superkaramba
@@ -1,4 +1,4 @@
-Document: kdeutils-doc-html-superkaramba
+Document: tdeutils-doc-html-superkaramba
 Title: Superkaramba API
 Author: Adam Geitgey
 Abstract: This Handbook documents the Superkaramba API
diff --git a/ubuntu/maverick/tdeutils/debian/kdeutils-trinity-dev.install b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install
index e6ba996f4..e6ba996f4 100644
--- a/ubuntu/maverick/tdeutils/debian/kdeutils-trinity-dev.install
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-doc.install b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-doc.install
new file mode 100644
index 000000000..669742a1b
--- /dev/null
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-doc.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeutils*-apidocs/* /opt/trinity/share/doc/kde/HTML/en/tdeutils-apidocs
diff --git a/ubuntu/maverick/tdevelop/debian/README.Debian b/ubuntu/maverick/tdevelop/debian/README.Debian
index ca17bc626..cc1813032 100644
--- a/ubuntu/maverick/tdevelop/debian/README.Debian
+++ b/ubuntu/maverick/tdevelop/debian/README.Debian
@@ -16,6 +16,6 @@ say "Yes" and the PCS files will be regenerated.
 -------------------------------------------------
 
 If you want to be able to view manpages and documentation within KDevelop,
-you need to install the 'kdebase-kio' plugins package.
+you need to install the 'tdebase-kio' plugins package.
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Sat, 02 Jun 2007 12:53:31 +0200
diff --git a/ubuntu/maverick/tdevelop/debian/changelog b/ubuntu/maverick/tdevelop/debian/changelog
index d37ad0e8d..937fcc409 100644
--- a/ubuntu/maverick/tdevelop/debian/changelog
+++ b/ubuntu/maverick/tdevelop/debian/changelog
@@ -1,70 +1,70 @@
-kdevelop-trinity (4:3.5.10-0ubuntu6) karmic; urgency=low
+tdevelop-trinity (4:3.5.10-0ubuntu6) karmic; urgency=low
 
   * Repaired debugger widget dbgshell issue
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 07 Sep 2009 17:52:00 -0600
 
-kdevelop-trinity (4:3.5.10-0ubuntu5) karmic; urgency=low
+tdevelop-trinity (4:3.5.10-0ubuntu5) karmic; urgency=low
 
   * Repaired libtool problems
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 25 Aug 2009 11:26:00 -0600
 
-kdevelop-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
+tdevelop-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdevelop-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
+tdevelop-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 23:07:00 -0600
 
-kdevelop-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
+tdevelop-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
 
   * Added -trinity prefix
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 02 Dec 2008 09:18:00 -0600
 
-kdevelop (4:3.5.3-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdevelop (4:3.5.3-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
     - Remove kubuntu_01_fix_missing_output.diff - applied upstream
-    - Bump version of build-dep kdelibs4-dev and libcvsservice-dev to
+    - Bump version of build-dep tdelibs4-dev and libcvsservice-dev to
       3.5.10
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:54:26 -0400
 
-kdevelop (4:3.5.1-0ubuntu2) hardy; urgency=low
+tdevelop (4:3.5.1-0ubuntu2) hardy; urgency=low
 
   * Add kubuntu_01_fix_missing_output.diff from upstream,
     fixes "some lines in the build outputview disappear"
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 06 Mar 2008 00:03:04 +0000
 
-kdevelop (4:3.5.1-0ubuntu1) hardy; urgency=low
+tdevelop (4:3.5.1-0ubuntu1) hardy; urgency=low
 
   * New upstream release
   * Upgrade build-deps to libdb4.6-dev, python2.5
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:08 +0000
 
-kdevelop (4:3.5.0-2ubuntu1) hardy; urgency=low
+tdevelop (4:3.5.0-2ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining change: kubuntu_01_svn_724231_qmake.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:50 +0000
 
-kdevelop (4:3.5.0-2) unstable; urgency=low
+tdevelop (4:3.5.0-2) unstable; urgency=low
 
   * Apply patch for user interface lag on large projects.
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Sun, 28 Oct 2007 22:46:07 +0100
 
-kdevelop (4:3.5.0-1) unstable; urgency=low
+tdevelop (4:3.5.0-1) unstable; urgency=low
 
   * New upstream release.
   * Replace Build-Depends on automake1.9 by automake (>= 1:1.10)
@@ -74,7 +74,7 @@ kdevelop (4:3.5.0-1) unstable; urgency=low
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Wed, 17 Oct 2007 08:01:52 +0200
 
-kdevelop (4:3.5.0-0ubuntu3) hardy; urgency=low
+tdevelop (4:3.5.0-0ubuntu3) hardy; urgency=low
 
   * Add kubuntu_02_user_interface_lag.diff
     Closes LP: #156654
@@ -82,43 +82,43 @@ kdevelop (4:3.5.0-0ubuntu3) hardy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 13 Nov 2007 17:34:08 +0000
 
-kdevelop (4:3.5.0-0ubuntu2) gutsy; urgency=low
+tdevelop (4:3.5.0-0ubuntu2) gutsy; urgency=low
 
   * Add kubuntu_01_svn_724231_qmake.diff as recommended by upstream to fix QMake
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 12 Oct 2007 16:34:11 +0100
 
-kdevelop (4:3.5.0-0ubuntu1) gutsy; urgency=low
+tdevelop (4:3.5.0-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:28 +0100
 
-kdevelop (4:3.4.1-3ubuntu1) gutsy; urgency=low
+tdevelop (4:3.4.1-3ubuntu1) gutsy; urgency=low
 
   * Merge with Debian, remaining change: .pot patch
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Aug 2007 12:04:37 +0100
 
-kdevelop (4:3.4.1-3) unstable; urgency=low
+tdevelop (4:3.4.1-3) unstable; urgency=low
 
-  * Make kdevelop binNMU safe using Michael Biebl's patch (Closes: #431360).
+  * Make tdevelop binNMU safe using Michael Biebl's patch (Closes: #431360).
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Mon, 02 Jul 2007 07:12:32 +0200
 
-kdevelop (4:3.4.1-2) unstable; urgency=low
+tdevelop (4:3.4.1-2) unstable; urgency=low
 
   * Apply patch to prevent integrated debugger losing focus (Closes: #427949).
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Thu, 28 Jun 2007 20:24:01 +0200
 
-kdevelop (4:3.4.1-1) unstable; urgency=low
+tdevelop (4:3.4.1-1) unstable; urgency=low
 
   * New upstream release.
   * Update ltmain.sh in application templates (Closes: #351358).
-  * Suggest kdebase-kio-plugins to view documentation (Closes: #412108).
+  * Suggest tdebase-kio-plugins to view documentation (Closes: #412108).
   * Add Build-Depends on libsvn-dev to build KDevelop's SVN ioslave,
-    drop Suggests on kdesdk-kio-plugins | kdesvn-kio-plugins.
+    drop Suggests on tdesdk-kio-plugins | tdesvn-kio-plugins.
   * Replace Build-Depends on libdb4.3 by libdb4.4.
   * Remove patches applied upstream:
     + 01_kofficepart_template.diff
@@ -126,17 +126,17 @@ kdevelop (4:3.4.1-1) unstable; urgency=low
     + 06_kicker_template.diff
     + 07_qmake_parser.diff
     + 08_fix_gcc43_ftbfs.diff
-  * Add new docs files to kdevelop-doc.install.
+  * Add new docs files to tdevelop-doc.install.
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Wed, 06 Jun 2007 09:59:46 +0200
 
-kdevelop (4:3.4.1-0ubuntu2) gutsy; urgency=low
+tdevelop (4:3.4.1-0ubuntu2) gutsy; urgency=low
 
   * Add build-dep on libsvn-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 25 May 2007 09:42:30 +0000
 
-kdevelop (4:3.4.1-0ubuntu1) gutsy; urgency=low
+tdevelop (4:3.4.1-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
   * Remove patches applied upstream
@@ -145,24 +145,24 @@ kdevelop (4:3.4.1-0ubuntu1) gutsy; urgency=low
     - 06_kicker_template.diff
     - 07_qmake_parser.diff
     - 08_fix_gcc43_ftbfs.diff
-  * Add new docs files to kdevelop-doc.install
+  * Add new docs files to tdevelop-doc.install
 	
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 May 2007 18:38:37 +0100
 
-kdevelop (4:3.4.0-3ubuntu1) gutsy; urgency=low
+tdevelop (4:3.4.0-3ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 20:32:57 +0100
 
-kdevelop (4:3.4.0-3) unstable; urgency=low
+tdevelop (4:3.4.0-3) unstable; urgency=low
 
   * Apply patch from Martin Michlmayr for GCC 4.3 FTBFS (Closes: #417343).
   * Add note about Persistent Class Store in README.Debian (Closes: #409364).
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Mon, 02 Apr 2007 14:41:41 +0200
 
-kdevelop (4:3.4.0-2) unstable; urgency=low
+tdevelop (4:3.4.0-2) unstable; urgency=low
 
   * Rework Suggests and Recommends:
     + Move Suggests on kdbg, a2ps, enscript and gv.
@@ -173,7 +173,7 @@ kdevelop (4:3.4.0-2) unstable; urgency=low
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Sun, 11 Feb 2007 09:02:59 +0100
 
-kdevelop (4:3.4.0-1) unstable; urgency=low
+tdevelop (4:3.4.0-1) unstable; urgency=low
 
   * New upstream release.
     + Reformat code works after creating a new project (Closes: #330028).
@@ -192,20 +192,20 @@ kdevelop (4:3.4.0-1) unstable; urgency=low
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Mon, 29 Jan 2007 09:27:16 +0100
 
-kdevelop (4:3.4.0-0ubuntu3) feisty; urgency=low
+tdevelop (4:3.4.0-0ubuntu3) feisty; urgency=low
 
   * Small fix to kubuntu_02_qmake_parser.diff from upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  8 Feb 2007 17:40:10 +0000
 
-kdevelop (4:3.4.0-0ubuntu2) feisty; urgency=low
+tdevelop (4:3.4.0-0ubuntu2) feisty; urgency=low
 
   * Add kubuntu_02_qmake_parser.diff recommended by upstream,
     fixes parsing QMake files
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  8 Feb 2007 11:21:06 +0000
 
-kdevelop (4:3.4.0-0ubuntu1) feisty; urgency=low
+tdevelop (4:3.4.0-0ubuntu1) feisty; urgency=low
 
   * New upstream release
   * Remove 02_pcsimporter_plugins_path.diff, applied upstream
@@ -214,13 +214,13 @@ kdevelop (4:3.4.0-0ubuntu1) feisty; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 26 Jan 2007 14:36:24 +0000
 
-kdevelop (4:3.3.5-1ubuntu1) feisty; urgency=low
+tdevelop (4:3.3.5-1ubuntu1) feisty; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 23:00:24 +0000
 
-kdevelop (4:3.3.5-1) unstable; urgency=low
+tdevelop (4:3.3.5-1) unstable; urgency=low
 
   * New upstream release.
     + Contains up-to-date KDE admin dir in application templates.
@@ -228,65 +228,65 @@ kdevelop (4:3.3.5-1) unstable; urgency=low
     + 05_support_autoconf26.diff
     + 06_xim_crash_caused_by_qt.diff
     + 07_documentation_plugins_path.diff
-  * Fix not-binnmuable-any-depends-all kdevelop -> kdevelop-data.
+  * Fix not-binnmuable-any-depends-all tdevelop -> tdevelop-data.
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Tue, 24 Oct 2006 11:59:24 +0200
 
-kdevelop (4:3.3.4-3) unstable; urgency=low
+tdevelop (4:3.3.4-3) unstable; urgency=low
 
   * Add Build-depends on groff-base for manpage generation
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Mon, 28 Aug 2006 11:48:49 +0200
 
-kdevelop (4:3.3.4-2) unstable; urgency=low
+tdevelop (4:3.3.4-2) unstable; urgency=low
 
-  * Remove reference to kdevelop3 in README.Debian
+  * Remove reference to tdevelop3 in README.Debian
   * Add manpages for all binaries (Closes: #215250)
   * Do not install /usr/bin/r++, it is useless and unusable
-  * Remove ${misc:Depends} from kdevelop's Depends, debconf is no longer used
+  * Remove ${misc:Depends} from tdevelop's Depends, debconf is no longer used
   * Update versioned Build-Depends on libcvsservice-dev to >= 3.5.4
   * Remove unnecessary Build-Depends on po-debconf
   * Add debian/patches/common to update admin/* (Closes: #345121)
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Mon, 28 Aug 2006 10:06:25 +0200
 
-kdevelop (4:3.3.4-1ubuntu2) edgy; urgency=low
+tdevelop (4:3.3.4-1ubuntu2) 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
 
-kdevelop (4:3.3.4-1ubuntu1) edgy; urgency=low
+tdevelop (4:3.3.4-1ubuntu1) edgy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 22 Aug 2006 11:00:16 -0400
 
-kdevelop (4:3.3.4-1) unstable; urgency=low
+tdevelop (4:3.3.4-1) unstable; urgency=low
 
   * New upstream release
   * Suggest khelpcenter (Closes: #273664)
-  * Clean up kdevelop-doc dependencies
+  * Clean up tdevelop-doc dependencies
   * No longer remove X-KDE-KDevelopIDE from *.desktop files
   * Fix C++ curses template project (Closes: #378336)
   * Add support for autoconf 2.6 in KDE templates (Closes: #378762)
-  * Fix "Qt XIM bug that breaks kdevelop" (Closes: #369291)
+  * Fix "Qt XIM bug that breaks tdevelop" (Closes: #369291)
   * Fix documentation plugins installation directory (Closes: #353421, #235126)
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Mon, 21 Aug 2006 08:59:03 +0200
 
-kdevelop (4:3.3.3-0ubuntu1) edgy; urgency=low
+tdevelop (4:3.3.3-0ubuntu1) edgy; urgency=low
 
   * New upstream release
-  * Sync with Debian, includes rename from kdevelop3 to kdevelop
+  * Sync with Debian, includes rename from tdevelop3 to tdevelop
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Jul 2006 17:29:42 +0000
 
-kdevelop (4:3.3.2-5) unstable; urgency=low
+tdevelop (4:3.3.2-5) unstable; urgency=low
 
   * Remove circular dependencies (Closes: #368474)
-  * Merge kdevelop-plugins into kdevelop
+  * Merge tdevelop-plugins into tdevelop
   * Add Recommends on libtool (Closes: #284694) 
   * Update to standards version 3.7.2
   * Update versioned Build-Depends on debhelper to >= 5
@@ -295,27 +295,27 @@ kdevelop (4:3.3.2-5) unstable; urgency=low
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Tue, 23 May 2006 18:39:42 +0200
 
-kdevelop (4:3.3.2-4) unstable; urgency=low
+tdevelop (4:3.3.2-4) unstable; urgency=low
 
-  * Rename kdevelop3 to kdevelop (Closes: #312705, #322422)
+  * Rename tdevelop3 to tdevelop (Closes: #312705, #322422)
   * Drop htdig cron job and debconf questions (Closes: #296867, #258382,
     #168113, #316252)
-  * Fix typo in kdevelop-data description (Closes: #364139)
+  * Fix typo in tdevelop-data description (Closes: #364139)
   * Fix debian/copyright
   * Move misplaced plugins from /usr/lib to /usr/lib/trinity
   * Update to standards version 3.7.0
-  * Add icon in XPM format for kdevelop
+  * Add icon in XPM format for tdevelop
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Thu,  4 May 2006 12:06:12 +0200
 
-kdevelop3 (4:3.3.2-1) unstable; urgency=low
+tdevelop3 (4:3.3.2-1) unstable; urgency=low
 
   * New upstream release
   * Add Italian debconf translations (Closes: #358163, #349345)
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Sun,  2 Apr 2006 16:05:18 +0200
 
-kdevelop3 (4:3.3.1-1) unstable; urgency=low
+tdevelop3 (4:3.3.1-1) unstable; urgency=low
 
   * New upstream release 
   - fix code completion for external libraries (Closes: #355444, #351290)
@@ -325,40 +325,40 @@ kdevelop3 (4:3.3.1-1) unstable; urgency=low
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Wed,  8 Mar 2006 23:39:40 +0100
 
-kdevelop3 (4:3.3.2-0ubuntu3) dapper; urgency=low
+tdevelop3 (4:3.3.2-0ubuntu3) dapper; urgency=low
 
   * debian/rules:
     + Use dh_iconcache .
 
  -- Zak B. Elep <zakame@ubuntu.com>  Thu,  4 May 2006 21:59:27 -0400
 
-kdevelop3 (4:3.3.2-0ubuntu2) dapper; urgency=low
+tdevelop3 (4:3.3.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:31 +0100
 
-kdevelop3 (4:3.3.2-0ubuntu1) dapper; urgency=low
+tdevelop3 (4:3.3.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:30 +0000
 
-kdevelop3 (4:3.3.1-0ubuntu1) dapper; urgency=low
+tdevelop3 (4:3.3.1-0ubuntu1) dapper; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 17:40:48 +0000
 
-kdevelop3 (4:3.3.0-2) unstable; urgency=low
+tdevelop3 (4:3.3.0-2) unstable; urgency=low
 
   * Add Suggests on exuberant-ctags (Closes: #178793)
-  * Make kdevelop3-dev architecture 'any' due to .la files
-  * Move some .la files back to kdevelop3, these are for plugins
+  * Make tdevelop3-dev architecture 'any' due to .la files
+  * Move some .la files back to tdevelop3, these are for plugins
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Tue, 17 Jan 2006 08:11:19 +0100
 
-kdevelop3 (4:3.3.0-1) unstable; urgency=low
+tdevelop3 (4:3.3.0-1) unstable; urgency=low
 
   * New upstream release, build against KDE 3.5 (Closes: #347862)
   * Add Jeremy Lainé to maintainers, acknowledge NMU fixes (Closes: #274966,
@@ -369,11 +369,11 @@ kdevelop3 (4:3.3.0-1) unstable; urgency=low
   * Update Suggests and README.Debian regarding SVN integration
   * Remove explicit Build-Depends on g++-3.4 (Closes: #342991)
   * Remove patches/qmake_new_class_fix.diff, included upstream
-  * Move development .la and .so files to kdevelop3-dev (Closes: #327904)
+  * Move development .la and .so files to tdevelop3-dev (Closes: #327904)
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Fri, 13 Jan 2006 20:00:05 +0100
 
-kdevelop3 (4:3.2.2-0.7) unstable; urgency=low
+tdevelop3 (4:3.2.2-0.7) unstable; urgency=low
 
   * Non-maintainer upload
   * Remove obsolete Build-Depends on libdb4.1-dev, add libdb4.3-dev
@@ -383,24 +383,24 @@ kdevelop3 (4:3.2.2-0.7) unstable; urgency=low
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Wed, 21 Dec 2005 22:00:59 +0100
 
-kdevelop3 (4:3.2.2-0.6) unstable; urgency=low
+tdevelop3 (4:3.2.2-0.6) unstable; urgency=low
 
   * Non-maintainer upload
-  * Rebuild against kdelibs4c2a (Closes: #341990)
+  * Rebuild against tdelibs4c2a (Closes: #341990)
   * Add a note about SVN integration in README.Debian (Closes: #295659)
   * Remove obsolete Build-Depends on libdb4.0-dev
   * Fix KDevelop documentation browsing (correct DocPath in *.desktop)
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Sun,  4 Dec 2005 17:24:35 +0100
 
-kdevelop3 (4:3.3.0-0ubuntu4) dapper; urgency=low
+tdevelop3 (4:3.3.0-0ubuntu4) dapper; urgency=low
 
-  * Add kubuntu_01_app_name.diff, fix .desktop files for kdevelop3
+  * Add kubuntu_01_app_name.diff, fix .desktop files for tdevelop3
     rename
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 30 Dec 2005 13:20:34 +0000
 
-kdevelop3 (4:3.3.0-0ubuntu3) dapper; urgency=low
+tdevelop3 (4:3.3.0-0ubuntu3) dapper; urgency=low
 
   * Replace automaken build-dep with automake1.9
   * Make libdb4.3 the only build-dep candidate for libdb
@@ -408,27 +408,27 @@ kdevelop3 (4:3.3.0-0ubuntu3) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 10 Dec 2005 18:35:19 +0000
 
-kdevelop3 (4:3.3.0-0ubuntu2) dapper; urgency=low
+tdevelop3 (4:3.3.0-0ubuntu2) dapper; urgency=low
 
   * Rebuild for a2c transition without changes.
 
  -- Stefan Potyra <sistpoty@ubuntu.com>  Fri,  9 Dec 2005 13:10:37 +0100
 
-kdevelop3 (4:3.3.0-0ubuntu1) dapper; urgency=low
+tdevelop3 (4:3.3.0-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 Nov 2005 23:59:22 +0000
 
-kdevelop3 (4:3.2.2-0.5) unstable; urgency=low
+tdevelop3 (4:3.2.2-0.5) unstable; urgency=low
 
   * Non-maintainer upload
-  * Make sure kdevelop3 and kdevelop3-plugins have the same version
+  * Make sure tdevelop3 and tdevelop3-plugins have the same version
     (Closes: #336094)
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Thu, 27 Oct 2005 18:47:30 +0200
 
-kdevelop3 (4:3.2.2-0.4) unstable; urgency=low
+tdevelop3 (4:3.2.2-0.4) unstable; urgency=low
 
   * Non-maintainer upload
   * Remove hardcoded Depends on debconf, let dh_installdebconf
@@ -439,14 +439,14 @@ kdevelop3 (4:3.2.2-0.4) unstable; urgency=low
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Tue, 18 Oct 2005 14:43:03 +0200
 
-kdevelop3 (4:3.2.2-0.3) unstable; urgency=low
+tdevelop3 (4:3.2.2-0.3) unstable; urgency=low
 
   * Non-maintainer upload.
   * work around gcc-4.0 FTBFS on some architectures
 
  -- LaMont Jones <lamont@debian.org>  Fri, 14 Oct 2005 19:28:31 +0000
 
-kdevelop3 (4:3.2.2-0.2) unstable; urgency=low
+tdevelop3 (4:3.2.2-0.2) unstable; urgency=low
 
   * Non-maintainer upload
   * Fix kdevdesigner crash on start (Closes: #309351)
@@ -455,7 +455,7 @@ kdevelop3 (4:3.2.2-0.2) unstable; urgency=low
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Thu, 15 Sep 2005 08:37:32 +0200
 
-kdevelop3 (4:3.2.2-0.1) unstable; urgency=low
+tdevelop3 (4:3.2.2-0.1) unstable; urgency=low
 
   * Non-maintainer upload
   * New upstream release (Closes: #326883)
@@ -463,7 +463,7 @@ kdevelop3 (4:3.2.2-0.1) unstable; urgency=low
   * Fix lintian warnings:
    - Update to Standards-Version 3.6.2
    - Replace possible bashism "-a" by "&&" in debian/config  
-  * Add Suggests on kdesdk-misc to provide kio_svn files
+  * Add Suggests on tdesdk-misc to provide kio_svn files
   * Translation fixes:
    - Fix debian/templates.master, run debconf-updatepo (Closes: #312161) 
    - Add Vietnamese debconf translation (Closes: #312160)
@@ -471,48 +471,48 @@ kdevelop3 (4:3.2.2-0.1) unstable; urgency=low
   * Fix adding new classes to qmake projects (Closes: #315170)
   * Remove X-KDE-KDevelopIDE category from .desktop entries
   * Add --disable-rpath to configure flags (Closes: #327710) 
-  * Fix debian/menu , package is 'kdevelop3' not 'kdevelop' (Closes: #311153)
-  * Fix some references to 'kdevelop' in .desktop files (Closes: #304203)
+  * Fix debian/menu , package is 'tdevelop3' not 'tdevelop' (Closes: #311153)
+  * Fix some references to 'tdevelop' in .desktop files (Closes: #304203)
   * Add missing Depends on debconf (Closes: #327730)
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Mon, 12 Sep 2005 23:15:38 +0200
 
-kdevelop3 (4:3.2.3-0ubuntu1) breezy; urgency=low
+tdevelop3 (4:3.2.3-0ubuntu1) breezy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat,  8 Oct 2005 22:20:19 +0000
 
-kdevelop3 (4:3.2.2-0ubuntu2) breezy; urgency=low
+tdevelop3 (4:3.2.2-0ubuntu2) breezy; urgency=low
 
   * Rebuild because of updated QT/KDE
 
  -- Stephan Hermann <sh@sourcecode.de>  Wed,  7 Sep 2005 21:09:08 +0200
 
-kdevelop3 (4:3.2.2-0ubuntu1) breezy; urgency=low
+tdevelop3 (4:3.2.2-0ubuntu1) breezy; urgency=low
 
   * New upstream release
   * Switch to Python 2.4
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 20:12:10 +0000
 
-kdevelop3 (4:3.2.1-0ubuntu1) breezy; urgency=low
+tdevelop3 (4:3.2.1-0ubuntu1) breezy; urgency=low
 
   * New upstream release 
 
  -- Jonathan Riddell <jr@jriddell.org>  Fri, 25 Mar 2005 00:40:35 +0000
 
-kdevelop3 (4:3.2.0-3) unstable; urgency=low
+tdevelop3 (4:3.2.0-3) unstable; urgency=low
 
   * Fixed up the creation and removal of the symlinks for kio_svn
     files (Closes: #310684)
 
  -- Norman Jordan <njordan@debian.org>  Wed, 25 May 2005 10:18:35 -0700
 
-kdevelop3 (4:3.2.0-2) unstable; urgency=medium
+tdevelop3 (4:3.2.0-2) unstable; urgency=medium
 
   * Added the debconf translations back (Closes: #305276)
-  * Removed kpaint from the suggests field for kdevelop3
+  * Removed kpaint from the suggests field for tdevelop3
     (Closes: #308198)
   * Fixed icon path (Closes: #299522)
   * Added pt_BR debconf translation (Closes: #304419)
@@ -521,25 +521,25 @@ kdevelop3 (4:3.2.0-2) unstable; urgency=medium
 
  -- Norman Jordan <njordan@debian.org>  Mon,  23 May 2005 03:52:16 -0700
 
-kdevelop3 (4:3.2.0-1) unstable; urgency=low
+tdevelop3 (4:3.2.0-1) unstable; urgency=low
 
   * New upstream release
 
  -- Norman Jordan <njordan@debian.org>  Mon,  4 Apr 2005 10:25:06 -0700
 
-kdevelop3 (4:3.2.0-0-BS1) unstable; urgency=low
+tdevelop3 (4:3.2.0-0-BS1) unstable; urgency=low
 
   * updated to released version
 
  -- Bernd Schubert <bernd.schubert@pci.uni-heidelberg.de>  Thu, 17 Mar 2005 00:49:05 +0100
 
-kdevelop3 (4:3.1.2-3.2.0-rc1-cvs050306-2) unstable; urgency=low
+tdevelop3 (4:3.1.2-3.2.0-rc1-cvs050306-2) unstable; urgency=low
 
   * reverted the Makefile changes, modified the sourcecode instead
 
  -- Bernd Schubert <bernd.schubert@pci.uni-heidelberg.de>  Wed,  9 Mar 2005 15:18:37 +0100
 
-kdevelop3 (4:3.1.2-3.2.0-rc1-cvs050306-1) unstable; urgency=low
+tdevelop3 (4:3.1.2-3.2.0-rc1-cvs050306-1) unstable; urgency=low
 
   * current cvs version
   * not an offical debian version, so changed the maintainer
@@ -547,7 +547,7 @@ kdevelop3 (4:3.1.2-3.2.0-rc1-cvs050306-1) unstable; urgency=low
 
  -- Bernd Schubert <bernd.schubert@pci.uni-heidelberg.de>  Wed,  9 Mar 2005 13:29:30 +0100
 
-kdevelop3 (4:3.1.2-4) unstable; urgency=low
+tdevelop3 (4:3.1.2-4) unstable; urgency=low
 
   * Fixed up the problem with linking a shared library with a static
     one (Closes: #296511)
@@ -555,38 +555,38 @@ kdevelop3 (4:3.1.2-4) unstable; urgency=low
 
  -- Norman Jordan <njordan@debian.org>  Thu,  9 Mar 2005 10:55:27 -0800
 
-kdevelop3 (4:3.1.2-3) unstable; urgency=low
+tdevelop3 (4:3.1.2-3) unstable; urgency=low
 
   * KDevelop 2.x is not yet phased out.
   * Upload to get the latest upstream version into Debian
 
  -- Norman Jordan <njordan@debian.org>  Tue, 19 Feb 2005 14:34:21 -0800
 
-kdevelop (4:3.1.2-2) unstable; urgency=low
+tdevelop (4:3.1.2-2) unstable; urgency=low
 
   * Added the Czech Debconf translation (Closes: #289456)
   * Fix building on amd64 (Closes: #287096)
 
  -- Norman Jordan <njordan@debian.org>  Wed, 26 Jan 2005 09:05:00 -0800
 
-kdevelop3 (4:3.1.2-1ubuntu2) hoary; urgency=low
+tdevelop3 (4:3.1.2-1ubuntu2) hoary; urgency=low
 
   * Patch bdb_compile_pic to compile bdb using -fPIC to prevent compiler errors on amd64
   * Build-dep on qt3-apps-dev
-  * Use /etc/trinity/kdevelop3rc not /usr/share/config/kdevelop3rc
+  * Use /etc/trinity/tdevelop3rc not /usr/share/config/tdevelop3rc
 
  -- Jonathan Riddell <jr@jriddell.org>  Sat, 22 Jan 2005 16:33:29 +0000
 
-kdevelop3 (4:3.1.2-1ubuntu1) hoary; urgency=low
+tdevelop3 (4:3.1.2-1ubuntu1) hoary; urgency=low
 
   * New upstream release 
 
  -- Andreas Mueller <amu@canonical.com>  Sun, 16 Jan 2005 13:50:28 +0100
 
-kdevelop (4:3.1.2-1) unstable; urgency=low
+tdevelop (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release
-  * KDevelop 2.x is now phased out, the kdevelop packages now contain
+  * KDevelop 2.x is now phased out, the tdevelop packages now contain
     KDevelop 3.x
   * Added libsvn0-dev to the build dependencies (Closes: #285873)
   * Fixed the search path for the images (Closes: #236111)
@@ -595,17 +595,17 @@ kdevelop (4:3.1.2-1) unstable; urgency=low
 
  -- Norman Jordan <njordan@debian.org>  Tue, 28 Dec 2004 01:22:23 -0800
 
-kdevelop3 (4:3.1.1-2) unstable; urgency=medium
+tdevelop3 (4:3.1.1-2) unstable; urgency=medium
 
-  * Changed the icon entry in kdevelop3.desktop to refer to the
-    kdevelop3 icon (Closes: #239028)
-  * Now symbolic links are created that are named kdevelop3.mo and
-    point to the kdevelop.mo files from the kde-i18n-* packages
+  * Changed the icon entry in tdevelop3.desktop to refer to the
+    tdevelop3 icon (Closes: #239028)
+  * Now symbolic links are created that are named tdevelop3.mo and
+    point to the tdevelop.mo files from the tde-i18n-* packages
     (Closes: #280794, #257076, #251475)
 
  -- Norman Jordan <njordan@debian.org>  Sun, 14 Nov 2004 02:27:16 -0800
 
-kdevelop3 (4:3.1.1-1) unstable; urgency=low
+tdevelop3 (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release
   * Modified debconf phrase to use a question mark (Closes: #274019)
@@ -614,14 +614,14 @@ kdevelop3 (4:3.1.1-1) unstable; urgency=low
 
  -- Norman Jordan <njordan@debian.org>  Tue,  9 Nov 2004 23:01:42 -0800
 
-kdevelop3 (4:3.1.0-4) unstable; urgency=low
+tdevelop3 (4:3.1.0-4) unstable; urgency=low
 
   * Changed the configure options that are used. Now all languages,
     and project types are enabled.
 
  -- Norman Jordan <njordan@debian.org>  Wed,  6 Oct 2004 02:22:34 -0700
 
-kdevelop3 (4:3.1.0-3) unstable; urgency=low
+tdevelop3 (4:3.1.0-3) unstable; urgency=low
 
   * Modified vcs/cvsservice/cvspartimpl.cpp to support the version of
     libcvsservice currently in Debian
@@ -630,26 +630,26 @@ kdevelop3 (4:3.1.0-3) unstable; urgency=low
 
  -- Norman Jordan <njordan@debian.org>  Mon, 29 Sep 2004 20:50:39 -0700
 
-kdevelop3 (4:3.1.0-2) unstable; urgency=low
+tdevelop3 (4:3.1.0-2) unstable; urgency=low
 
   * Added qt3-apps-dev to the build-dependencies (Closes: #273534)
 
  -- Norman Jordan <njordan@debian.org>  Sun, 26 Sep 2004 18:07:38 -0700
 
-kdevelop3 (4:3.1.0-1) unstable; urgency=low
+tdevelop3 (4:3.1.0-1) unstable; urgency=low
 
   * New upstream release
   * Added the Japanese Debconf translation (Closes: #255057)
-  * Added ctags to the recommends field of the kdevelop3 package
+  * Added ctags to the recommends field of the tdevelop3 package
     (Closes: #265742)
   * Changed the local copy of BDB to compile with the -fPIC flag. Required
     for compiling on AMD64.
 
  -- Norman Jordan <njordan@debian.org>  Sat, 25 Sep 2004 11:21:57 -0700
 
-kdevelop3 (4:3.0.4-2) unstable; urgency=low
+tdevelop3 (4:3.0.4-2) unstable; urgency=low
 
-  * Now the kdevelop3 package depends on automaken, rather than listing each
+  * Now the tdevelop3 package depends on automaken, rather than listing each
     version of automake, same for the build-dependencies
   * Added a diversion for the file
     /usr/share/icons/hicolor/22x22/actions/save_all.png
@@ -659,41 +659,41 @@ kdevelop3 (4:3.0.4-2) unstable; urgency=low
 
  -- Norman Jordan <njordan@debian.org>  Sun, 11 Jul 2004 23:07:36 -0700
 
-kdevelop3 (4:3.0.4-1) unstable; urgency=low
+tdevelop3 (4:3.0.4-1) unstable; urgency=low
 
   * New upstream release
-  * Rewrote the kdevelop3 postinst script in Perl
+  * Rewrote the tdevelop3 postinst script in Perl
   * Now the global documentation index is generated in the background
     (Closes: #247123)
   * Updated the menu file (Closes: #254651)
 
  -- Norman Jordan <njordan@debian.org>  Wed, 16 Jun 2004 12:55:21 -0700
 
-kdevelop3 (4:3.0.3-2) unstable; urgency=low
+tdevelop3 (4:3.0.3-2) unstable; urgency=low
 
-  * Updated the depends field for kdevelop3 to accept automake1.8 as the
+  * Updated the depends field for tdevelop3 to accept automake1.8 as the
     automake package to use (Closes: #249624)
-  * Added libtool to the recommends field for kdevelop3 (Closes: #250597)
+  * Added libtool to the recommends field for tdevelop3 (Closes: #250597)
 
  -- Norman Jordan <njordan@debian.org>  Wed,  2 Jun 2004 00:10:17 -0700
 
-kdevelop3 (4:3.0.3-1) unstable; urgency=low
+tdevelop3 (4:3.0.3-1) unstable; urgency=low
 
   * New upstream release
-  * Removed the /usr/lib/lib*.la files from the kdevelop3-dev package
+  * Removed the /usr/lib/lib*.la files from the tdevelop3-dev package
     (Closes: #243981)
 
  -- Norman Jordan <njordan@debian.org>  Thu, 22 Apr 2004 12:52:06 -0700
 
-kdevelop3 (4:3.0.2-2) unstable; urgency=low
+tdevelop3 (4:3.0.2-2) unstable; urgency=low
 
-  * Moved the *.la files from kdevelop3-dev to kdevelop3 (Closes: #234824)
+  * Moved the *.la files from tdevelop3-dev to tdevelop3 (Closes: #234824)
   * Added the Dutch translation provided by Frans Pop <aragorn@tiscali.nl>
     (Closes: #237817)
 
  -- Norman Jordan <njordan@debian.org>  Wed, 17 Mar 2004 19:22:00 -0800
 
-kdevelop3 (4:3.0.2-1) unstable; urgency=low
+tdevelop3 (4:3.0.2-1) unstable; urgency=low
 
   * New upstream release
   * Added a French debconf translation provided by Eric <eric-m@wanadoo.fr>
@@ -701,7 +701,7 @@ kdevelop3 (4:3.0.2-1) unstable; urgency=low
 
  -- Norman Jordan <njordan@debian.org>  Wed, 10 Mar 2004 01:49:46 -0800
 
-kdevelop3 (4:3.0.1-2) unstable; urgency=low
+tdevelop3 (4:3.0.1-2) unstable; urgency=low
 
   * Now the update_doc_index.sh script and the config script will only accept
     the installed version of ht://Dig if it is version 3.2.x (Closes: #234753)
@@ -710,13 +710,13 @@ kdevelop3 (4:3.0.1-2) unstable; urgency=low
     (Closes: #235105)
   * Fixed the debconf templates using the patch from Denis Barbier
     (Closes: #234825)
-  * Changed the description for the kdevelop3-dev package to make it clear
+  * Changed the description for the tdevelop3-dev package to make it clear
     that this package is only needed for writing KDevelop plugins
     (Closes: #235248)
 
  -- Norman Jordan <njordan@debian.org>  Sun, 29 Feb 2004 23:40:45 -0800
 
-kdevelop3 (4:3.0.1-1) unstable; urgency=low
+tdevelop3 (4:3.0.1-1) unstable; urgency=low
 
   * New upstream release
   * Updated the configure options
@@ -724,7 +724,7 @@ kdevelop3 (4:3.0.1-1) unstable; urgency=low
 
  -- Norman Jordan <njordan@debian.org>  Fri, 20 Feb 2004 21:48:35 -0800
 
-kdevelop3 (4:3.0.0-1) unstable; urgency=low
+tdevelop3 (4:3.0.0-1) unstable; urgency=low
 
   * Updated to the 3.0.0 release
   * Update debian/update_doc_index.sh
@@ -736,7 +736,7 @@ kdevelop3 (4:3.0.0-1) unstable; urgency=low
 
  -- Norman Jordan <njordan@debian.org>  Sun,  15 Feb 2004 19:26:18 -0800
 
-kdevelop3 (4:3.0-00cvs-20031106) unstable; urgency=low
+tdevelop3 (4:3.0-00cvs-20031106) unstable; urgency=low
 
   * Updated CVS sources
   * Update debian/update_doc_index.sh
@@ -745,7 +745,7 @@ kdevelop3 (4:3.0-00cvs-20031106) unstable; urgency=low
 
  -- Norman Jordan <njordan@debian.org>  Thu,  6 Nov 2003 22:40:19 -0800
 
-kdevelop3 (4:3.0-00cvs20031021) unstable; urgency=low
+tdevelop3 (4:3.0-00cvs20031021) unstable; urgency=low
 
   * Updated CVS sources
   * Added the 'noopt' option to use the --enable-debug=full to configure
@@ -753,22 +753,22 @@ kdevelop3 (4:3.0-00cvs20031021) unstable; urgency=low
 
  -- Norman Jordan <njordan@debian.org>  Tue, 21 Oct 2003 13:51:34 -0700
 
-kdevelop3 (4:3.0-00cvs20031013) unstable; urgency=low
+tdevelop3 (4:3.0-00cvs20031013) unstable; urgency=low
 
   * Updated CVS sources
-  * Change the package names again to kdevelop3*
+  * Change the package names again to tdevelop3*
     - Now KDevelop 3 and KDevelop 2 can be installed at the same time
 
  -- Norman Jordan <njordan@debian.org>  Mon, 13 Oct 2003 23:05:06 -0700
 
-kdevelop (4:2.999-0cvs20031006) unstable; urgency=low
+tdevelop (4:2.999-0cvs20031006) unstable; urgency=low
 
   * Updated CVS sources
-  * Changed the packages to kdevelop* rather than gideon*
+  * Changed the packages to tdevelop* rather than gideon*
   * The packages now conflict with the gideon packages
-  * The kdevelop package now contains all lib*.so.* and lib*.so files in
+  * The tdevelop package now contains all lib*.so.* and lib*.so files in
     /usr/lib
-  * The kdevelop-dev package now contains all lib*.la files in /usr/lib
+  * The tdevelop-dev package now contains all lib*.la files in /usr/lib
 
  -- Norman Jordan <njordan@debian.org>  Mon,  6 Oct 2003 13:03:35 -0700
 
@@ -905,7 +905,7 @@ gideon (1:2.999-0cvs20030514) unstable; urgency=low
   * Updated CVS sources
   * Added the prefix to debian/rules and debian/buld-gideon
   * Added stl-manual to the suggests field for gideon-doc
-  * Fixed up the path to the kdevelop manual
+  * Fixed up the path to the tdevelop manual
 
  -- Norman Jordan <njordan@debian.org>  Wed, 14 May 2003 02:47:32 -0700
 
@@ -986,63 +986,63 @@ gideon (1:3.0-1) unstable; urgency=low
 
  -- Eray Ozkural (exa) <erayo@cs.bilkent.edu.tr>  Mon, 30 Jul 2001 18:52:20 +0300
 
-kdevelop (1:2.0b1-2) unstable; urgency=low
+tdevelop (1:2.0b1-2) unstable; urgency=low
 
   * Renamed debian doc-base entries to standard ones.
 
  -- Christian Couder <chcouder@club-internet.fr>  Mon, 23 Jul 2001 22:58:54 +0100
 
-kdevelop (1:2.0b1-1) unstable; urgency=low
+tdevelop (1:2.0b1-1) unstable; urgency=low
 
   * New release
   * don't compress tip database
-  * small fix to find kdelibs docs in setup wizard
+  * small fix to find tdelibs docs in setup wizard
   * split into binary, doc and data packages
   * added graphviz to suggests
 
  -- Eray Ozkural (exa) <erayo@cs.bilkent.edu.tr>  Mon, 23 Jul 2001 20:18:09 +0300
 
-kdevelop (1:1.4.0-3.4) unstable; urgency=low
+tdevelop (1:1.4.0-3.4) unstable; urgency=low
 
   * Updated the build-depends field 
 
  -- Norman Jordan <njordan@debian.org>  Sun, 13 May 2001 22:17:08 -0700
 
-kdevelop (1:1.4.0-3.3) unstable; urgency=low
+tdevelop (1:1.4.0-3.3) unstable; urgency=low
 
   * Suggests sgmltools-lite instead of sgmltools (Closes: #96274)
 
  -- Norman Jordan <njordan@debian.org>  Sun, 13 May 2001 13:09:12 -0700
 
-kdevelop (1:1.4.0-3.2) unstable; urgency=low
+tdevelop (1:1.4.0-3.2) unstable; urgency=low
 
   * Change Maintainer (Closes: #90814)
   * No longer installs extractrc (Closes: #93012)
-  * Suggests kdesdk-scripts 
+  * Suggests tdesdk-scripts 
 
  -- Norman Jordan <njordan@debian.org>  Thu,  5 Apr 2001 11:03:57 -0700
 
-kdevelop (1:1.4.0-3.1) unstable; urgency=low
+tdevelop (1:1.4.0-3.1) unstable; urgency=low
  
   * NMU
   * Fixing build-depends (Closes: #92190)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 30 Mar 2001 21:22:00 -0700
 
-kdevelop (1:1.4.0-3) unstable; urgency=low
+tdevelop (1:1.4.0-3) unstable; urgency=low
  
   * Change Maintainer
   * More upstream fixes while I'm at it
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 23 Mar 2001 03:00:00 -0700
 
-kdevelop (1:1.4.0-2) unstable; urgency=low
+tdevelop (1:1.4.0-2) unstable; urgency=low
  
-  * Removed non en docs as they are provided in kde-i18n now
+  * Removed non en docs as they are provided in tde-i18n now
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 04 Mar 2001 20:00:00 -0700
 
-kdevelop (1:1.4.0-1) unstable; urgency=low
+tdevelop (1:1.4.0-1) unstable; urgency=low
  
   * Cleaned up source based off of current CVS branch
   * Fix desktop file (Closes: #87802)
@@ -1051,14 +1051,14 @@ kdevelop (1:1.4.0-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 02 Mar 2001 07:00:00 -0700
 
-kdevelop (1:1.4-final-1) unstable; urgency=low
+tdevelop (1:1.4-final-1) unstable; urgency=low
  
   * New upstream release
-  * Fix kde-i18n conflicts (Closes: #87381)
+  * Fix tde-i18n conflicts (Closes: #87381)
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:06:00 -0700
 
-kdevelop (1:1.4-20010218-1) unstable; urgency=low
+tdevelop (1:1.4-20010218-1) unstable; urgency=low
  
   * New upstream cvs pull
   * New upload to Debian with permission of Raphael Bossek who did the ITP
@@ -1066,30 +1066,30 @@ kdevelop (1:1.4-20010218-1) unstable; urgency=low
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 18 Feb 2001 02:06:00 -0700
 
-kdevelop (1:1.4-20010127-1) unstable; urgency=low
+tdevelop (1:1.4-20010127-1) unstable; urgency=low
 
   * New upstream release
   * Updating for potato/woody/sid
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 27 Jan 2001 05:06:00 -0700
 
-kdevelop (1:1.1final-20000228-1) stable; urgency=low
+tdevelop (1:1.1final-20000228-1) stable; urgency=low
 
   * New upstream release
-  * Recommend kdelibs-doc
+  * Recommend tdelibs-doc
   * Don't include Makefiles
 
  -- Bernd Gehrmann <bernd@users.sourceforge.net>  Sun, 27 Feb 2000 12:00:00 +0100
 
-kdevelop (1:1.1beta2-20000206-1) stable; urgency=low
+tdevelop (1:1.1beta2-20000206-1) stable; urgency=low
 
   * Back to old configure arguments
   * Mentioned debugger in control file, 
-    made kdebase a dependency
+    made tdebase a dependency
 
  -- Bernd Gehrmann <bernd@physik.hu-berlin.de>  Mon,  7 Feb 2000 00:10:59 +0100
 
-kdevelop (1:1.1beta2-20000131-1) stable; urgency=low
+tdevelop (1:1.1beta2-20000131-1) stable; urgency=low
 
   * New upstream version: 1.1beta2
   * Use --prefix in configure, set kde_confdir, kde_htmldir explicitly
@@ -1097,53 +1097,53 @@ kdevelop (1:1.1beta2-20000131-1) stable; urgency=low
 
  -- Bernd Gehrmann <bernd@physik.hu-berlin.de>  Mon, 31 Jan 2000 21:15:04 +0100
 
-kdevelop (1:1.0-19991206-1) stable; urgency=low
+tdevelop (1:1.0-19991206-1) stable; urgency=low
 
   * New upstream version: 1.0
 
  -- Bernd Gehrmann <bernd@physik.hu-berlin.de>  Mon,  6 Dec 1999 20:21:54 +0100
 
-kdevelop (1:1.0beta4.1-19991030-1) unstable; urgency=low
+tdevelop (1:1.0beta4.1-19991030-1) unstable; urgency=low
 
   * New upstream changes
   * Disabled debug - is stripped anyway
 
  -- Bernd Gehrmann <bernd@physik.hu-berlin.de>  Sat, 30 Oct 1999 09:02:41 +0200
 
-kdevelop (1:0.4-19990728-1) unstable; urgency=low
+tdevelop (1:0.4-19990728-1) unstable; urgency=low
 
   * Added further manuals to doc-base
 
  -- Bernd Gehrmann <bernd@physik.hu-berlin.de>  Wed, 28 Jul 1999 23:29:03 +0200
 
-kdevelop (1:0.4-19990716-1) unstable; urgency=low
+tdevelop (1:0.4-19990716-1) unstable; urgency=low
 
   * Call ldconfig in postinst
   * configure with flag --enable-kdoc2
 
  -- Bernd Gehrmann <bernd@physik.hu-berlin.de>  Fri, 16 Jul 1999 20:47:55 +0200
 
-kdevelop (1:0.4-19990705-1) unstable; urgency=low
+tdevelop (1:0.4-19990705-1) unstable; urgency=low
 
   * configure with flag --enable-docbase
   * install kdlgloader into the correct directories
 
  -- Bernd Gehrmann <bernd@physik.hu-berlin.de>  Mon,  5 Jul 1999 12:21:59 +0200
 
-kdevelop (1:0.4-19990619-1) unstable; urgency=low
+tdevelop (1:0.4-19990619-1) unstable; urgency=low
 
   * Fixed a competing problem between kderules and dh_installdocs
   * New upstream changes
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 19 Jun 1999 02:03:38 -0400
 
-kdevelop (1:0.4-19990614-1) unstable; urgency=low
+tdevelop (1:0.4-19990614-1) unstable; urgency=low
 
   * Aiiiiiiiiiie!! Fixed the broken kderules file
 
  -- Bernd Gehrmann <bernd@physik.hu-berlin.de>  Mon, 14 Jun 1999 20:45:38 +0200
 
-kdevelop (1:0.4-19990613-1) unstable; urgency=low
+tdevelop (1:0.4-19990613-1) unstable; urgency=low
 
   * New upstream CVS version
   * New kderules script
@@ -1152,14 +1152,14 @@ kdevelop (1:0.4-19990613-1) unstable; urgency=low
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 13 Jun 1999 09:49:48 -0400
 
-kdevelop (990531-1) experimental; urgency=low
+tdevelop (990531-1) experimental; urgency=low
 
   * Use DESTDIR mechanism instead of --with-install-root
   * Do not install subdirectories of doc-base
 
  -- Bernd Gehrmann <bernd@physik.hu-berlin.de>  Mon, 31 May 1999 21:49:48 +0200
 
-kdevelop (990422-1) experimental; urgency=low
+tdevelop (990422-1) experimental; urgency=low
 
   * Initial Release 
 
diff --git a/ubuntu/maverick/tdevelop/debian/control b/ubuntu/maverick/tdevelop/debian/control
index a5a40986f..d7597762b 100644
--- a/ubuntu/maverick/tdevelop/debian/control
+++ b/ubuntu/maverick/tdevelop/debian/control
@@ -1,18 +1,18 @@
-Source: kdevelop-trinity
+Source: tdevelop-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), tdelibs4-trinity-dev (>= 4:3.5.10), gettext, tdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: kdevelop-trinity
+Package: tdevelop-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, kdevelop-data-trinity (>= ${source:Version}), kdebase-trinity-bin
-Replaces: kdevelop-kde3 (<< 4:3.5.13)
-Breaks: kdevelop-kde3 (<< 4:3.5.13)
-Recommends: kdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, kdelibs4-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, kdesdk-scripts-trinity, graphviz, kdebase-kio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, kdelibs4-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
+Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebase-trinity-bin
+Replaces: tdevelop-kde3 (<< 4:3.5.13)
+Breaks: tdevelop-kde3 (<< 4:3.5.13)
+Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
+Suggests: libtqtinterface-dev, tdelibs4-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-kio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs4-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
 Description: An IDE for Unix/X11
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 
@@ -22,13 +22,13 @@ Description: An IDE for Unix/X11
  The application wizard can generate fully functional projects
  for terminal programs and GUI programs using Qt, KDE or GNOME.
  .
-  Homepage: http://www.kdevelop.org/
+  Homepage: http://www.tdevelop.org/
 
-Package: kdevelop-trinity-doc
+Package: tdevelop-trinity-doc
 Section: doc
 Architecture: all
-Replaces: kdevelop-kde3-doc (<< 4:3.5.13)
-Breaks: kdevelop-kde3-doc (<< 4:3.5.13)
+Replaces: tdevelop-kde3-doc (<< 4:3.5.13)
+Breaks: tdevelop-kde3-doc (<< 4:3.5.13)
 Description: An IDE for Unix/X11 - documentation
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 
@@ -40,12 +40,12 @@ Description: An IDE for Unix/X11 - documentation
  .
  This package contains documentation for KDevelop.
  .
-  Homepage: http://www.kdevelop.org/
+  Homepage: http://www.tdevelop.org/
 
-Package: kdevelop-data-trinity
+Package: tdevelop-data-trinity
 Architecture: all
-Replaces: kdevelop-data-kde3 (<< 4:3.5.13)
-Breaks: kdevelop-data-kde3 (<< 4:3.5.13)
+Replaces: tdevelop-data-kde3 (<< 4:3.5.13)
+Breaks: tdevelop-data-kde3 (<< 4:3.5.13)
 Description: An IDE for Unix/X11 - data
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 
@@ -57,13 +57,13 @@ Description: An IDE for Unix/X11 - data
  .
  This package contains arch independent data for KDevelop.
  .
-  Homepage: http://www.kdevelop.org/
+  Homepage: http://www.tdevelop.org/
 
-Package: kdevelop-trinity-dev
+Package: tdevelop-trinity-dev
 Architecture: any
-Depends: kdevelop-trinity (= ${binary:Version}), kdelibs4-trinity-dev
-Replaces: kdevelop-kde3-dev (<< 4:3.5.13)
-Breaks: kdevelop-kde3-dev (<< 4:3.5.13)
+Depends: tdevelop-trinity (= ${binary:Version}), tdelibs4-trinity-dev
+Replaces: tdevelop-kde3-dev (<< 4:3.5.13)
+Breaks: tdevelop-kde3-dev (<< 4:3.5.13)
 Description: An IDE for Unix/X11 - development files
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 
@@ -75,5 +75,5 @@ Description: An IDE for Unix/X11 - development files
  .
  This package contains development files for KDevelop.
  .
-  Homepage: http://www.kdevelop.org/
+  Homepage: http://www.tdevelop.org/
 
diff --git a/ubuntu/maverick/tdevelop/debian/copyright b/ubuntu/maverick/tdevelop/debian/copyright
index d967b6c07..04553bfac 100644
--- a/ubuntu/maverick/tdevelop/debian/copyright
+++ b/ubuntu/maverick/tdevelop/debian/copyright
@@ -4,21 +4,21 @@ Norman Jordan <njordan@debian.org>.
 
 The current Debian maintainer is Jeremy Lainé <jeremy.laine@m4x.org>.
 
-It was downloaded from http://www.kdevelop.org/
+It was downloaded from http://www.tdevelop.org/
 
 Upstream Authors:
 
   Bernd Gehrmann <bernd@physik.hu-berlin.de>
-  John Birch <jbb@kdevelop.org>
+  John Birch <jbb@tdevelop.org>
   Jonas Nordin <jonas.nordin@cenacle.se>
   Richard Dale <Richard_Dale@tipitina.demon.co.uk>
-  Sandy Meier <smeier@kdevelop.org>
+  Sandy Meier <smeier@tdevelop.org>
   Matthias Hoelzer-Kluepfel <hoelzer@kde.org>
   Victor Roeder <victor_roeder@gmx.de>
   Kurth Granroth <kurt@granroth.org>
   The KWrite authors <kwrite-devel@kde.org>
-  Roberto Raggi <roberto@kdevelop.org>
-  Harald Fernengel <harry@kdevelop.org>
+  Roberto Raggi <roberto@tdevelop.org>
+  Harald Fernengel <harry@tdevelop.org>
   Simon Hausmann <hausmann@kde.org>
   Mickael Marchand <marchand@kde.org>
   Dominic Seichter <domseichter@t-online.de>
diff --git a/ubuntu/maverick/tdevelop/debian/kdevelop-data-trinity.lintian b/ubuntu/maverick/tdevelop/debian/kdevelop-data-trinity.lintian
deleted file mode 100644
index 7fae2cfa6..000000000
--- a/ubuntu/maverick/tdevelop/debian/kdevelop-data-trinity.lintian
+++ /dev/null
@@ -1,11 +0,0 @@
-# These files are provided to create new applications.
-kdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING
-kdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING.LIB
-kdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.QPL
-kdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.BSD
-# This file is a template, not a script.
-kdevelop-data: script-not-executable ./usr/share/apps/kdevfilecreate/file-templates/pl
-# This file is used internally by kio_pydoc.la and invoked explicitly with python.
-kdevelop-data: script-not-executable ./usr/share/apps/kio_pydoc/kde_pydoc.py
-# This file is used internally by libkdevcvsservice.la and invoked explicitly with sh.
-kdevelop-data: script-not-executable ./usr/share/apps/kdevcvsservice/buildcvs.sh
diff --git a/ubuntu/maverick/tdevelop/debian/man/kdeopt.part b/ubuntu/maverick/tdevelop/debian/man/kdeopt.part
index d258f0ad1..e8fd346a6 100644
--- a/ubuntu/maverick/tdevelop/debian/man/kdeopt.part
+++ b/ubuntu/maverick/tdevelop/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/tdevelop/debian/man/kdevprj2kdevelop.man b/ubuntu/maverick/tdevelop/debian/man/kdevprj2tdevelop.man
index 1a499963d..c1f90ec97 100644
--- a/ubuntu/maverick/tdevelop/debian/man/kdevprj2kdevelop.man
+++ b/ubuntu/maverick/tdevelop/debian/man/kdevprj2tdevelop.man
@@ -1,13 +1,13 @@
 .TH KDEVPRJ2KDEVELOP 1
 .SH NAME
-kdevprj2kdevelop \- KDevelop 2.x project converter
+kdevprj2tdevelop \- KDevelop 2.x project converter
 .SH SYNOPSIS
-.B kdevprj2kdevelop
+.B kdevprj2tdevelop
 .I file
 .SH DESCRIPTION
-.B kdevprj2kdevelop
+.B kdevprj2tdevelop
 is a tool for converting KDevelop 2.x projects (*.kdevprj) to the
-format used by KDevelop 3.x (*.kdevelop).
+format used by KDevelop 3.x (*.tdevelop).
 .SH PROGRAM OPTIONS
 .TP
 .B file
diff --git a/ubuntu/maverick/tdevelop/debian/man/kdevelop-htdig.man b/ubuntu/maverick/tdevelop/debian/man/tdevelop-htdig.man
index b917bdcdf..f05491dd8 100644
--- a/ubuntu/maverick/tdevelop/debian/man/kdevelop-htdig.man
+++ b/ubuntu/maverick/tdevelop/debian/man/tdevelop-htdig.man
@@ -1,11 +1,11 @@
 .TH KDEVELOP-HTDIG 1
 .SH NAME
-kdevelop-htdig \- KDevelop index generator for documentation files
+tdevelop-htdig \- KDevelop index generator for documentation files
 .SH SYNOPSIS
-.B kdevelop-htdig
+.B tdevelop-htdig
 .I [Qt-options] [KDE-options] [options]
 .SH DESCRIPTION
-.B kdevelop-htdig
+.B tdevelop-htdig
 is an index generator for documentation files which is used by the 
 KDevelop integrated development environment.
 .SH PROGRAM OPTIONS
diff --git a/ubuntu/maverick/tdevelop/debian/man/kdevelop.man b/ubuntu/maverick/tdevelop/debian/man/tdevelop.man
index dc54b591c..8da6fd6b3 100644
--- a/ubuntu/maverick/tdevelop/debian/man/kdevelop.man
+++ b/ubuntu/maverick/tdevelop/debian/man/tdevelop.man
@@ -1,8 +1,8 @@
 .TH KDEVELOP 1
 .SH NAME
-kdevelop \- Integrated Development Environment for KDE
+tdevelop \- Integrated Development Environment for KDE
 .SH SYNOPSIS
-.B kdevelop
+.B tdevelop
 .I [Qt-options] [KDE-options] [options] file(s)
 .SH DESCRIPTION
 .B KDevelop
@@ -17,6 +17,6 @@ Files to load.
 .so kdeopt.part
 .SH SEE ALSO
 More detailed user documentation is available from
-.BR help:/kdevelop
+.BR help:/tdevelop
 (either enter this URL into \fBkonqueror\fP, or run `khelpcenter
-help:/kdevelop').
+help:/tdevelop').
diff --git a/ubuntu/maverick/tdevelop/debian/rules b/ubuntu/maverick/tdevelop/debian/rules
index 9c61d0589..f5bce32b3 100755
--- a/ubuntu/maverick/tdevelop/debian/rules
+++ b/ubuntu/maverick/tdevelop/debian/rules
@@ -16,10 +16,10 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
 
 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
-PACKAGES_WITH_LIBS := kdevelop-trinity
+PACKAGES_WITH_LIBS := tdevelop-trinity
 
 DEB_KDE_ENABLE_FINAL :=
-DEB_INSTALL_DOCS_kdevelop = AUTHORS
+DEB_INSTALL_DOCS_tdevelop = AUTHORS
 DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp
 DEB_CONFIGURE_EXTRA_FLAGS := \
 				--disable-debug \
@@ -47,13 +47,13 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
 				--enable-vba \
 				--enable-subversion \
 				--with-pic \
-				--with-kdelibsdoxy-dir=/opt/trinity/share/doc/kde/HTML/en/kdelibs-apidocs \
+				--with-tdelibsdoxy-dir=/opt/trinity/share/doc/kde/HTML/en/tdelibs-apidocs \
 				--with-pythondir=/usr \
 				--with-qtdoc-dir=/usr/share/qt3/doc/html \
 				--prefix=/opt/trinity \
 				--with-extra-libs=/opt/trinity/lib
 
-binary-install/kdevelop-trinity::
-	mkdir -p debian/kdevelop-trinity/opt/trinity/share/pixmaps
-	cp debian/kdevelop.xpm debian/kdevelop-trinity/opt/trinity/share/pixmaps
+binary-install/tdevelop-trinity::
+	mkdir -p debian/tdevelop-trinity/opt/trinity/share/pixmaps
+	cp debian/tdevelop.xpm debian/tdevelop-trinity/opt/trinity/share/pixmaps
 
diff --git a/ubuntu/maverick/tdevelop/debian/source.lintian-overrides b/ubuntu/maverick/tdevelop/debian/source.lintian-overrides
index f74fddc6e..4aed86542 100644
--- a/ubuntu/maverick/tdevelop/debian/source.lintian-overrides
+++ b/ubuntu/maverick/tdevelop/debian/source.lintian-overrides
@@ -1,3 +1,3 @@
 # These files are updated at build time by CDBS.
-kdevelop source: outdated-autotools-helper-file parts/appwizard/common/incadmin/config.guess 2002-10-21
-kdevelop source: outdated-autotools-helper-file parts/appwizard/common/incadmin/config.sub 2002-09-05
+tdevelop source: outdated-autotools-helper-file parts/appwizard/common/incadmin/config.guess 2002-10-21
+tdevelop source: outdated-autotools-helper-file parts/appwizard/common/incadmin/config.sub 2002-09-05
diff --git a/ubuntu/maverick/tdevelop/debian/kdevelop-data-trinity.install b/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.install
index 70e2f0ebc..70e2f0ebc 100644
--- a/ubuntu/maverick/tdevelop/debian/kdevelop-data-trinity.install
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.install
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian b/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian
new file mode 100644
index 000000000..876c972e5
--- /dev/null
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian
@@ -0,0 +1,11 @@
+# These files are provided to create new applications.
+tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING
+tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING.LIB
+tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.QPL
+tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.BSD
+# This file is a template, not a script.
+tdevelop-data: script-not-executable ./usr/share/apps/kdevfilecreate/file-templates/pl
+# This file is used internally by kio_pydoc.la and invoked explicitly with python.
+tdevelop-data: script-not-executable ./usr/share/apps/kio_pydoc/kde_pydoc.py
+# This file is used internally by libkdevcvsservice.la and invoked explicitly with sh.
+tdevelop-data: script-not-executable ./usr/share/apps/kdevcvsservice/buildcvs.sh
diff --git a/ubuntu/maverick/tdevelop/debian/kdevelop-trinity-dev.install b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-dev.install
index 5c24ba5bb..5c24ba5bb 100644
--- a/ubuntu/maverick/tdevelop/debian/kdevelop-trinity-dev.install
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-dev.install
diff --git a/ubuntu/maverick/tdevelop/debian/kdevelop-trinity-doc.install b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install
index e14858a44..0f80b5149 100644
--- a/ubuntu/maverick/tdevelop/debian/kdevelop-trinity-doc.install
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install
@@ -1,5 +1,5 @@
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdevelop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdevelop-apidocs/common
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdevelop
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdevelop-apidocs/common
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kde_app_devel/appwizard.png
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kde_app_devel/index.docbook
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kde_app_devel/kscribblefiles.png
diff --git a/ubuntu/maverick/tdevelop/debian/kdevelop-trinity.install b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install
index 0c92940b2..95659c5bc 100644
--- a/ubuntu/maverick/tdevelop/debian/kdevelop-trinity.install
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install
@@ -1,11 +1,11 @@
 debian/tmp/etc/trinity/kdevassistantrc
-debian/tmp/etc/trinity/kdeveloprc
-debian/tmp/opt/trinity/bin/kdevelop-htdig
+debian/tmp/etc/trinity/tdeveloprc
+debian/tmp/opt/trinity/bin/tdevelop-htdig
 debian/tmp/opt/trinity/bin/kdevdesigner
 debian/tmp/opt/trinity/bin/kdevprofileeditor
 debian/tmp/opt/trinity/bin/kdevassistant
-debian/tmp/opt/trinity/bin/kdevprj2kdevelop
-debian/tmp/opt/trinity/bin/kdevelop
+debian/tmp/opt/trinity/bin/kdevprj2tdevelop
+debian/tmp/opt/trinity/bin/tdevelop
 debian/tmp/opt/trinity/lib/kconf_update_bin/kdev-gen-settings-kconf_update
 debian/tmp/opt/trinity/share/services
 debian/tmp/opt/trinity/share/servicetypes
diff --git a/ubuntu/maverick/tdevelop/debian/kdevelop-trinity.manpages b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages
index b5d676453..1e10ab62e 100644
--- a/ubuntu/maverick/tdevelop/debian/kdevelop-trinity.manpages
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages
@@ -1,6 +1,6 @@
-debian/man/out/kdevelop.1
+debian/man/out/tdevelop.1
 debian/man/out/kdevdesigner.1
 debian/man/out/kdevassistant.1
-debian/man/out/kdevprj2kdevelop.1
+debian/man/out/kdevprj2tdevelop.1
 debian/man/out/kdevprofileeditor.1
-debian/man/out/kdevelop-htdig.1
+debian/man/out/tdevelop-htdig.1
diff --git a/ubuntu/maverick/tdevelop/debian/kdevelop-trinity.menu b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.menu
index 7f40efdc4..3734293c3 100644
--- a/ubuntu/maverick/tdevelop/debian/kdevelop-trinity.menu
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.menu
@@ -1,8 +1,8 @@
-?package(kdevelop):\
+?package(tdevelop):\
         needs="X11"\
         section="Applications/Programming"\
         hints="KDE,Development"\
         title="KDevelop"\
         longtitle="KDevelop (Development Environment)"\
-        icon="/usr/share/pixmaps/kdevelop.xpm"\
-        command="/opt/trinity/bin/kdevelop"
+        icon="/usr/share/pixmaps/tdevelop.xpm"\
+        command="/opt/trinity/bin/tdevelop"
diff --git a/ubuntu/maverick/tdevelop/debian/kdevelop.xpm b/ubuntu/maverick/tdevelop/debian/tdevelop.xpm
index 348a95692..ae07ff13a 100644
--- a/ubuntu/maverick/tdevelop/debian/kdevelop.xpm
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kdevelop[] = {
+static char *tdevelop[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 257 2",
 "   c #000000",
diff --git a/ubuntu/maverick/tdevelop/debian/watch b/ubuntu/maverick/tdevelop/debian/watch
index bbf94d39c..18344a41a 100644
--- a/ubuntu/maverick/tdevelop/debian/watch
+++ b/ubuntu/maverick/tdevelop/debian/watch
@@ -1,2 +1,2 @@
 version=3
-ftp://ftp.kde.org/pub/kde/stable/latest/src/kdevelop-(.*)\.tar\.bz2
+ftp://ftp.kde.org/pub/kde/stable/latest/src/tdevelop-(.*)\.tar\.bz2
diff --git a/ubuntu/maverick/tdewebdev/debian/changelog b/ubuntu/maverick/tdewebdev/debian/changelog
index 67562c948..58f475bcf 100644
--- a/ubuntu/maverick/tdewebdev/debian/changelog
+++ b/ubuntu/maverick/tdewebdev/debian/changelog
@@ -1,42 +1,42 @@
-kdewebdev-trinity (4:3.5.10-0ubuntu5) karmic; urgency=low
+tdewebdev-trinity (4:3.5.10-0ubuntu5) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdewebdev-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
+tdewebdev-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 20:08:00 -0600
 
-kdewebdev-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
+tdewebdev-trinity (4:3.5.10-0ubuntu1~intrepid1) intrepid; urgency=low
 
   * SVN Import
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 30 Nov 2008 23:48:00 -0600
 
-kdewebdev (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdewebdev (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
-    - Bump build-dep version on kdelibs4-dev and libcvsservice-dev to 3.5.10
+    - Bump build-dep version on tdelibs4-dev and libcvsservice-dev to 3.5.10
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:55:17 -0400
 
-kdewebdev (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdewebdev (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:08 +0000
 
-kdewebdev (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdewebdev (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 11:16:45 +0000
 
-kdewebdev (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdewebdev (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining change,
    - Use -fpermissive when building with g++-4.3 (duplicate #define in
@@ -44,7 +44,7 @@ kdewebdev (4:3.5.8-1ubuntu1) hardy; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:49 +0000
 
-kdewebdev (4:3.5.8-1) unstable; urgency=low
+tdewebdev (4:3.5.8-1) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
@@ -59,7 +59,7 @@ kdewebdev (4:3.5.8-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 15 Oct 2007 17:02:52 +0200
 
-kdewebdev (4:3.5.7-2) unstable; urgency=low
+tdewebdev (4:3.5.7-2) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
   
@@ -73,60 +73,60 @@ kdewebdev (4:3.5.7-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 24 Jul 2007 00:46:49 +0200
 
-kdewebdev (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdewebdev (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:28 +0100
 
-kdewebdev (4:3.5.7-1ubuntu2) gutsy; urgency=low
+tdewebdev (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
   * Use -fpermissive when building with g++-4.3 (duplicate #define in
     libxslt1-dev header). LP: #138601.
 
  -- Matthias Klose <doko@ubuntu.com>  Thu, 13 Sep 2007 01:28:09 +0000
 
-kdewebdev (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdewebdev (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * Merge with Debian for new upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 24 May 2007 22:07:41 +0100
 
-kdewebdev (4:3.5.7-1) unstable; urgency=low
+tdewebdev (4:3.5.7-1) unstable; urgency=low
 
   * New upstream release.  
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 16 May 2007 16:19:30 +0100
 
-kdewebdev (4:3.5.6-2ubuntu1) gutsy; urgency=low
+tdewebdev (4:3.5.6-2ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 20:32:57 +0100
 
-kdewebdev (4:3.5.6-1) experimental; urgency=low
+tdewebdev (4:3.5.6-1) experimental; urgency=low
 
   * New upstream release.  
-  * Make kdewebdev-dbg depend on kdelibs-dbg to get useful backtraces when
+  * Make tdewebdev-dbg depend on tdelibs-dbg to get useful backtraces when
     debugging.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 19 Jan 2007 02:14:45 +0100
 
-kdewebdev (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdewebdev (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
   * Remove kubuntu_01_kimagemapeditor_crash.diff, applied upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:31 +0000
 
-kdewebdev (4:3.5.5-1ubuntu1) feisty; urgency=low
+tdewebdev (4:3.5.5-1ubuntu1) feisty; urgency=low
 
   * Merge with Debian
   * Build with --enable-gcc-hidden-visibility
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 22:52:45 +0000
 
-kdewebdev (4:3.5.5-1) unstable; urgency=medium
+tdewebdev (4:3.5.5-1) unstable; urgency=medium
 
   * New upstream release.
     + Add some more special characters to the list. (Closes: #342705)
@@ -143,7 +143,7 @@ kdewebdev (4:3.5.5-1) unstable; urgency=medium
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 10 Oct 2006 18:01:00 -0400
 
-kdewebdev (4:3.5.4-1) unstable; urgency=low
+tdewebdev (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
     + Fixes quanta "Quick Start" producing invalid xhtml/javascript code.
@@ -160,40 +160,40 @@ kdewebdev (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 26 Aug 2006 14:11:51 -0400
 
-kdewebdev (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdewebdev (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:07 +0000
 
-kdewebdev (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdewebdev (4:3.5.4-0ubuntu2) 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:12 +0000
 
-kdewebdev (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdewebdev (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:20 +0000
 
-kdewebdev (4:3.5.3-0ubuntu1) edgy; urgency=low
+tdewebdev (4:3.5.3-0ubuntu1) edgy; urgency=low
 
   * New upstream release
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  7 Jul 2006 09:44:31 +0000
 
-kdewebdev (4:3.5.2-2) unstable; urgency=low
+tdewebdev (4:3.5.2-2) unstable; urgency=low
 
-  * Make kdewebdev binNMUable again. This rebuild also removes all references
+  * Make tdewebdev binNMUable again. This rebuild also removes all references
     to libXrender.la. (Closes: #365699)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon,  8 May 2006 10:52:38 -0400
 
-kdewebdev (4:3.5.2-1) unstable; urgency=low
+tdewebdev (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
     + Fixes crashes when typing source code. (Closes: #357396)
@@ -202,7 +202,7 @@ kdewebdev (4:3.5.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 30 Mar 2006 09:15:22 -0500
 
-kdewebdev (4:3.5.1-1) unstable; urgency=low
+tdewebdev (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -212,7 +212,7 @@ kdewebdev (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  2 Feb 2006 11:09:11 -0500
 
-kdewebdev (4:3.5.0-3) unstable; urgency=low
+tdewebdev (4:3.5.0-3) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -222,7 +222,7 @@ kdewebdev (4:3.5.0-3) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 12 Jan 2006 21:59:40 -0500
 
-kdewebdev (4:3.5.0-2) experimental; urgency=low
+tdewebdev (4:3.5.0-2) experimental; urgency=low
 
   * Upload to experimental.
 
@@ -235,83 +235,83 @@ kdewebdev (4:3.5.0-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 21 Dec 2005 09:49:53 -0500
 
-kdewebdev (4:3.5.2-0ubuntu5) dapper; urgency=low
+tdewebdev (4:3.5.2-0ubuntu5) dapper; urgency=low
 
   * debian/cdbs/kde.mk:
     - added dh_iconcache.
 
  -- Daniel Holbach <daniel.holbach@ubuntu.com>  Sun, 21 May 2006 16:42:57 +0200
 
-kdewebdev (4:3.5.2-0ubuntu4) dapper; urgency=low
+tdewebdev (4:3.5.2-0ubuntu4) dapper; urgency=low
 
   * Use correct version of kubuntu_01_kdepot.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 23 Apr 2006 19:31:20 +0100
 
-kdewebdev (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdewebdev (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Edit debian/cdbs/kde.mk to mark .po files as UTF-8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Apr 2006 19:14:32 +0100
 
-kdewebdev (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdewebdev (4:3.5.2-0ubuntu2) dapper; urgency=low
 
   * Add kubuntu_01_kimagemapeditor_crash.diff
     Fix Malone No 36460
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 30 Mar 2006 20:21:01 +0100
 
-kdewebdev (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdewebdev (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:32 +0000
 
-kdewebdev (4:3.5.1-0ubuntu2) dapper; urgency=low
+tdewebdev (4:3.5.1-0ubuntu2) dapper; urgency=low
 
   * Don't use GCC 3.4 on hppa
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Feb 2006 12:03:45 +0000
 
-kdewebdev (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdewebdev (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 23:06:11 +0000
 
-kdewebdev (4:3.5.0-1ubuntu1) dapper; urgency=low
+tdewebdev (4:3.5.0-1ubuntu1) dapper; urgency=low
 
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  9 Dec 2005 23:08:32 +0000
 
-kdewebdev (4:3.5.0-1) alioth; urgency=low
+tdewebdev (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
 
   * Bump DH_COMPAT to 5. No changes.
 
-  * Add kdewebdev-dbg, to help track down problems.
+  * Add tdewebdev-dbg, to help track down problems.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue,  6 Dec 2005 13:44:49 -0500
 
-kdewebdev (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdewebdev (4:3.5.0-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Remove gcc 3.4 for hppa
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Dec 2005 12:29:38 +0000
 
-kdewebdev (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdewebdev (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Sync with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 Nov 2005 23:09:10 +0000
 
-kdewebdev (4:3.4.3-2) unstable; urgency=low
+tdewebdev (4:3.4.3-2) unstable; urgency=low
 
-  * Upload to unstable, rebuilding against kdelibs4c2a.
+  * Upload to unstable, rebuilding against tdelibs4c2a.
 
   +++ Changes by Adeodato Simó:
 
@@ -319,18 +319,18 @@ kdewebdev (4:3.4.3-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon,  5 Dec 2005 09:28:57 -0500
 
-kdewebdev (4:3.4.3-1) experimental; urgency=low
+tdewebdev (4:3.4.3-1) experimental; urgency=low
 
   * New upstream release.
 
   +++ Changes by Christopher Martin:
 
-  * Build with g++-3.4 on arm, m68k and hppa, as kdewebdev fails with the same gcc
+  * Build with g++-3.4 on arm, m68k and hppa, as tdewebdev fails with the same gcc
     4.0 ICE as do most other KDE modules.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 17 Oct 2005 16:27:42 -0400
 
-kdewebdev (4:3.4.2-1) unstable; urgency=low
+tdewebdev (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -338,7 +338,7 @@ kdewebdev (4:3.4.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue,  6 Sep 2005 14:04:31 -0400
 
-kdewebdev (4:3.4.1-1) experimental; urgency=low
+tdewebdev (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.
 
@@ -347,7 +347,7 @@ kdewebdev (4:3.4.1-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  2 Jun 2005 13:45:58 -0400
 
-kdewebdev (4:3.4.0-0pre3) alioth; urgency=low
+tdewebdev (4:3.4.0-0pre3) alioth; urgency=low
 
   * New upstream release.
 
@@ -356,7 +356,7 @@ kdewebdev (4:3.4.0-0pre3) alioth; urgency=low
   +++ Changes by Pierre Habouzit:
 
   * Converted packaging to CDBS.
-  * [debian/control] kdewebdev is now handled by the debian-qt-kde team.
+  * [debian/control] tdewebdev is now handled by the debian-qt-kde team.
 
   +++ Changes by Isaac Clerencia:
 
@@ -364,7 +364,7 @@ kdewebdev (4:3.4.0-0pre3) alioth; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 19 Apr 2005 10:48:15 -0400
 
-kdewebdev (1:3.3.2-6) unstable; urgency=high
+tdewebdev (1:3.3.2-6) unstable; urgency=high
 
   * Security upload.
   * Fixed the patch for CAN-2005-0754.  The previous patch from 1:3.3.2-5 was
@@ -372,7 +372,7 @@ kdewebdev (1:3.3.2-6) unstable; urgency=high
 
  -- Ben Burton <bab@debian.org>  Thu,  5 May 2005 14:32:03 +1000
 
-kdewebdev (1:3.3.2-5) unstable; urgency=high
+tdewebdev (1:3.3.2-5) unstable; urgency=high
 
   * Security upload.
   * Fixed untrusted code execution in kommander (closes: #305833).
@@ -382,7 +382,7 @@ kdewebdev (1:3.3.2-5) unstable; urgency=high
 
  -- Ben Burton <bab@debian.org>  Mon, 25 Apr 2005 20:50:21 +1000
 
-kdewebdev (1:3.3.2-4) unstable; urgency=low
+tdewebdev (1:3.3.2-4) unstable; urgency=low
 
   * Included the full text of the GFDL in debian/copyright, which applies to
     the docbook documentation.
@@ -392,7 +392,7 @@ kdewebdev (1:3.3.2-4) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Fri, 25 Mar 2005 17:06:55 +1100
 
-kdewebdev (1:3.3.2-3) unstable; urgency=low
+tdewebdev (1:3.3.2-3) unstable; urgency=low
 
   * Updated from KDE_3_3_BRANCH.
   * Bugfixes from KDE_3_3_BRANCH include a fix for the broken detection
@@ -400,7 +400,7 @@ kdewebdev (1:3.3.2-3) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Thu, 10 Feb 2005 22:04:22 +1100
 
-kdewebdev (1:3.3.2-2) unstable; urgency=low
+tdewebdev (1:3.3.2-2) unstable; urgency=low
 
   * Removed empty lines from php.docrc, thereby fixing command-line
     warnings when starting quanta (closes: #278560).
@@ -409,14 +409,14 @@ kdewebdev (1:3.3.2-2) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun,  6 Feb 2005 17:51:59 +1100
 
-kdewebdev (1:3.3.2-1) unstable; urgency=low
+tdewebdev (1:3.3.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
   * Fixed typo in kommander package description.
 
  -- Ben Burton <bab@debian.org>  Sat, 22 Jan 2005 10:24:58 +1100
 
-kdewebdev (1:3.3.1-1) unstable; urgency=medium
+tdewebdev (1:3.3.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.
   * Build-conflicts with autoconf2.13, which does not play well with
@@ -427,12 +427,12 @@ kdewebdev (1:3.3.1-1) unstable; urgency=medium
 
  -- Ben Burton <bab@debian.org>  Wed, 10 Nov 2004 07:45:35 +1100
 
-kdewebdev (1:3.3.0-1) unstable; urgency=low
+tdewebdev (1:3.3.0-1) unstable; urgency=low
 
   * New upstream release.
-  * Source package has been renamed from quanta to kdewebdev.
+  * Source package has been renamed from quanta to tdewebdev.
   * New binary packages kimagemapeditor, klinkstatus, kommander-dev and
-    kdewebdev-doc-html.
+    tdewebdev-doc-html.
   * Patched so that kafkapart is no longer skipped under KDE 3.3, thus
     fixing a FTBFS on sid (closes: #261629, #269340, #272767).
   * Pumped up the dependencies for quanta, which with each new release makes
@@ -493,7 +493,7 @@ quanta (1:3.2.0-2) experimental; urgency=low
 
   * First KDE 3.2 upload to experimental.
   * Sync from KDE_3_2_BRANCH for recent bugfixes.
-  * Using versioned dependencies for the kdewebdev metapackage.
+  * Using versioned dependencies for the tdewebdev metapackage.
 
  -- Ben Burton <bab@debian.org>  Mon, 23 Feb 2004 08:14:22 +1100
 
@@ -664,7 +664,7 @@ quanta (1:2.0-pr2-5) unstable; urgency=low
 
 quanta (1:2.0-pr2-4) unstable; urgency=low
 
-  * Build-depends on a newer version of kdelibs (closes: Bug#104234).
+  * Build-depends on a newer version of tdelibs (closes: Bug#104234).
   * Builds on alpha.
   * Upped standards-version to 3.5.6.
 
@@ -711,7 +711,7 @@ quanta (1:2.0-pr1-3) unstable; urgency=low
 
 quanta (1:2.0-pr1-2) unstable; urgency=low
 
-  * Build-Depends: Replaced kdelibs3-dev with kdelibs-dev.
+  * Build-Depends: Replaced tdelibs3-dev with tdelibs-dev.
   * Corrected upstream author's email address (pdima@kde.org -> dima@kde.org).
 
  -- Ben Burton <benb@acm.org>  Thu, 22 Feb 2001 12:12:25 -0600
@@ -725,7 +725,7 @@ quanta (1:2.0-pr1-1) unstable; urgency=low
   * Upgraded debian/rules to DH_COMPAT=2.
   * Build-Depends: added uic.
   * Build-Depends: required version (>> 2.0.0) of debhelper.
-  * Build-Depends: replaced the required version of kdelibs3-dev with
+  * Build-Depends: replaced the required version of tdelibs3-dev with
     the version cited in the corresponding bugfix (#79410).
   * Commented out lintian overrides for deleted plugin libproject.so
     and added overrides for new plugin libftpclient.so.
@@ -766,7 +766,7 @@ quanta (2.0-beta3-2) unstable; urgency=low
   * Suggests: added wdg-html-reference.
   * Added css.docrc, html.docrc and php.docrc for indexing docs from
     phpdoc and wdg-html-reference.
-  * Build-Depends: provides required versions of kdelibs3-dev for 
+  * Build-Depends: provides required versions of tdelibs3-dev for 
     autobuilders (closes: #79410).
   * More cleanups in debian.
   * Upload sponsored by Bradley Bell <btb@debian.org>.
diff --git a/ubuntu/maverick/tdewebdev/debian/control b/ubuntu/maverick/tdewebdev/debian/control
index 40a7cdfdd..5dd974e56 100644
--- a/ubuntu/maverick/tdewebdev/debian/control
+++ b/ubuntu/maverick/tdewebdev/debian/control
@@ -1,20 +1,20 @@
-Source: kdewebdev-trinity
+Source: tdewebdev-trinity
 Section: web
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Armin Berres <trigger+debian@space-based.de>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://trinity.pearsoncomputing.net
 
-Package: kdewebdev-trinity
+Package: tdewebdev-trinity
 Architecture: all
 Section: kde
-Replaces: kdewebdev-kde3 (<< 4:3.5.13)
-Breaks: kdewebdev-kde3 (<< 4:3.5.13)
+Replaces: tdewebdev-kde3 (<< 4:3.5.13)
+Breaks: tdewebdev-kde3 (<< 4:3.5.13)
 Depends: quanta-trinity (>= ${source:Version}), kfilereplace-trinity (>= ${source:Version}), kimagemapeditor-trinity (>= ${source:Version}), klinkstatus-trinity (>= ${source:Version}), kommander-trinity (>= ${source:Version}), kxsldbg-trinity (>= ${source:Version})
-Suggests: kommander-trinity-dev (>= ${source:Version}), kdewebdev-trinity-doc-html (>= ${source:Version})
+Suggests: kommander-trinity-dev (>= ${source:Version}), tdewebdev-trinity-doc-html (>= ${source:Version})
 Description: web development apps from the official KDE release [Trinity]
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -24,12 +24,12 @@ Description: web development apps from the official KDE release [Trinity]
  This metapackage includes a collection of web development applications
  provided with the official release of KDE.
 
-Package: kdewebdev-trinity-doc-html
+Package: tdewebdev-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: kdewebdev-kde3-doc-html (<< 4:3.5.13)
-Breaks: kdewebdev-kde3-doc-html (<< 4:3.5.13)
-Suggests: konqueror-trinity | www-browser, kdewebdev-trinity
+Replaces: tdewebdev-kde3-doc-html (<< 4:3.5.13)
+Breaks: tdewebdev-kde3-doc-html (<< 4:3.5.13)
+Suggests: konqueror-trinity | www-browser, tdewebdev-trinity
 Description: KDE web development documentation in HTML format [Trinity]
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
@@ -42,7 +42,7 @@ Description: KDE web development documentation in HTML format [Trinity]
  KDE web development packages.
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'kdewebdev-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: quanta-trinity
 Architecture: any
@@ -67,7 +67,7 @@ Description: web development environment for KDE [Trinity]
  version to produce a commercial product.
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'kdewebdev-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: quanta-data-trinity
 Architecture: all
@@ -83,7 +83,7 @@ Description: data files for Quanta Plus web development environment [Trinity]
  See the quanta package for further information.
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'kdewebdev-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: kfilereplace-trinity
 Architecture: any
@@ -102,7 +102,7 @@ Description: batch search-and-replace component for KDE [Trinity]
  component is Quanta Plus (found in the package quanta).
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'kdewebdev-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: kimagemapeditor-trinity
 Architecture: any
@@ -117,7 +117,7 @@ Description: HTML image map editor for KDE [Trinity]
  makes itself available as a KPart for embedding into larger applications.
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'kdewebdev-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: klinkstatus-trinity
 Architecture: any
@@ -135,7 +135,7 @@ Description: web link validity checker for KDE [Trinity]
  KIO protocols. For performance, links can be checked simultaneously.
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'kdewebdev-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: kommander-trinity
 Architecture: any
@@ -164,14 +164,14 @@ Description: visual dialog builder and executor tool [Trinity]
  mainwindow applications.
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'kdewebdev-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: kommander-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: kommander-kde3-dev (<< 4:3.5.13)
 Breaks: kommander-kde3-dev (<< 4:3.5.13)
-Depends: kommander-trinity (= ${binary:Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: kommander-trinity (= ${binary:Version}), tdelibs4-dev (>= 4:3.5.8)
 Description: development files for Kommander [Trinity]
  This package contains the headers and other development files for
  building plugins or otherwise extending Kommander.
@@ -183,7 +183,7 @@ Description: development files for Kommander [Trinity]
  See the kommander package for further information.
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'kdewebdev-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: kxsldbg-trinity
 Architecture: any
@@ -202,16 +202,16 @@ Description: graphical XSLT debugger for KDE [Trinity]
  using standard XSLT stylesheets.
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'kdewebdev-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
 
-Package: kdewebdev-trinity-dbg
+Package: tdewebdev-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: kdewebdev-kde3-dbg (<< 4:3.5.13)
-Breaks: kdewebdev-kde3-dbg (<< 4:3.5.13)
-Depends: kdelibs-trinity-dbg
+Replaces: tdewebdev-kde3-dbg (<< 4:3.5.13)
+Breaks: tdewebdev-kde3-dbg (<< 4:3.5.13)
+Depends: tdelibs-trinity-dbg
 Priority: extra
-Description: debugging symbols for kdewebdev [Trinity]
- This package contains the debugging symbols associated with kdewebdev.
- They will automatically be used by gdb for debugging kdewebdev-related
+Description: debugging symbols for tdewebdev [Trinity]
+ This package contains the debugging symbols associated with tdewebdev.
+ They will automatically be used by gdb for debugging tdewebdev-related
  issues.
diff --git a/ubuntu/maverick/tdewebdev/debian/control.in b/ubuntu/maverick/tdewebdev/debian/control.in
index 8c86fd3cf..91b26e274 100644
--- a/ubuntu/maverick/tdewebdev/debian/control.in
+++ b/ubuntu/maverick/tdewebdev/debian/control.in
@@ -1,17 +1,17 @@
-Source: kdewebdev
+Source: tdewebdev
 Section: web
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), libcvsservice-dev (>= 4:3.5.8), libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libcvsservice-dev (>= 4:3.5.8), libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
 Standards-Version: 3.7.2
 
-Package: kdewebdev
+Package: tdewebdev
 Architecture: all
 Section: kde
 Depends: quanta (>= ${Source-Version}), kfilereplace (>= ${Source-Version}), kimagemapeditor (>= ${Source-Version}), klinkstatus (>= ${Source-Version}), kommander (>= ${Source-Version}), kxsldbg (>= ${Source-Version})
-Suggests: kommander-dev (>= ${Source-Version}), kdewebdev-doc-html (>= ${Source-Version})
+Suggests: kommander-dev (>= ${Source-Version}), tdewebdev-doc-html (>= ${Source-Version})
 Description: web development apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -21,10 +21,10 @@ Description: web development apps from the official KDE release
  This metapackage includes a collection of web development applications
  provided with the official release of KDE.
 
-Package: kdewebdev-doc-html
+Package: tdewebdev-doc-html
 Architecture: all
 Section: doc
-Suggests: konqueror | www-browser, kdewebdev
+Suggests: konqueror | www-browser, tdewebdev
 Replaces: kxsldbg (<< 1:3.3.0), quanta (<< 1:3.3.0)
 Description: KDE web development documentation in HTML format
  By default the modules provided by KDE only provide their documentation
@@ -38,7 +38,7 @@ Description: KDE web development documentation in HTML format
  KDE web development packages.
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'kdewebdev' packages for more information.
+ See the 'kde' and 'tdewebdev' packages for more information.
 
 Package: quanta
 Architecture: any
@@ -61,7 +61,7 @@ Description: web development environment for KDE
  version to produce a commercial product.
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'kdewebdev' packages for more information.
+ See the 'kde' and 'tdewebdev' packages for more information.
  .
  Homepage: http://quanta.sourceforge.net
 
@@ -78,7 +78,7 @@ Description: data files for Quanta Plus web development environment
  See the quanta package for further information.
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'kdewebdev' packages for more information.
+ See the 'kde' and 'tdewebdev' packages for more information.
 
 Package: kfilereplace
 Architecture: any
@@ -95,7 +95,7 @@ Description: batch search-and-replace component for KDE
  component is Quanta Plus (found in the package quanta).
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'kdewebdev' packages for more information.
+ See the 'kde' and 'tdewebdev' packages for more information.
 
 Package: kimagemapeditor
 Architecture: any
@@ -108,7 +108,7 @@ Description: HTML image map editor for KDE
  makes itself available as a KPart for embedding into larger applications.
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'kdewebdev' packages for more information.
+ See the 'kde' and 'tdewebdev' packages for more information.
 
 Package: klinkstatus
 Architecture: any
@@ -124,7 +124,7 @@ Description: web link validity checker for KDE
  KIO protocols. For performance, links can be checked simultaneously.
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'kdewebdev' packages for more information.
+ See the 'kde' and 'tdewebdev' packages for more information.
 
 Package: kommander
 Architecture: any
@@ -152,12 +152,12 @@ Description: visual dialog builder and executor tool
  mainwindow applications.
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'kdewebdev' packages for more information.
+ See the 'kde' and 'tdewebdev' packages for more information.
 
 Package: kommander-dev
 Architecture: any
 Section: libdevel
-Depends: kommander (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: kommander (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
 Replaces: kommander (<< 1:3.3.0)
 Description: development files for Kommander
  This package contains the headers and other development files for
@@ -170,7 +170,7 @@ Description: development files for Kommander
  See the kommander package for further information.
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'kdewebdev' packages for more information.
+ See the 'kde' and 'tdewebdev' packages for more information.
 
 Package: kxsldbg
 Architecture: any
@@ -188,14 +188,14 @@ Description: graphical XSLT debugger for KDE
  using standard XSLT stylesheets.
  .
  This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'kdewebdev' packages for more information.
+ See the 'kde' and 'tdewebdev' packages for more information.
 
-Package: kdewebdev-dbg
+Package: tdewebdev-dbg
 Section: libdevel
 Architecture: any
-Depends: kdelibs-dbg
+Depends: tdelibs-dbg
 Priority: extra
-Description: debugging symbols for kdewebdev
- This package contains the debugging symbols associated with kdewebdev.
- They will automatically be used by gdb for debugging kdewebdev-related
+Description: debugging symbols for tdewebdev
+ This package contains the debugging symbols associated with tdewebdev.
+ They will automatically be used by gdb for debugging tdewebdev-related
  issues.
diff --git a/ubuntu/maverick/tdewebdev/debian/copyright b/ubuntu/maverick/tdewebdev/debian/copyright
index f0f4e2f07..8ae0e05d3 100644
--- a/ubuntu/maverick/tdewebdev/debian/copyright
+++ b/ubuntu/maverick/tdewebdev/debian/copyright
@@ -15,9 +15,9 @@ Upstream Authors:
   KFileReplace: François Dupoux <fdupoux@dupoux.com> and
       Andras Mantia <amantia@kde.org>
   KImageMapEditor: Jan Schäfer <janschaefer@users.sourceforge.net>
-  KLinkStatus: Paulo Moura Guedes <moura@kdewebdev.org>
+  KLinkStatus: Paulo Moura Guedes <moura@tdewebdev.org>
   Kommander: Marc Britton <consume@optusnet.com.au>,
-      Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@kdewebdev.org>,
+      Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>,
       Andras Mantia <amantia@kde.org> and Trolltech
   KXSLDbg: Keith Isdale <k_isdale@tpg.com.au>
 
diff --git a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.README.Debian b/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.README.Debian
index e1c211379..0a62677c5 100644
--- a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.README.Debian
+++ b/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.README.Debian
@@ -3,7 +3,7 @@ KLinkStatus for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdewebdev-doc-html.
+web browser, see the package tdewebdev-doc-html.
 
  -- Ben Burton <bab@debian.org>, Tue, 19 Oct 2004 09:09:06 +1000
 
diff --git a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.README.Debian b/ubuntu/maverick/tdewebdev/debian/kommander-trinity.README.Debian
index 2b4b6e2a1..fdc07a2b2 100644
--- a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.README.Debian
+++ b/ubuntu/maverick/tdewebdev/debian/kommander-trinity.README.Debian
@@ -3,7 +3,7 @@ Kommander for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdewebdev-doc-html.
+web browser, see the package tdewebdev-doc-html.
 
  -- Ben Burton <bab@debian.org>, Tue, 19 Oct 2004 09:09:06 +1000
 
diff --git a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.README.Debian b/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.README.Debian
index 23c2e7507..11d15b161 100644
--- a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.README.Debian
+++ b/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.README.Debian
@@ -3,7 +3,7 @@ KXSLDbg for Debian
 
 This application provides documentation in a docbook format that the KDE
 Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package kdewebdev-doc-html.
+web browser, see the package tdewebdev-doc-html.
 
  -- Ben Burton <bab@debian.org>, Tue, 19 Oct 2004 09:09:06 +1000
 
diff --git a/ubuntu/maverick/tdewebdev/debian/man/klinkstatus-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/klinkstatus-trinity.1
index 9fe279851..58ad198eb 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/klinkstatus-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/klinkstatus-trinity.1
@@ -43,10 +43,10 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdewebdev-doc-html\fP and read this documentation in HTML format from
+\fItdewebdev-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/klinkstatus/\fP.
 .SH AUTHOR
-KLinkStatus was written by Paulo Moura Guedes <moura@kdewebdev.org>.
+KLinkStatus was written by Paulo Moura Guedes <moura@tdewebdev.org>.
 .br
 This manual page was prepared by Ben Burton <bab@debian.org>
 for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kmdr-editor-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/kmdr-editor-trinity.1
index 8e420e4d8..e1865905e 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kmdr-editor-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/kmdr-editor-trinity.1
@@ -59,11 +59,11 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdewebdev-doc-html\fP and read this documentation in HTML format from
+\fItdewebdev-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kommander/\fP.
 .SH AUTHOR
 Kommander was written by Marc Britton <consume@optusnet.com.au>,
-Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@kdewebdev.org>,
+Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>,
 Andras Mantia <amantia@kde.org> and Trolltech.
 .br
 This manual page was prepared by Ben Burton <bab@debian.org>
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kmdr-executor-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/kmdr-executor-trinity.1
index 6d6557c75..f5b69feaf 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kmdr-executor-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/kmdr-executor-trinity.1
@@ -76,11 +76,11 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdewebdev-doc-html\fP and read this documentation in HTML format from
+\fItdewebdev-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kommander/\fP.
 .SH AUTHOR
 Kommander was written by Marc Britton <consume@optusnet.com.au>,
-Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@kdewebdev.org>,
+Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>,
 Andras Mantia <amantia@kde.org> and Trolltech.
 .br
 This manual page was prepared by Ben Burton <bab@debian.org>
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kmdr-plugins-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/kmdr-plugins-trinity.1
index c6314837d..51987bd96 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kmdr-plugins-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/kmdr-plugins-trinity.1
@@ -60,11 +60,11 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdewebdev-doc-html\fP and read this documentation in HTML format from
+\fItdewebdev-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kommander/\fP.
 .SH AUTHOR
 Kommander was written by Marc Britton <consume@optusnet.com.au>,
-Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@kdewebdev.org>,
+Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>,
 Andras Mantia <amantia@kde.org> and Trolltech.
 .br
 This manual page was prepared by Ben Burton <bab@debian.org>
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kxsldbg-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/kxsldbg-trinity.1
index 0c2afd55d..918746a9e 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kxsldbg-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/kxsldbg-trinity.1
@@ -45,7 +45,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdewebdev-doc-html\fP and read this documentation in HTML format from
+\fItdewebdev-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/kxsldbg/\fP.
 .SH AUTHOR
 KXSLDbg was written by Keith Isdale <k_isdale@tpg.com.au>.
diff --git a/ubuntu/maverick/tdewebdev/debian/man/quanta-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/quanta-trinity.1
index ff7b367e8..4880e9546 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/quanta-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/quanta-trinity.1
@@ -60,7 +60,7 @@ directly into konqueror or you can run
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
-\fIkdewebdev-doc-html\fP and read this documentation in HTML format from
+\fItdewebdev-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/kde/HTML/en/quanta/\fP.
 .SH AUTHOR
 Quanta was written by Eric Laffoon <sequitur@kde.org>, Andras Mantia
diff --git a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.README.Debian b/ubuntu/maverick/tdewebdev/debian/quanta-trinity.README.Debian
index eed8069b3..f9f471663 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.README.Debian
+++ b/ubuntu/maverick/tdewebdev/debian/quanta-trinity.README.Debian
@@ -23,7 +23,7 @@ HTML Documentation:
 
   Quanta Plus provides documentation in a docbook format that the
   KDE Help Centre can display.  For HTML documentation that can be read
-  in any web browser, see the package kdewebdev-doc-html.
+  in any web browser, see the package tdewebdev-doc-html.
 
 Kommander:
 
diff --git a/ubuntu/maverick/tdewebdev/debian/rules b/ubuntu/maverick/tdewebdev/debian/rules
index cce47390d..2dcf9658d 100755
--- a/ubuntu/maverick/tdewebdev/debian/rules
+++ b/ubuntu/maverick/tdewebdev/debian/rules
@@ -26,7 +26,7 @@ ifeq ($(GCC_VERSION),4.3)
   CXX = g++ -fpermissive
 endif
 
-DEB_DH_STRIP_ARGS  := --dbg-package=kdewebdev-trinity-dbg
+DEB_DH_STRIP_ARGS  := --dbg-package=tdewebdev-trinity-dbg
 
 PACKAGES_WITH_LIBS := kommander-trinity
 
diff --git a/ubuntu/maverick/tdewebdev/debian/kdewebdev-doc-html.doc-base.kfilereplace b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kfilereplace
index c2358003b..c2358003b 100644
--- a/ubuntu/maverick/tdewebdev/debian/kdewebdev-doc-html.doc-base.kfilereplace
+++ b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kfilereplace
diff --git a/ubuntu/maverick/tdewebdev/debian/kdewebdev-doc-html.doc-base.klinkstatus b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.klinkstatus
index ea725b38b..cc174bd07 100644
--- a/ubuntu/maverick/tdewebdev/debian/kdewebdev-doc-html.doc-base.klinkstatus
+++ b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.klinkstatus
@@ -1,6 +1,6 @@
 Document: klinkstatus
 Title: KLinkStatus Handbook
-Author: Paulo Moura Guedes <moura@kdewebdev.org>
+Author: Paulo Moura Guedes <moura@tdewebdev.org>
 Abstract: KLinkStatus is a link checker for KDE.
 Section: Apps/Net
 
diff --git a/ubuntu/maverick/tdewebdev/debian/kdewebdev-doc-html.doc-base.kommander b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kommander
index c9cd8f0ce..c9cd8f0ce 100644
--- a/ubuntu/maverick/tdewebdev/debian/kdewebdev-doc-html.doc-base.kommander
+++ b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kommander
diff --git a/ubuntu/maverick/tdewebdev/debian/kdewebdev-doc-html.doc-base.kxsldbg b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kxsldbg
index f60f9dfa0..f60f9dfa0 100644
--- a/ubuntu/maverick/tdewebdev/debian/kdewebdev-doc-html.doc-base.kxsldbg
+++ b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kxsldbg
diff --git a/ubuntu/maverick/tdewebdev/debian/kdewebdev-doc-html.doc-base.quanta b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.quanta
index 4f14507b6..4f14507b6 100644
--- a/ubuntu/maverick/tdewebdev/debian/kdewebdev-doc-html.doc-base.quanta
+++ b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.quanta
diff --git a/ubuntu/maverick/tdewebdev/debian/kdewebdev-doc-html.doc-base.xsldbg b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.xsldbg
index 6c81a9924..6c81a9924 100644
--- a/ubuntu/maverick/tdewebdev/debian/kdewebdev-doc-html.doc-base.xsldbg
+++ b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.xsldbg