Rename a bunch of kde names to tde

181 files changed, 761 insertions, 761 deletions

diff --git a/debian/lenny/applications/abakus/debian/control b/debian/lenny/applications/abakus/debian/control
index 93c3d77c3..2596da72b 100644
--- a/debian/lenny/applications/abakus/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/adept/debian/changelog b/debian/lenny/applications/adept/debian/changelog
index 58496db32..ec12c0119 100644
--- a/debian/lenny/applications/adept/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/adept/debian/control b/debian/lenny/applications/adept/debian/control
index 64cc6d154..cf6ef6714 100644
--- a/debian/lenny/applications/adept/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/adept/debian/control.in b/debian/lenny/applications/adept/debian/control.in
index 2c9a1ea70..a313fdbae 100644
--- a/debian/lenny/applications/adept/debian/control.in
+++ b/debian/lenny/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/debian/lenny/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/lenny/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
index ca324be99..db5399106 100644
--- a/debian/lenny/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/lenny/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/debian/lenny/applications/amarok.cmake/debian/README.Debian b/debian/lenny/applications/amarok.cmake/debian/README.Debian
index 7dc17fb17..d696b9696 100644
--- a/debian/lenny/applications/amarok.cmake/debian/README.Debian
+++ b/debian/lenny/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/debian/lenny/applications/amarok.cmake/debian/changelog b/debian/lenny/applications/amarok.cmake/debian/changelog
index 43671ac52..e72612a70 100644
--- a/debian/lenny/applications/amarok.cmake/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/amarok.cmake/debian/control b/debian/lenny/applications/amarok.cmake/debian/control
index 3f9f0a8d2..497ef51d1 100644
--- a/debian/lenny/applications/amarok.cmake/debian/control
+++ b/debian/lenny/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
@@ -90,7 +90,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/debian/lenny/applications/amarok.cmake/debian/control.in b/debian/lenny/applications/amarok.cmake/debian/control.in
index d57046d4c..52ef14266 100644
--- a/debian/lenny/applications/amarok.cmake/debian/control.in
+++ b/debian/lenny/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/debian/lenny/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/lenny/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
index ca324be99..db5399106 100644
--- a/debian/lenny/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/lenny/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/debian/lenny/applications/amarok/debian/README.Debian b/debian/lenny/applications/amarok/debian/README.Debian
index 7dc17fb17..d696b9696 100644
--- a/debian/lenny/applications/amarok/debian/README.Debian
+++ b/debian/lenny/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/debian/lenny/applications/amarok/debian/changelog b/debian/lenny/applications/amarok/debian/changelog
index 43671ac52..e72612a70 100644
--- a/debian/lenny/applications/amarok/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/amarok/debian/control b/debian/lenny/applications/amarok/debian/control
index dbb0f8232..95cccb152 100644
--- a/debian/lenny/applications/amarok/debian/control
+++ b/debian/lenny/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,
@@ -90,7 +90,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/debian/lenny/applications/amarok/debian/control.in b/debian/lenny/applications/amarok/debian/control.in
index d57046d4c..52ef14266 100644
--- a/debian/lenny/applications/amarok/debian/control.in
+++ b/debian/lenny/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/debian/lenny/applications/basket/debian/changelog b/debian/lenny/applications/basket/debian/changelog
index e50268cd0..03f2c0199 100644
--- a/debian/lenny/applications/basket/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/basket/debian/control b/debian/lenny/applications/basket/debian/control
index 3f4027902..e9718a185 100644
--- a/debian/lenny/applications/basket/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/bibletime/debian/changelog b/debian/lenny/applications/bibletime/debian/changelog
index 8ee32cf7c..e660fbb85 100644
--- a/debian/lenny/applications/bibletime/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/bibletime/debian/control b/debian/lenny/applications/bibletime/debian/control
index 594a28798..5edb06118 100644
--- a/debian/lenny/applications/bibletime/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/bibletime/debian/control.in b/debian/lenny/applications/bibletime/debian/control.in
index d1bcaa676..6bcc44da7 100644
--- a/debian/lenny/applications/bibletime/debian/control.in
+++ b/debian/lenny/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/debian/lenny/applications/compizconfig-backend-kconfig/debian/control b/debian/lenny/applications/compizconfig-backend-kconfig/debian/control
index 33a99eec5..8b011c50d 100644
--- a/debian/lenny/applications/compizconfig-backend-kconfig/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/desktop-effects-tde/debian/changelog b/debian/lenny/applications/desktop-effects-tde/debian/changelog
index 6ec99959d..0db149393 100644
--- a/debian/lenny/applications/desktop-effects-tde/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/desktop-effects-tde/debian/control b/debian/lenny/applications/desktop-effects-tde/debian/control
index 80486a941..1f494fe87 100644
--- a/debian/lenny/applications/desktop-effects-tde/debian/control
+++ b/debian/lenny/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,7 +6,7 @@ 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
 XB-Python-Version: ${python:Versions}
diff --git a/debian/lenny/applications/desktop-effects-tde/debian/copyright b/debian/lenny/applications/desktop-effects-tde/debian/copyright
index b2569f52f..b037bf1ac 100644
--- a/debian/lenny/applications/desktop-effects-tde/debian/copyright
+++ b/debian/lenny/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/debian/lenny/applications/desktop-effects-tde/debian/desktop-effects-kde-trinity.install b/debian/lenny/applications/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
index e6d16e467..d5af8f5d9 100644
--- a/debian/lenny/applications/desktop-effects-tde/debian/desktop-effects-kde-trinity.install
+++ b/debian/lenny/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/debian/lenny/applications/desktop-effects-tde/debian/rules b/debian/lenny/applications/desktop-effects-tde/debian/rules
index 89b037f13..7bdd258a5 100755
--- a/debian/lenny/applications/desktop-effects-tde/debian/rules
+++ b/debian/lenny/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/debian/lenny/applications/digikam/debian/changelog b/debian/lenny/applications/digikam/debian/changelog
index 89c1b4e52..86611e634 100644
--- a/debian/lenny/applications/digikam/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/digikam/debian/control b/debian/lenny/applications/digikam/debian/control
index f62de083c..86a3c0874 100644
--- a/debian/lenny/applications/digikam/debian/control
+++ b/debian/lenny/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,
@@ -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/debian/lenny/applications/digikam/debian/control.in b/debian/lenny/applications/digikam/debian/control.in
index dd5bda9e2..f0c7fd2cb 100644
--- a/debian/lenny/applications/digikam/debian/control.in
+++ b/debian/lenny/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/debian/lenny/applications/digikam/debian/copyright b/debian/lenny/applications/digikam/debian/copyright
index c4c44e441..637b1fa8d 100644
--- a/debian/lenny/applications/digikam/debian/copyright
+++ b/debian/lenny/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/debian/lenny/applications/dolphin/debian/changelog b/debian/lenny/applications/dolphin/debian/changelog
index 0c80abc8d..409e81b52 100644
--- a/debian/lenny/applications/dolphin/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/dolphin/debian/control b/debian/lenny/applications/dolphin/debian/control
index 5b7cd047e..e5f307a94 100644
--- a/debian/lenny/applications/dolphin/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/dolphin/debian/control.in b/debian/lenny/applications/dolphin/debian/control.in
index e678c91e0..9926c47b0 100644
--- a/debian/lenny/applications/dolphin/debian/control.in
+++ b/debian/lenny/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/debian/lenny/applications/filelight-l10n/debian/control b/debian/lenny/applications/filelight-l10n/debian/control
index 9edd33456..34f0ed9ec 100644
--- a/debian/lenny/applications/filelight-l10n/debian/control
+++ b/debian/lenny/applications/filelight-l10n/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Raúl Sánchez 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/debian/lenny/applications/filelight/debian/control b/debian/lenny/applications/filelight/debian/control
index bcc6df08f..78d2efde2 100644
--- a/debian/lenny/applications/filelight/debian/control
+++ b/debian/lenny/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: Raúl Sánchez 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/debian/lenny/applications/gtk-qt-engine/debian/changelog b/debian/lenny/applications/gtk-qt-engine/debian/changelog
index 7bbe149b1..477da1594 100644
--- a/debian/lenny/applications/gtk-qt-engine/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/gtk-qt-engine/debian/control b/debian/lenny/applications/gtk-qt-engine/debian/control
index 5d4629ded..01e4d424b 100644
--- a/debian/lenny/applications/gtk-qt-engine/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/gwenview/debian/changelog b/debian/lenny/applications/gwenview/debian/changelog
index fde66b4ad..0ebf36378 100644
--- a/debian/lenny/applications/gwenview/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/gwenview/debian/control b/debian/lenny/applications/gwenview/debian/control
index e0c4add47..82c33fd04 100644
--- a/debian/lenny/applications/gwenview/debian/control
+++ b/debian/lenny/applications/gwenview/debian/control
@@ -2,14 +2,14 @@ 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
 
 Package: gwenview-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-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
@@ -21,7 +21,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/debian/lenny/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/lenny/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 0cf0bd0a6..58d2a725a 100644
--- a/debian/lenny/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/lenny/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/debian/lenny/applications/k3b/debian/changelog b/debian/lenny/applications/k3b/debian/changelog
index 37b58f616..dccced4b4 100644
--- a/debian/lenny/applications/k3b/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/k3b/debian/control b/debian/lenny/applications/k3b/debian/control
index ae97f656c..5d91723a0 100644
--- a/debian/lenny/applications/k3b/debian/control
+++ b/debian/lenny/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})
 Recommends: dvd+rw-tools, libk3b3-extracodecs-trinity
 Suggests: k3b-i18n, normalize-audio, toolame, sox, movixmaker-2, vcdimager (>= 0.7)
 Replaces: libk3b3-trinity (<< 1.0.5-2)
diff --git a/debian/lenny/applications/k9copy/debian/control b/debian/lenny/applications/k9copy/debian/control
index ef2576f9a..de8dad059 100644
--- a/debian/lenny/applications/k9copy/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kaffeine/debian/changelog b/debian/lenny/applications/kaffeine/debian/changelog
index 856250282..be405ad6c 100644
--- a/debian/lenny/applications/kaffeine/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/kaffeine/debian/control b/debian/lenny/applications/kaffeine/debian/control
index aca1029a2..105509a63 100644
--- a/debian/lenny/applications/kaffeine/debian/control
+++ b/debian/lenny/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,
@@ -15,7 +15,7 @@ Standards-Version: 3.8.4
 Package: kaffeine-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, hdparm
-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
@@ -31,8 +31,8 @@ Package: kaffeine-trinity-dbg
 Section: devel
 Architecture: any
 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/debian/lenny/applications/kaffeine/debian/rules b/debian/lenny/applications/kaffeine/debian/rules
index 5af03107b..efff35a86 100755
--- a/debian/lenny/applications/kaffeine/debian/rules
+++ b/debian/lenny/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/debian/lenny/applications/katapult/debian/control b/debian/lenny/applications/katapult/debian/control
index b43c2565e..e8a858c21 100644
--- a/debian/lenny/applications/katapult/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kbarcode/debian/control b/debian/lenny/applications/kbarcode/debian/control
index 925429b87..a372496f9 100644
--- a/debian/lenny/applications/kbarcode/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kbfx/debian/control b/debian/lenny/applications/kbfx/debian/control
index dfa9d2054..7c1918ac1 100644
--- a/debian/lenny/applications/kbfx/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kbookreader/debian/control b/debian/lenny/applications/kbookreader/debian/control
index 8ac579805..bc85ba375 100644
--- a/debian/lenny/applications/kbookreader/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kchmviewer/debian/control b/debian/lenny/applications/kchmviewer/debian/control
index 933c2f9d7..2402649ca 100644
--- a/debian/lenny/applications/kchmviewer/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kcpuload/debian/changelog b/debian/lenny/applications/kcpuload/debian/changelog
index 574b5d91e..a5b5f833f 100644
--- a/debian/lenny/applications/kcpuload/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/kcpuload/debian/control b/debian/lenny/applications/kcpuload/debian/control
index 2b2dd5b40..2577a5722 100644
--- a/debian/lenny/applications/kcpuload/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kdbusnotification/debian/control b/debian/lenny/applications/kdbusnotification/debian/control
index dfd6737bd..b08146fc3 100644
--- a/debian/lenny/applications/kdbusnotification/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kdiff3/debian/control b/debian/lenny/applications/kdiff3/debian/control
index b2a88e31b..87de53339 100644
--- a/debian/lenny/applications/kdiff3/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kdirstat/debian/control b/debian/lenny/applications/kdirstat/debian/control
index 4071787f7..654c44554 100644
--- a/debian/lenny/applications/kdirstat/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kdmtheme/debian/changelog b/debian/lenny/applications/kdmtheme/debian/changelog
index ef78ad6fb..120d16cf8 100644
--- a/debian/lenny/applications/kdmtheme/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/kdmtheme/debian/control b/debian/lenny/applications/kdmtheme/debian/control
index 6bfce967f..b3d52012f 100644
--- a/debian/lenny/applications/kdmtheme/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kdmtheme/debian/kdmtheme.lintian-overrides b/debian/lenny/applications/kdmtheme/debian/kdmtheme.lintian-overrides
index d033183c7..4932c5f8a 100644
--- a/debian/lenny/applications/kdmtheme/debian/kdmtheme.lintian-overrides
+++ b/debian/lenny/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/debian/lenny/applications/kdpkg/debian/control b/debian/lenny/applications/kdpkg/debian/control
index 96dd69e74..681eb0cb2 100644
--- a/debian/lenny/applications/kdpkg/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kdpkg/debian/copyright b/debian/lenny/applications/kdpkg/debian/copyright
index 6ca73edad..a0a9c1d0d 100644
--- a/debian/lenny/applications/kdpkg/debian/copyright
+++ b/debian/lenny/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/debian/lenny/applications/keep/debian/control b/debian/lenny/applications/keep/debian/control
index 10a37e764..f12169a33 100644
--- a/debian/lenny/applications/keep/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kerry/debian/control b/debian/lenny/applications/kerry/debian/control
index a88165323..36f6f9aae 100644
--- a/debian/lenny/applications/kerry/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kerry/debian/control.in b/debian/lenny/applications/kerry/debian/control.in
index 38fbd9e47..b8b098bdd 100644
--- a/debian/lenny/applications/kerry/debian/control.in
+++ b/debian/lenny/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/debian/lenny/applications/kgtk-qt3/debian/control b/debian/lenny/applications/kgtk-qt3/debian/control
index 67715ac0f..9edbf0887 100644
--- a/debian/lenny/applications/kgtk-qt3/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kile/debian/README.Debian b/debian/lenny/applications/kile/debian/README.Debian
index 8e55c77bc..5339affff 100644
--- a/debian/lenny/applications/kile/debian/README.Debian
+++ b/debian/lenny/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/debian/lenny/applications/kile/debian/TODO.Debian b/debian/lenny/applications/kile/debian/TODO.Debian
index bbfc0d8dd..7fe556fd4 100644
--- a/debian/lenny/applications/kile/debian/TODO.Debian
+++ b/debian/lenny/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/debian/lenny/applications/kile/debian/changelog b/debian/lenny/applications/kile/debian/changelog
index f47c5878b..855ceef5e 100644
--- a/debian/lenny/applications/kile/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/kile/debian/control b/debian/lenny/applications/kile/debian/control
index 8007ed8d7..ae5bf2225 100644
--- a/debian/lenny/applications/kile/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kima/debian/control b/debian/lenny/applications/kima/debian/control
index 29b1cd176..d553a3e9b 100644
--- a/debian/lenny/applications/kima/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kio-apt/debian/control b/debian/lenny/applications/kio-apt/debian/control
index 793a97da7..114c26b8b 100644
--- a/debian/lenny/applications/kio-apt/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kio-locate/debian/control b/debian/lenny/applications/kio-locate/debian/control
index 822a4f30d..9ef792a05 100644
--- a/debian/lenny/applications/kio-locate/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kio-umountwrapper/debian/control b/debian/lenny/applications/kio-umountwrapper/debian/control
index 8c760573e..03cd3f7fa 100644
--- a/debian/lenny/applications/kio-umountwrapper/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kio-umountwrapper/debian/media_safelyremove.desktop b/debian/lenny/applications/kio-umountwrapper/debian/media_safelyremove.desktop
index 970caf8a5..7f73117a9 100644
--- a/debian/lenny/applications/kio-umountwrapper/debian/media_safelyremove.desktop
+++ b/debian/lenny/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/debian/lenny/applications/kiosktool/debian/changelog b/debian/lenny/applications/kiosktool/debian/changelog
index a81e4659e..05237119a 100644
--- a/debian/lenny/applications/kiosktool/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/kiosktool/debian/control b/debian/lenny/applications/kiosktool/debian/control
index bbf9a457f..68d0b7404 100644
--- a/debian/lenny/applications/kiosktool/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kmplayer/debian/control b/debian/lenny/applications/kmplayer/debian/control
index 1b45021c4..41f5f695e 100644
--- a/debian/lenny/applications/kmplayer/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kmyfirewall/debian/control b/debian/lenny/applications/kmyfirewall/debian/control
index 8fee4a60f..7003b4966 100644
--- a/debian/lenny/applications/kmyfirewall/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kmymoney/debian/changelog b/debian/lenny/applications/kmymoney/debian/changelog
index 9907ea10b..36986fd74 100644
--- a/debian/lenny/applications/kmymoney/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/kmymoney/debian/control b/debian/lenny/applications/kmymoney/debian/control
index e2790dbf1..30c1d33e2 100644
--- a/debian/lenny/applications/kmymoney/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/knemo/debian/changelog b/debian/lenny/applications/knemo/debian/changelog
index 31b53d817..884cc039e 100644
--- a/debian/lenny/applications/knemo/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/knemo/debian/control b/debian/lenny/applications/knemo/debian/control
index 500b81dfc..41e259f13 100644
--- a/debian/lenny/applications/knemo/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/knetload/debian/changelog b/debian/lenny/applications/knetload/debian/changelog
index be58cc89a..d8577dc0d 100644
--- a/debian/lenny/applications/knetload/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/knetload/debian/control b/debian/lenny/applications/knetload/debian/control
index 65d5b4b4d..43ba42fd8 100644
--- a/debian/lenny/applications/knetload/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/knetstats/debian/control b/debian/lenny/applications/knetstats/debian/control
index c2f2f6429..12c6974ee 100644
--- a/debian/lenny/applications/knetstats/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/knetworkmanager.cmake/debian/control b/debian/lenny/applications/knetworkmanager.cmake/debian/control
index 73fa9be0d..6e36a14dd 100644
--- a/debian/lenny/applications/knetworkmanager.cmake/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/knetworkmanager.cmake/debian/control.in b/debian/lenny/applications/knetworkmanager.cmake/debian/control.in
index 43adf3e33..9d0819bca 100644
--- a/debian/lenny/applications/knetworkmanager.cmake/debian/control.in
+++ b/debian/lenny/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/debian/lenny/applications/knetworkmanager8/debian/control b/debian/lenny/applications/knetworkmanager8/debian/control
index 0b04bbf74..49ac8454d 100644
--- a/debian/lenny/applications/knetworkmanager8/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/knetworkmanager8/debian/control.in b/debian/lenny/applications/knetworkmanager8/debian/control.in
index 43adf3e33..9d0819bca 100644
--- a/debian/lenny/applications/knetworkmanager8/debian/control.in
+++ b/debian/lenny/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/debian/lenny/applications/knights/debian/changelog b/debian/lenny/applications/knights/debian/changelog
index cf45a8316..05bfb3450 100644
--- a/debian/lenny/applications/knights/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/knights/debian/control b/debian/lenny/applications/knights/debian/control
index a86c5632b..2599fc08a 100644
--- a/debian/lenny/applications/knights/debian/control
+++ b/debian/lenny/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
 Suggests: gnuchess | crafty | sjeng, knights-themepack-trinity
 Description: A chess interface for the K Desktop Environment [Trinity]
  Knights aims to be the ultimate chess resource on your computer. 
diff --git a/debian/lenny/applications/knowit/debian/control b/debian/lenny/applications/knowit/debian/control
index fef19e0c9..fa527e889 100644
--- a/debian/lenny/applications/knowit/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/knutclient/debian/control b/debian/lenny/applications/knutclient/debian/control
index 84941f4b7..520f8eaf8 100644
--- a/debian/lenny/applications/knutclient/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/koffice/debian/changelog b/debian/lenny/applications/koffice/debian/changelog
index 8ce61b75e..fa9c8a04f 100644
--- a/debian/lenny/applications/koffice/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/koffice/debian/control b/debian/lenny/applications/koffice/debian/control
index 969929548..93824f845 100644
--- a/debian/lenny/applications/koffice/debian/control
+++ b/debian/lenny/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>, Raúl Sánchez 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
@@ -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/debian/lenny/applications/koffice/debian/control.in b/debian/lenny/applications/koffice/debian/control.in
index faee83eb7..6977987da 100644
--- a/debian/lenny/applications/koffice/debian/control.in
+++ b/debian/lenny/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/debian/lenny/applications/konversation/debian/changelog b/debian/lenny/applications/konversation/debian/changelog
index 5d44efa2e..69aa8c22f 100644
--- a/debian/lenny/applications/konversation/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/konversation/debian/control b/debian/lenny/applications/konversation/debian/control
index d60e16fdc..44b89e4d2 100644
--- a/debian/lenny/applications/konversation/debian/control
+++ b/debian/lenny/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/
@@ -36,7 +36,7 @@ Package: konversation-trinity-dbg
 Architecture: any
 Priority: extra
 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/debian/lenny/applications/konversation/debian/copyright b/debian/lenny/applications/konversation/debian/copyright
index cb5c85c8e..337154e3c 100644
--- a/debian/lenny/applications/konversation/debian/copyright
+++ b/debian/lenny/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/debian/lenny/applications/kopete-otr/debian/control b/debian/lenny/applications/kopete-otr/debian/control
index 259bcfcd8..08ad0470c 100644
--- a/debian/lenny/applications/kopete-otr/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kpicosim/debian/control b/debian/lenny/applications/kpicosim/debian/control
index 1095c68eb..fbcda31ad 100644
--- a/debian/lenny/applications/kpicosim/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kpilot/debian/control b/debian/lenny/applications/kpilot/debian/control
index e55a7a241..0b30e45f9 100644
--- a/debian/lenny/applications/kpilot/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kpowersave.cmake/debian/control b/debian/lenny/applications/kpowersave.cmake/debian/control
index 430ad6cb1..d435507bd 100644
--- a/debian/lenny/applications/kpowersave.cmake/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kpowersave.cmake/debian/control.in b/debian/lenny/applications/kpowersave.cmake/debian/control.in
index 8fb5ca51f..f8d6ca2fe 100644
--- a/debian/lenny/applications/kpowersave.cmake/debian/control.in
+++ b/debian/lenny/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/debian/lenny/applications/kpowersave/debian/control b/debian/lenny/applications/kpowersave/debian/control
index faaac13d0..4a54de6f4 100644
--- a/debian/lenny/applications/kpowersave/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kradio/debian/control b/debian/lenny/applications/kradio/debian/control
index c0a67d9da..8bb777261 100644
--- a/debian/lenny/applications/kradio/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/krename/debian/control b/debian/lenny/applications/krename/debian/control
index 29e40ed70..ed591e17f 100644
--- a/debian/lenny/applications/krename/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/krusader/debian/changelog b/debian/lenny/applications/krusader/debian/changelog
index 609286530..a4c38c63d 100644
--- a/debian/lenny/applications/krusader/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/krusader/debian/control b/debian/lenny/applications/krusader/debian/control
index 80e187bea..46be3e1c4 100644
--- a/debian/lenny/applications/krusader/debian/control
+++ b/debian/lenny/applications/krusader/debian/control
@@ -12,8 +12,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 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/debian/lenny/applications/krusader/debian/copyright b/debian/lenny/applications/krusader/debian/copyright
index 127bd8f63..4f0e31c89 100644
--- a/debian/lenny/applications/krusader/debian/copyright
+++ b/debian/lenny/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/debian/lenny/applications/krusader/debian/krusader.lintian-overrides b/debian/lenny/applications/krusader/debian/krusader.lintian-overrides
index ab5986658..74c03c669 100644
--- a/debian/lenny/applications/krusader/debian/krusader.lintian-overrides
+++ b/debian/lenny/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/debian/lenny/applications/ksplash-engine-moodin/debian/control b/debian/lenny/applications/ksplash-engine-moodin/debian/control
index 589ccedb3..9a0c66c80 100644
--- a/debian/lenny/applications/ksplash-engine-moodin/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/ksquirrel/debian/README.debian b/debian/lenny/applications/ksquirrel/debian/README.debian
index 7c478322f..c580229d7 100644
--- a/debian/lenny/applications/ksquirrel/debian/README.debian
+++ b/debian/lenny/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/debian/lenny/applications/kstreamripper/debian/control b/debian/lenny/applications/kstreamripper/debian/control
index df0adf1a0..bf57f140b 100644
--- a/debian/lenny/applications/kstreamripper/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/ksystemlog/debian/control b/debian/lenny/applications/ksystemlog/debian/control
index d818029c1..9eeba2863 100644
--- a/debian/lenny/applications/ksystemlog/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/ktechlab/debian/changelog b/debian/lenny/applications/ktechlab/debian/changelog
index eb84eb89e..d20521745 100644
--- a/debian/lenny/applications/ktechlab/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/ktechlab/debian/control b/debian/lenny/applications/ktechlab/debian/control
index 978ef5a9c..a7711a595 100644
--- a/debian/lenny/applications/ktechlab/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/ktechlab/debian/debiandirs b/debian/lenny/applications/ktechlab/debian/debiandirs
index 57c2b82b6..d35ab77aa 100644
--- a/debian/lenny/applications/ktechlab/debian/debiandirs
+++ b/debian/lenny/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/debian/lenny/applications/ktorrent/debian/changelog b/debian/lenny/applications/ktorrent/debian/changelog
index 7d19f0f25..96eb17815 100644
--- a/debian/lenny/applications/ktorrent/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/ktorrent/debian/control b/debian/lenny/applications/ktorrent/debian/control
index 059977a33..38305d8ea 100644
--- a/debian/lenny/applications/ktorrent/debian/control
+++ b/debian/lenny/applications/ktorrent/debian/control
@@ -2,14 +2,14 @@ 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
 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/debian/lenny/applications/ktorrent/debian/control.in b/debian/lenny/applications/ktorrent/debian/control.in
index f688d0c53..93b55e4ff 100644
--- a/debian/lenny/applications/ktorrent/debian/control.in
+++ b/debian/lenny/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/debian/lenny/applications/kuickshow/debian/changelog b/debian/lenny/applications/kuickshow/debian/changelog
index 6d94f0d4b..9683f6e2d 100644
--- a/debian/lenny/applications/kuickshow/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/kuickshow/debian/control b/debian/lenny/applications/kuickshow/debian/control
index 58a19c6c9..a878557ad 100644
--- a/debian/lenny/applications/kuickshow/debian/control
+++ b/debian/lenny/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
@@ -19,6 +19,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/debian/lenny/applications/kuickshow/debian/control.in b/debian/lenny/applications/kuickshow/debian/control.in
index 1d61299fe..ed8445afa 100644
--- a/debian/lenny/applications/kuickshow/debian/control.in
+++ b/debian/lenny/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/debian/lenny/applications/kvirc/debian/changelog b/debian/lenny/applications/kvirc/debian/changelog
index 802811b21..28535f296 100644
--- a/debian/lenny/applications/kvirc/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/kvirc/debian/control b/debian/lenny/applications/kvirc/debian/control
index 4dc24713a..fdb7cc1ae 100644
--- a/debian/lenny/applications/kvirc/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/kvkbd/debian/control b/debian/lenny/applications/kvkbd/debian/control
index 29201756c..75efa3c37 100644
--- a/debian/lenny/applications/kvkbd/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/piklab/debian/control b/debian/lenny/applications/piklab/debian/control
index 2e8d8ffda..330a9b6e5 100644
--- a/debian/lenny/applications/piklab/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/potracegui/debian/control b/debian/lenny/applications/potracegui/debian/control
index 2f31a207a..9dcd0c545 100644
--- a/debian/lenny/applications/potracegui/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/rosegarden/debian/changelog b/debian/lenny/applications/rosegarden/debian/changelog
index 1733e9ec5..da6daabcb 100644
--- a/debian/lenny/applications/rosegarden/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/rosegarden/debian/control b/debian/lenny/applications/rosegarden/debian/control
index 76e00d176..ab232fe7a 100644
--- a/debian/lenny/applications/rosegarden/debian/control
+++ b/debian/lenny/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
 Recommends: jackd, lilypond, swh-plugins | ladspa-plugin
 Suggests: qjackctl
 Description: music editor and MIDI/audio sequencer [Trinity]
diff --git a/debian/lenny/applications/smb4k/debian/changelog b/debian/lenny/applications/smb4k/debian/changelog
index 4bbfd4f98..aee60a650 100644
--- a/debian/lenny/applications/smb4k/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/smb4k/debian/control b/debian/lenny/applications/smb4k/debian/control
index 921e4d04f..361f06da3 100644
--- a/debian/lenny/applications/smb4k/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/soundkonverter/debian/control b/debian/lenny/applications/soundkonverter/debian/control
index 1d04a540a..6971d4e98 100644
--- a/debian/lenny/applications/soundkonverter/debian/control
+++ b/debian/lenny/applications/soundkonverter/debian/control
@@ -3,14 +3,14 @@ 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
 
 Package: soundkonverter-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-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/debian/lenny/applications/tde-guidance/debian/changelog b/debian/lenny/applications/tde-guidance/debian/changelog
index fbd50fb8f..f73cc1d80 100644
--- a/debian/lenny/applications/tde-guidance/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/tde-guidance/debian/control b/debian/lenny/applications/tde-guidance/debian/control
index 454cdfd58..49f18dbad 100644
--- a/debian/lenny/applications/tde-guidance/debian/control
+++ b/debian/lenny/applications/tde-guidance/debian/control
@@ -1,19 +1,19 @@
-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), python (>= 2.5), python-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)
-Conflicts: guidance-power-manager, kde-guidance-powermanager
+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
@@ -32,7 +32,7 @@ Description: collection of KDE system administration tools for GNU/Linux [Trinit
 Package: guidance-backends-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python (>= 2.5), python-dev (>= 2.5)
-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
@@ -40,10 +40,10 @@ 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)
-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)
+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/debian/lenny/applications/tde-guidance/debian/copyright b/debian/lenny/applications/tde-guidance/debian/copyright
index 38c1d30e8..d50783096 100644
--- a/debian/lenny/applications/tde-guidance/debian/copyright
+++ b/debian/lenny/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/debian/lenny/applications/tde-guidance/debian/kde-guidance-trinity.lintian-overrides b/debian/lenny/applications/tde-guidance/debian/kde-guidance-trinity.lintian-overrides
deleted file mode 100644
index 6131946c2..000000000
--- a/debian/lenny/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/debian/lenny/applications/tde-guidance/debian/rules b/debian/lenny/applications/tde-guidance/debian/rules
index 54634ed38..2bb582451 100755
--- a/debian/lenny/applications/tde-guidance/debian/rules
+++ b/debian/lenny/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/debian/lenny/applications/tde-guidance/debian/kde-guidance-powermanager-trinity.install b/debian/lenny/applications/tde-guidance/debian/tde-guidance-powermanager-trinity.install
index 8c707520e..396df988c 100644
--- a/debian/lenny/applications/tde-guidance/debian/kde-guidance-powermanager-trinity.install
+++ b/debian/lenny/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/debian/lenny/applications/tde-guidance/debian/kde-guidance-trinity.init b/debian/lenny/applications/tde-guidance/debian/tde-guidance-trinity.init
index 30a3854d1..734e51725 100644
--- a/debian/lenny/applications/tde-guidance/debian/kde-guidance-trinity.init
+++ b/debian/lenny/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/debian/lenny/applications/tde-guidance/debian/kde-guidance-trinity.install b/debian/lenny/applications/tde-guidance/debian/tde-guidance-trinity.install
index 5a92a6472..de46528da 100644
--- a/debian/lenny/applications/tde-guidance/debian/kde-guidance-trinity.install
+++ b/debian/lenny/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/debian/lenny/applications/tde-guidance/debian/tde-guidance-trinity.lintian-overrides b/debian/lenny/applications/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
new file mode 100644
index 000000000..f151ee69f
--- /dev/null
+++ b/debian/lenny/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/debian/lenny/applications/tde-guidance/debian/kde-guidance-trinity.postinst b/debian/lenny/applications/tde-guidance/debian/tde-guidance-trinity.postinst
index de2804fc4..af8e365b5 100644
--- a/debian/lenny/applications/tde-guidance/debian/kde-guidance-trinity.postinst
+++ b/debian/lenny/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/debian/lenny/applications/tde-style-lipstik/debian/changelog b/debian/lenny/applications/tde-style-lipstik/debian/changelog
index 4e603d7ed..2010b4b10 100644
--- a/debian/lenny/applications/tde-style-lipstik/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/tde-style-lipstik/debian/control b/debian/lenny/applications/tde-style-lipstik/debian/control
index 223626346..cc8cd43be 100644
--- a/debian/lenny/applications/tde-style-lipstik/debian/control
+++ b/debian/lenny/applications/tde-style-lipstik/debian/control
@@ -1,11 +1,11 @@
-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
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/lenny/applications/tde-style-lipstik/debian/rules b/debian/lenny/applications/tde-style-lipstik/debian/rules
index 0f4c518e5..c25c8d5bd 100755
--- a/debian/lenny/applications/tde-style-lipstik/debian/rules
+++ b/debian/lenny/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/debian/lenny/applications/tde-style-qtcurve/debian/changelog b/debian/lenny/applications/tde-style-qtcurve/debian/changelog
index b89b8bc90..3ff72d99c 100644
--- a/debian/lenny/applications/tde-style-qtcurve/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/tde-style-qtcurve/debian/control b/debian/lenny/applications/tde-style-qtcurve/debian/control
index d6d163039..534c7d08a 100644
--- a/debian/lenny/applications/tde-style-qtcurve/debian/control
+++ b/debian/lenny/applications/tde-style-qtcurve/debian/control
@@ -1,16 +1,16 @@
-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}
 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.
@@ -20,8 +20,8 @@ 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
 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/debian/lenny/applications/tde-style-qtcurve/debian/rules b/debian/lenny/applications/tde-style-qtcurve/debian/rules
index 7e7cc1d9e..3d090390b 100755
--- a/debian/lenny/applications/tde-style-qtcurve/debian/rules
+++ b/debian/lenny/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/debian/lenny/applications/tde-systemsettings/debian/changelog b/debian/lenny/applications/tde-systemsettings/debian/changelog
index 7e97530ed..49bc830e9 100644
--- a/debian/lenny/applications/tde-systemsettings/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/tde-systemsettings/debian/control b/debian/lenny/applications/tde-systemsettings/debian/control
index 6d3d022c9..4497e37e2 100644
--- a/debian/lenny/applications/tde-systemsettings/debian/control
+++ b/debian/lenny/applications/tde-systemsettings/debian/control
@@ -1,11 +1,11 @@
-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
 Description: easy to use control centre for TDE
diff --git a/debian/lenny/applications/tde-systemsettings/debian/rules b/debian/lenny/applications/tde-systemsettings/debian/rules
index f6bd275e1..82d5c2429 100755
--- a/debian/lenny/applications/tde-systemsettings/debian/rules
+++ b/debian/lenny/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/debian/lenny/applications/tde-systemsettings/debian/kde-systemsettings-trinity.preinst b/debian/lenny/applications/tde-systemsettings/debian/tde-systemsettings-trinity.preinst
index f7b840ea2..f7b840ea2 100644
--- a/debian/lenny/applications/tde-systemsettings/debian/kde-systemsettings-trinity.preinst
+++ b/debian/lenny/applications/tde-systemsettings/debian/tde-systemsettings-trinity.preinst
diff --git a/debian/lenny/applications/tdesudo/debian/changelog b/debian/lenny/applications/tdesudo/debian/changelog
index 3e01f5533..c0e354a0f 100644
--- a/debian/lenny/applications/tdesudo/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/tdesudo/debian/control b/debian/lenny/applications/tdesudo/debian/control
index f14497994..667a2a419 100644
--- a/debian/lenny/applications/tdesudo/debian/control
+++ b/debian/lenny/applications/tdesudo/debian/control
@@ -1,11 +1,11 @@
-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
 Description: sudo frontend for Trinity
diff --git a/debian/lenny/applications/tdesudo/debian/copyright b/debian/lenny/applications/tdesudo/debian/copyright
index 9cd32407b..ee75c3d6d 100644
--- a/debian/lenny/applications/tdesudo/debian/copyright
+++ b/debian/lenny/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/debian/lenny/applications/tdesudo/debian/links b/debian/lenny/applications/tdesudo/debian/links
index c30adf9c1..0482e1e4f 100644
--- a/debian/lenny/applications/tdesudo/debian/links
+++ b/debian/lenny/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/debian/lenny/applications/tdesudo/debian/postinst b/debian/lenny/applications/tdesudo/debian/postinst
index d452abce3..b0100d96c 100644
--- a/debian/lenny/applications/tdesudo/debian/postinst
+++ b/debian/lenny/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/debian/lenny/applications/tdesudo/debian/postrm b/debian/lenny/applications/tdesudo/debian/postrm
index 526a8c60a..a5b54ebf1 100644
--- a/debian/lenny/applications/tdesudo/debian/postrm
+++ b/debian/lenny/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/debian/lenny/applications/tdesudo/debian/preinst b/debian/lenny/applications/tdesudo/debian/preinst
index d711fde5b..fe6a85b58 100644
--- a/debian/lenny/applications/tdesudo/debian/preinst
+++ b/debian/lenny/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/debian/lenny/applications/tdesudo/debian/rules b/debian/lenny/applications/tdesudo/debian/rules
index 25290a923..f3b2afb13 100755
--- a/debian/lenny/applications/tdesudo/debian/rules
+++ b/debian/lenny/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/debian/lenny/applications/tdesudo/debian/kdesudo-trinity.1.docbook b/debian/lenny/applications/tdesudo/debian/tdesudo-trinity.1.docbook
index 0e1ba2b60..ab5db3a96 100644
--- a/debian/lenny/applications/tdesudo/debian/kdesudo-trinity.1.docbook
+++ b/debian/lenny/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/debian/lenny/applications/tdesvn/debian/changelog b/debian/lenny/applications/tdesvn/debian/changelog
index 55c73dd3c..07180f154 100644
--- a/debian/lenny/applications/tdesvn/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/tdesvn/debian/control b/debian/lenny/applications/tdesvn/debian/control
index a90ca64c8..34d14fe77 100644
--- a/debian/lenny/applications/tdesvn/debian/control
+++ b/debian/lenny/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
@@ -26,10 +26,10 @@ 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
-Depends: ${shlibs:Depends}, ${misc:Depends}, kdesvn-kio-plugins-trinity (= ${binary:Version})
+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]
@@ -40,14 +40,14 @@ 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
 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/debian/lenny/applications/tdesvn/debian/copyright b/debian/lenny/applications/tdesvn/debian/copyright
index a3d664a33..74f00ccfd 100644
--- a/debian/lenny/applications/tdesvn/debian/copyright
+++ b/debian/lenny/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/debian/lenny/applications/tdesvn/debian/icons/kdesvn.xpm b/debian/lenny/applications/tdesvn/debian/icons/tdesvn.xpm
index d5e2abf6a..38da00075 100644
--- a/debian/lenny/applications/tdesvn/debian/icons/kdesvn.xpm
+++ b/debian/lenny/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/debian/lenny/applications/tdesvn/debian/kdesvn-trinity.manpages b/debian/lenny/applications/tdesvn/debian/kdesvn-trinity.manpages
deleted file mode 100644
index c834c876c..000000000
--- a/debian/lenny/applications/tdesvn/debian/kdesvn-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kdesvn.1
-debian/man/kdesvnaskpass.1
diff --git a/debian/lenny/applications/tdesvn/debian/man/kdesvn.1 b/debian/lenny/applications/tdesvn/debian/man/tdesvn.1
index 0e4816669..bc8ceb053 100644
--- a/debian/lenny/applications/tdesvn/debian/man/kdesvn.1
+++ b/debian/lenny/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/debian/lenny/applications/tdesvn/debian/man/kdesvnaskpass.1 b/debian/lenny/applications/tdesvn/debian/man/tdesvnaskpass.1
index 4cc8f03ad..053bb8cdd 100644
--- a/debian/lenny/applications/tdesvn/debian/man/kdesvnaskpass.1
+++ b/debian/lenny/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/debian/lenny/applications/tdesvn/debian/kdesvn-kio-plugins-trinity.install b/debian/lenny/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
index f461ccbef..32155110b 100644
--- a/debian/lenny/applications/tdesvn/debian/kdesvn-kio-plugins-trinity.install
+++ b/debian/lenny/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/debian/lenny/applications/tdesvn/debian/kdesvn-trinity.install b/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.install
index a222a6ad4..f3c840c12 100644
--- a/debian/lenny/applications/tdesvn/debian/kdesvn-trinity.install
+++ b/debian/lenny/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/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.manpages b/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.manpages
new file mode 100644
index 000000000..8cb778203
--- /dev/null
+++ b/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.manpages
@@ -0,0 +1,2 @@
+debian/man/tdesvn.1
+debian/man/tdesvnaskpass.1
diff --git a/debian/lenny/applications/tdesvn/debian/kdesvn-trinity.menu b/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.menu
index c85d2665d..12595e540 100644
--- a/debian/lenny/applications/tdesvn/debian/kdesvn-trinity.menu
+++ b/debian/lenny/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/debian/lenny/applications/tdesvn/debian/watch b/debian/lenny/applications/tdesvn/debian/watch
index 190c9f8f7..80c0f090c 100644
--- a/debian/lenny/applications/tdesvn/debian/watch
+++ b/debian/lenny/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/debian/lenny/applications/tellico/debian/changelog b/debian/lenny/applications/tellico/debian/changelog
index 01268f186..bced6a6bb 100644
--- a/debian/lenny/applications/tellico/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/tellico/debian/control b/debian/lenny/applications/tellico/debian/control
index a55db709f..a68d139b2 100644
--- a/debian/lenny/applications/tellico/debian/control
+++ b/debian/lenny/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/
 
@@ -26,7 +26,7 @@ Description: collection manager for books, videos, music [Trinity]
 
 Package: tellico-data-trinity
 Architecture: all
-Depends: kdelibs-data-trinity
+Depends: tdelibs-data-trinity
 Recommends: tellico-trinity
 Suggests: python
 Description: collection manager for books, videos, music [data] [Trinity]
diff --git a/debian/lenny/applications/twin-style-crystal/debian/changelog b/debian/lenny/applications/twin-style-crystal/debian/changelog
index f330cbc5f..b2d80f32a 100644
--- a/debian/lenny/applications/twin-style-crystal/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/twin-style-crystal/debian/control b/debian/lenny/applications/twin-style-crystal/debian/control
index 0f61547f5..ca5489a04 100644
--- a/debian/lenny/applications/twin-style-crystal/debian/control
+++ b/debian/lenny/applications/twin-style-crystal/debian/control
@@ -1,12 +1,12 @@
-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}
 Description: semi transparant window decoration for Trinity
diff --git a/debian/lenny/applications/wlassistant/debian/changelog b/debian/lenny/applications/wlassistant/debian/changelog
index 17905f7ed..02865da0c 100644
--- a/debian/lenny/applications/wlassistant/debian/changelog
+++ b/debian/lenny/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/debian/lenny/applications/wlassistant/debian/control b/debian/lenny/applications/wlassistant/debian/control
index a7f1f0865..ccf503647 100644
--- a/debian/lenny/applications/wlassistant/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/yakuake/debian/control b/debian/lenny/applications/yakuake/debian/control
index 5632af112..0ba3c1f17 100644
--- a/debian/lenny/applications/yakuake/debian/control
+++ b/debian/lenny/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/