Rename some instances of kde to tde in Ubuntu and Debian

531 files changed, 2540 insertions, 2540 deletions

diff --git a/debian/lenny/applications/adept/debian/changelog b/debian/lenny/applications/adept/debian/changelog
index ec12c0119..332ec5674 100644
--- a/debian/lenny/applications/adept/debian/changelog
+++ b/debian/lenny/applications/adept/debian/changelog
@@ -378,7 +378,7 @@ adept (2.1.2ubuntu13) feisty; urgency=low
 
   * Add kubuntu_08_no_unique_application.diff don't use a unique application,
     stops it forking which broke xauthority and means debconf can't work in X mode
-  * Add kubuntu_09_no_double_kdesu.diff stop using kdesu twice
+  * Add kubuntu_09_no_double_tdesu.diff stop using tdesu twice
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Feb 2007 12:38:42 +0000
 
@@ -674,7 +674,7 @@ ept (0.4) experimental; urgency=low
   * Easy Tag filter.
   * Ship own copies of nuvola icons.
   * Fix segfaulting extenders.
-  * Use kdesu for .desktop entries.
+  * Use tdesu for .desktop entries.
   * Fix crasher on cache reload with active tag filter.
   * Major speedup of the tag menu.
   * Improve handling of comments in sources.list editor.
diff --git a/debian/lenny/applications/amarok.cmake/debian/changelog b/debian/lenny/applications/amarok.cmake/debian/changelog
index e72612a70..c2bf1ae55 100644
--- a/debian/lenny/applications/amarok.cmake/debian/changelog
+++ b/debian/lenny/applications/amarok.cmake/debian/changelog
@@ -284,7 +284,7 @@ amarok (2:1.4.8-0ubuntu3) hardy; urgency=low
 
   [ Sarah Hobbs ]
   * Sponsored upload.  (Closes LP: #187406)
-  * Reworked patch to avoid setting absolute paths (eg /usr/bin/kdesu) 
+  * Reworked patch to avoid setting absolute paths (eg /usr/bin/tdesu) 
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 12 Mar 2008 00:50:22 +1100
 
diff --git a/debian/lenny/applications/amarok.cmake/debian/install-mp3 b/debian/lenny/applications/amarok.cmake/debian/install-mp3
index 7b06cbd2f..ae0663182 100644
--- a/debian/lenny/applications/amarok.cmake/debian/install-mp3
+++ b/debian/lenny/applications/amarok.cmake/debian/install-mp3
@@ -27,8 +27,8 @@ INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install`
 
 #is available, not installed
 if [ -z "$INSTALLED" ]; then
-  if [ -x /opt/trinity/bin/kdesu ] && [ -x /usr/bin/install-package ]; then
-    /opt/trinity/bin/kdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
+  if [ -x /opt/trinity/bin/tdesu ] && [ -x /usr/bin/install-package ]; then
+    /opt/trinity/bin/tdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
   elif [ -x /usr/bin/gksudo ] && [ -x /usr/sbin/synaptic ]; then
     gksudo "sh -c 'echo \"libxine1-ffmpeg i\"|synaptic --non-interactive --set-selections'"
   else
diff --git a/debian/lenny/applications/amarok/debian/changelog b/debian/lenny/applications/amarok/debian/changelog
index e72612a70..c2bf1ae55 100644
--- a/debian/lenny/applications/amarok/debian/changelog
+++ b/debian/lenny/applications/amarok/debian/changelog
@@ -284,7 +284,7 @@ amarok (2:1.4.8-0ubuntu3) hardy; urgency=low
 
   [ Sarah Hobbs ]
   * Sponsored upload.  (Closes LP: #187406)
-  * Reworked patch to avoid setting absolute paths (eg /usr/bin/kdesu) 
+  * Reworked patch to avoid setting absolute paths (eg /usr/bin/tdesu) 
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 12 Mar 2008 00:50:22 +1100
 
diff --git a/debian/lenny/applications/amarok/debian/install-mp3 b/debian/lenny/applications/amarok/debian/install-mp3
index 7b06cbd2f..ae0663182 100644
--- a/debian/lenny/applications/amarok/debian/install-mp3
+++ b/debian/lenny/applications/amarok/debian/install-mp3
@@ -27,8 +27,8 @@ INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install`
 
 #is available, not installed
 if [ -z "$INSTALLED" ]; then
-  if [ -x /opt/trinity/bin/kdesu ] && [ -x /usr/bin/install-package ]; then
-    /opt/trinity/bin/kdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
+  if [ -x /opt/trinity/bin/tdesu ] && [ -x /usr/bin/install-package ]; then
+    /opt/trinity/bin/tdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
   elif [ -x /usr/bin/gksudo ] && [ -x /usr/sbin/synaptic ]; then
     gksudo "sh -c 'echo \"libxine1-ffmpeg i\"|synaptic --non-interactive --set-selections'"
   else
diff --git a/debian/lenny/applications/digikam/debian/changelog b/debian/lenny/applications/digikam/debian/changelog
index 86611e634..4e7505827 100644
--- a/debian/lenny/applications/digikam/debian/changelog
+++ b/debian/lenny/applications/digikam/debian/changelog
@@ -772,7 +772,7 @@ digikam (0.7.4-5) unstable; urgency=low
     (Closes: #326786)
   * debian/rules enable DEB_CONFIGURE_USER_FLAGS
   * Renable debian/patches/visibility.diff for 0.7.4
-  * Recommends: kdeprint, konqueror
+  * Recommends: tdeprint, konqueror
 
  -- Mark Purcell <msp@debian.org>  Sat, 17 Sep 2005 22:09:19 +0100
 
diff --git a/debian/lenny/applications/digikam/debian/control b/debian/lenny/applications/digikam/debian/control
index 86a3c0874..94ae91fef 100644
--- a/debian/lenny/applications/digikam/debian/control
+++ b/debian/lenny/applications/digikam/debian/control
@@ -16,7 +16,7 @@ Homepage: http://www.digikam.org
 Package: digikam-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: kipi-plugins-trinity, kdeprint-trinity, konqueror-trinity
+Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Suggests: digikam-trinity-doc
 Description: digital photo management application for KDE [Trinity]
  An easy to use and powerful digital photo management
@@ -42,7 +42,7 @@ Package: showfoto-trinity
 Architecture: any
 Section: graphics
 Depends: ${shlibs:Depends}, digikam-trinity
-Recommends: kipi-plugins-trinity, kdeprint-trinity, konqueror-trinity
+Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Description: image viewer/editor for KDE [Trinity]
  Showphoto is part of the Digikam project.
  It allows to browse your photo collection and edit them with ease.
diff --git a/debian/lenny/applications/digikam/debian/control.in b/debian/lenny/applications/digikam/debian/control.in
index f0c7fd2cb..6905744a8 100644
--- a/debian/lenny/applications/digikam/debian/control.in
+++ b/debian/lenny/applications/digikam/debian/control.in
@@ -16,7 +16,7 @@ Homepage: http://www.digikam.org
 Package: digikam-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: kipi-plugins-trinity, kdeprint-trinity, konqueror-trinity
+Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Suggests: digikam-trinity-doc
 Description: digital photo management application for KDE [Trinity]
  An easy to use and powerful digital photo management
@@ -42,7 +42,7 @@ Package: showfoto-trinity
 Architecture: any
 Section: graphics
 Depends: ${shlibs:Depends}, digikam-trinity
-Recommends: kipi-plugins-trinity, kdeprint-trinity, konqueror-trinity
+Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Description: image viewer/editor for KDE [Trinity]
  Showphoto is part of the Digikam project.
  It allows to browse your photo collection and edit them with ease.
diff --git a/debian/lenny/applications/gwenview/debian/changelog b/debian/lenny/applications/gwenview/debian/changelog
index 0ebf36378..25741414f 100644
--- a/debian/lenny/applications/gwenview/debian/changelog
+++ b/debian/lenny/applications/gwenview/debian/changelog
@@ -157,7 +157,7 @@ gwenview (1.1.8+1.2.0pre1-1) unstable; urgency=low
   * New upstream release.
     + Fixes crash when double-clicking on an image using the konqueror kpart.
       (Closes: #290097)
-    + Gwenview is now a kdeinit module - added appropriate lintian override.
+    + Gwenview is now a tdeinit module - added appropriate lintian override.
 
  -- Christopher Martin <chrsmrtn@freeshell.org>  Wed, 26 Jan 2005 09:45:17 -0500
 
diff --git a/debian/lenny/applications/gwenview/debian/gwenview.lintian b/debian/lenny/applications/gwenview/debian/gwenview.lintian
index 91d566d75..6fdaead63 100644
--- a/debian/lenny/applications/gwenview/debian/gwenview.lintian
+++ b/debian/lenny/applications/gwenview/debian/gwenview.lintian
@@ -1,3 +1,3 @@
 gwenview binary: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libgwenviewcore.so.1.0.0 opt/trinity/lib/libgwenviewcore.so
-gwenview binary: shlib-missing-in-control-file libkdeinit_gwenview.so for opt/trinity/lib/libkdeinit_gwenview.so
-gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libkdeinit-gwenview
+gwenview binary: shlib-missing-in-control-file libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
+gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-gwenview
diff --git a/debian/lenny/applications/kaffeine/debian/install-codecs b/debian/lenny/applications/kaffeine/debian/install-codecs
index 271285c4e..720dfcd4c 100644
--- a/debian/lenny/applications/kaffeine/debian/install-codecs
+++ b/debian/lenny/applications/kaffeine/debian/install-codecs
@@ -102,7 +102,7 @@ class CodecInstallerWidget(QDialog, apt.OpProgress):
         return True
 
     def install_cache_package(self, pkg):
-        if os.system('kdesu -d \'adept_batch install ' + pkg.name + '\'') != 0:
+        if os.system('tdesu -d \'adept_batch install ' + pkg.name + '\'') != 0:
             QApplication.exit(1)
             return
 
diff --git a/debian/lenny/applications/kdiff3/debian/rules b/debian/lenny/applications/kdiff3/debian/rules
index 09511bd51..90b33c108 100755
--- a/debian/lenny/applications/kdiff3/debian/rules
+++ b/debian/lenny/applications/kdiff3/debian/rules
@@ -45,7 +45,7 @@ build: build-stamp
 build-stamp:  config.status
 	dh_testdir
 
-	$(MAKE) LDFLAGS="-lkdecore -lkdeui" LIBS=""
+	$(MAKE) LDFLAGS="-ltdecore -ltdeui" LIBS=""
 	/usr/bin/docbook-to-man debian/kdiff3.sgml > doc/en/kdiff3.1
 	touch build-stamp
 
diff --git a/debian/lenny/applications/kerry/debian/rules b/debian/lenny/applications/kerry/debian/rules
index e3861ca8d..0d08e83f9 100755
--- a/debian/lenny/applications/kerry/debian/rules
+++ b/debian/lenny/applications/kerry/debian/rules
@@ -23,7 +23,7 @@ clean::
 	rm -f kerry.1
 
 binary-post-install/kerry-trinity::
-	chrpath -d debian/kerry-trinity/opt/trinity/lib/libkdeinit_kerry.so
+	chrpath -d debian/kerry-trinity/opt/trinity/lib/libtdeinit_kerry.so
 	chrpath -d debian/kerry-trinity/opt/trinity/bin/kerry
 	chrpath -d debian/kerry-trinity/opt/trinity/lib/trinity/kerry.so
 	chrpath -d debian/kerry-trinity/opt/trinity/lib/trinity/kcm_beagle.so
diff --git a/debian/lenny/applications/kmplayer/debian/kmplayer-trinity.install b/debian/lenny/applications/kmplayer/debian/kmplayer-trinity.install
index 3c2a5f5ff..f25460f29 100644
--- a/debian/lenny/applications/kmplayer/debian/kmplayer-trinity.install
+++ b/debian/lenny/applications/kmplayer/debian/kmplayer-trinity.install
@@ -1,4 +1,4 @@
-opt/trinity/lib/libkdeinit_kmplayer.so
+opt/trinity/lib/libtdeinit_kmplayer.so
 opt/trinity/lib/trinity/kmplayer.so
 opt/trinity/bin/kmplayer
 opt/trinity/bin/kxvplayer
diff --git a/debian/lenny/applications/kmymoney/debian/changelog b/debian/lenny/applications/kmymoney/debian/changelog
index 36986fd74..a7240314d 100644
--- a/debian/lenny/applications/kmymoney/debian/changelog
+++ b/debian/lenny/applications/kmymoney/debian/changelog
@@ -246,7 +246,7 @@ kmymoney2 (0.8.4-4) unstable; urgency=low
 
 kmymoney2 (0.8.4-3) unstable; urgency=low
 
-  * export LDFLAGS=-lgwenhywfar -laqbanking -lqbanking -lkdeui
+  * export LDFLAGS=-lgwenhywfar -laqbanking -lqbanking -ltdeui
    -- Fixes: FTBFS in sid (problem with kbanking) (Closes: #373707)
 
  -- Mark Purcell <msp@debian.org>  Wed, 21 Jun 2006 16:34:03 +0100
diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides b/debian/lenny/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
index 9ae01a92b..b5316fc73 100644
--- a/debian/lenny/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
+++ b/debian/lenny/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
@@ -1,2 +1,2 @@
-network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager
-network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so
+network-manager-kde: package-name-doesnt-match-sonames libtdeinit-knetworkmanager
+network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libtdeinit_knetworkmanager.so libtdeinit_knetworkmanager.so
diff --git a/debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides b/debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
index 9ae01a92b..b5316fc73 100644
--- a/debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
+++ b/debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
@@ -1,2 +1,2 @@
-network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager
-network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so
+network-manager-kde: package-name-doesnt-match-sonames libtdeinit-knetworkmanager
+network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libtdeinit_knetworkmanager.so libtdeinit_knetworkmanager.so
diff --git a/debian/lenny/applications/koffice/debian/chalk-trinity.install b/debian/lenny/applications/koffice/debian/chalk-trinity.install
index a36c77eb8..4df24b77e 100644
--- a/debian/lenny/applications/koffice/debian/chalk-trinity.install
+++ b/debian/lenny/applications/koffice/debian/chalk-trinity.install
@@ -142,7 +142,7 @@ debian/tmp/opt/trinity/lib/trinity/libchalktiffexport.la
 debian/tmp/opt/trinity/lib/trinity/libchalktiffexport.so
 debian/tmp/opt/trinity/lib/trinity/libchalktiffimport.la
 debian/tmp/opt/trinity/lib/trinity/libchalktiffimport.so
-debian/tmp/opt/trinity/lib/libkdeinit_chalk.so
+debian/tmp/opt/trinity/lib/libtdeinit_chalk.so
 debian/tmp/opt/trinity/lib/libchalk_cmyk_*.so.*
 debian/tmp/opt/trinity/lib/libchalkcolor.so.*
 debian/tmp/opt/trinity/lib/libchalkcommon.so.*
diff --git a/debian/lenny/applications/koffice/debian/chalk-trinity.lintian b/debian/lenny/applications/koffice/debian/chalk-trinity.lintian
index 40bb7a6ee..08adc5291 100644
--- a/debian/lenny/applications/koffice/debian/chalk-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/chalk-trinity.lintian
@@ -1,4 +1,4 @@
-chalk: shlib-missing-in-control-file libkdeinit_chalk.so for usr/lib/libkdeinit_chalk.so
+chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so
 chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libkdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
+chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
 
diff --git a/debian/lenny/applications/koffice/debian/karbon-trinity.install b/debian/lenny/applications/koffice/debian/karbon-trinity.install
index 363bf04dc..653f730e0 100644
--- a/debian/lenny/applications/koffice/debian/karbon-trinity.install
+++ b/debian/lenny/applications/koffice/debian/karbon-trinity.install
@@ -45,7 +45,7 @@ debian/tmp/opt/trinity/lib/trinity/libwmfexport.so
 debian/tmp/opt/trinity/lib/trinity/libwmfimport.la
 debian/tmp/opt/trinity/lib/trinity/libwmfimport.so
 debian/tmp/opt/trinity/lib/libkarboncommon.so.*
-debian/tmp/opt/trinity/lib/libkdeinit_karbon.so
+debian/tmp/opt/trinity/lib/libtdeinit_karbon.so
 debian/tmp/opt/trinity/share/applications/kde/karbon.desktop
 debian/tmp/opt/trinity/share/apps/karbon
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/karbon_konqi.desktop
diff --git a/debian/lenny/applications/koffice/debian/karbon-trinity.lintian b/debian/lenny/applications/koffice/debian/karbon-trinity.lintian
index e8e11eff0..9733b0a93 100644
--- a/debian/lenny/applications/koffice/debian/karbon-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/karbon-trinity.lintian
@@ -1,2 +1,2 @@
-karbon: shlib-missing-in-control-file libkdeinit_karbon.so for usr/lib/libkdeinit_karbon.so
-karbon: package-name-doesnt-match-sonames libkarboncommon0 libkdeinit-karbon
+karbon: shlib-missing-in-control-file libtdeinit_karbon.so for usr/lib/libtdeinit_karbon.so
+karbon: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon
diff --git a/debian/lenny/applications/koffice/debian/kchart-trinity.install b/debian/lenny/applications/koffice/debian/kchart-trinity.install
index 095261d9f..443a6acbf 100644
--- a/debian/lenny/applications/koffice/debian/kchart-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kchart-trinity.install
@@ -21,7 +21,7 @@ debian/tmp/opt/trinity/lib/trinity/libkchartxpmexport.so
 debian/tmp/opt/trinity/lib/libkchartcommon.so.*
 debian/tmp/opt/trinity/lib/libkchartimageexport.so.*
 debian/tmp/opt/trinity/lib/libkdchart.*
-debian/tmp/opt/trinity/lib/libkdeinit_kchart.so
+debian/tmp/opt/trinity/lib/libtdeinit_kchart.so
 debian/tmp/opt/trinity/share/applications/kde/kchart.desktop
 debian/tmp/opt/trinity/share/apps/kchart
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kchart_konqi.desktop
diff --git a/debian/lenny/applications/koffice/debian/kchart-trinity.lintian b/debian/lenny/applications/koffice/debian/kchart-trinity.lintian
index 1c399d1f3..4a9df9c9e 100644
--- a/debian/lenny/applications/koffice/debian/kchart-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kchart-trinity.lintian
@@ -1,5 +1,5 @@
 # There is no -dev package.
 kchart: non-dev-pkg-with-shlib-symlink usr/lib/libkdchart.so.0.0.0 usr/lib/libkdchart.so
-kchart: shlib-missing-in-control-file libkdeinit_kchart.so for usr/lib/libkdeinit_kchart.so
-kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libkdeinit-kchart
+kchart: shlib-missing-in-control-file libtdeinit_kchart.so for usr/lib/libtdeinit_kchart.so
+kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-kchart
 
diff --git a/debian/lenny/applications/koffice/debian/kexi-trinity.install b/debian/lenny/applications/koffice/debian/kexi-trinity.install
index fc645134d..a0b259950 100644
--- a/debian/lenny/applications/koffice/debian/kexi-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kexi-trinity.install
@@ -46,7 +46,7 @@ debian/tmp/opt/trinity/lib/trinity/krosskexiapp.la
 debian/tmp/opt/trinity/lib/trinity/krosskexiapp.so
 debian/tmp/opt/trinity/lib/trinity/krosskexidb.la
 debian/tmp/opt/trinity/lib/trinity/krosskexidb.so
-debian/tmp/opt/trinity/lib/libkdeinit_kexi.so
+debian/tmp/opt/trinity/lib/libtdeinit_kexi.so
 debian/tmp/opt/trinity/lib/libkexicore.so.*
 debian/tmp/opt/trinity/lib/libkexidatatable.so.*
 debian/tmp/opt/trinity/lib/libkexidbparser.so.*
diff --git a/debian/lenny/applications/koffice/debian/kexi-trinity.lintian b/debian/lenny/applications/koffice/debian/kexi-trinity.lintian
index d1dfd14c2..5288fb87d 100644
--- a/debian/lenny/applications/koffice/debian/kexi-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kexi-trinity.lintian
@@ -1,4 +1,4 @@
-kexi: shlib-missing-in-control-file libkdeinit_kexi.so for usr/lib/libkdeinit_kexi.so
+kexi: shlib-missing-in-control-file libtdeinit_kexi.so for usr/lib/libtdeinit_kexi.so
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/importxhtml/ImportXHTML.py
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/readme.html
@@ -11,4 +11,4 @@ kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/Copy
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/kross/python/kexiapp/__init__.py
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/exportxhtml/ExportXHTML.rc
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenter.py
-kexi: package-name-doesnt-match-sonames libkdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
+kexi: package-name-doesnt-match-sonames libtdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
diff --git a/debian/lenny/applications/koffice/debian/kformula-trinity.install b/debian/lenny/applications/koffice/debian/kformula-trinity.install
index d9ba60a08..7c09d82a4 100644
--- a/debian/lenny/applications/koffice/debian/kformula-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kformula-trinity.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/lib/trinity/libkformulapart.la
 debian/tmp/opt/trinity/lib/trinity/libkformulapart.so
 debian/tmp/opt/trinity/lib/trinity/libkfosvgexport.la
 debian/tmp/opt/trinity/lib/trinity/libkfosvgexport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kformula.so
+debian/tmp/opt/trinity/lib/libtdeinit_kformula.so
 debian/tmp/opt/trinity/share/applications/kde/kformula.desktop
 debian/tmp/opt/trinity/share/apps/kformula
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kformula_konqi.desktop
diff --git a/debian/lenny/applications/koffice/debian/kformula-trinity.lintian b/debian/lenny/applications/koffice/debian/kformula-trinity.lintian
index 1224a3094..1062b39db 100644
--- a/debian/lenny/applications/koffice/debian/kformula-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kformula-trinity.lintian
@@ -1,4 +1,4 @@
-kformula: no-shlibs-control-file usr/lib/libkdeinit_kformula.so
-kformula: postinst-must-call-ldconfig usr/lib/libkdeinit_kformula.so
-kformula: postrm-should-call-ldconfig usr/lib/libkdeinit_kformula.so
-kformula: package-name-doesnt-match-sonames libkdeinit-kformula
+kformula: no-shlibs-control-file usr/lib/libtdeinit_kformula.so
+kformula: postinst-must-call-ldconfig usr/lib/libtdeinit_kformula.so
+kformula: postrm-should-call-ldconfig usr/lib/libtdeinit_kformula.so
+kformula: package-name-doesnt-match-sonames libtdeinit-kformula
diff --git a/debian/lenny/applications/koffice/debian/kivio-trinity.install b/debian/lenny/applications/koffice/debian/kivio-trinity.install
index 510c85320..289580d09 100644
--- a/debian/lenny/applications/koffice/debian/kivio-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kivio-trinity.install
@@ -17,5 +17,5 @@ debian/tmp/opt/trinity/lib/trinity/libkiviozoomtool.la
 debian/tmp/opt/trinity/lib/trinity/libkiviozoomtool.so
 debian/tmp/opt/trinity/lib/trinity/straight_connector.la
 debian/tmp/opt/trinity/lib/trinity/straight_connector.so
-debian/tmp/opt/trinity/lib/libkdeinit_kivio.so
+debian/tmp/opt/trinity/lib/libtdeinit_kivio.so
 debian/tmp/opt/trinity/lib/libkiviocommon.so.*
diff --git a/debian/lenny/applications/koffice/debian/kivio-trinity.lintian b/debian/lenny/applications/koffice/debian/kivio-trinity.lintian
index 2d8cfc583..02a07173b 100644
--- a/debian/lenny/applications/koffice/debian/kivio-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kivio-trinity.lintian
@@ -1,4 +1,4 @@
-kivio: shlib-missing-in-control-file libkdeinit_kivio.so for usr/lib/libkdeinit_kivio.so
+kivio: shlib-missing-in-control-file libtdeinit_kivio.so for usr/lib/libtdeinit_kivio.so
 kivio: menu-icon-missing /usr/share/pixmaps/kivio.xpm
-kivio: package-name-doesnt-match-sonames libkdeinit-kivio libkiviocommon0
+kivio: package-name-doesnt-match-sonames libtdeinit-kivio libkiviocommon0
 
diff --git a/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install b/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install
index c65cbd3d3..936153c99 100644
--- a/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install
+++ b/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install
@@ -5,20 +5,20 @@ debian/tmp/opt/trinity/lib/libkchartcommon.la
 debian/tmp/opt/trinity/lib/libkchartcommon.so
 debian/tmp/opt/trinity/lib/libkchartimageexport.la
 debian/tmp/opt/trinity/lib/libkchartimageexport.so
-debian/tmp/opt/trinity/lib/libkdeinit_karbon.la
-debian/tmp/opt/trinity/lib/libkdeinit_kchart.la
-debian/tmp/opt/trinity/lib/libkdeinit_kexi.la
-debian/tmp/opt/trinity/lib/libkdeinit_kformula.la
-debian/tmp/opt/trinity/lib/libkdeinit_kivio.la
-debian/tmp/opt/trinity/lib/libkdeinit_koshell.la
-debian/tmp/opt/trinity/lib/libkdeinit_kplato.la
-debian/tmp/opt/trinity/lib/libkdeinit_kpresenter.la
-debian/tmp/opt/trinity/lib/libkdeinit_chalk.la
-debian/tmp/opt/trinity/lib/libkdeinit_kspread.la
-debian/tmp/opt/trinity/lib/libkdeinit_kthesaurus.la
-debian/tmp/opt/trinity/lib/libkdeinit_kudesigner.la
-debian/tmp/opt/trinity/lib/libkdeinit_kugar.la
-debian/tmp/opt/trinity/lib/libkdeinit_kword.la
+debian/tmp/opt/trinity/lib/libtdeinit_karbon.la
+debian/tmp/opt/trinity/lib/libtdeinit_kchart.la
+debian/tmp/opt/trinity/lib/libtdeinit_kexi.la
+debian/tmp/opt/trinity/lib/libtdeinit_kformula.la
+debian/tmp/opt/trinity/lib/libtdeinit_kivio.la
+debian/tmp/opt/trinity/lib/libtdeinit_koshell.la
+debian/tmp/opt/trinity/lib/libtdeinit_kplato.la
+debian/tmp/opt/trinity/lib/libtdeinit_kpresenter.la
+debian/tmp/opt/trinity/lib/libtdeinit_chalk.la
+debian/tmp/opt/trinity/lib/libtdeinit_kspread.la
+debian/tmp/opt/trinity/lib/libtdeinit_kthesaurus.la
+debian/tmp/opt/trinity/lib/libtdeinit_kudesigner.la
+debian/tmp/opt/trinity/lib/libtdeinit_kugar.la
+debian/tmp/opt/trinity/lib/libtdeinit_kword.la
 debian/tmp/opt/trinity/lib/libkexicore.la
 debian/tmp/opt/trinity/lib/libkexicore.so
 debian/tmp/opt/trinity/lib/libkexidatatable.la
diff --git a/debian/lenny/applications/koffice/debian/koshell-trinity.install b/debian/lenny/applications/koffice/debian/koshell-trinity.install
index fc8fbb841..c0399020b 100644
--- a/debian/lenny/applications/koffice/debian/koshell-trinity.install
+++ b/debian/lenny/applications/koffice/debian/koshell-trinity.install
@@ -2,7 +2,7 @@ debian/koshell.xpm opt/trinity/share/pixmaps
 debian/tmp/opt/trinity/bin/koshell
 debian/tmp/opt/trinity/lib/trinity/koshell.la
 debian/tmp/opt/trinity/lib/trinity/koshell.so
-debian/tmp/opt/trinity/lib/libkdeinit_koshell.so
+debian/tmp/opt/trinity/lib/libtdeinit_koshell.so
 debian/tmp/opt/trinity/share/applications/kde/koshell.desktop
 debian/tmp/opt/trinity/share/apps/koshell/koshellui.rc
 debian/tmp/opt/trinity/share/config.kcfg/koshell.kcfg
diff --git a/debian/lenny/applications/koffice/debian/koshell-trinity.lintian b/debian/lenny/applications/koffice/debian/koshell-trinity.lintian
index e410a8d00..45d130a4e 100644
--- a/debian/lenny/applications/koffice/debian/koshell-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/koshell-trinity.lintian
@@ -1,4 +1,4 @@
-koshell: no-shlibs-control-file usr/lib/libkdeinit_koshell.so
-koshell: postinst-must-call-ldconfig usr/lib/libkdeinit_koshell.so
-koshell: postrm-should-call-ldconfig usr/lib/libkdeinit_koshell.so
-koshell: package-name-doesnt-match-sonames libkdeinit-koshell
+koshell: no-shlibs-control-file usr/lib/libtdeinit_koshell.so
+koshell: postinst-must-call-ldconfig usr/lib/libtdeinit_koshell.so
+koshell: postrm-should-call-ldconfig usr/lib/libtdeinit_koshell.so
+koshell: package-name-doesnt-match-sonames libtdeinit-koshell
diff --git a/debian/lenny/applications/koffice/debian/kplato-trinity.install b/debian/lenny/applications/koffice/debian/kplato-trinity.install
index df01154f4..d9667f9c6 100644
--- a/debian/lenny/applications/koffice/debian/kplato-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kplato-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/kplato.la
 debian/tmp/opt/trinity/lib/trinity/kplato.so
 debian/tmp/opt/trinity/lib/trinity/libkplatopart.la
 debian/tmp/opt/trinity/lib/trinity/libkplatopart.so
-debian/tmp/opt/trinity/lib/libkdeinit_kplato.so
+debian/tmp/opt/trinity/lib/libtdeinit_kplato.so
 debian/tmp/opt/trinity/share/applications/kde/kplato.desktop
 debian/tmp/opt/trinity/share/apps/kplato/icons/crystalsvg/22x22/actions/accounts.png
 debian/tmp/opt/trinity/share/apps/kplato/icons/crystalsvg/22x22/actions/add_milestone.png
diff --git a/debian/lenny/applications/koffice/debian/kplato-trinity.lintian b/debian/lenny/applications/koffice/debian/kplato-trinity.lintian
index 62e4d82ea..f08eafe73 100644
--- a/debian/lenny/applications/koffice/debian/kplato-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kplato-trinity.lintian
@@ -1,4 +1,4 @@
-kplato: no-shlibs-control-file usr/lib/libkdeinit_kplato.so
-kplato: postinst-must-call-ldconfig usr/lib/libkdeinit_kplato.so
-kplato: postrm-should-call-ldconfig usr/lib/libkdeinit_kplato.so
-kplato: package-name-doesnt-match-sonames libkdeinit-kplato
+kplato: no-shlibs-control-file usr/lib/libtdeinit_kplato.so
+kplato: postinst-must-call-ldconfig usr/lib/libtdeinit_kplato.so
+kplato: postrm-should-call-ldconfig usr/lib/libtdeinit_kplato.so
+kplato: package-name-doesnt-match-sonames libtdeinit-kplato
diff --git a/debian/lenny/applications/koffice/debian/kpresenter-trinity.install b/debian/lenny/applications/koffice/debian/kpresenter-trinity.install
index fc90edce6..5aada1cab 100644
--- a/debian/lenny/applications/koffice/debian/kpresenter-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kpresenter-trinity.install
@@ -24,6 +24,6 @@ debian/tmp/opt/trinity/lib/trinity/libooimpressexport.la
 debian/tmp/opt/trinity/lib/trinity/libooimpressexport.so
 debian/tmp/opt/trinity/lib/trinity/libooimpressimport.la
 debian/tmp/opt/trinity/lib/trinity/libooimpressimport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kpresenter.so
+debian/tmp/opt/trinity/lib/libtdeinit_kpresenter.so
 debian/tmp/opt/trinity/lib/libkpresenterimageexport.so.*
 debian/tmp/opt/trinity/lib/libkpresenterprivate.so.*
diff --git a/debian/lenny/applications/koffice/debian/kpresenter-trinity.lintian b/debian/lenny/applications/koffice/debian/kpresenter-trinity.lintian
index d038ca914..6e7af5591 100644
--- a/debian/lenny/applications/koffice/debian/kpresenter-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kpresenter-trinity.lintian
@@ -1,4 +1,4 @@
 kpresenter: script-with-language-extension usr/bin/kprconverter.pl
-kpresenter: shlib-missing-in-control-file libkdeinit_kpresenter.so for usr/lib/libkdeinit_kpresenter.so
+kpresenter: shlib-missing-in-control-file libtdeinit_kpresenter.so for usr/lib/libtdeinit_kpresenter.so
 kpresenter: menu-icon-missing /usr/share/pixmaps/kpresenter.xpm
-kpresenter: package-name-doesnt-match-sonames libkdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
+kpresenter: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
diff --git a/debian/lenny/applications/koffice/debian/kspread-trinity.install b/debian/lenny/applications/koffice/debian/kspread-trinity.install
index 9b1251bf2..6a7228fd3 100644
--- a/debian/lenny/applications/koffice/debian/kspread-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kspread-trinity.install
@@ -36,7 +36,7 @@ debian/tmp/opt/trinity/lib/trinity/libopencalcimport.la
 debian/tmp/opt/trinity/lib/trinity/libopencalcimport.so
 debian/tmp/opt/trinity/lib/trinity/libqproimport.la
 debian/tmp/opt/trinity/lib/trinity/libqproimport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kspread.so
+debian/tmp/opt/trinity/lib/libtdeinit_kspread.so
 debian/tmp/opt/trinity/lib/libkspreadcommon.so.*
 debian/tmp/opt/trinity/share/applications/kde/kspread.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kspread_konqi.desktop
diff --git a/debian/lenny/applications/koffice/debian/kspread-trinity.lintian b/debian/lenny/applications/koffice/debian/kspread-trinity.lintian
index 6c23d706d..b47c3a364 100644
--- a/debian/lenny/applications/koffice/debian/kspread-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kspread-trinity.lintian
@@ -1,7 +1,7 @@
-kspread: shlib-missing-in-control-file libkdeinit_kspread.so for usr/lib/libkdeinit_kspread.so
+kspread: shlib-missing-in-control-file libtdeinit_kspread.so for usr/lib/libtdeinit_kspread.so
 kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/scripteditor/ScriptEditor.rc
 kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/exporthtml/ExportHtml.rc
 kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/exporthtml/ExportHtml.py
 kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/scripteditor/ScriptEditor.py
-kspread: package-name-doesnt-match-sonames libkdeinit-kspread libkspreadcommon0
+kspread: package-name-doesnt-match-sonames libtdeinit-kspread libkspreadcommon0
 
diff --git a/debian/lenny/applications/koffice/debian/kthesaurus-trinity.install b/debian/lenny/applications/koffice/debian/kthesaurus-trinity.install
index d115bcf4b..d0e29dd5c 100644
--- a/debian/lenny/applications/koffice/debian/kthesaurus-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kthesaurus-trinity.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/kthesaurus
 debian/tmp/opt/trinity/lib/trinity/kthesaurus.*
 debian/tmp/opt/trinity/lib/trinity/libthesaurustool.la
 debian/tmp/opt/trinity/lib/trinity/libthesaurustool.so
-debian/tmp/opt/trinity/lib/libkdeinit_kthesaurus.so
+debian/tmp/opt/trinity/lib/libtdeinit_kthesaurus.so
 debian/tmp/opt/trinity/share/applnk/Office/KThesaurus.desktop
 debian/tmp/opt/trinity/share/apps/thesaurus
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/thesaurus/*.bz2
diff --git a/debian/lenny/applications/koffice/debian/kthesaurus-trinity.lintian b/debian/lenny/applications/koffice/debian/kthesaurus-trinity.lintian
index b32d255df..7d7018a77 100644
--- a/debian/lenny/applications/koffice/debian/kthesaurus-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kthesaurus-trinity.lintian
@@ -1,5 +1,5 @@
-kthesaurus: no-shlibs-control-file usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: postinst-must-call-ldconfig usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: postrm-should-call-ldconfig usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: package-name-doesnt-match-sonames libkdeinit-kthesaurus
+kthesaurus: no-shlibs-control-file usr/lib/libtdeinit_kthesaurus.so
+kthesaurus: postinst-must-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
+kthesaurus: postrm-should-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
+kthesaurus: package-name-doesnt-match-sonames libtdeinit-kthesaurus
 
diff --git a/debian/lenny/applications/koffice/debian/kugar-trinity.install b/debian/lenny/applications/koffice/debian/kugar-trinity.install
index 62c8c369f..c12230725 100644
--- a/debian/lenny/applications/koffice/debian/kugar-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kugar-trinity.install
@@ -11,8 +11,8 @@ debian/tmp/opt/trinity/lib/trinity/libkugarnopimport.la
 debian/tmp/opt/trinity/lib/trinity/libkugarnopimport.so
 debian/tmp/opt/trinity/lib/trinity/libkugarpart.la
 debian/tmp/opt/trinity/lib/trinity/libkugarpart.so
-debian/tmp/opt/trinity/lib/libkdeinit_kudesigner.so
-debian/tmp/opt/trinity/lib/libkdeinit_kugar.so
+debian/tmp/opt/trinity/lib/libtdeinit_kudesigner.so
+debian/tmp/opt/trinity/lib/libtdeinit_kugar.so
 debian/tmp/opt/trinity/lib/libkudesignercore.la
 debian/tmp/opt/trinity/lib/libkudesignercore.so
 debian/tmp/opt/trinity/lib/libkugarlib.so.*
diff --git a/debian/lenny/applications/koffice/debian/kugar-trinity.lintian b/debian/lenny/applications/koffice/debian/kugar-trinity.lintian
index e06755739..5b8ec0d77 100644
--- a/debian/lenny/applications/koffice/debian/kugar-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kugar-trinity.lintian
@@ -1,4 +1,4 @@
-kugar: shlib-missing-in-control-file libkdeinit_kudesigner.so for usr/lib/libkdeinit_kudesigner.so
-kugar: shlib-missing-in-control-file libkdeinit_kugar.so for usr/lib/libkdeinit_kugar.so
+kugar: shlib-missing-in-control-file libtdeinit_kudesigner.so for usr/lib/libtdeinit_kudesigner.so
+kugar: shlib-missing-in-control-file libtdeinit_kugar.so for usr/lib/libtdeinit_kugar.so
 kugar: shlib-missing-in-control-file libkudesignercore.so for usr/lib/libkudesignercore.so
-kugar: package-name-doesnt-match-sonames libkdeinit-kudesigner libkdeinit-kugar libkudesignercore libkugarlib1
+kugar: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-kugar libkudesignercore libkugarlib1
diff --git a/debian/lenny/applications/koffice/debian/kword-trinity.install b/debian/lenny/applications/koffice/debian/kword-trinity.install
index d003812cd..7f3f2f954 100644
--- a/debian/lenny/applications/koffice/debian/kword-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kword-trinity.install
@@ -67,5 +67,5 @@ debian/tmp/opt/trinity/lib/trinity/libwpexport.la
 debian/tmp/opt/trinity/lib/trinity/libwpexport.so
 debian/tmp/opt/trinity/lib/trinity/libwpimport.la
 debian/tmp/opt/trinity/lib/trinity/libwpimport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kword.so
+debian/tmp/opt/trinity/lib/libtdeinit_kword.so
 debian/tmp/opt/trinity/lib/libkwordprivate.so.*
diff --git a/debian/lenny/applications/koffice/debian/kword-trinity.lintian b/debian/lenny/applications/koffice/debian/kword-trinity.lintian
index e18dbe8b2..5d08d84ca 100644
--- a/debian/lenny/applications/koffice/debian/kword-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kword-trinity.lintian
@@ -1,4 +1,4 @@
-kword: shlib-missing-in-control-file libkdeinit_kword.so for usr/lib/libkdeinit_kword.so
+kword: shlib-missing-in-control-file libtdeinit_kword.so for usr/lib/libtdeinit_kword.so
 kword: menu-icon-missing /usr/share/pixmaps/kword.xpm
-kword: package-name-doesnt-match-sonames libkdeinit-kword libkwordprivate4
+kword: package-name-doesnt-match-sonames libtdeinit-kword libkwordprivate4
 
diff --git a/debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.linda b/debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
index 4d9818595..ff5153632 100644
--- a/debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
+++ b/debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
@@ -1,4 +1,4 @@
 Tag: lib-not-in-shlibs
 
 Tag: no-shlib-file
-Data: /usr/trinity/lib/libkdeinit_*.so
+Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian b/debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
index 1f650ceb8..edff50852 100644
--- a/debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
+++ b/debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libkdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
 
diff --git a/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.linda b/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.linda
index 4d9818595..ff5153632 100644
--- a/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.linda
+++ b/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.linda
@@ -1,4 +1,4 @@
 Tag: lib-not-in-shlibs
 
 Tag: no-shlib-file
-Data: /usr/trinity/lib/libkdeinit_*.so
+Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.lintian b/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.lintian
index 1f650ceb8..edff50852 100644
--- a/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.lintian
+++ b/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libkdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
 
diff --git a/debian/lenny/applications/krusader/debian/krusader.lintian-overrides b/debian/lenny/applications/krusader/debian/krusader.lintian-overrides
index 74c03c669..62bf48233 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 tdebase-bin, which provides kdesu
-krusader-trinity: menu-command-not-in-package /usr/share/menu/krusader:17 kdesu
+# package depends on tdebase-bin, which provides tdesu
+krusader-trinity: menu-command-not-in-package /usr/share/menu/krusader:17 tdesu
diff --git a/debian/lenny/applications/krusader/debian/menu b/debian/lenny/applications/krusader/debian/menu
index 92d07892f..759ac536f 100644
--- a/debian/lenny/applications/krusader/debian/menu
+++ b/debian/lenny/applications/krusader/debian/menu
@@ -14,4 +14,4 @@
 	title="krusader - root-mode (File Manager)"\
 	icon32x32="/usr/share/pixmaps/krusader_root.xpm"\
 	icon16x16="/usr/share/pixmaps/krusader_root-16.xpm"\
-	command="kdesu -c /opt/trinity/bin/krusader"
+	command="tdesu -c /opt/trinity/bin/krusader"
diff --git a/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.lintian b/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.lintian
index dd274dba5..89f453cea 100644
--- a/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.lintian
+++ b/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.lintian
@@ -1,4 +1,4 @@
-kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow-trinity: package-name-doesnt-match-sonames libkdeinit-kuickshow
+kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow
diff --git a/debian/lenny/applications/tdesudo/debian/links b/debian/lenny/applications/tdesudo/debian/links
index 0482e1e4f..faf8013c3 100644
--- a/debian/lenny/applications/tdesudo/debian/links
+++ b/debian/lenny/applications/tdesudo/debian/links
@@ -1 +1 @@
-opt/trinity/bin/tdesudo opt/trinity/bin/kdesu 
+opt/trinity/bin/tdesudo opt/trinity/bin/tdesu 
diff --git a/debian/lenny/applications/tdesudo/debian/postinst b/debian/lenny/applications/tdesudo/debian/postinst
index b0100d96c..9164f9d4a 100644
--- a/debian/lenny/applications/tdesudo/debian/postinst
+++ b/debian/lenny/applications/tdesudo/debian/postinst
@@ -12,7 +12,7 @@ fi
 case "$1" in
   configure)
 	dpkg-divert --package $package_name --rename --remove \
-                /usr/trinity/bin/kdesu || true
+                /usr/trinity/bin/tdesu || true
     ;;
   abort-upgrade)
     ;;
diff --git a/debian/lenny/applications/tdesudo/debian/postrm b/debian/lenny/applications/tdesudo/debian/postrm
index a5b54ebf1..dfab37030 100644
--- a/debian/lenny/applications/tdesudo/debian/postrm
+++ b/debian/lenny/applications/tdesudo/debian/postrm
@@ -12,7 +12,7 @@ fi
 case "$1" in
   remove)
     dpkg-divert --package $package_name --rename --remove \
-                /opt/trinity/bin/kdesu
+                /opt/trinity/bin/tdesu
     ;;
   purge)
     ;;
diff --git a/debian/lenny/applications/tdesudo/debian/preinst b/debian/lenny/applications/tdesudo/debian/preinst
index fe6a85b58..a13492559 100644
--- a/debian/lenny/applications/tdesudo/debian/preinst
+++ b/debian/lenny/applications/tdesudo/debian/preinst
@@ -12,13 +12,13 @@ fi
 case "$1" in
   install)
     dpkg-divert --package $package_name \
-    --divert /opt/trinity/bin/kdesu.distrib \
-    --rename /opt/trinity/bin/kdesu
+    --divert /opt/trinity/bin/tdesu.distrib \
+    --rename /opt/trinity/bin/tdesu
     ;;
   upgrade)
     dpkg-divert --package $package_name \
-    --divert /opt/trinity/bin/kdesu.distrib \
-    --rename /opt/trinity/bin/kdesu
+    --divert /opt/trinity/bin/tdesu.distrib \
+    --rename /opt/trinity/bin/tdesu
     ;;
   abort-upgrade)
     ;;
diff --git a/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu b/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu
index dc43a7b0f..e30b43ad8 100644
--- a/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu
@@ -5,6 +5,6 @@
         icon32x32="/usr/share/pixmaps/wlassistant.xpm"\
         icon16x16="/usr/share/pixmaps/wlassistant-16.xpm"\
         title="wlassistant"\
-        command="/opt/trinity/bin/kdesu -X -c /opt/trinity/bin/wlassistant"
+        command="/opt/trinity/bin/tdesu -X -c /opt/trinity/bin/wlassistant"
 
 
diff --git a/debian/lenny/libraries/kipi-plugins/debian/changelog b/debian/lenny/libraries/kipi-plugins/debian/changelog
index d9e80a9a4..0ba259e3b 100755
--- a/debian/lenny/libraries/kipi-plugins/debian/changelog
+++ b/debian/lenny/libraries/kipi-plugins/debian/changelog
@@ -297,7 +297,7 @@ kipi-plugins (0.1.1-1) unstable; urgency=low
   * New upstream release
     - Delete: debian/patches/13_10_pull_from_upstreamsvn_from_r460242.diff
   * Add debian/rules print-version & get-orig-source targets
-  * Recommends: kdeprint
+  * Recommends: tdeprint
   * Build-Depends: libmagick9++-dev | libmagick++-dev
   * Relibtoolize from /pkg-kde/trunk/common-patches/ for 3.5.2
       + patches/02_autotools_update.diff
@@ -375,7 +375,7 @@ kipi-plugins (0.1+rc1-1) unstable; urgency=low
   [ Mark Purcell ]
   * Bump Suggests: to Recommends: these would be found together in all but
   unusual situations
-    - kdeprinter - PrintWizard
+    - tdeprinter - PrintWizard
     - kmail - SendImages
     - sane-utils - AcquireImages
     - k3b - CdArchiving
diff --git a/debian/lenny/libraries/kipi-plugins/debian/control b/debian/lenny/libraries/kipi-plugins/debian/control
index 2d0f17de3..fd3f5bf67 100755
--- a/debian/lenny/libraries/kipi-plugins/debian/control
+++ b/debian/lenny/libraries/kipi-plugins/debian/control
@@ -15,7 +15,7 @@ Package: kipi-plugins-trinity
 Replaces: digikamplugins-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kmail-trinity, kdeprint-trinity, sane-utils, kooka-trinity, konqueror-trinity, mpg123
+Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kmail-trinity, tdeprint-trinity, sane-utils, kooka-trinity, konqueror-trinity, mpg123
 Suggests: gimp, gallery, kipi-plugins-trinity-doc
 Enhances: digikam-trinity, kphotoalbum-trinity, showimg, gwenview-trinity
 Description: image manipulation/handling plugins for KIPI aware programs [Trinity]
diff --git a/debian/lenny/libraries/kipi-plugins/debian/control.in b/debian/lenny/libraries/kipi-plugins/debian/control.in
index 0d68a8196..94cbc99da 100755
--- a/debian/lenny/libraries/kipi-plugins/debian/control.in
+++ b/debian/lenny/libraries/kipi-plugins/debian/control.in
@@ -16,7 +16,7 @@ Package: kipi-plugins-trinity
 Replaces: digikamplugins-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kmail-trinity, kdeprint-trinity, sane-utils, kooka-trinity, konqueror-trinity, mpg123
+Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kmail-trinity, tdeprint-trinity, sane-utils, kooka-trinity, konqueror-trinity, mpg123
 Suggests: gimp, gallery, kipi-plugins-trinity-doc
 Enhances: digikam-trinity, kphotoalbum-trinity, showimg, gwenview-trinity
 Description: image manipulation/handling plugins for KIPI aware programs [Trinity]
diff --git a/debian/lenny/libraries/libkdcraw/debian/changelog b/debian/lenny/libraries/libkdcraw/debian/changelog
index 4458e7b08..3cc18c357 100644
--- a/debian/lenny/libraries/libkdcraw/debian/changelog
+++ b/debian/lenny/libraries/libkdcraw/debian/changelog
@@ -90,8 +90,8 @@ libkdcraw (0.1.1-2) unstable; urgency=low
       patches/04_am_maintainer_mode.diff
       patches/05_pedantic-errors.diff
       patches/98_buildprep.diff
-      patches/98_configure.diff: makes $LIB_QT only -lqt-mt and LIB_KDECORE
-      only -lkdecore
+      patches/98_configure.diff: makes $LIB_QT only -lqt-mt and LIB_TDECORE
+      only -ltdecore
   * Add utils.mk to debian/rules to have list-missing target
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Tue, 26 Jun 2007 07:31:15 +0100
diff --git a/debian/lenny/libraries/libkipi/debian/changelog b/debian/lenny/libraries/libkipi/debian/changelog
index eaec4a227..af82417d7 100644
--- a/debian/lenny/libraries/libkipi/debian/changelog
+++ b/debian/lenny/libraries/libkipi/debian/changelog
@@ -111,7 +111,7 @@ libkipi (0.1.2-3) unstable; urgency=low
       + debian/rules: add buildprep rule to recreate the buildpref diff
       + add 06_aclocal_update.diff: aclocal.m4 gets recreated after each
         new buildprep diff
-      + patches/10_link_to_right_libs.diff: add missing libraries -lkdecore
+      + patches/10_link_to_right_libs.diff: add missing libraries -ltdecore
         -lqt-mt
     Result: libkipi0 now depends on 5 instead of 25 packages
   * remove unnecessary build dependency on libimlib2-dev
diff --git a/debian/lenny/tdeadmin/debian/changelog b/debian/lenny/tdeadmin/debian/changelog
index 4c2296fcb..4fca9af79 100644
--- a/debian/lenny/tdeadmin/debian/changelog
+++ b/debian/lenny/tdeadmin/debian/changelog
@@ -531,7 +531,7 @@ tdeadmin (4:3.4.0-0pre2) alioth; urgency=low
 
   +++ Changes by Pierre Habouzit:
 
-  * Recommends tdebase-bin for lilo-config (kdesu in the menu command).
+  * Recommends tdebase-bin for lilo-config (tdesu in the menu command).
   * Remove kcmlinuz from Depends for tdeadmin meta package.
   * Wrote a man page for kdat.
 
diff --git a/debian/lenny/tdeadmin/debian/control b/debian/lenny/tdeadmin/debian/control
index 5fcf59ebb..fcf54e33e 100644
--- a/debian/lenny/tdeadmin/debian/control
+++ b/debian/lenny/tdeadmin/debian/control
@@ -140,7 +140,7 @@ Description: Trinity frontend for lilo configuration
  It runs out of the KDE Control Center.
  .
  If you want to use the menu entry to launch lilo-config, you need to install
- tdebase-bin since it uses the kdesu command to gain root privileges.
+ tdebase-bin since it uses the tdesu command to gain root privileges.
  .
  This package is part of Trinity, as a component of the KDE administration module.
  See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
diff --git a/debian/lenny/tdeadmin/debian/control.in b/debian/lenny/tdeadmin/debian/control.in
index 8fd3732e5..5d67ada60 100644
--- a/debian/lenny/tdeadmin/debian/control.in
+++ b/debian/lenny/tdeadmin/debian/control.in
@@ -140,7 +140,7 @@ Description: KDE frontend for lilo configuration
  It runs out of the KDE Control Center.
  .
  If you want to use the menu entry to launch lilo-config, you need to install
- tdebase-bin since it uses the kdesu command to gain root privileges.
+ tdebase-bin since it uses the tdesu command to gain root privileges.
  .
  This package is part of KDE, as a component of the KDE administration module.
  See the 'kde' and 'tdeadmin' packages for more information.
diff --git a/debian/lenny/tdeadmin/debian/lilo-config-trinity.lintian b/debian/lenny/tdeadmin/debian/lilo-config-trinity.lintian
index 96c770df9..dc8ec46fb 100644
--- a/debian/lenny/tdeadmin/debian/lilo-config-trinity.lintian
+++ b/debian/lenny/tdeadmin/debian/lilo-config-trinity.lintian
@@ -1 +1 @@
-lilo-config: menu-command-not-in-package /usr/share/menu/lilo-config:6 /opt/trinity/bin/kdesu
+lilo-config: menu-command-not-in-package /usr/share/menu/lilo-config:6 /opt/trinity/bin/tdesu
diff --git a/debian/lenny/tdeadmin/debian/lilo-config-trinity.menu b/debian/lenny/tdeadmin/debian/lilo-config-trinity.menu
index 3f2bfca36..6efa201f0 100644
--- a/debian/lenny/tdeadmin/debian/lilo-config-trinity.menu
+++ b/debian/lenny/tdeadmin/debian/lilo-config-trinity.menu
@@ -3,4 +3,4 @@
 	section="Applications/System/Administration"\
 	hints="KDE"\
 	title="lilo-config"\
-	command="/opt/trinity/bin/kdesu kcmshell lilo"
+	command="/opt/trinity/bin/tdesu kcmshell lilo"
diff --git a/debian/lenny/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/debian/lenny/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
index 2a94294ef..5d776fe2d 100644
--- a/debian/lenny/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/debian/lenny/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
@@ -24,7 +24,7 @@ binary-install/tdebase-bin::
 	install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap
 	install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap
 
---with-sudo-kdesu-backend
+--with-sudo-tdesu-backend
 
 XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/tdebase/debian
 
diff --git a/debian/lenny/tdebase/debian/changelog b/debian/lenny/tdebase/debian/changelog
index 348bfd069..b991c3875 100644
--- a/debian/lenny/tdebase/debian/changelog
+++ b/debian/lenny/tdebase/debian/changelog
@@ -635,7 +635,7 @@ tdebase (4:3.5.7.dfsg.1-1) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
   
-  * Add smbclient to suggests of kdeprint to show that it is needed to make
+  * Add smbclient to suggests of tdeprint to show that it is needed to make
     smb printers work. Also adapt the description. (Closes: #445182)
   * Lower gdb recommends to a suggests now that recommends get installed by
     default. (Closes: 442432)
@@ -866,7 +866,7 @@ tdebase (4:3.5.7-1ubuntu10) gutsy; urgency=low
 
   * Added kubuntu_99_kate_crashfix_from_svn.diff.  (LP: #122296)
   * Committed into Bzr.
-  * Added gs-esp-x to kdeprint depends and konqueror depends. (LP: #83597)
+  * Added gs-esp-x to tdeprint depends and konqueror depends. (LP: #83597)
   * Added konqueror Recommends: libxine1-ffmpeg, so that the thumbnail
     generation no longer fails on video files. (LP: #51024)
   * Added konqueror Recommends: libarts1-mpeglib, so that the thumbnail
@@ -1050,7 +1050,7 @@ tdebase (4:3.5.6.dfsg.2-1) unstable; urgency=low
       - Simplified chinese thanks to Ming Hua. (Closes: #418486)
       - Malayam thanks to Praveen A. (Closes: #418495)
       - Greek (still has a couple of fuzzy strings).
-  * Add a patch to put some quotes in kdeprintgfax to have spaces in
+  * Add a patch to put some quotes in tdeprintgfax to have spaces in
     names/numbers. Thanks to Robert Cheramy. (Closes: #247396)
   * Fix minor issues in manpage. Thanks JS Bygott. (Closes: #414270)
   * Enable kerberos in kio slaves. It seems do not break anything. 
@@ -1347,7 +1347,7 @@ tdebase (4:3.5.5a.dfsg.1-1ubuntu7) feisty; urgency=low
 
 tdebase (4:3.5.5a.dfsg.1-1ubuntu6) feisty; urgency=low
 
-  * Compile with --with-sudo-kdesu-backend
+  * Compile with --with-sudo-tdesu-backend
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Nov 2006 10:18:52 +0000
 
@@ -1425,7 +1425,7 @@ tdebase (4:3.5.5a.dfsg.1-5) unstable; urgency=high
 tdebase (4:3.5.5a.dfsg.1-4) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
-  * Add a section to man page about how to use sudo as kdesu backend 
+  * Add a section to man page about how to use sudo as tdesu backend 
     (Closes: #399823, #384416)
  
   +++ Changes by Ana Guerrero:
@@ -1713,13 +1713,13 @@ tdebase (4:3.5.5-0ubuntu1) edgy; urgency=low
   * 28_tdebase_rubberband.diff now kubuntu_28_tdebase_rubberband.diff and hunk
     removed to apply
   * kubuntu_14_hide_konquerorsu_menu_entry.diff updated
-  * kubuntu_20_kdesu_sudo.diff updated, merged upstream
+  * kubuntu_20_tdesu_sudo.diff updated, merged upstream
   * kubuntu_35_hide_klipper_menu_entry.diff updated
   * kubuntu_73_nomediaioslave_mounthelper.diff  updated
   * kubuntu_75_kicker_taskbar_resize.diff removed, fixed upstream
   * kubuntu_76_kickermedia.diff updated
   * kubuntu_83_media_desktop.diff updated
-  * Use --with-sudo-kdesu-backend and build-dep on sudo
+  * Use --with-sudo-tdesu-backend and build-dep on sudo
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:06 +0000
 
@@ -2232,7 +2232,7 @@ tdebase (4:3.5.2-0ubuntu23) dapper; urgency=low
 
 tdebase (4:3.5.2-0ubuntu22) dapper; urgency=low
 
-  * Update kubuntu_20_kdesu_sudo.diff to fix run as foo message in kdesu
+  * Update kubuntu_20_tdesu_sudo.diff to fix run as foo message in tdesu
     with -u switch (Closes: Malone #41184)
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Thu, 11 May 2006 12:12:44 +0200
@@ -2294,7 +2294,7 @@ tdebase (4:3.5.2-0ubuntu14) dapper; urgency=low
   * Removed system tab from konqueror's sidebar
   * Alter kubuntu_52_gtk_qt_engine_config.diff, don't make use of
     gtk_qt_engine if gnome or xfce are already installed (Malone #36256)
-  * Added kubuntu_61_kdeprint_admin.diff, makes kdeprint admin mode work
+  * Added kubuntu_61_tdeprint_admin.diff, makes tdeprint admin mode work
     (Malone #39867)
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 24 Apr 2006 21:16:19 +0200
@@ -2503,7 +2503,7 @@ tdebase (4:3.5.1-0ubuntu1) dapper; urgency=low
 
 tdebase (4:3.5.0-0ubuntu16) dapper; urgency=low
 
-  * Add kubuntu_43_kdesu_terminal_output.diff to make kdesu
+  * Add kubuntu_43_tdesu_terminal_output.diff to make tdesu
     have terminal output
   * Remove xlibs-static-pic from build-deps
 
@@ -2605,7 +2605,7 @@ tdebase (4:3.5.0-0ubuntu2) dapper; urgency=low
     duplicate printer .desktop files
   * Add kubuntu_35_hide_klipper_menu_entry.diff autostarts by default
   * Add kubuntu_36_hide_kjobviewer_menu_entry.diff starts when printing
-  * Add kubuntu_37_hide_kdeprintfax_menu_entry.diff kdeprintfax 
+  * Add kubuntu_37_hide_tdeprintfax_menu_entry.diff tdeprintfax 
     is available when printing with Print to Fax
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Dec 2005 21:51:29 +0000
@@ -2848,7 +2848,7 @@ tdebase (4:3.4.1-1) experimental; urgency=low
 
 tdebase (4:3.4.3-0ubuntu6) breezy-updates; urgency=low
 
-  * Add kubuntu_34_kdesu_sycoca_cache_path.diff fix administrator
+  * Add kubuntu_34_tdesu_sycoca_cache_path.diff fix administrator
     kcontrol module bug http://bugzilla.ubuntu.com/8681
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  2 Nov 2005 02:37:11 +0000
@@ -3069,7 +3069,7 @@ tdebase (4:3.4.0-0pre4) alioth; urgency=low
     fail when kpersonalizer is not present. (Closes: #309803)
 
   * Add manpages for kdialog (thanks to Bastian Kleineidam for tracking it
-    down) and my own manpage for kdesu/kdesud. (Closes: #239945)
+    down) and my own manpage for tdesu/tdesud. (Closes: #239945)
 
   +++ Changes by Adeodato Simó:
 
@@ -3090,7 +3090,7 @@ tdebase (4:3.3.2-1) unstable; urgency=low
 
   * Fix typo in tdebase-bin description. (Closes: #286587)
 
-  * Update kdeprint documentation to sync with tdelibs patches.
+  * Update tdeprint documentation to sync with tdelibs patches.
 
   * Add NEWS.Debian for kdm, explaining the "keyboard doesn't work"
     problem when upgrading to KDE 3.3, and how to deal with it.
@@ -3107,8 +3107,8 @@ tdebase (4:3.3.2-1) unstable; urgency=low
   +++ Changes by Adeodato Simó:
 
   * debian/control:
-    - make tdebase-dev depend on kwin for the libkdecorations.so ->
-      libkdecorations.so.1.0.0 symlink. (Closes: #289544)
+    - make tdebase-dev depend on kwin for the libtdecorations.so ->
+      libtdecorations.so.1.0.0 symlink. (Closes: #289544)
 
   * Included Czech po-debconf translation by Miroslav Kure.
     (Closes: #289454)
@@ -3153,7 +3153,7 @@ tdebase (4:3.4.0-0ubuntu17) hoary; urgency=low
 
 tdebase (4:3.4.0-0ubuntu16) hoary; urgency=low
 
-  * Add kubuntu_20_kdesu_sudo.diff to fix string on kdesu for sudo.
+  * Add kubuntu_20_tdesu_sudo.diff to fix string on tdesu for sudo.
     Fixes http://bugzilla.ubuntu.com/7327
 
  -- Jonathan Riddell <jr@jriddell.org>  Sat,  2 Apr 2005 17:01:37 +0100
@@ -3311,7 +3311,7 @@ tdebase (4:3.3.2-0pre1) experimental; urgency=low
   * New upstream release.
   * KDE_3_3_BRANCH update. Includes the tdebase part of the fix
     for CAN-2004-1158.
-  * Lower kdeprint's dependency on gv to a Suggests. (Closes: #269590)
+  * Lower tdeprint's dependency on gv to a Suggests. (Closes: #269590)
   * kwin is now registered as an x-window-manager. (Closes: #249162)
   * Added /usr/share/xsessions to KDM's default session path, so
     .desktop files installed there are found.
@@ -3498,7 +3498,7 @@ tdebase (4:3.1.4-1) unstable; urgency=low
   * Added patch to update autotools files.
   * Added patch to remove pedantic-errors from KDE_CHECK_FUNC_EXT since it
     causes configure checks to fail due to #line numbers being > 32767.
-  * Demote kdeprint Depends 'efax | hylafax-client | mgetty-fax' to Suggests.
+  * Demote tdeprint Depends 'efax | hylafax-client | mgetty-fax' to Suggests.
     (Closes: #142489)
   * Change kicker.menu-method to not display the empty_mime icon if a menu file
     doesn't provide an icon. (Closes: #154065)
@@ -3540,7 +3540,7 @@ tdebase (4:3.1.2-1) unstable; urgency=low
   * New upstream release.
   * Remove Build-Depends on libsasl-dev. (Closes: #189949, #193866)
   * Add libkregexpeditor to kate Recommends. (Closes: #183280)
-  * Add efax | hylafax | mgetty-fax to kdeprint Depends. (Closes: #142489)
+  * Add efax | hylafax | mgetty-fax to tdeprint Depends. (Closes: #142489)
   * Add kfind to konqueror Depends. (Closes: #192859)
   * Fix KDE GDM Session file. (Closes: #144206, #154519, #188560, #189438,
     #193274)
@@ -4289,7 +4289,7 @@ tdebase (4:2.1-beta2-0128-1) unstable; urgency=low
 tdebase (4:2.1-beta2-3) unstable; urgency=low
  
   * Don't crash when trying to load/read faulty plugins (Closes: #82983)
-  * Moving kdesu to tdebase-libs so that we can use it without needing
+  * Moving tdesu to tdebase-libs so that we can use it without needing
     tdebase installed
   * Adding autoconf and gettext to build-deps
   * Several small bug fixes from upstream
diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control
index 4a86b50f9..802953a5f 100644
--- a/debian/lenny/tdebase/debian/control
+++ b/debian/lenny/tdebase/debian/control
@@ -12,7 +12,7 @@ Standards-Version: 3.8.4
 Package: tdebase-trinity
 Section: kde
 Architecture: all
-Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), kdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), kwin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
+Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), kwin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
 Recommends: kdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -129,7 +129,7 @@ Description: shared data files for the KDE base module
 Package: tdebase-trinity-dev
 Section: devel
 Architecture: any
-Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), kdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), kwin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), kwin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
 Replaces: kate-trinity (<< 4:3.0.0), tdebase-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0)
 Description: development files for the KDE base module
  This package contains headers and other development files needed to
@@ -199,7 +199,7 @@ Description: password changer for KDE
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: kdeprint-trinity
+Package: tdeprint-trinity
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}, enscript, poster, psutils
diff --git a/debian/lenny/tdebase/debian/control.in b/debian/lenny/tdebase/debian/control.in
index c23253584..107c75b66 100644
--- a/debian/lenny/tdebase/debian/control.in
+++ b/debian/lenny/tdebase/debian/control.in
@@ -13,7 +13,7 @@ XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/tdebase/debian
 Package: tdebase
 Section: kde
 Architecture: all
-Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), kdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
+Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
 Recommends: kdm (>= ${Source-Version})
 Suggests: tdebase-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -121,7 +121,7 @@ Description: shared data files for the KDE base module
 Package: tdebase-dev
 Section: devel
 Architecture: any
-Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), kdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), tdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
 Replaces: kate (<< 4:3.0.0), tdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
 Description: development files for the KDE base module
  This package contains headers and other development files needed to
@@ -191,7 +191,7 @@ Description: password changer for KDE
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde' and 'tdebase' packages for more information.
 
-Package: kdeprint
+Package: tdeprint
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}, enscript, poster, psutils
diff --git a/debian/lenny/tdebase/debian/copyright b/debian/lenny/tdebase/debian/copyright
index 8e0933735..a17edd5c2 100644
--- a/debian/lenny/tdebase/debian/copyright
+++ b/debian/lenny/tdebase/debian/copyright
@@ -16,7 +16,7 @@ headings and other identifying marks.
 
 Artistic
 --------
-kdcop, kdesu, klipper
+kdcop, tdesu, klipper
 
 BSD
 ---
@@ -24,7 +24,7 @@ drkonqi, kaddressbook, kicker, ksmserver, ksplash, kwin, legacyimport
 
 GPL
 ---
-kappfinder, kate, kcheckpass, kdeprint, kdm, kfind, khelpcenter, kmenuedit,
+kappfinder, kate, kcheckpass, tdeprint, kdm, kfind, khelpcenter, kmenuedit,
 konqueror, konsole, kpager, kpersonalizer, kreadconfig, kstart, ksysguard, ktip
 
 LGPL
diff --git a/debian/lenny/tdebase/debian/edit-as-root.desktop b/debian/lenny/tdebase/debian/edit-as-root.desktop
index 049454ea0..e3df17006 100644
--- a/debian/lenny/tdebase/debian/edit-as-root.desktop
+++ b/debian/lenny/tdebase/debian/edit-as-root.desktop
@@ -9,4 +9,4 @@ Name[fr]=Editer en tant que Root
 Name[es]=Editar como Root
 Name[de]=Als root bearbeiten
 Icon=kfm
-Exec=kdesu "kwrite" "%U"
+Exec=tdesu "kwrite" "%U"
diff --git a/debian/lenny/tdebase/debian/icons/kdeprint-16.xpm b/debian/lenny/tdebase/debian/icons/kdeprint-16.xpm
index 4f03a0b06..58b87a90d 100644
--- a/debian/lenny/tdebase/debian/icons/kdeprint-16.xpm
+++ b/debian/lenny/tdebase/debian/icons/kdeprint-16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kdeprint-16[] = {
+static char *tdeprint-16[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 137 2",
 "   c black",
diff --git a/debian/lenny/tdebase/debian/icons/kdeprint.xpm b/debian/lenny/tdebase/debian/icons/kdeprint.xpm
index f11005860..c10da523c 100644
--- a/debian/lenny/tdebase/debian/icons/kdeprint.xpm
+++ b/debian/lenny/tdebase/debian/icons/kdeprint.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kdeprint[] = {
+static char *tdeprint[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 130 2",
 "   c black",
diff --git a/debian/lenny/tdebase/debian/icons/kdeprintfax-16.xpm b/debian/lenny/tdebase/debian/icons/kdeprintfax-16.xpm
index debb554b6..3e07385e5 100644
--- a/debian/lenny/tdebase/debian/icons/kdeprintfax-16.xpm
+++ b/debian/lenny/tdebase/debian/icons/kdeprintfax-16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kdeprintfax-16[] = {
+static char *tdeprintfax-16[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 168 2",
 "   c black",
diff --git a/debian/lenny/tdebase/debian/icons/kdeprintfax.xpm b/debian/lenny/tdebase/debian/icons/kdeprintfax.xpm
index 6af142f57..9f5d6a2e7 100644
--- a/debian/lenny/tdebase/debian/icons/kdeprintfax.xpm
+++ b/debian/lenny/tdebase/debian/icons/kdeprintfax.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kdeprintfax[] = {
+static char *tdeprintfax[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 94 2",
 "   c #000000",
diff --git a/debian/lenny/tdebase/debian/kate-trinity.install b/debian/lenny/tdebase/debian/kate-trinity.install
index bc586a595..3b65dfabc 100644
--- a/debian/lenny/tdebase/debian/kate-trinity.install
+++ b/debian/lenny/tdebase/debian/kate-trinity.install
@@ -9,8 +9,8 @@ debian/tmp/opt/trinity/lib/libkateinterfaces.so.0
 debian/tmp/opt/trinity/lib/libkateinterfaces.so.0.0.0
 debian/tmp/opt/trinity/lib/libkateutils.so.0
 debian/tmp/opt/trinity/lib/libkateutils.so.0.0.0
-debian/tmp/opt/trinity/lib/libkdeinit_kate.so
-debian/tmp/opt/trinity/lib/libkdeinit_kwrite.so
+debian/tmp/opt/trinity/lib/libtdeinit_kate.so
+debian/tmp/opt/trinity/lib/libtdeinit_kwrite.so
 debian/tmp/opt/trinity/share/applications/kde/kate.desktop
 debian/tmp/opt/trinity/share/applications/kde/kwrite.desktop
 debian/tmp/opt/trinity/share/apps/kate/externaltools
diff --git a/debian/lenny/tdebase/debian/kate-trinity.lintian b/debian/lenny/tdebase/debian/kate-trinity.lintian
index fcc9b79aa..0ad1f24b6 100644
--- a/debian/lenny/tdebase/debian/kate-trinity.lintian
+++ b/debian/lenny/tdebase/debian/kate-trinity.lintian
@@ -1,2 +1,2 @@
-kate: shlib-missing-in-control-file libkdeinit_kwrite.so usr/lib/libkdeinit_kwrite.so
-kate: shlib-missing-in-control-file libkdeinit_kate.so usr/lib/libkdeinit_kate.so
+kate: shlib-missing-in-control-file libtdeinit_kwrite.so usr/lib/libtdeinit_kwrite.so
+kate: shlib-missing-in-control-file libtdeinit_kate.so usr/lib/libtdeinit_kate.so
diff --git a/debian/lenny/tdebase/debian/kcontrol-trinity.install b/debian/lenny/tdebase/debian/kcontrol-trinity.install
index f337002f6..71527a0c5 100644
--- a/debian/lenny/tdebase/debian/kcontrol-trinity.install
+++ b/debian/lenny/tdebase/debian/kcontrol-trinity.install
@@ -124,8 +124,8 @@ debian/tmp/opt/trinity/lib/trinity/libkurisearchfilter.la
 debian/tmp/opt/trinity/lib/trinity/libkurisearchfilter.so
 debian/tmp/opt/trinity/lib/trinity/liblocaldomainurifilter.la
 debian/tmp/opt/trinity/lib/trinity/liblocaldomainurifilter.so
-debian/tmp/opt/trinity/lib/libkdeinit_kaccess.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcontrol.so
+debian/tmp/opt/trinity/lib/libtdeinit_kaccess.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcontrol.so
 debian/tmp/opt/trinity/lib/libkfontinst.so.0
 debian/tmp/opt/trinity/lib/libkfontinst.so.0.0.0
 debian/tmp/opt/trinity/share/applications/kde/arts.desktop
diff --git a/debian/lenny/tdebase/debian/kcontrol-trinity.lintian b/debian/lenny/tdebase/debian/kcontrol-trinity.lintian
index 3c7f407c6..d18964b2d 100644
--- a/debian/lenny/tdebase/debian/kcontrol-trinity.lintian
+++ b/debian/lenny/tdebase/debian/kcontrol-trinity.lintian
@@ -1,3 +1,3 @@
-kcontrol: shlib-missing-in-control-file libkdeinit_kaccess.so usr/lib/libkdeinit_kaccess.so
-kcontrol: shlib-missing-in-control-file libkdeinit_kcontrol.so usr/lib/libkdeinit_kcontrol.so
-kcontrol: shlib-missing-in-control-file libkdeinit_krandrinithack.so usr/lib/libkdeinit_krandrinithack.so
+kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so
+kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so
+kcontrol: shlib-missing-in-control-file libtdeinit_krandrinithack.so usr/lib/libtdeinit_krandrinithack.so
diff --git a/debian/lenny/tdebase/debian/kdeprint-trinity.install b/debian/lenny/tdebase/debian/kdeprint-trinity.install
index bd25acf54..69f67a958 100644
--- a/debian/lenny/tdebase/debian/kdeprint-trinity.install
+++ b/debian/lenny/tdebase/debian/kdeprint-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/bin/kdeprintfax
+debian/tmp/opt/trinity/bin/tdeprintfax
 debian/tmp/opt/trinity/bin/kjobviewer
 debian/tmp/opt/trinity/bin/kprinter
 debian/tmp/opt/trinity/lib/trinity/kcm_printmgr.la
@@ -9,126 +9,126 @@ debian/tmp/opt/trinity/lib/trinity/kjobviewer.la
 debian/tmp/opt/trinity/lib/trinity/kjobviewer.so
 debian/tmp/opt/trinity/lib/trinity/kprinter.la
 debian/tmp/opt/trinity/lib/trinity/kprinter.so
-debian/tmp/opt/trinity/lib/trinity/libkdeprint_part.la
-debian/tmp/opt/trinity/lib/trinity/libkdeprint_part.so
-debian/tmp/opt/trinity/lib/libkdeinit_kjobviewer.so
-debian/tmp/opt/trinity/lib/libkdeinit_kprinter.so
-debian/tmp/opt/trinity/share/applications/kde/kdeprintfax.desktop
+debian/tmp/opt/trinity/lib/trinity/libtdeprint_part.la
+debian/tmp/opt/trinity/lib/trinity/libtdeprint_part.so
+debian/tmp/opt/trinity/lib/libtdeinit_kjobviewer.so
+debian/tmp/opt/trinity/lib/libtdeinit_kprinter.so
+debian/tmp/opt/trinity/share/applications/kde/tdeprintfax.desktop
 debian/tmp/opt/trinity/share/applications/kde/kjobviewer.desktop
 debian/tmp/opt/trinity/share/applications/kde/printers.desktop
-debian/tmp/opt/trinity/share/apps/kdeprintfax/anytops
-debian/tmp/opt/trinity/share/apps/kdeprintfax/faxfilters
-debian/tmp/opt/trinity/share/apps/kdeprintfax/icons/crystalsvg/16x16/actions/abentry.png
-debian/tmp/opt/trinity/share/apps/kdeprintfax/kdeprintfaxui.rc
-debian/tmp/opt/trinity/share/apps/kdeprint_part/kdeprint_part.rc
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-middle-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-middle-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-top-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-top-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-centre-kdeprint.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-middle-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-middle-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-top-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-top-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/class.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/driver.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/htmlstyles.css
-debian/tmp/opt/trinity/share/apps/kdeprint/template/jobs.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/printer.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/pseudo.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/top-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/top-right-kdeprint.png
+debian/tmp/opt/trinity/share/apps/tdeprintfax/anytops
+debian/tmp/opt/trinity/share/apps/tdeprintfax/faxfilters
+debian/tmp/opt/trinity/share/apps/tdeprintfax/icons/crystalsvg/16x16/actions/abentry.png
+debian/tmp/opt/trinity/share/apps/tdeprintfax/tdeprintfaxui.rc
+debian/tmp/opt/trinity/share/apps/tdeprint_part/tdeprint_part.rc
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-middle-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-middle-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-top-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-top-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-centre-tdeprint.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-middle-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-middle-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-top-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-top-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/class.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/driver.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/htmlstyles.css
+debian/tmp/opt/trinity/share/apps/tdeprint/template/jobs.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/printer.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/pseudo.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/top-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/top-right-tdeprint.png
 debian/tmp/opt/trinity/share/apps/kjobviewer/kjobviewerui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/add-printer-wiz.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cr32-action-wizard.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard2_backendselection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan_results.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard4_networkscan_config.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cups-config.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsoptions.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browse_relay_add_button.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsingmasks_add_button.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration10_browsinggeneral.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration11_browsingconnections.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration11_browsingmasks.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration12_browsingtimeouts.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration14_browsingrelay.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration1_welcome.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration2_general.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration3_logging.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration4_directories.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration5_HTTP.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration6_encryption.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration7_miscellanious.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration8_networkgeneral.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration9_networkclients.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminauthorization.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_securityoverview.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/extensions.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/external-command.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/final-word.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/getting-started.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/highlights.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kcontrol-icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kcron_to_be_printed.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kdeprint-jobviewer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter-as-netscape-printcommand.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter_called_from_run_command.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter-kivio.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter_with_kcron_developer_special.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/lpd.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/lpr-bsd.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/lprng.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/ps-boxes.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/rlpr.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/steinbruch_scaled.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/tech-overview.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/theory.docbook
-debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/add-printer-wiz.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/common
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cr32-action-wizard.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard1.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard2_backendselection.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard3_networkscan.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard3_networkscan_results.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard4_networkscan_config.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cups-config.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsoptions.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfig_browse_relay_add_button.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfig_browsingmasks_add_button.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration10_browsinggeneral.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration11_browsingconnections.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration11_browsingmasks.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration12_browsingtimeouts.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration14_browsingrelay.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration1_welcome.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration2_general.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration3_logging.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration4_directories.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration5_HTTP.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration6_encryption.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration7_miscellanious.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration8_networkgeneral.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration9_networkclients.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaddprinters.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminauthorization.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_securityoverview.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/extensions.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/external-command.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/final-word.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/getting-started.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/highlights.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/index.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kcontrol-icon.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kcron_to_be_printed.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/tdeprint-jobviewer.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter-as-netscape-printcommand.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter_called_from_run_command.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter-kivio.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter_with_kcron_developer_special.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/lpd.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/lpr-bsd.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/lprng.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/ps-boxes.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/rlpr.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/steinbruch_scaled.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/tech-overview.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/theory.docbook
+debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kdeprintfax.svgz
+debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/tdeprintfax.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kjobviewer.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/printmgr.svgz
 debian/tmp/opt/trinity/share/mimelnk/print/class.desktop
@@ -138,13 +138,13 @@ debian/tmp/opt/trinity/share/mimelnk/print/jobs.desktop
 debian/tmp/opt/trinity/share/mimelnk/print/manager.desktop
 debian/tmp/opt/trinity/share/mimelnk/print/printer.desktop
 debian/tmp/opt/trinity/share/mimelnk/print/printermodel.desktop
-debian/tmp/opt/trinity/share/services/kdeprint_part.desktop
+debian/tmp/opt/trinity/share/services/tdeprint_part.desktop
 debian/tmp/opt/trinity/share/services/printdb.protocol
 debian/tmp/opt/trinity/share/services/print.protocol
 
 debian/icons/kjobviewer.xpm		/opt/trinity/share/pixmaps
 debian/icons/kjobviewer-16.xpm		/opt/trinity/share/pixmaps
-debian/icons/kdeprint.xpm		/opt/trinity/share/pixmaps
-debian/icons/kdeprint-16.xpm		/opt/trinity/share/pixmaps
-debian/icons/kdeprintfax.xpm		/opt/trinity/share/pixmaps
-debian/icons/kdeprintfax-16.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeprint.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeprint-16.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeprintfax.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeprintfax-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdebase/debian/kdeprint-trinity.lintian b/debian/lenny/tdebase/debian/kdeprint-trinity.lintian
index 6cac09d35..9da8261d7 100644
--- a/debian/lenny/tdebase/debian/kdeprint-trinity.lintian
+++ b/debian/lenny/tdebase/debian/kdeprint-trinity.lintian
@@ -1,4 +1,4 @@
-kdeprint: no-shlibs-control-file usr/lib/libkdeinit_kjobviewer.so
-kdeprint: no-shlibs-control-file usr/lib/libkdeinit_kprinter.so
-kdeprint: postinst-must-call-ldconfig usr/lib/libkdeinit_kjobviewer.so
-kdeprint: postrm-should-call-ldconfig usr/lib/libkdeinit_kjobviewer.so
+tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kjobviewer.so
+tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kprinter.so
+tdeprint: postinst-must-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
+tdeprint: postrm-should-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
diff --git a/debian/lenny/tdebase/debian/kdeprint-trinity.manpages b/debian/lenny/tdebase/debian/kdeprint-trinity.manpages
index 6d4136bf9..55b9bfae7 100644
--- a/debian/lenny/tdebase/debian/kdeprint-trinity.manpages
+++ b/debian/lenny/tdebase/debian/kdeprint-trinity.manpages
@@ -1,3 +1,3 @@
-debian/man/kdeprintfax-trinity.1
+debian/man/tdeprintfax-trinity.1
 debian/man/kjobviewer-trinity.1
 debian/man/kprinter-trinity.1
diff --git a/debian/lenny/tdebase/debian/kdeprint-trinity.menu b/debian/lenny/tdebase/debian/kdeprint-trinity.menu
index 3140de34c..1268aa55c 100644
--- a/debian/lenny/tdebase/debian/kdeprint-trinity.menu
+++ b/debian/lenny/tdebase/debian/kdeprint-trinity.menu
@@ -1,4 +1,4 @@
-?package(kdeprint):\
+?package(tdeprint):\
 	needs="X11"\
 	section="Applications/System/Monitoring"\
 	hints="KDE"\
@@ -7,29 +7,29 @@
 	icon16x16="/opt/trinity/share/pixmaps/kjobviewer-16.xpm"\
 	command="/opt/trinity/bin/kjobviewer --show --all"
 
-?package(kdeprint):\
+?package(tdeprint):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="KDE"\
 	title="KPrinter"\
-	icon32x32="/opt/trinity/share/pixmaps/kdeprint.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kdeprint-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeprint.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeprint-16.xpm"\
 	command="/opt/trinity/bin/kprinter"
 
-?package(kdeprint):\
+?package(tdeprint):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="KDE"\
 	title="KDEPrintFax"\
-	icon32x32="/opt/trinity/share/pixmaps/kdeprintfax.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kdeprintfax-16.xpm"\
-	command="/opt/trinity/bin/kdeprintfax"
+	icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\
+	command="/opt/trinity/bin/tdeprintfax"
 
-# Icon 32x32 kdeprint/kjobviewer/cr32-app-kjobviewer.png kjobviewer.xpm
-# Icon 16x16 kdeprint/kjobviewer/cr16-app-kjobviewer.png kjobviewer-16.xpm
+# Icon 32x32 tdeprint/kjobviewer/cr32-app-kjobviewer.png kjobviewer.xpm
+# Icon 16x16 tdeprint/kjobviewer/cr16-app-kjobviewer.png kjobviewer-16.xpm
 
-# Icon 32x32 kdeprint/printmgr/cr32-app-printmgr.png kdeprint.xpm
-# Icon 16x16 kdeprint/printmgr/cr16-app-printmgr.png kdeprint-16.xpm
+# Icon 32x32 tdeprint/printmgr/cr32-app-printmgr.png tdeprint.xpm
+# Icon 16x16 tdeprint/printmgr/cr16-app-printmgr.png tdeprint-16.xpm
 
-# Icon 32x32 kdeprint/kdeprintfax/cr32-app-kdeprintfax.png kdeprintfax.xpm
-# Icon 16x16 kdeprint/kdeprintfax/cr16-app-kdeprintfax.png kdeprintfax-16.xpm
+# Icon 32x32 tdeprint/tdeprintfax/cr32-app-tdeprintfax.png tdeprintfax.xpm
+# Icon 16x16 tdeprint/tdeprintfax/cr16-app-tdeprintfax.png tdeprintfax-16.xpm
diff --git a/debian/lenny/tdebase/debian/kdesktop-trinity.install b/debian/lenny/tdebase/debian/kdesktop-trinity.install
index aa950c6d5..8ee3c9256 100644
--- a/debian/lenny/tdebase/debian/kdesktop-trinity.install
+++ b/debian/lenny/tdebase/debian/kdesktop-trinity.install
@@ -8,7 +8,7 @@ debian/tmp/opt/trinity/bin/kdesktop_lock
 debian/tmp/opt/trinity/bin/kwebdesktop
 debian/tmp/opt/trinity/lib/trinity/kdesktop.la
 debian/tmp/opt/trinity/lib/trinity/kdesktop.so
-debian/tmp/opt/trinity/lib/libkdeinit_kdesktop.so
+debian/tmp/opt/trinity/lib/libtdeinit_kdesktop.so
 debian/tmp/opt/trinity/share/apps/kdesktop/DesktopLinks/Home.desktop usr/share/apps/kdesktop/unused/
 debian/tmp/opt/trinity/share/apps/kdesktop/DesktopLinks/System.desktop usr/share/apps/kdesktop/unused/
 debian/tmp/opt/trinity/share/apps/kdesktop/directory.autostart
diff --git a/debian/lenny/tdebase/debian/kdesktop-trinity.lintian b/debian/lenny/tdebase/debian/kdesktop-trinity.lintian
index b652ef1a3..478f4fbc8 100644
--- a/debian/lenny/tdebase/debian/kdesktop-trinity.lintian
+++ b/debian/lenny/tdebase/debian/kdesktop-trinity.lintian
@@ -1 +1 @@
-kdesktop: no-shlibs-control-file usr/lib/libkdeinit_kdesktop.so
+kdesktop: no-shlibs-control-file usr/lib/libtdeinit_kdesktop.so
diff --git a/debian/lenny/tdebase/debian/khelpcenter-trinity.install b/debian/lenny/tdebase/debian/khelpcenter-trinity.install
index 8e219a21f..eff975b5d 100644
--- a/debian/lenny/tdebase/debian/khelpcenter-trinity.install
+++ b/debian/lenny/tdebase/debian/khelpcenter-trinity.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/bin/khc_mansearch.pl
 debian/tmp/opt/trinity/bin/khelpcenter
 debian/tmp/opt/trinity/lib/trinity/khelpcenter.la
 debian/tmp/opt/trinity/lib/trinity/khelpcenter.so
-debian/tmp/opt/trinity/lib/libkdeinit_khelpcenter.so
+debian/tmp/opt/trinity/lib/libtdeinit_khelpcenter.so
 debian/tmp/opt/trinity/share/applications/kde/Help.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/glossary.html.in
 debian/tmp/opt/trinity/share/apps/khelpcenter/glossary.xslt
@@ -79,7 +79,7 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/checkxrefs
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/common
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/kdeprintingglossary.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/tdeprintingglossary.docbook
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/help.docbook
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/index.docbook
diff --git a/debian/lenny/tdebase/debian/khelpcenter-trinity.lintian b/debian/lenny/tdebase/debian/khelpcenter-trinity.lintian
index db8286ac4..44eb5fc11 100644
--- a/debian/lenny/tdebase/debian/khelpcenter-trinity.lintian
+++ b/debian/lenny/tdebase/debian/khelpcenter-trinity.lintian
@@ -1,3 +1,3 @@
-khelpcenter: no-shlibs-control-file usr/lib/libkdeinit_khelpcenter.so
-khelpcenter: postinst-must-call-ldconfig usr/lib/libkdeinit_khelpcenter.so
-khelpcenter: postrm-should-call-ldconfig usr/lib/libkdeinit_khelpcenter.so
+khelpcenter: no-shlibs-control-file usr/lib/libtdeinit_khelpcenter.so
+khelpcenter: postinst-must-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
+khelpcenter: postrm-should-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
diff --git a/debian/lenny/tdebase/debian/kicker-trinity.install b/debian/lenny/tdebase/debian/kicker-trinity.install
index bdd7a8a8b..c99afee75 100644
--- a/debian/lenny/tdebase/debian/kicker-trinity.install
+++ b/debian/lenny/tdebase/debian/kicker-trinity.install
@@ -18,8 +18,8 @@ debian/tmp/opt/trinity/lib/trinity/kickermenu_find.la
 debian/tmp/opt/trinity/lib/trinity/kickermenu_find.so
 debian/tmp/opt/trinity/lib/trinity/kickermenu_kate.so
 debian/tmp/opt/trinity/lib/trinity/kickermenu_kate.la
-debian/tmp/opt/trinity/lib/trinity/kickermenu_kdeprint.la
-debian/tmp/opt/trinity/lib/trinity/kickermenu_kdeprint.so
+debian/tmp/opt/trinity/lib/trinity/kickermenu_tdeprint.la
+debian/tmp/opt/trinity/lib/trinity/kickermenu_tdeprint.so
 debian/tmp/opt/trinity/lib/trinity/kickermenu_konqueror.la
 debian/tmp/opt/trinity/lib/trinity/kickermenu_konqueror.so
 debian/tmp/opt/trinity/lib/trinity/kickermenu_konsole.la
@@ -59,9 +59,9 @@ debian/tmp/opt/trinity/lib/trinity/trash_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/trash_panelapplet.so
 debian/tmp/opt/trinity/lib/libkasbar.so.1
 debian/tmp/opt/trinity/lib/libkasbar.so.1.0.0
-debian/tmp/opt/trinity/lib/libkdeinit_appletproxy.so
-debian/tmp/opt/trinity/lib/libkdeinit_extensionproxy.so
-debian/tmp/opt/trinity/lib/libkdeinit_kicker.so
+debian/tmp/opt/trinity/lib/libtdeinit_appletproxy.so
+debian/tmp/opt/trinity/lib/libtdeinit_extensionproxy.so
+debian/tmp/opt/trinity/lib/libtdeinit_kicker.so
 debian/tmp/opt/trinity/lib/libkickermain.so.1
 debian/tmp/opt/trinity/lib/libkickermain.so.1.0.0
 debian/tmp/opt/trinity/lib/libtaskbar.so.1
diff --git a/debian/lenny/tdebase/debian/kicker-trinity.lintian b/debian/lenny/tdebase/debian/kicker-trinity.lintian
index 41de1be8e..f600f5d82 100644
--- a/debian/lenny/tdebase/debian/kicker-trinity.lintian
+++ b/debian/lenny/tdebase/debian/kicker-trinity.lintian
@@ -1,3 +1,3 @@
-kicker: shlib-missing-in-control-file libkdeinit_extensionproxy.so usr/lib/libkdeinit_extensionproxy.so
-kicker: shlib-missing-in-control-file libkdeinit_kicker.so usr/lib/libkdeinit_kicker.so
-kicker: shlib-missing-in-control-file libkdeinit_appletproxy.so usr/lib/libkdeinit_appletproxy.so
+kicker: shlib-missing-in-control-file libtdeinit_extensionproxy.so usr/lib/libtdeinit_extensionproxy.so
+kicker: shlib-missing-in-control-file libtdeinit_kicker.so usr/lib/libtdeinit_kicker.so
+kicker: shlib-missing-in-control-file libtdeinit_appletproxy.so usr/lib/libtdeinit_appletproxy.so
diff --git a/debian/lenny/tdebase/debian/klipper-trinity.install b/debian/lenny/tdebase/debian/klipper-trinity.install
index e84bf502b..467dd6710 100644
--- a/debian/lenny/tdebase/debian/klipper-trinity.install
+++ b/debian/lenny/tdebase/debian/klipper-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/lib/trinity/klipper.la
 debian/tmp/opt/trinity/lib/trinity/klipper_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/klipper_panelapplet.so
 debian/tmp/opt/trinity/lib/trinity/klipper.so
-debian/tmp/opt/trinity/lib/libkdeinit_klipper.so
+debian/tmp/opt/trinity/lib/libtdeinit_klipper.so
 debian/tmp/opt/trinity/share/applications/kde/klipper.desktop
 debian/tmp/opt/trinity/share/apps/kconf_update/klipper-1-2.pl
 debian/tmp/opt/trinity/share/apps/kconf_update/klipper-trinity1.sh
diff --git a/debian/lenny/tdebase/debian/klipper-trinity.lintian b/debian/lenny/tdebase/debian/klipper-trinity.lintian
index 710a50459..f7bcf9946 100644
--- a/debian/lenny/tdebase/debian/klipper-trinity.lintian
+++ b/debian/lenny/tdebase/debian/klipper-trinity.lintian
@@ -1,3 +1,3 @@
-klipper: no-shlibs-control-file usr/lib/libkdeinit_klipper.so
-klipper: postinst-must-call-ldconfig usr/lib/libkdeinit_klipper.so
-klipper: postrm-should-call-ldconfig usr/lib/libkdeinit_klipper.so
+klipper: no-shlibs-control-file usr/lib/libtdeinit_klipper.so
+klipper: postinst-must-call-ldconfig usr/lib/libtdeinit_klipper.so
+klipper: postrm-should-call-ldconfig usr/lib/libtdeinit_klipper.so
diff --git a/debian/lenny/tdebase/debian/kmenuedit-trinity.install b/debian/lenny/tdebase/debian/kmenuedit-trinity.install
index 140ea409b..49711b6e4 100644
--- a/debian/lenny/tdebase/debian/kmenuedit-trinity.install
+++ b/debian/lenny/tdebase/debian/kmenuedit-trinity.install
@@ -4,8 +4,8 @@ debian/tmp/opt/trinity/lib/trinity/kcontroledit.la
 debian/tmp/opt/trinity/lib/trinity/kcontroledit.so
 debian/tmp/opt/trinity/lib/trinity/kmenuedit.la
 debian/tmp/opt/trinity/lib/trinity/kmenuedit.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcontroledit.so
-debian/tmp/opt/trinity/lib/libkdeinit_kmenuedit.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcontroledit.so
+debian/tmp/opt/trinity/lib/libtdeinit_kmenuedit.so
 debian/tmp/opt/trinity/share/applications/kde/kmenuedit.desktop
 debian/tmp/opt/trinity/share/applnk/System/kmenuedit.desktop
 debian/tmp/opt/trinity/share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png
diff --git a/debian/lenny/tdebase/debian/kmenuedit-trinity.lintian b/debian/lenny/tdebase/debian/kmenuedit-trinity.lintian
index 075ffc823..154077ad9 100644
--- a/debian/lenny/tdebase/debian/kmenuedit-trinity.lintian
+++ b/debian/lenny/tdebase/debian/kmenuedit-trinity.lintian
@@ -1,4 +1,4 @@
-kmenuedit: no-shlibs-control-file usr/lib/libkdeinit_kcontroledit.so
-kmenuedit: no-shlibs-control-file usr/lib/libkdeinit_kmenuedit.so
-kmenuedit: postinst-must-call-ldconfig usr/lib/libkdeinit_kcontroledit.so
-kmenuedit: postrm-should-call-ldconfig usr/lib/libkdeinit_kcontroledit.so
+kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kcontroledit.so
+kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kmenuedit.so
+kmenuedit: postinst-must-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
+kmenuedit: postrm-should-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
diff --git a/debian/lenny/tdebase/debian/konqueror-trinity.install b/debian/lenny/tdebase/debian/konqueror-trinity.install
index 11d8a57c1..ece23b00f 100644
--- a/debian/lenny/tdebase/debian/konqueror-trinity.install
+++ b/debian/lenny/tdebase/debian/konqueror-trinity.install
@@ -37,9 +37,9 @@ debian/tmp/opt/trinity/lib/trinity/konqueror.la
 debian/tmp/opt/trinity/lib/trinity/konqueror.so
 debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.la
 debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.so
-debian/tmp/opt/trinity/lib/libkdeinit_keditbookmarks.so
-debian/tmp/opt/trinity/lib/libkdeinit_kfmclient.so
-debian/tmp/opt/trinity/lib/libkdeinit_konqueror.so
+debian/tmp/opt/trinity/lib/libtdeinit_keditbookmarks.so
+debian/tmp/opt/trinity/lib/libtdeinit_kfmclient.so
+debian/tmp/opt/trinity/lib/libtdeinit_konqueror.so
 debian/tmp/opt/trinity/lib/libkonqsidebarplugin.so.1
 debian/tmp/opt/trinity/lib/libkonqsidebarplugin.so.1.2.0
 debian/tmp/opt/trinity/share/applications/kde/Home.desktop
diff --git a/debian/lenny/tdebase/debian/konqueror-trinity.lintian b/debian/lenny/tdebase/debian/konqueror-trinity.lintian
index 27e528d84..243cafb9f 100644
--- a/debian/lenny/tdebase/debian/konqueror-trinity.lintian
+++ b/debian/lenny/tdebase/debian/konqueror-trinity.lintian
@@ -1,3 +1,3 @@
-konqueror: shlib-missing-in-control-file libkdeinit_keditbookmarks.so usr/lib/libkdeinit_keditbookmarks.so
-konqueror: shlib-missing-in-control-file libkdeinit_kfmclient.so usr/lib/libkdeinit_kfmclient.so
-konqueror: shlib-missing-in-control-file libkdeinit_konqueror.so usr/lib/libkdeinit_konqueror.so
+konqueror: shlib-missing-in-control-file libtdeinit_keditbookmarks.so usr/lib/libtdeinit_keditbookmarks.so
+konqueror: shlib-missing-in-control-file libtdeinit_kfmclient.so usr/lib/libtdeinit_kfmclient.so
+konqueror: shlib-missing-in-control-file libtdeinit_konqueror.so usr/lib/libtdeinit_konqueror.so
diff --git a/debian/lenny/tdebase/debian/konsole-trinity.install b/debian/lenny/tdebase/debian/konsole-trinity.install
index 0fb1e3a22..69e1c7699 100644
--- a/debian/lenny/tdebase/debian/konsole-trinity.install
+++ b/debian/lenny/tdebase/debian/konsole-trinity.install
@@ -7,7 +7,7 @@ debian/tmp/opt/trinity/lib/trinity/konsole.la
 debian/tmp/opt/trinity/lib/trinity/konsole.so
 debian/tmp/opt/trinity/lib/trinity/libkonsolepart.la
 debian/tmp/opt/trinity/lib/trinity/libkonsolepart.so
-debian/tmp/opt/trinity/lib/libkdeinit_konsole.so
+debian/tmp/opt/trinity/lib/libtdeinit_konsole.so
 debian/tmp/opt/trinity/share/applications/kde/konsole.desktop
 debian/tmp/opt/trinity/share/applications/kde/konsolesu.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kcmkonsole.desktop
diff --git a/debian/lenny/tdebase/debian/konsole-trinity.lintian b/debian/lenny/tdebase/debian/konsole-trinity.lintian
index 95c2d012e..765754c3e 100644
--- a/debian/lenny/tdebase/debian/konsole-trinity.lintian
+++ b/debian/lenny/tdebase/debian/konsole-trinity.lintian
@@ -1,3 +1,3 @@
-konsole: no-shlibs-control-file usr/lib/libkdeinit_konsole.so
-konsole: postinst-must-call-ldconfig usr/lib/libkdeinit_konsole.so
-konsole: postrm-should-call-ldconfig usr/lib/libkdeinit_konsole.so
+konsole: no-shlibs-control-file usr/lib/libtdeinit_konsole.so
+konsole: postinst-must-call-ldconfig usr/lib/libtdeinit_konsole.so
+konsole: postrm-should-call-ldconfig usr/lib/libtdeinit_konsole.so
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.install b/debian/lenny/tdebase/debian/ksmserver-trinity.install
index f5200691f..0946d8a57 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.install
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/ksmserver
 debian/tmp/opt/trinity/bin/startkde
 debian/tmp/opt/trinity/lib/trinity/ksmserver.la
 debian/tmp/opt/trinity/lib/trinity/ksmserver.so
-debian/tmp/opt/trinity/lib/libkdeinit_ksmserver.so
+debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.so
 debian/tmp/opt/trinity/share/apps/kconf_update/ksmserver.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/move_session_config.sh
 debian/tmp/opt/trinity/share/apps/ksmserver/pics/shutdownkonq.png
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.lintian b/debian/lenny/tdebase/debian/ksmserver-trinity.lintian
index 669919e49..20f94f8ee 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.lintian
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.lintian
@@ -1,2 +1,2 @@
-ksmserver: no-shlibs-control-file usr/lib/libkdeinit_ksmserver.so
-ksmserver: postinst-must-call-ldconfig usr/lib/libkdeinit_ksmserver.so
+ksmserver: no-shlibs-control-file usr/lib/libtdeinit_ksmserver.so
+ksmserver: postinst-must-call-ldconfig usr/lib/libtdeinit_ksmserver.so
diff --git a/debian/lenny/tdebase/debian/kwin-trinity.install b/debian/lenny/tdebase/debian/kwin-trinity.install
index 6ebdc3c30..a6fde0638 100644
--- a/debian/lenny/tdebase/debian/kwin-trinity.install
+++ b/debian/lenny/tdebase/debian/kwin-trinity.install
@@ -44,10 +44,10 @@ debian/tmp/opt/trinity/lib/trinity/kwin_quartz_config.so
 debian/tmp/opt/trinity/lib/trinity/kwin_rules_dialog.la
 debian/tmp/opt/trinity/lib/trinity/kwin_rules_dialog.so
 debian/tmp/opt/trinity/lib/trinity/kwin.so
-debian/tmp/opt/trinity/lib/libkdecorations.so.1
-debian/tmp/opt/trinity/lib/libkdecorations.so.1.0.0
-debian/tmp/opt/trinity/lib/libkdeinit_kwin_rules_dialog.so
-debian/tmp/opt/trinity/lib/libkdeinit_kwin.so
+debian/tmp/opt/trinity/lib/libtdecorations.so.1
+debian/tmp/opt/trinity/lib/libtdecorations.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdeinit_kwin_rules_dialog.so
+debian/tmp/opt/trinity/lib/libtdeinit_kwin.so
 debian/tmp/opt/trinity/share/applications/kde/showdesktop.desktop
 debian/tmp/opt/trinity/share/applications/kde/kwindecoration.desktop
 debian/tmp/opt/trinity/share/applications/kde/kwinoptions.desktop
diff --git a/debian/lenny/tdebase/debian/kwin-trinity.lintian b/debian/lenny/tdebase/debian/kwin-trinity.lintian
index 1bf281c8a..ab81fccc0 100644
--- a/debian/lenny/tdebase/debian/kwin-trinity.lintian
+++ b/debian/lenny/tdebase/debian/kwin-trinity.lintian
@@ -1,2 +1,2 @@
-kwin: shlib-missing-in-control-file libkdeinit_kwin.so usr/lib/libkdeinit_kwin.so
-kwin: shlib-missing-in-control-file libkdeinit_kwin_rules_dialog.so usr/lib/libkdeinit_kwin_rules_dialog.so
+kwin: shlib-missing-in-control-file libtdeinit_kwin.so usr/lib/libtdeinit_kwin.so
+kwin: shlib-missing-in-control-file libtdeinit_kwin_rules_dialog.so usr/lib/libtdeinit_kwin_rules_dialog.so
diff --git a/debian/lenny/tdebase/debian/man/drkonqi-trinity.1 b/debian/lenny/tdebase/debian/man/drkonqi-trinity.1
index c1a7a8936..9371c2d9f 100644
--- a/debian/lenny/tdebase/debian/man/drkonqi-trinity.1
+++ b/debian/lenny/tdebase/debian/man/drkonqi-trinity.1
@@ -34,8 +34,8 @@ The PID of the program
 .B  \-\-startupid  <id>
 Startup ID of the program
 .TP
-.B  \-\-kdeinit  
-The program was started by kdeinit
+.B  \-\-tdeinit  
+The program was started by tdeinit
 .TP
 .B  \-\-safer  
 Disable arbitrary disk access
diff --git a/debian/lenny/tdebase/debian/man/kdeprintfax-trinity.1 b/debian/lenny/tdebase/debian/man/kdeprintfax-trinity.1
index 0308ac1d8..353fb6529 100644
--- a/debian/lenny/tdebase/debian/man/kdeprintfax-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kdeprintfax-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDEPRINTFAX 1 "June 2006" "K Desktop Environment" "A fax utility"
+.TH TDEPRINTFAX 1 "June 2006" "K Desktop Environment" "A fax utility"
 .SH NAME
-kdeprintfax
+tdeprintfax
 \- a interface to fax-packages
 .SH SYNOPSIS
-\fBkdeprintfax\fP [Qt\-options] [KDE\-options] [options] [file] 
+\fBtdeprintfax\fP [Qt\-options] [KDE\-options] [options] [file] 
 .SH DESCRIPTION
-\fBkdeprintfax\fP is a small fax utility to be used with kdeprint.
+\fBtdeprintfax\fP is a small fax utility to be used with tdeprint.
 .SH OPTIONS
 .SS
 .SS Arguments:
@@ -148,7 +148,7 @@ sets the client geometry of the main widget \- see man X for the argument format
 
 .SH AUTHORS
 .nf
-Michael Goffioul <kdeprint@swing.be>
+Michael Goffioul <tdeprint@swing.be>
 .br
 
 .br
diff --git a/debian/lenny/tdebase/debian/man/kdesu-trinity.1 b/debian/lenny/tdebase/debian/man/kdesu-trinity.1
index e552d288c..8befa3c39 100644
--- a/debian/lenny/tdebase/debian/man/kdesu-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kdesu-trinity.1
@@ -1,16 +1,16 @@
-.TH KDESU 1 "May 2005" "K Desktop Environment" "Runs a program with elevated privileges."
+.TH TDESU 1 "May 2005" "K Desktop Environment" "Runs a program with elevated privileges."
 .SH NAME
-kdesu \- Runs a program with elevated privileges.
+tdesu \- Runs a program with elevated privileges.
 .SH SYNOPSIS
-\fBkdesu\fR [Qt\-options] [KDE\-options] [kdesu options] command 
+\fBtdesu\fR [Qt\-options] [KDE\-options] [tdesu options] command 
 .SH DESCRIPTION
 Runs a program with elevated privileges.
 .PP
 KDE su is a graphical front end to the Unix \fBsu\fR utility. It allows you to run programs as another user by entering their password. It is not a SUID root program, but runs unprivileged. The system program \fBsu\fR is used for acquiring special privileges.
 .PP
-\fBkdesu\fR has the ability to store passwords for the convenience of users. The passwords are NOT written to disk, but stored in memory using a special program, \fBkdesud\fR. This is only done if the user specifies that the password be remembered. In this case, passwords are stored in memory for a certain period of time before being removed. \fBkdesud\fR runs in such a way that only the user who entered the password originally can use it, though no one, not even the user who originally entered the password, can retrieve the password that is stored by \fBkdesud\fR. Through these measures, users can avoid having to repeatedly enter root passwords or other passwords, without a significant risk to overall system security.
+\fBtdesu\fR has the ability to store passwords for the convenience of users. The passwords are NOT written to disk, but stored in memory using a special program, \fBtdesud\fR. This is only done if the user specifies that the password be remembered. In this case, passwords are stored in memory for a certain period of time before being removed. \fBtdesud\fR runs in such a way that only the user who entered the password originally can use it, though no one, not even the user who originally entered the password, can retrieve the password that is stored by \fBtdesud\fR. Through these measures, users can avoid having to repeatedly enter root passwords or other passwords, without a significant risk to overall system security.
 .PP
-\fBkdesu\fR uses normally \fBsu\fR to gain root by using the root password. \fBkdesu\fR can also be configured to use other commands to gain root like sudo to use users password.
+\fBtdesu\fR uses normally \fBsu\fR to gain root by using the root password. \fBtdesu\fR can also be configured to use other commands to gain root like sudo to use users password.
 .SH OPTIONS
 .SS Generic options:
 .TP
@@ -35,7 +35,7 @@ Show version information
 .B  --license
 Show license information
 .SS
-.SS kdesu Options:
+.SS tdesu Options:
 .TP
 .TP
 .B -c <command>
@@ -78,7 +78,7 @@ Specifies the command to run
 
 .SH CONFIGURATION FILES
 .PP
-\fBkdesu\fR can be configured with a default configuration file /etc/trinity/kdesurc and with a per user configuration file in .kde/share/config/kdesurc. Alternative a section could be added to kdeglobals.
+\fBtdesu\fR can be configured with a default configuration file /etc/trinity/tdesurc and with a per user configuration file in .kde/share/config/tdesurc. Alternative a section could be added to kdeglobals.
 .SH EXAMPLE
 The configuration item for the configuration files is the following:
 .br
@@ -88,9 +88,9 @@ super-user-command=sudo
 
 .SH SEE ALSO
 Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kdesu/
+.BR help:/tdesu/
 directly into konqueror or you can run 
-.BR "`khelpcenter help:/kdesu/'"
+.BR "`khelpcenter help:/tdesu/'"
 from the command-line.
 .br
 .SH AUTHORS
diff --git a/debian/lenny/tdebase/debian/man/kjobviewer-trinity.1 b/debian/lenny/tdebase/debian/man/kjobviewer-trinity.1
index 767d4ab1f..04ebe8a44 100644
--- a/debian/lenny/tdebase/debian/man/kjobviewer-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kjobviewer-trinity.1
@@ -190,7 +190,7 @@ from the command\-line.
 .br
 .SH AUTHORS
 .nf
-Michael Goffioul <kdeprint@swing.be>
+Michael Goffioul <tdeprint@swing.be>
 .br
 
 .br
diff --git a/debian/lenny/tdebase/debian/man/kprinter-trinity.1 b/debian/lenny/tdebase/debian/man/kprinter-trinity.1
index 340bd84d1..8eaf6c4fb 100644
--- a/debian/lenny/tdebase/debian/man/kprinter-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kprinter-trinity.1
@@ -198,7 +198,7 @@ from the command\-line.
 .br
 .SH AUTHORS
 .nf
-Michael Goffioul <kdeprint@swing.be>
+Michael Goffioul <tdeprint@swing.be>
 
 .br
 .fi
diff --git a/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules
index cb172b726..20a5315f2 100755
--- a/debian/lenny/tdebase/debian/rules
+++ b/debian/lenny/tdebase/debian/rules
@@ -21,19 +21,19 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -
 
 DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
 -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DKDM_PAM_SERVICE="kdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
--DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_KDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON"
+-DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
 DEB_BUILD_PARALLEL = true
 
 DEB_FIXPERMS_EXCLUDE := \
-	opt/trinity/bin/kdesud    \
+	opt/trinity/bin/tdesud    \
 	opt/trinity/bin/kdmtsak
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdebase-trinity-dbg
 
-DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter kdesu knetattach kioslave kxkb kdebugdialog kdcop
+DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach kioslave kxkb kdebugdialog kdcop
 
 PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
 			ksysguard-trinity kwin-trinity libkonq4-trinity
diff --git a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kdeprint b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
index f43d9196b..7610a4313 100644
--- a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
+++ b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
@@ -1,10 +1,10 @@
-Document: tdebase-doc-html-kdeprint
+Document: tdebase-doc-html-tdeprint
 Title: KDEPrint Handbook
 Author: Kurt Pfeifle
 Abstract: KDEPrint is the official printing system of KDE. 
 Section: Apps/Tools 
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kdeprint/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kdeprint/*.html
+Index: /opt/trinity/share/doc/kde/HTML/en/tdeprint/index.html
+Files: /opt/trinity/share/doc/kde/HTML/en/tdeprint/*.html
 
diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-bin.install b/debian/lenny/tdebase/debian/tdebase-trinity-bin.install
index 2322b0008..fd0d3ac41 100644
--- a/debian/lenny/tdebase/debian/tdebase-trinity-bin.install
+++ b/debian/lenny/tdebase/debian/tdebase-trinity-bin.install
@@ -13,8 +13,8 @@ debian/tmp/opt/trinity/bin/kcheckpass
 debian/tmp/opt/trinity/bin/kcminit
 debian/tmp/opt/trinity/bin/kcminit_startup
 debian/tmp/opt/trinity/bin/kdcop
-debian/tmp/opt/trinity/bin/kdesu
-debian/tmp/opt/trinity/bin/kdesud
+debian/tmp/opt/trinity/bin/tdesu
+debian/tmp/opt/trinity/bin/tdesud
 debian/tmp/opt/trinity/bin/kdialog
 debian/tmp/opt/trinity/bin/khotkeys
 debian/tmp/opt/trinity/bin/knetattach
@@ -44,11 +44,11 @@ debian/tmp/opt/trinity/lib/trinity/khotkeys_arts.la
 debian/tmp/opt/trinity/lib/trinity/khotkeys_arts.so
 debian/tmp/opt/trinity/lib/trinity/kxkb.la
 debian/tmp/opt/trinity/lib/trinity/kxkb.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcminit.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcminit_startup.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcminit_startup.so
-debian/tmp/opt/trinity/lib/libkdeinit_khotkeys.so
-debian/tmp/opt/trinity/lib/libkdeinit_kxkb.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcminit.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcminit_startup.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcminit_startup.so
+debian/tmp/opt/trinity/lib/libtdeinit_khotkeys.so
+debian/tmp/opt/trinity/lib/libtdeinit_kxkb.so
 debian/tmp/opt/trinity/lib/libkhotkeys_shared.so.1
 debian/tmp/opt/trinity/lib/libkhotkeys_shared.so.1.0.0
 debian/tmp/opt/trinity/share/applications/kde/keyboard.desktop
@@ -74,9 +74,9 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdcop/index.docbook
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebugdialog/common
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebugdialog/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebugdialog/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesu/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesu/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesu/index.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesu/common
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesu/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesu/index.docbook
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/common
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/index.docbook
diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-bin.links b/debian/lenny/tdebase/debian/tdebase-trinity-bin.links
index ae21842e4..2c6c3384a 100644
--- a/debian/lenny/tdebase/debian/tdebase-trinity-bin.links
+++ b/debian/lenny/tdebase/debian/tdebase-trinity-bin.links
@@ -1 +1 @@
-opt/trinity/share/man/man1/kdesu.1.gz opt/trinity/share/man/man1/kdesud.1.gz
+opt/trinity/share/man/man1/tdesu.1.gz opt/trinity/share/man/man1/tdesud.1.gz
diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-bin.lintian b/debian/lenny/tdebase/debian/tdebase-trinity-bin.lintian
index 1b1985b6d..3f56c6d4a 100644
--- a/debian/lenny/tdebase/debian/tdebase-trinity-bin.lintian
+++ b/debian/lenny/tdebase/debian/tdebase-trinity-bin.lintian
@@ -1,6 +1,6 @@
-tdebase-bin: setgid-binary usr/bin/kdesud 2755 root/nogroup
-tdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kcminit.so
-tdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_khotkeys.so
-tdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kxkb.so
-tdebase-bin: postinst-must-call-ldconfig usr/lib/libkdeinit_khotkeys.so
-tdebase-bin: postrm-should-call-ldconfig usr/lib/libkdeinit_khotkeys.so
+tdebase-bin: setgid-binary usr/bin/tdesud 2755 root/nogroup
+tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kcminit.so
+tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_khotkeys.so
+tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kxkb.so
+tdebase-bin: postinst-must-call-ldconfig usr/lib/libtdeinit_khotkeys.so
+tdebase-bin: postrm-should-call-ldconfig usr/lib/libtdeinit_khotkeys.so
diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-bin.manpages b/debian/lenny/tdebase/debian/tdebase-trinity-bin.manpages
index b801c202a..ebb07daf7 100644
--- a/debian/lenny/tdebase/debian/tdebase-trinity-bin.manpages
+++ b/debian/lenny/tdebase/debian/tdebase-trinity-bin.manpages
@@ -4,7 +4,7 @@ debian/man/kcheckpass-trinity.1
 debian/man/kcminit-trinity.1
 debian/man/kdcop-trinity.1
 debian/man/kdebugdialog-trinity.1
-debian/man/kdesu-trinity.1
+debian/man/tdesu-trinity.1
 debian/man/kdialog-trinity.1
 debian/man/khotkeys-trinity.1
 debian/man/kio_system_documenthelper-trinity.1
diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-dev.install b/debian/lenny/tdebase/debian/tdebase-trinity-dev.install
index d9759729d..4328f203e 100644
--- a/debian/lenny/tdebase/debian/tdebase-trinity-dev.install
+++ b/debian/lenny/tdebase/debian/tdebase-trinity-dev.install
@@ -43,32 +43,32 @@ debian/tmp/opt/trinity/lib/libkateinterfaces.la
 debian/tmp/opt/trinity/lib/libkateinterfaces.so
 debian/tmp/opt/trinity/lib/libkateutils.la
 debian/tmp/opt/trinity/lib/libkateutils.so
-debian/tmp/opt/trinity/lib/libkdecorations.la
-debian/tmp/opt/trinity/lib/libkdecorations.so
-debian/tmp/opt/trinity/lib/libkdeinit_appletproxy.la
-debian/tmp/opt/trinity/lib/libkdeinit_extensionproxy.la
-debian/tmp/opt/trinity/lib/libkdeinit_kaccess.la
-debian/tmp/opt/trinity/lib/libkdeinit_kate.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcminit.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcontroledit.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcontrol.la
-debian/tmp/opt/trinity/lib/libkdeinit_kdesktop.la
-debian/tmp/opt/trinity/lib/libkdeinit_keditbookmarks.la
-debian/tmp/opt/trinity/lib/libkdeinit_kfmclient.la
-debian/tmp/opt/trinity/lib/libkdeinit_khelpcenter.la
-debian/tmp/opt/trinity/lib/libkdeinit_khotkeys.la
-debian/tmp/opt/trinity/lib/libkdeinit_kicker.la
-debian/tmp/opt/trinity/lib/libkdeinit_kjobviewer.la
-debian/tmp/opt/trinity/lib/libkdeinit_klipper.la
-debian/tmp/opt/trinity/lib/libkdeinit_kmenuedit.la
-debian/tmp/opt/trinity/lib/libkdeinit_konqueror.la
-debian/tmp/opt/trinity/lib/libkdeinit_konsole.la
-debian/tmp/opt/trinity/lib/libkdeinit_kprinter.la
-debian/tmp/opt/trinity/lib/libkdeinit_ksmserver.la
-debian/tmp/opt/trinity/lib/libkdeinit_kwin.la
-debian/tmp/opt/trinity/lib/libkdeinit_kwin_rules_dialog.la
-debian/tmp/opt/trinity/lib/libkdeinit_kwrite.la
-debian/tmp/opt/trinity/lib/libkdeinit_kxkb.la
+debian/tmp/opt/trinity/lib/libtdecorations.la
+debian/tmp/opt/trinity/lib/libtdecorations.so
+debian/tmp/opt/trinity/lib/libtdeinit_appletproxy.la
+debian/tmp/opt/trinity/lib/libtdeinit_extensionproxy.la
+debian/tmp/opt/trinity/lib/libtdeinit_kaccess.la
+debian/tmp/opt/trinity/lib/libtdeinit_kate.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcminit.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcontroledit.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcontrol.la
+debian/tmp/opt/trinity/lib/libtdeinit_kdesktop.la
+debian/tmp/opt/trinity/lib/libtdeinit_keditbookmarks.la
+debian/tmp/opt/trinity/lib/libtdeinit_kfmclient.la
+debian/tmp/opt/trinity/lib/libtdeinit_khelpcenter.la
+debian/tmp/opt/trinity/lib/libtdeinit_khotkeys.la
+debian/tmp/opt/trinity/lib/libtdeinit_kicker.la
+debian/tmp/opt/trinity/lib/libtdeinit_kjobviewer.la
+debian/tmp/opt/trinity/lib/libtdeinit_klipper.la
+debian/tmp/opt/trinity/lib/libtdeinit_kmenuedit.la
+debian/tmp/opt/trinity/lib/libtdeinit_konqueror.la
+debian/tmp/opt/trinity/lib/libtdeinit_konsole.la
+debian/tmp/opt/trinity/lib/libtdeinit_kprinter.la
+debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.la
+debian/tmp/opt/trinity/lib/libtdeinit_kwin.la
+debian/tmp/opt/trinity/lib/libtdeinit_kwin_rules_dialog.la
+debian/tmp/opt/trinity/lib/libtdeinit_kwrite.la
+debian/tmp/opt/trinity/lib/libtdeinit_kxkb.la
 debian/tmp/opt/trinity/lib/libkfontinst.la
 debian/tmp/opt/trinity/lib/libkfontinst.so
 debian/tmp/opt/trinity/lib/libkhotkeys_shared.la
diff --git a/debian/lenny/tdebindings/debian/local/krubyinit.1 b/debian/lenny/tdebindings/debian/local/krubyinit.1
index 21cd93112..cca53af30 100644
--- a/debian/lenny/tdebindings/debian/local/krubyinit.1
+++ b/debian/lenny/tdebindings/debian/local/krubyinit.1
@@ -7,7 +7,7 @@ krubyinit \- Start Korundum Ruby Scripts Faster
 .SH DESCRIPTION
 Krubyinit is a wrapper around the ruby interpreter for executing Ruby
 scripts using the Korundum library ( the Ruby KDE bindings ).  It uses
-the kdeinit system to start the app so that they start a little bit
+the tdeinit system to start the app so that they start a little bit
 faster when started in a running KDE session.
 
 The script takes exactly the same options as the ruby(1) program.
diff --git a/debian/lenny/tdebindings/debian/local/qtrubyinit.1 b/debian/lenny/tdebindings/debian/local/qtrubyinit.1
index 61a505863..52b099b0e 100644
--- a/debian/lenny/tdebindings/debian/local/qtrubyinit.1
+++ b/debian/lenny/tdebindings/debian/local/qtrubyinit.1
@@ -6,7 +6,7 @@ qtrubyinit \- Start Qt Ruby Scripts Faster
 [switches] [--] [programfile] [arguments]
 .SH DESCRIPTION
 Qtrubyinit is a wrapper around the ruby interpreter for executing Ruby
-scripts using the QtRuby library.  It uses the kdeinit system to start
+scripts using the QtRuby library.  It uses the tdeinit system to start
 the app so that they start a little bit faster when started in a
 running KDE session.
 
diff --git a/debian/lenny/tdegames/debian/kolf-trinity.install b/debian/lenny/tdegames/debian/kolf-trinity.install
index 7ca84b810..beb920191 100644
--- a/debian/lenny/tdegames/debian/kolf-trinity.install
+++ b/debian/lenny/tdegames/debian/kolf-trinity.install
@@ -11,8 +11,8 @@
 /opt/trinity/share/icons/hicolor/128x128/apps/kolf.png
 /opt/trinity/share/mimelnk/application/x-kolf.desktop
 /opt/trinity/share/mimelnk/application/x-kourse.desktop
-/opt/trinity/lib/libkdeinit_kolf.so
-/opt/trinity/lib/libkdeinit_kolf.la
+/opt/trinity/lib/libtdeinit_kolf.so
+/opt/trinity/lib/libtdeinit_kolf.la
 /opt/trinity/lib/trinity/kolf.la
 /opt/trinity/lib/trinity/kolf.so
 /opt/trinity/lib/libkolf.la
diff --git a/debian/lenny/tdegraphics/debian/kmrml-trinity.install b/debian/lenny/tdegraphics/debian/kmrml-trinity.install
index 99491c4e7..bdbbef7c6 100644
--- a/debian/lenny/tdegraphics/debian/kmrml-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kmrml-trinity.install
@@ -9,7 +9,7 @@ debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.la
 debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.so
 debian/tmp/opt/trinity/lib/trinity/mrmlsearch.la
 debian/tmp/opt/trinity/lib/trinity/mrmlsearch.so
-debian/tmp/opt/trinity/lib/libkdeinit_mrmlsearch.so
+debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.so
 debian/tmp/opt/trinity/share/applications/kde/kcmkmrml.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/mrml-servicemenu.desktop
 debian/tmp/opt/trinity/share/mimelnk/text/mrml.desktop
diff --git a/debian/lenny/tdegraphics/debian/kmrml-trinity.lintian b/debian/lenny/tdegraphics/debian/kmrml-trinity.lintian
index 5c83f447b..e3a5ddb8a 100644
--- a/debian/lenny/tdegraphics/debian/kmrml-trinity.lintian
+++ b/debian/lenny/tdegraphics/debian/kmrml-trinity.lintian
@@ -1,4 +1,4 @@
-kmrml: no-shlibs-control-file opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: package-name-doesnt-match-sonames libkdeinit-mrmlsearch
+kmrml: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml: package-name-doesnt-match-sonames libtdeinit-mrmlsearch
diff --git a/debian/lenny/tdegraphics/debian/kuickshow-trinity.install b/debian/lenny/tdegraphics/debian/kuickshow-trinity.install
index 07929cfa2..d9ef57977 100644
--- a/debian/lenny/tdegraphics/debian/kuickshow-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kuickshow-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kuickshow
 debian/tmp/opt/trinity/lib/trinity/kuickshow.la
 debian/tmp/opt/trinity/lib/trinity/kuickshow.so
-debian/tmp/opt/trinity/lib/libkdeinit_kuickshow.so
+debian/tmp/opt/trinity/lib/libtdeinit_kuickshow.so
 debian/tmp/opt/trinity/share/applications/kde/kuickshow.desktop
 debian/tmp/opt/trinity/share/apps/kuickshow/im_palette.pal
 debian/tmp/opt/trinity/share/apps/kuickshow/pics/about.png
diff --git a/debian/lenny/tdegraphics/debian/kuickshow-trinity.lintian b/debian/lenny/tdegraphics/debian/kuickshow-trinity.lintian
index 61cb450ac..4551b5f0c 100644
--- a/debian/lenny/tdegraphics/debian/kuickshow-trinity.lintian
+++ b/debian/lenny/tdegraphics/debian/kuickshow-trinity.lintian
@@ -1,4 +1,4 @@
-kuickshow: no-shlibs-control-file opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: package-name-doesnt-match-sonames libkdeinit-kuickshow
+kuickshow: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow: package-name-doesnt-match-sonames libtdeinit-kuickshow
diff --git a/debian/lenny/tdegraphics/debian/kview-trinity.install b/debian/lenny/tdegraphics/debian/kview-trinity.install
index 0efbbd7b5..ca570ad61 100644
--- a/debian/lenny/tdegraphics/debian/kview-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kview-trinity.install
@@ -21,7 +21,7 @@ debian/tmp/opt/trinity/lib/trinity/libkviewcanvas.la
 debian/tmp/opt/trinity/lib/trinity/libkviewcanvas.so
 debian/tmp/opt/trinity/lib/trinity/libkviewviewer.la
 debian/tmp/opt/trinity/lib/trinity/libkviewviewer.so
-debian/tmp/opt/trinity/lib/libkdeinit_kview.so
+debian/tmp/opt/trinity/lib/libtdeinit_kview.so
 debian/tmp/opt/trinity/lib/libkimageviewer.so.0
 debian/tmp/opt/trinity/lib/libkimageviewer.so.0.0.0
 debian/tmp/opt/trinity/lib/trinity/libphotobook.la
diff --git a/debian/lenny/tdegraphics/debian/kview-trinity.lintian b/debian/lenny/tdegraphics/debian/kview-trinity.lintian
index 8314a8155..b81a18ccc 100644
--- a/debian/lenny/tdegraphics/debian/kview-trinity.lintian
+++ b/debian/lenny/tdegraphics/debian/kview-trinity.lintian
@@ -1,3 +1,3 @@
 kview: shlib-missing-in-control-file libphotobook.so opt/trinity/lib/libphotobook.so
-kview: shlib-missing-in-control-file libkdeinit_kview.so opt/trinity/lib/libkdeinit_kview.so
-kview: package-name-doesnt-match-sonames libkdeinit-kview libkimageviewer0
+kview: shlib-missing-in-control-file libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so
+kview: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0
diff --git a/debian/lenny/tdegraphics/debian/rules b/debian/lenny/tdegraphics/debian/rules
index 42330d01a..caff9212a 100755
--- a/debian/lenny/tdegraphics/debian/rules
+++ b/debian/lenny/tdegraphics/debian/rules
@@ -35,7 +35,7 @@ DEB_DH_MAKESHLIBS_ARGS_libkscan1-trinity	:= -V'libkscan1-trinity (>= 4:3.5.5-1)'
 
 binary-post-install/kuickshow-trinity::
 ifeq ($(DEB_HOST_ARCH), powerpc)
-	chrpath -d -k debian/kuickshow-trinity/opt/trinity/lib/libkdeinit_kuickshow.so
+	chrpath -d -k debian/kuickshow-trinity/opt/trinity/lib/libtdeinit_kuickshow.so
 endif
 
 #shlibs_ver = 4:3.5.0-1
diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-dev-trinity.install b/debian/lenny/tdegraphics/debian/tdegraphics-dev-trinity.install
index 3c15273ee..608149acc 100644
--- a/debian/lenny/tdegraphics/debian/tdegraphics-dev-trinity.install
+++ b/debian/lenny/tdegraphics/debian/tdegraphics-dev-trinity.install
@@ -179,8 +179,8 @@ debian/tmp/opt/trinity/include/kde/kviewshell/zoomlimits.h
 debian/tmp/opt/trinity/include/kde/libtext2path-0.1/BezierPath.h
 debian/tmp/opt/trinity/include/kde/libtext2path-0.1/Glyph.h
 debian/tmp/opt/trinity/include/kde/libtext2path-0.1/GlyphTracer.h
-debian/tmp/opt/trinity/lib/libkdeinit_kview.la
-debian/tmp/opt/trinity/lib/libkdeinit_mrmlsearch.la
+debian/tmp/opt/trinity/lib/libtdeinit_kview.la
+debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.la
 debian/tmp/opt/trinity/lib/libkghostviewlib.la
 debian/tmp/opt/trinity/lib/libkghostviewlib.so
 debian/tmp/opt/trinity/lib/libkimageviewer.la
diff --git a/debian/lenny/tdelibs/debian/changelog b/debian/lenny/tdelibs/debian/changelog
index ff494b112..936097e90 100644
--- a/debian/lenny/tdelibs/debian/changelog
+++ b/debian/lenny/tdelibs/debian/changelog
@@ -136,12 +136,12 @@ tdelibs (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
 tdelibs (4:3.5.9-0ubuntu7.1) hardy-security; urgency=low
 
-  * SECURITY UPDATE: integer overflow in start_kdeinit. The start_kdeinit
+  * SECURITY UPDATE: integer overflow in start_tdeinit. The start_tdeinit
     processing of user-influenceable input is faulty.  A local user
     might be able to send unix signals to other processes, cause
     a denial of service or even possibly execute arbitrary code.
   * Add kubuntu_9903_kinit_integer_overflow.diff, edits
-    kinit/start_kdeinit.c, patch from upstream KDE
+    kinit/start_tdeinit.c, patch from upstream KDE
   * References
     http://www.kde.org/info/security/advisory-20080426-2.txt
     CVE-2008-1671
@@ -321,7 +321,7 @@ tdelibs (4:3.5.8-3ubuntu1) hardy; urgency=low
    - remove tdelibs4c2a depends on menu-xdg
    - include kubuntu_01_kdepot.diff and kde.pot in debian/patches/common
    - use a local copy of kde.mk without the common-install-prehook-impl:: rule; edit debian-qt-kde.mk to include debian/cdbs/kde.mk
-   - build with --with-sudo-kdesu-backend and build-dep on sudo and make tdelibs4c2a depend on sudo
+   - build with --with-sudo-tdesu-backend and build-dep on sudo and make tdelibs4c2a depend on sudo
    - tdelibs-data.install : Add nzb mimetype
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 13 Nov 2007 18:18:05 +0000
@@ -348,8 +348,8 @@ tdelibs (4:3.5.8.dfsg.1-1) unstable; urgency=low
   * New upstream release (Closes: #444383, #328479, #425741)
   * Resync patches:
     - Remove, applied upstream:
-      01_branch_kate_redo_save_fix, 01_branch_wait_for_kdeinit_to_finish,
-      48_cups13, 55_several-CVE-tdelibs-kdecore.
+      01_branch_kate_redo_save_fix, 01_branch_wait_for_tdeinit_to_finish,
+      48_cups13, 55_several-CVE-tdelibs-tdecore.
   * Update *.install files. 
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 13 Oct 2007 11:53:45 +0200
@@ -364,7 +364,7 @@ tdelibs (4:3.5.7.dfsg.1-7) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
-  * Add patch 55_several-CVE-tdelibs-kdecore.diff to make Konqueror address
+  * Add patch 55_several-CVE-tdelibs-tdecore.diff to make Konqueror address
     bar more robust against addressbar spoofing.
     Related CVEs: CVE-2007-4224, CVE-2007-4225, CVE-2007-3820.
 
@@ -420,7 +420,7 @@ tdelibs (4:3.5.7.dfsg.1-2) unstable; urgency=low
   * Better error messages when opening a tty fails. Thanks to Robert Millan.
     (Closes: #334974)
   * Don't refer to help:/kcmshell in kcmshell manpage. (Closes: #408470)
-  * Make sure kdeinit closes all files before terminating kde. (Closes: #425314)
+  * Make sure tdeinit closes all files before terminating kde. (Closes: #425314)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 19 Jul 2007 22:52:17 +0200
 
@@ -690,7 +690,7 @@ tdelibs (4:3.5.6-0ubuntu8) feisty; urgency=low
 
 tdelibs (4:3.5.6-0ubuntu7) feisty; urgency=low
 
-  * Add kubuntu_92_kdeprint_filter.diff, closes Malone
+  * Add kubuntu_92_tdeprint_filter.diff, closes Malone
     #51354. Patch from Marcus Trautwig
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 22 Feb 2007 17:27:47 +0100
@@ -739,11 +739,11 @@ tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low
 
 tdelibs (4:3.5.6-0ubuntu1) feisty; urgency=low
 
-  * Remove 02_kate_kdeprint_fixes_branch.diff
+  * Remove 02_kate_tdeprint_fixes_branch.diff
   * Update 27_kdnssd_avahi.dif
   * Remove 33_cups12_kprinter_fixes.diff
   * Remove 35_cups_unify_ipp_uri_assembling.diff
-  * Remove 36_kdeprintd_64bit_fix.diff
+  * Remove 36_tdeprintd_64bit_fix.diff
   * Remove 41_x_kde_getactionmenu_no_timeout.diff
   * Remove kubuntu_63_ark.diff
   * Remove kubuntu_65_kstyle_password_noasterisk
@@ -788,7 +788,7 @@ tdelibs (4:3.5.5a.dfsg.1-3ubuntu5) feisty; urgency=low
 
 tdelibs (4:3.5.5a.dfsg.1-3ubuntu4) feisty; urgency=low
 
-  * Compile with --with-sudo-kdesu-backend
+  * Compile with --with-sudo-tdesu-backend
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Nov 2006 10:16:08 +0000
 
@@ -924,8 +924,8 @@ tdelibs (4:3.5.5a.dfsg.1-3) unstable; urgency=medium
       when there are no printers.
     * 35_cups_unify_ipp_uri_assembling.diff - ensure proper IPP URI
       generation when CUPS is accessed via a UNIX socket. (Closes: #379216)
-  * Add 36_kdeprintd_64bit_fix.diff - fix a bug on 64bit arches when kdeprint
-    is not able to get a configuration file from CUPS server because kdeprintd
+  * Add 36_tdeprintd_64bit_fix.diff - fix a bug on 64bit arches when tdeprint
+    is not able to get a configuration file from CUPS server because tdeprintd
     fails to retreive the password from kpasswdserver.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  2 Nov 2006 17:54:30 -0500
@@ -953,7 +953,7 @@ tdelibs (4:3.5.5a-2) unstable; urgency=medium
 
   * Grab two more fixes from KDE_3_5_BRANCH.
     + Fix kate's indentation of C/C++ files.
-    + Fix kdeprint's timeout when trying to find cupsd.
+    + Fix tdeprint's timeout when trying to find cupsd.
       (Closes: #392052, #392052)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 13 Oct 2006 17:04:21 -0400
@@ -1026,7 +1026,7 @@ tdelibs (4:3.5.4-1) unstable; urgency=low
     tdelibs-data.
 
   * Add a number of patches, courtesy of Debian, which attempt to get
-    kdeprint working reasonably well with CUPS 1.2.x. These patches should
+    tdeprint working reasonably well with CUPS 1.2.x. These patches should
     resolve a number of user glitches, such as cryptic errors popping up when
     no printer has yet been added to CUPS.
     (Closes: #369140, #370403, #375477, #379216)
@@ -1050,7 +1050,7 @@ tdelibs (4:3.5.5-0ubuntu3) edgy; urgency=low
 
 tdelibs (4:3.5.5-0ubuntu2) edgy; urgency=low
 
-  * Revert kdeprint directory and patches to those from kde 3.5.4 packages
+  * Revert tdeprint directory and patches to those from kde 3.5.4 packages
     closes malone No 65665
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 14 Oct 2006 01:54:33 +0000
@@ -1065,8 +1065,8 @@ tdelibs (4:3.5.5-0ubuntu1) edgy; urgency=low
    - kubuntu_48_cups12_cupsdconf.diff
    - kubuntu_54_mouse_scroll_speed.diff
    - cups 1.2 domain socket fixed upstream
-  * Remove kubuntu_01_kdesu_sudo.diff, and kubuntu_50_kdesu_non_root.patch
-    patches gone upstream, use new --with-sudo-kdesu-backend
+  * Remove kubuntu_01_tdesu_sudo.diff, and kubuntu_50_tdesu_non_root.patch
+    patches gone upstream, use new --with-sudo-tdesu-backend
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 11:23:11 +0000
 
@@ -1469,8 +1469,8 @@ tdelibs (4:3.5.2-0ubuntu18) dapper; urgency=low
 
 tdelibs (4:3.5.2-0ubuntu17) dapper; urgency=low
 
-  * Add kubuntu_50_kdesu_non_root.patch to fix running commands as non-root
-    with kdesu with su instead of sudo (Malone #41184)
+  * Add kubuntu_50_tdesu_non_root.patch to fix running commands as non-root
+    with tdesu with su instead of sudo (Malone #41184)
 
  -- Luka Renko <lure.net@gmail.net>  Wed, 10 May 2006 22:45:27 +0200
 
@@ -1575,7 +1575,7 @@ tdelibs (4:3.5.2-0ubuntu4) dapper; urgency=low
 
 tdelibs (4:3.5.2-0ubuntu3) dapper; urgency=low
 
-  * Add kubuntu_35_kdeprint_branch.diff to fix compile error
+  * Add kubuntu_35_tdeprint_branch.diff to fix compile error
     with CUPS 1.2, remove my random hack from kubuntu_34_cups12.diff 
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Apr 2006 18:53:24 +0100
@@ -1781,20 +1781,20 @@ tdelibs (4:3.5-rc2-0ubuntu5) dapper; urgency=low
 
 tdelibs (4:3.5-rc2-0ubuntu4) dapper; urgency=low
 
-  * Add debian/patches/kubuntu_06_fix_kdeprint_cups12_fix.diff, fix kdeprint compile error properly
+  * Add debian/patches/kubuntu_06_fix_tdeprint_cups12_fix.diff, fix tdeprint compile error properly
   * Add common/kubuntu_01_kdepot.diff and common/kde.pot, fix .pot generation
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 25 Nov 2005 22:11:51 +0000
 
 tdelibs (4:3.5-rc2-0ubuntu3) dapper; urgency=low
 
-  * Fix broken kubuntu_06_fix_kdeprint_compile_hack.diff
+  * Fix broken kubuntu_06_fix_tdeprint_compile_hack.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 25 Nov 2005 18:44:54 +0000
 
 tdelibs (4:3.5-rc2-0ubuntu2) dapper; urgency=low
 
-  * Add kubuntu_06_fix_kdeprint_compile_hack.diff, quick patch until I
+  * Add kubuntu_06_fix_tdeprint_compile_hack.diff, quick patch until I
     work out how to fix it properly
   * Fix tdelibs4-doc.install for correct path of files
 
@@ -1831,8 +1831,8 @@ tdelibs (4:3.4.3-1) experimental; urgency=low
   * Tweak the rounded text selection patch to avoid it causing icon spacing
     issues in Konqueror. (Closes: #329404)
 
-  * Add a patch to generate a PIC static libkdefakes, libkdefakes_pic.a.
-    This will allow other libraries, such as mimelib, to use libkdefakes,
+  * Add a patch to generate a PIC static libtdefakes, libtdefakes_pic.a.
+    This will allow other libraries, such as mimelib, to use libtdefakes,
     without acquiring non-PIC code or a dependency upon the full tdelibs.
     (Closes: #326113)
 
@@ -2203,7 +2203,7 @@ tdelibs (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
 
 tdelibs (4:3.4.0~rc1-1ubuntu0.2) hoary; urgency=low
 
-  * Add sudo for kdesu patch kubuntu_01_kdesu_sudo.diff
+  * Add sudo for tdesu patch kubuntu_01_tdesu_sudo.diff
   * Add applications.menu move patch to stop collisions with Gnome kubuntu_02_applications_menu_rename.diff
 
  -- Jonathan Riddell <jr@jriddell.org>  Sat,  5 Mar 2005 21:00:03 +0000
@@ -2310,7 +2310,7 @@ tdelibs (4:3.3.2-2) unstable; urgency=high
 
   * Add patch from upstream that solves the problem wherein programs whose
     .desktop entry contained their full path, rather than just the binary
-    to be executed (mainly games), confused kdeinit.
+    to be executed (mainly games), confused tdeinit.
     (Closes: #270592, #290323)
 
   * debian/control: Add necessary tdelibs-data Replaces for old
@@ -2379,7 +2379,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low
 
   * New patches:
     - 06_automake-1.9.diff
-    - 12_cups_docroot.diff: changed the CUPS document path in kdeprint to
+    - 12_cups_docroot.diff: changed the CUPS document path in tdeprint to
       reflect the Debian default. [CM]
 
   * Updated dcop.1 manpage with patch by Helge Kreutzman. (Closes: #250631)
@@ -3323,7 +3323,7 @@ tdelibs (4:2.1-20010109-1) unstable; urgency=low
    * This was definatly built with the same dpkg that tdelibs-crypto was so
      I'm assuming this just squeaked by dinstall...so just to be sure...
    * Java should work again
-   * Fix kdesud security by
+   * Fix tdesud security by
      a) Not creating the socket under /tmp
      b) Verifying afterwards that it was our own socket
  
@@ -3332,7 +3332,7 @@ tdelibs (4:2.1-20010109-1) unstable; urgency=low
 tdelibs (4:2.1-20010106-1) unstable; urgency=low
  
    * more upstream bug fixes
-   * Contains both the symlink/sniff attack fix for kdesu
+   * Contains both the symlink/sniff attack fix for tdesu
    * Moving conflicts for task-* packages to tdebase
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 06 Jan 2001 15:00:00 -0700
diff --git a/debian/lenny/tdelibs/debian/copyright b/debian/lenny/tdelibs/debian/copyright
index c622c0cf8..7c67eaede 100644
--- a/debian/lenny/tdelibs/debian/copyright
+++ b/debian/lenny/tdelibs/debian/copyright
@@ -14,8 +14,8 @@ systems, the complete text of the BSD, GPL and LGPL licenses can be found
 in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and
 /usr/share/common-licenses/LGPL files.
 
-libartskde, interfaces, kabc, kate, kcert, kconf_update, kdecore, kded, kdefx,
-kdeprint, kdesu, kdeui, kdewidgets, khtml, kimgio, kinit, kio, kioslave, kjs,
+libartskde, interfaces, kabc, kate, kcert, kconf_update, tdecore, kded, tdefx,
+tdeprint, tdesu, tdeui, kdewidgets, khtml, kimgio, kinit, kio, kioslave, kjs,
 kparts, ksmartcard, kspell, kstyles, libkmid, libkscreensaver
 ------------------------------------------------------------------------------
 LGPL
diff --git a/debian/lenny/tdelibs/debian/kubuntu-desktop-i18n/findfiles b/debian/lenny/tdelibs/debian/kubuntu-desktop-i18n/findfiles
index 59a1d97a2..e53ad2bee 100644
--- a/debian/lenny/tdelibs/debian/kubuntu-desktop-i18n/findfiles
+++ b/debian/lenny/tdelibs/debian/kubuntu-desktop-i18n/findfiles
@@ -31,7 +31,7 @@ for file in `cat ./kolf/courses.list 2>/dev/null`; do
 	cat ./kolf/$file 2>/dev/null | grep -v debian >> $filelist
 done
 find ./amor/data -name \*rc -print 2>/dev/null | grep -v debian >> $filelist
-find ./kdeprint -name \*.print -print 2>/dev/null | grep -v debian >> $filelist 
+find ./tdeprint -name \*.print -print 2>/dev/null | grep -v debian >> $filelist 
 find . -name \*.kksrc -print 2>/dev/null | grep -v debian >> $filelist
 find ./kopete -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
 find . -name \*.kdevtemplate -print 2>/dev/null | grep -v debian >> $filelist
diff --git a/debian/lenny/tdelibs/debian/man/cupsdoprint-trinity.1 b/debian/lenny/tdelibs/debian/man/cupsdoprint-trinity.1
index a79649057..52275e6f8 100644
--- a/debian/lenny/tdelibs/debian/man/cupsdoprint-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/cupsdoprint-trinity.1
@@ -49,7 +49,7 @@ Information about printing under UNIX
 .BR lp (1),\  lpr (1),\  lpoptions (1)
 .SH AUTHORS
 .nf
-Michael Goffioul <kdeprint@swing.be>
+Michael Goffioul <tdeprint@swing.be>
 
 .br
 .fi
diff --git a/debian/lenny/tdelibs/debian/man/kdeinit-trinity.1 b/debian/lenny/tdelibs/debian/man/kdeinit-trinity.1
index 1e1e10adf..1c3861783 100644
--- a/debian/lenny/tdelibs/debian/man/kdeinit-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/kdeinit-trinity.1
@@ -1,21 +1,21 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDEINIT 1 "Jun 2006" "K Desktop Environment" "process launcher"
+.TH TDEINIT 1 "Jun 2006" "K Desktop Environment" "process launcher"
 .SH NAME
-kdeinit
+tdeinit
 \- KDE process launcher
 .SH SYNOPSIS
-\fBkdeinit\fP [options]
+\fBtdeinit\fP [options]
 .SH DESCRIPTION
-\fBkdeinit\fP is a process launcher similar to \fBinit\fP used for booting UNIX.
+\fBtdeinit\fP is a process launcher similar to \fBinit\fP used for booting UNIX.
 .sp 1
-\fBkdeinit\fP is used to start all other KDE programs. It can start binary program files as well as kdeinit loadable modules (KLMs).
+\fBtdeinit\fP is used to start all other KDE programs. It can start binary program files as well as tdeinit loadable modules (KLMs).
 .sp 1
-When \fBkdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstartkde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
+When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstartkde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
 .sp 1
-The \fBkdeinit\fP master process can be used to start additional KDE programs via \fBkdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
+The \fBtdeinit\fP master process can be used to start additional KDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
 .sp 1
 KLMs are dynamic libraries that work like binary programs but can be started more efficiently.
-Starting KLMs via \fBkdeinit\fP is much faster and more memory efficient because \fBkdeinit\fP is linked against all libraries a standard KDE application needs. To start a KLM \fBkdeinit\fP forks and loads the dynamic library.
+Starting KLMs via \fBtdeinit\fP is much faster and more memory efficient because \fBtdeinit\fP is linked against all libraries a standard KDE application needs. To start a KLM \fBtdeinit\fP forks and loads the dynamic library.
 .SH OPTIONS
 .TP
 .B \-\-no\-kded
@@ -27,9 +27,9 @@ Terminate when no KDE applications are left running
 .SH FILES
 .TP
 .I /usr/lib/trinity
-directory with KLMs (kdeinit loadable modules)
+directory with KLMs (tdeinit loadable modules)
 .SH SEE ALSO
-.BR dcopserver (1),\  kded (1),\  kcminit (1),\  kdeinit_wrapper (1),\  klauncher (1),\  kshell (1),\  kwrapper (1),\  startkde (1)
+.BR dcopserver (1),\  kded (1),\  kcminit (1),\  tdeinit_wrapper (1),\  klauncher (1),\  kshell (1),\  kwrapper (1),\  startkde (1)
 .SH AUTHORS
 .nf
 Waldo Bastian <bastian@kde.org>
diff --git a/debian/lenny/tdelibs/debian/man/kdeinit_shutdown-trinity.1 b/debian/lenny/tdelibs/debian/man/kdeinit_shutdown-trinity.1
index 11081656a..679666846 100644
--- a/debian/lenny/tdelibs/debian/man/kdeinit_shutdown-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/kdeinit_shutdown-trinity.1
@@ -1,14 +1,14 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDEINIT_SHUTDOWN 1 "Jun 2006" "K Desktop Environment" ""
+.TH TDEINIT_SHUTDOWN 1 "Jun 2006" "K Desktop Environment" ""
 .SH NAME
-kdeinit_shutdown
-\- shuts down kdeinit master process
+tdeinit_shutdown
+\- shuts down tdeinit master process
 .SH SYNOPSIS
-\fBkdeinit_shutdown
+\fBtdeinit_shutdown
 .SH DESCRIPTION
-\fBkdeinit_shutdown\fP shuts down kdeinit master process and terminates all processes spawned from it.
+\fBtdeinit_shutdown\fP shuts down tdeinit master process and terminates all processes spawned from it.
 .SH SEE ALSO
-.BR kdeinit (1)
+.BR tdeinit (1)
 .SH AUTHORS
 .nf
 The KDE project
diff --git a/debian/lenny/tdelibs/debian/man/kdesu_stub-trinity.1 b/debian/lenny/tdelibs/debian/man/kdesu_stub-trinity.1
index 7a3800513..f21330cc4 100644
--- a/debian/lenny/tdelibs/debian/man/kdesu_stub-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/kdesu_stub-trinity.1
@@ -1,23 +1,23 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDESU_STUB 1 "Jun 2006" "K Desktop Environment" "KDE internal"
+.TH TDESU_STUB 1 "Jun 2006" "K Desktop Environment" "KDE internal"
 .SH NAME
-kdesu_stub
+tdesu_stub
 \- used by KDE su
 .SH DESCRIPTION
-!!! \fBkdesu_stub\fP is for KDE internal use only !!!
+!!! \fBtdesu_stub\fP is for KDE internal use only !!!
 .sp 1
-KDE su executes \fBkdesu_stub\fP through su or ssh. The stub is running as the target user. After some information is sent via stdin and stdout the stub executes the target program.
+KDE su executes \fBtdesu_stub\fP through su or ssh. The stub is running as the target user. After some information is sent via stdin and stdout the stub executes the target program.
 .br
 The information passed over are the X display, a X authentication cookie (if available), the PATH and the command to run.
 .sp 1
 KDE su uses a stub program because the X cookie is private information and therefore cannot be passed on the command line.
 .SH SEE ALSO
-.BR kdesu (1)
+.BR tdesu (1)
 .sp 1
 Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kdesu/
+.BR help:/tdesu/
 directly into konqueror or you can run 
-.BR "`khelpcenter help:/kdesu/'"
+.BR "`khelpcenter help:/tdesu/'"
 from the command\-line.
 .br
 .SH AUTHORS
diff --git a/debian/lenny/tdelibs/debian/man/klauncher-trinity.1 b/debian/lenny/tdelibs/debian/man/klauncher-trinity.1
index f8274aea6..240dab5e3 100644
--- a/debian/lenny/tdelibs/debian/man/klauncher-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/klauncher-trinity.1
@@ -4,15 +4,15 @@
 klauncher
 \- daemon for service activation in KDE
 .SH DESCRIPTION
-!!! \fBklauncher\fP is started automatically by kdeinit. It is not supposed to be started manually. !!!
+!!! \fBklauncher\fP is started automatically by tdeinit. It is not supposed to be started manually. !!!
 .sp 1
-\fBklauncher\fP is a daemon responsible for service activation in KDE. It operates closely together with the kdeinit master process to start new processes. KDE applications communicate with \fBklauncher\fP via DCOP to start new applications or services.
+\fBklauncher\fP is a daemon responsible for service activation in KDE. It operates closely together with the tdeinit master process to start new processes. KDE applications communicate with \fBklauncher\fP via DCOP to start new applications or services.
 .sp 1
 The error message "KLauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBklauncher\fP crashed.
 .sp 1
 Note: \fBklauncher\fP is not the "run command" dialog (Alt+F2)!
 .SH SEE ALSO
-.BR dcopserver (1),\  kdeinit (1)
+.BR dcopserver (1),\  tdeinit (1)
 .SH AUTHORS
 .nf
 Waldo Bastian <bastian@kde.org>
diff --git a/debian/lenny/tdelibs/debian/man/kshell-trinity.1 b/debian/lenny/tdelibs/debian/man/kshell-trinity.1
index acbe215c8..5afbc3048 100644
--- a/debian/lenny/tdelibs/debian/man/kshell-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/kshell-trinity.1
@@ -1,21 +1,21 @@
 .TH KSHELL 1 "Jun 2006" "K Desktop Environment" ""
 .SH NAME
-kdeinit_wrapper, kshell, kwrapper
-\- start applications via kdeinit
+tdeinit_wrapper, kshell, kwrapper
+\- start applications via tdeinit
 .SH SYNOPSIS
-\fBkdeinit_wrapper\fP application [arguments]
+\fBtdeinit_wrapper\fP application [arguments]
 .sp 1
 \fBkshell\fP application [arguments]
 .sp 1
 \fBkwrapper\fP application [arguments]
 .SH DESCRIPTION
-\fBkdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP start applications via \fBkdeinit\fP.
+\fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP start applications via \fBtdeinit\fP.
 .sp 1
-\fBkdeinit_wrapper\fP simply passes application name and arguments to \fBkdeinit\fP.
+\fBtdeinit_wrapper\fP simply passes application name and arguments to \fBtdeinit\fP.
 .sp 1
-\fBkshell\fP passes application name, arguments, complete environment and current working directory to \fBkdeinit\fP.
+\fBkshell\fP passes application name, arguments, complete environment and current working directory to \fBtdeinit\fP.
 .sp 1
-\fBkwrapper\fP tries to make the application look like it was actually started directly and not via \fBkdeinit\fP. Like \fBkshell\fP it passes application name, arguments, complete environment and current working directory to \fBkdeinit\fP.
+\fBkwrapper\fP tries to make the application look like it was actually started directly and not via \fBtdeinit\fP. Like \fBkshell\fP it passes application name, arguments, complete environment and current working directory to \fBtdeinit\fP.
 .br
 Additionally it
 .IP "    \-"
@@ -37,7 +37,7 @@ application to start
 arguments of application to start
 .SS 
 .SH SEE ALSO
-.BR kdeinit (1)
+.BR tdeinit (1)
 .br
 .SH AUTHORS
 .nf
@@ -45,7 +45,7 @@ arguments of application to start
 .br
 Oswald Buddenhagen <ossi@kde.org>
 
-\fBkwrapper\fP and \fBkdeinit_wrapper\fP:
+\fBkwrapper\fP and \fBtdeinit_wrapper\fP:
 .br
 Waldo Bastian <bastian@kde.org>
 Mario Weilguni <mweilguni@sime.org>
diff --git a/debian/lenny/tdelibs/debian/man/make_driver_db_cups-trinity.1 b/debian/lenny/tdelibs/debian/man/make_driver_db_cups-trinity.1
index e4eb8251f..0201523ce 100644
--- a/debian/lenny/tdelibs/debian/man/make_driver_db_cups-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/make_driver_db_cups-trinity.1
@@ -25,7 +25,7 @@ directory with ppd files
 write printer database into this file
 .SH FILES
 .TP
-.I $KDEHOME/share/apps/kdeprint/printerdb_cups.txt
+.I $KDEHOME/share/apps/tdeprint/printerdb_cups.txt
 KDE printer database
 .br
 (if $KDEHOME is not set ~/.kde is used)
diff --git a/debian/lenny/tdelibs/debian/rules b/debian/lenny/tdelibs/debian/rules
index 4cdb2747a..119f2a4fe 100755
--- a/debian/lenny/tdelibs/debian/rules
+++ b/debian/lenny/tdelibs/debian/rules
@@ -31,7 +31,7 @@ DEB_FIXPERMS_EXCLUDE := \
 	opt/trinity/bin/fileshareset	\
 	opt/trinity/bin/kgrantpty	\
 	opt/trinity/bin/kpac_dhcp_helper \
-	opt/trinity/bin/start_kdeinit
+	opt/trinity/bin/start_tdeinit
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdelibs-trinity-dbg
 
@@ -40,7 +40,7 @@ DEB_DH_MAKESHLIBS_ARGS_tdelibs4c2a-trinity := -V'tdelibs4c2a-trinity (>= 4:3.5.8
 binary-install/tdelibs-data-trinity::
 	install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu
 	install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf
-	uudecode debian/icons/aboutkde-kubuntu.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/apps/kdeui/pics/aboutkde.png
+	uudecode debian/icons/aboutkde-kubuntu.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/apps/tdeui/pics/aboutkde.png
 
 	uudecode debian/icons/cr16-device-system.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/16x16/devices/system.png
 	uudecode debian/icons/cr22-device-system.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/22x22/devices/system.png
diff --git a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
index 22d939e81..6cd2a864c 100644
--- a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
@@ -8,7 +8,7 @@ debian/tmp/etc/trinity/katefiletyperc
 debian/tmp/etc/trinity/katesyntaxhighlightingrc
 debian/tmp/etc/trinity/kdebug.areas
 debian/tmp/etc/trinity/kdebugrc
-debian/tmp/etc/trinity/kdeprintrc
+debian/tmp/etc/trinity/tdeprintrc
 debian/tmp/etc/trinity/kio_isorc
 debian/tmp/etc/trinity/ksslcalist
 debian/tmp/etc/trinity/kthemestylerc
@@ -40,152 +40,152 @@ debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_instantmessenger.desk
 debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_ktexteditor.desktop
 debian/tmp/opt/trinity/share/apps/kconf_update/kcookiescfg.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/kded.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kdeprintrc.upd
+debian/tmp/opt/trinity/share/apps/kconf_update/tdeprintrc.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/kio_help.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/kioslave.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/move_kio_help_cache.sh
 debian/tmp/opt/trinity/share/apps/kconf_update/proxytype.pl
 debian/tmp/opt/trinity/share/apps/kconf_update/useragent.pl
-debian/tmp/opt/trinity/share/apps/kdeprint/apsdriver1
-debian/tmp/opt/trinity/share/apps/kdeprint/apsdriver2
-debian/tmp/opt/trinity/share/apps/kdeprint/cupsd.conf.template
-debian/tmp/opt/trinity/share/apps/kdeprint/cups_logo.png
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/enscript.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/enscript.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/imagetops.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/imagetops.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/pdf2ps.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/pdf2ps.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/pdfwrite.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/pdfwrite.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/poster.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/poster.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/ps2pdf.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/ps2pdf.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook1.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook1.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook2.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook2.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psnup.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psnup.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psselect.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psselect.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/actions/filterstop.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/actions/kdeprint_restartsrv.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/actions/kdeprint_uploadsmb.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_computer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_cancelled.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_completed.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_error.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_class.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_class_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_class_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_defect.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_remote.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_remote_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_remote_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/history.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_addprinter.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_addpseudo.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_configmgr.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_configsrv.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_defaulthard.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_defaultsoft.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_enableprinter.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_printer_infos.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_printstate.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_queuestate.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_report.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_restartsrv.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_stopprinter.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_testprinter.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_uploadsmb.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/package_utilities.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/actions/kdeprint_inklevel.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_defect.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_users.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/48x48/apps/kdeprint_printer_class.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/48x48/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer_class.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/kde_logo.png
-debian/tmp/opt/trinity/share/apps/kdeprint/lprngtooldriver1
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_collate.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_collate_reverse.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_color.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_duplex_long.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_duplex_none.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_duplex_short.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_grayscale.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_landscape.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_nup1.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_nup2.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_nup4.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_nupother.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_portrait.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_prettyprint.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_revlandscape.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_revportrait.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_uncollate.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_uncollate_reverse.png
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/cups.print
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/ext.print
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/lpdunix.print
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/lpr.print
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/rlpr.print
-debian/tmp/opt/trinity/share/apps/kdeprint/preview-mini.png
-debian/tmp/opt/trinity/share/apps/kdeprint/preview.png
-debian/tmp/opt/trinity/share/apps/kdeprint/side.png
-debian/tmp/opt/trinity/share/apps/kdeprint/specials.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/testprint.ps
-debian/tmp/opt/trinity/share/apps/kdeprint/tiledown.png
-debian/tmp/opt/trinity/share/apps/kdeprint/tileup.png
-debian/tmp/opt/trinity/share/apps/kdeprint/tools/escputil.desktop
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-middle-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-middle-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-top-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-top-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-middle-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-middle-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-top-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-top-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/kde_infopage.css
-debian/tmp/opt/trinity/share/apps/kdeui/about/kde_infopage_rtl.css
-debian/tmp/opt/trinity/share/apps/kdeui/about/top-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/pics/aboutkde.png
-debian/tmp/opt/trinity/share/apps/kdeui/pics/ktip-background.png
-debian/tmp/opt/trinity/share/apps/kdeui/pics/ktip-bulb.png
+debian/tmp/opt/trinity/share/apps/tdeprint/apsdriver1
+debian/tmp/opt/trinity/share/apps/tdeprint/apsdriver2
+debian/tmp/opt/trinity/share/apps/tdeprint/cupsd.conf.template
+debian/tmp/opt/trinity/share/apps/tdeprint/cups_logo.png
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/enscript.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/enscript.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/imagetops.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/imagetops.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/pdf2ps.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/pdf2ps.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/pdfwrite.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/pdfwrite.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/poster.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/poster.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/ps2pdf.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/ps2pdf.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook1.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook1.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook2.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook2.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psnup.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psnup.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psselect.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psselect.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/actions/filterstop.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/actions/tdeprint_restartsrv.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/actions/tdeprint_uploadsmb.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_computer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_cancelled.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_completed.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_error.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_class.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_class_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_class_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_defect.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_remote.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_remote_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_remote_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/history.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_addprinter.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_addpseudo.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_configmgr.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_configsrv.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_defaulthard.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_defaultsoft.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_enableprinter.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_printer_infos.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_printstate.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_queuestate.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_report.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_restartsrv.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_stopprinter.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_testprinter.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_uploadsmb.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/package_utilities.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/actions/tdeprint_inklevel.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_class.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_class_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_class_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_defect.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_remote.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_remote_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_remote_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_users.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/48x48/apps/tdeprint_printer_class.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/48x48/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/64x64/apps/tdeprint_printer_class.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/64x64/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/kde_logo.png
+debian/tmp/opt/trinity/share/apps/tdeprint/lprngtooldriver1
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_collate.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_collate_reverse.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_color.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_duplex_long.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_duplex_none.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_duplex_short.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_grayscale.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_landscape.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_nup1.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_nup2.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_nup4.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_nupother.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_portrait.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_prettyprint.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_revlandscape.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_revportrait.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_uncollate.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_uncollate_reverse.png
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/cups.print
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/ext.print
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/lpdunix.print
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/lpr.print
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/rlpr.print
+debian/tmp/opt/trinity/share/apps/tdeprint/preview-mini.png
+debian/tmp/opt/trinity/share/apps/tdeprint/preview.png
+debian/tmp/opt/trinity/share/apps/tdeprint/side.png
+debian/tmp/opt/trinity/share/apps/tdeprint/specials.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/testprint.ps
+debian/tmp/opt/trinity/share/apps/tdeprint/tiledown.png
+debian/tmp/opt/trinity/share/apps/tdeprint/tileup.png
+debian/tmp/opt/trinity/share/apps/tdeprint/tools/escputil.desktop
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-middle-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-middle-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-middle-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-middle-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage.css
+debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage_rtl.css
+debian/tmp/opt/trinity/share/apps/tdeui/about/top-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/pics/aboutkde.png
+debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-background.png
+debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-bulb.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kactionselector.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kactivelabel.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kcharselect.png
@@ -3572,7 +3572,7 @@ debian/tmp/opt/trinity/share/services/katepart.desktop
 debian/tmp/opt/trinity/share/services/kbzip2filter.desktop
 debian/tmp/opt/trinity/share/services/kcertpart.desktop
 debian/tmp/opt/trinity/share/services/kded/kcookiejar.desktop
-debian/tmp/opt/trinity/share/services/kded/kdeprintd.desktop
+debian/tmp/opt/trinity/share/services/kded/tdeprintd.desktop
 debian/tmp/opt/trinity/share/services/kded/kdetrayproxy.desktop
 debian/tmp/opt/trinity/share/services/kded/kpasswdserver.desktop
 debian/tmp/opt/trinity/share/services/kded/kssld.desktop
diff --git a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
index b065921dd..8f84589d6 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -204,33 +204,33 @@ debian/tmp/opt/trinity/include/kde_file.h
 debian/tmp/opt/trinity/include/tdelibs_export.h
 debian/tmp/opt/trinity/include/kdemacros.h
 debian/tmp/opt/trinity/include/kde.pot
-debian/tmp/opt/trinity/include/kdeprint/driver.h
-debian/tmp/opt/trinity/include/kdeprint/kiconselectaction.h
-debian/tmp/opt/trinity/include/kdeprint/kmjob.h
-debian/tmp/opt/trinity/include/kdeprint/kmjobmanager.h
-debian/tmp/opt/trinity/include/kdeprint/kmjobviewer.h
-debian/tmp/opt/trinity/include/kdeprint/kmmainview.h
-debian/tmp/opt/trinity/include/kdeprint/kmmanager.h
-debian/tmp/opt/trinity/include/kdeprint/kmobject.h
-debian/tmp/opt/trinity/include/kdeprint/kmprinter.h
-debian/tmp/opt/trinity/include/kdeprint/kmprinterpage.h
-debian/tmp/opt/trinity/include/kdeprint/kmtimer.h
-debian/tmp/opt/trinity/include/kdeprint/kpreloadobject.h
-debian/tmp/opt/trinity/include/kdeprint/kprintdialog.h
-debian/tmp/opt/trinity/include/kdeprint/kprintdialogpage.h
-debian/tmp/opt/trinity/include/kdeprint/lpr/lprhandler.h
-debian/tmp/opt/trinity/include/kdeprint/lpr/lprsettings.h
-debian/tmp/opt/trinity/include/kdeprint/lpr/printcapentry.h
+debian/tmp/opt/trinity/include/tdeprint/driver.h
+debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h
+debian/tmp/opt/trinity/include/tdeprint/kmjob.h
+debian/tmp/opt/trinity/include/tdeprint/kmjobmanager.h
+debian/tmp/opt/trinity/include/tdeprint/kmjobviewer.h
+debian/tmp/opt/trinity/include/tdeprint/kmmainview.h
+debian/tmp/opt/trinity/include/tdeprint/kmmanager.h
+debian/tmp/opt/trinity/include/tdeprint/kmobject.h
+debian/tmp/opt/trinity/include/tdeprint/kmprinter.h
+debian/tmp/opt/trinity/include/tdeprint/kmprinterpage.h
+debian/tmp/opt/trinity/include/tdeprint/kmtimer.h
+debian/tmp/opt/trinity/include/tdeprint/kpreloadobject.h
+debian/tmp/opt/trinity/include/tdeprint/kprintdialog.h
+debian/tmp/opt/trinity/include/tdeprint/kprintdialogpage.h
+debian/tmp/opt/trinity/include/tdeprint/lpr/lprhandler.h
+debian/tmp/opt/trinity/include/tdeprint/lpr/lprsettings.h
+debian/tmp/opt/trinity/include/tdeprint/lpr/printcapentry.h
 debian/tmp/opt/trinity/include/kdesktopfile.h
-debian/tmp/opt/trinity/include/kdesu/client.h
-debian/tmp/opt/trinity/include/kdesu/defaults.h
-debian/tmp/opt/trinity/include/kdesu/kcookie.h
-debian/tmp/opt/trinity/include/kdesu/kdesu_pty.h
-debian/tmp/opt/trinity/include/kdesu/process.h
-debian/tmp/opt/trinity/include/kdesu/pty.h
-debian/tmp/opt/trinity/include/kdesu/ssh.h
-debian/tmp/opt/trinity/include/kdesu/stub.h
-debian/tmp/opt/trinity/include/kdesu/su.h
+debian/tmp/opt/trinity/include/tdesu/client.h
+debian/tmp/opt/trinity/include/tdesu/defaults.h
+debian/tmp/opt/trinity/include/tdesu/kcookie.h
+debian/tmp/opt/trinity/include/tdesu/tdesu_pty.h
+debian/tmp/opt/trinity/include/tdesu/process.h
+debian/tmp/opt/trinity/include/tdesu/pty.h
+debian/tmp/opt/trinity/include/tdesu/ssh.h
+debian/tmp/opt/trinity/include/tdesu/stub.h
+debian/tmp/opt/trinity/include/tdesu/su.h
 debian/tmp/opt/trinity/include/kde_terminal_interface.h
 debian/tmp/opt/trinity/include/kdeversion.h
 debian/tmp/opt/trinity/include/kdialogbase.h
@@ -324,7 +324,7 @@ debian/tmp/opt/trinity/include/kio/http_slave_defaults.h
 debian/tmp/opt/trinity/include/kio/ioslave_defaults.h
 debian/tmp/opt/trinity/include/kio/jobclasses.h
 debian/tmp/opt/trinity/include/kio/job.h
-debian/tmp/opt/trinity/include/kio/kdesasl.h
+debian/tmp/opt/trinity/include/kio/tdesasl.h
 debian/tmp/opt/trinity/include/kio/kmdbase.h
 debian/tmp/opt/trinity/include/kio/kmdcodec.h
 debian/tmp/opt/trinity/include/kio/kntlm.h
@@ -743,35 +743,35 @@ debian/tmp/opt/trinity/lib/libkabc_ldapkio.so
 debian/tmp/opt/trinity/lib/libkabc.so
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.la
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so
-debian/tmp/opt/trinity/lib/libkdecore.la
-debian/tmp/opt/trinity/lib/libkdecore.so
-debian/tmp/opt/trinity/lib/libkdefakes.la
-debian/tmp/opt/trinity/lib/libkdefakes_nonpic.a
-debian/tmp/opt/trinity/lib/libkdefakes_pic.a
-debian/tmp/opt/trinity/lib/libkdefakes.so
-debian/tmp/opt/trinity/lib/libkdefx.la
-debian/tmp/opt/trinity/lib/libkdefx.so
-debian/tmp/opt/trinity/lib/libkdeinit_cupsdconf.la
-debian/tmp/opt/trinity/lib/libkdeinit_dcopserver.la
-debian/tmp/opt/trinity/lib/libkdeinit_kaddprinterwizard.la
-debian/tmp/opt/trinity/lib/libkdeinit_kbuildsycoca.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcmshell.la
-debian/tmp/opt/trinity/lib/libkdeinit_kconf_update.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcookiejar.la
-debian/tmp/opt/trinity/lib/libkdeinit_kded.la
-debian/tmp/opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.la
-debian/tmp/opt/trinity/lib/libkdeinit_kio_uiserver.la
-debian/tmp/opt/trinity/lib/libkdeinit_klauncher.la
-debian/tmp/opt/trinity/lib/libkdeprint.la
-debian/tmp/opt/trinity/lib/libkdeprint_management.la
-debian/tmp/opt/trinity/lib/libkdeprint_management.so
-debian/tmp/opt/trinity/lib/libkdeprint.so
-debian/tmp/opt/trinity/lib/libkdesasl.la
-debian/tmp/opt/trinity/lib/libkdesasl.so
-debian/tmp/opt/trinity/lib/libkdesu.la
-debian/tmp/opt/trinity/lib/libkdesu.so
-debian/tmp/opt/trinity/lib/libkdeui.la
-debian/tmp/opt/trinity/lib/libkdeui.so
+debian/tmp/opt/trinity/lib/libtdecore.la
+debian/tmp/opt/trinity/lib/libtdecore.so
+debian/tmp/opt/trinity/lib/libtdefakes.la
+debian/tmp/opt/trinity/lib/libtdefakes_nonpic.a
+debian/tmp/opt/trinity/lib/libtdefakes_pic.a
+debian/tmp/opt/trinity/lib/libtdefakes.so
+debian/tmp/opt/trinity/lib/libtdefx.la
+debian/tmp/opt/trinity/lib/libtdefx.so
+debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.la
+debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.la
+debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.la
+debian/tmp/opt/trinity/lib/libtdeinit_kbuildsycoca.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcmshell.la
+debian/tmp/opt/trinity/lib/libtdeinit_kconf_update.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcookiejar.la
+debian/tmp/opt/trinity/lib/libtdeinit_kded.la
+debian/tmp/opt/trinity/lib/libtdeinit_kio_http_cache_cleaner.la
+debian/tmp/opt/trinity/lib/libtdeinit_kio_uiserver.la
+debian/tmp/opt/trinity/lib/libtdeinit_klauncher.la
+debian/tmp/opt/trinity/lib/libtdeprint.la
+debian/tmp/opt/trinity/lib/libtdeprint_management.la
+debian/tmp/opt/trinity/lib/libtdeprint_management.so
+debian/tmp/opt/trinity/lib/libtdeprint.so
+debian/tmp/opt/trinity/lib/libtdesasl.la
+debian/tmp/opt/trinity/lib/libtdesasl.so
+debian/tmp/opt/trinity/lib/libtdesu.la
+debian/tmp/opt/trinity/lib/libtdesu.so
+debian/tmp/opt/trinity/lib/libtdeui.la
+debian/tmp/opt/trinity/lib/libtdeui.so
 debian/tmp/opt/trinity/lib/libkdnssd.la
 debian/tmp/opt/trinity/lib/libkdnssd.so
 debian/tmp/opt/trinity/lib/libkhtml.la
diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install
index 6ee941938..91c12cb5b 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -20,12 +20,12 @@ debian/tmp/opt/trinity/bin/kconf_update
 debian/tmp/opt/trinity/bin/kcookiejar
 debian/tmp/opt/trinity/bin/kde-config
 debian/tmp/opt/trinity/bin/kded
-debian/tmp/opt/trinity/bin/kdeinit
-debian/tmp/opt/trinity/bin/kdeinit_shutdown
-debian/tmp/opt/trinity/bin/kdeinit_wrapper
+debian/tmp/opt/trinity/bin/tdeinit
+debian/tmp/opt/trinity/bin/tdeinit_shutdown
+debian/tmp/opt/trinity/bin/tdeinit_wrapper
 debian/tmp/opt/trinity/bin/kdetcompmgr
 debian/tmp/opt/trinity/bin/kde-menu
-debian/tmp/opt/trinity/bin/kdesu_stub
+debian/tmp/opt/trinity/bin/tdesu_stub
 debian/tmp/opt/trinity/bin/kdontchangethehostname
 debian/tmp/opt/trinity/bin/kdostartupconfig
 debian/tmp/opt/trinity/bin/kfile
@@ -50,8 +50,8 @@ debian/tmp/opt/trinity/bin/lnusertemp
 debian/tmp/opt/trinity/bin/make_driver_db_cups
 debian/tmp/opt/trinity/bin/make_driver_db_lpr
 debian/tmp/opt/trinity/bin/meinproc
-debian/tmp/opt/trinity/bin/start_kdeinit
-debian/tmp/opt/trinity/bin/start_kdeinit_wrapper
+debian/tmp/opt/trinity/bin/start_tdeinit
+debian/tmp/opt/trinity/bin/start_tdeinit_wrapper
 debian/tmp/opt/trinity/lib/trinity/cupsdconf.la
 debian/tmp/opt/trinity/lib/trinity/cupsdconf.so
 debian/tmp/opt/trinity/lib/trinity/dcopserver.la
@@ -83,8 +83,8 @@ debian/tmp/opt/trinity/lib/trinity/kcookiejar.la
 debian/tmp/opt/trinity/lib/trinity/kcookiejar.so
 debian/tmp/opt/trinity/lib/trinity/kded_kcookiejar.la
 debian/tmp/opt/trinity/lib/trinity/kded_kcookiejar.so
-debian/tmp/opt/trinity/lib/trinity/kded_kdeprintd.la
-debian/tmp/opt/trinity/lib/trinity/kded_kdeprintd.so
+debian/tmp/opt/trinity/lib/trinity/kded_tdeprintd.la
+debian/tmp/opt/trinity/lib/trinity/kded_tdeprintd.so
 debian/tmp/opt/trinity/lib/trinity/kded_kdetrayproxy.la
 debian/tmp/opt/trinity/lib/trinity/kded_kdetrayproxy.so
 debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.la
@@ -97,18 +97,18 @@ debian/tmp/opt/trinity/lib/trinity/kded.la
 debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.la
 debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.so
 debian/tmp/opt/trinity/lib/trinity/kded.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_cups.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_cups.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_ext.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_ext.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_lpdunix.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_lpdunix.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_lpr.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_lpr.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_rlpr.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_rlpr.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_tool_escputil.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_tool_escputil.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_cups.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_cups.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_ext.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_ext.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_lpdunix.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_lpdunix.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_lpr.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_lpr.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_rlpr.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_rlpr.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_tool_escputil.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_tool_escputil.so
 debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.la
 debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.so
 debian/tmp/opt/trinity/lib/trinity/kgzipfilter.la
@@ -187,8 +187,8 @@ debian/tmp/opt/trinity/lib/trinity/libkatepart.la
 debian/tmp/opt/trinity/lib/trinity/libkatepart.so
 debian/tmp/opt/trinity/lib/trinity/libkcertpart.la
 debian/tmp/opt/trinity/lib/trinity/libkcertpart.so
-debian/tmp/opt/trinity/lib/trinity/libkdeprint_management_module.la
-debian/tmp/opt/trinity/lib/trinity/libkdeprint_management_module.so
+debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.la
+debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.so
 debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.la
 debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.so
 debian/tmp/opt/trinity/lib/trinity/libkmultipart.la
@@ -235,33 +235,33 @@ debian/tmp/opt/trinity/lib/libkabc.so.1
 debian/tmp/opt/trinity/lib/libkabc.so.1.2.0
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0.0.0
-debian/tmp/opt/trinity/lib/libkdecore.so.4
-debian/tmp/opt/trinity/lib/libkdecore.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdefakes.so.4
-debian/tmp/opt/trinity/lib/libkdefakes.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdefx.so.4
-debian/tmp/opt/trinity/lib/libkdefx.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdeinit_cupsdconf.so
-debian/tmp/opt/trinity/lib/libkdeinit_dcopserver.so
-debian/tmp/opt/trinity/lib/libkdeinit_kaddprinterwizard.so
-debian/tmp/opt/trinity/lib/libkdeinit_kbuildsycoca.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcmshell.so
-debian/tmp/opt/trinity/lib/libkdeinit_kconf_update.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcookiejar.so
-debian/tmp/opt/trinity/lib/libkdeinit_kded.so
-debian/tmp/opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.so
-debian/tmp/opt/trinity/lib/libkdeinit_kio_uiserver.so
-debian/tmp/opt/trinity/lib/libkdeinit_klauncher.so
-debian/tmp/opt/trinity/lib/libkdeprint_management.so.4
-debian/tmp/opt/trinity/lib/libkdeprint_management.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdeprint.so.4
-debian/tmp/opt/trinity/lib/libkdeprint.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdesasl.so.1
-debian/tmp/opt/trinity/lib/libkdesasl.so.1.2.0
-debian/tmp/opt/trinity/lib/libkdesu.so.4
-debian/tmp/opt/trinity/lib/libkdesu.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdeui.so.4
-debian/tmp/opt/trinity/lib/libkdeui.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdecore.so.4
+debian/tmp/opt/trinity/lib/libtdecore.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdefakes.so.4
+debian/tmp/opt/trinity/lib/libtdefakes.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdefx.so.4
+debian/tmp/opt/trinity/lib/libtdefx.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.so
+debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.so
+debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+debian/tmp/opt/trinity/lib/libtdeinit_kbuildsycoca.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcmshell.so
+debian/tmp/opt/trinity/lib/libtdeinit_kconf_update.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcookiejar.so
+debian/tmp/opt/trinity/lib/libtdeinit_kded.so
+debian/tmp/opt/trinity/lib/libtdeinit_kio_http_cache_cleaner.so
+debian/tmp/opt/trinity/lib/libtdeinit_kio_uiserver.so
+debian/tmp/opt/trinity/lib/libtdeinit_klauncher.so
+debian/tmp/opt/trinity/lib/libtdeprint_management.so.4
+debian/tmp/opt/trinity/lib/libtdeprint_management.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeprint.so.4
+debian/tmp/opt/trinity/lib/libtdeprint.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdesasl.so.1
+debian/tmp/opt/trinity/lib/libtdesasl.so.1.2.0
+debian/tmp/opt/trinity/lib/libtdesu.so.4
+debian/tmp/opt/trinity/lib/libtdesu.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeui.so.4
+debian/tmp/opt/trinity/lib/libtdeui.so.4.2.0
 debian/tmp/opt/trinity/lib/libkdnssd.so.1
 debian/tmp/opt/trinity/lib/libkdnssd.so.1.0.0
 debian/tmp/opt/trinity/lib/libkhtml.so.4
diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.lintian b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.lintian
index 68997d62e..593ec30ed 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.lintian
+++ b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.lintian
@@ -1,15 +1,15 @@
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kaddprinterwizard.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_cupsdconf.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_dcopserver.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcmshell.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kbuildsycoca.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kded.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcookiejar.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_klauncher.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kconf_update.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_uiserver.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcmshell.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kio_http_cache_cleaner.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kbuildsycoca.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_klauncher.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kconf_update.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kio_uiserver.so
 tdelibs4c2a binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
 tdelibs4c2a binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
 tdelibs4c2a binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/start_kdeinit 4755 root/root
+tdelibs4c2a binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.manpages b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.manpages
index eba677adb..00ed3a04e 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.manpages
+++ b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.manpages
@@ -20,7 +20,7 @@ debian/man/out/ksendbugmail-trinity.1
 debian/man/out/ktelnetservice-trinity.1
 debian/man/out/lnusertemp-trinity.1
 debian/man/out/meinproc-trinity.1
-./debian/man/kdeinit-trinity.1
+./debian/man/tdeinit-trinity.1
 ./debian/man/cupsdoprint-trinity.1
 ./debian/man/dcopclient-trinity.1
 ./debian/man/dcopobject-trinity.1
@@ -31,9 +31,9 @@ debian/man/out/meinproc-trinity.1
 ./debian/man/imagetops-trinity.1
 ./debian/man/kab2kabc-trinity.1
 ./debian/man/kcmshell-trinity.1
-./debian/man/kdeinit_shutdown-trinity.1
+./debian/man/tdeinit_shutdown-trinity.1
 ./debian/man/kde-menu-trinity.1
-./debian/man/kdesu_stub-trinity.1
+./debian/man/tdesu_stub-trinity.1
 ./debian/man/kgrantpty-trinity.1
 ./debian/man/khotnewstuff-trinity.1
 ./debian/man/kioexec-trinity.1
diff --git a/debian/lenny/tdemultimedia/debian/kmix-trinity.install b/debian/lenny/tdemultimedia/debian/kmix-trinity.install
index 742bd3f9c..79dfc1cef 100644
--- a/debian/lenny/tdemultimedia/debian/kmix-trinity.install
+++ b/debian/lenny/tdemultimedia/debian/kmix-trinity.install
@@ -6,8 +6,8 @@ debian/tmp/opt/trinity/lib/trinity/kmix_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/kmix_panelapplet.so
 debian/tmp/opt/trinity/lib/trinity/kmixctrl.la
 debian/tmp/opt/trinity/lib/trinity/kmixctrl.so
-debian/tmp/opt/trinity/lib/libkdeinit_kmix.so
-debian/tmp/opt/trinity/lib/libkdeinit_kmixctrl.so
+debian/tmp/opt/trinity/lib/libtdeinit_kmix.so
+debian/tmp/opt/trinity/lib/libtdeinit_kmixctrl.so
 debian/tmp/opt/trinity/share/applications/kde/kmix.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/kmixapplet.desktop
 debian/tmp/opt/trinity/share/apps/kmix/kmixui.rc
diff --git a/debian/lenny/tdemultimedia/debian/kmix-trinity.lintian b/debian/lenny/tdemultimedia/debian/kmix-trinity.lintian
index 6f97d1c92..a2a96f9ee 100644
--- a/debian/lenny/tdemultimedia/debian/kmix-trinity.lintian
+++ b/debian/lenny/tdemultimedia/debian/kmix-trinity.lintian
@@ -1,4 +1,4 @@
-kmix: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmixctrl.so
-kmix: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmix.so
-kmix: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
-kmix: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
+kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
+kmix: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
diff --git a/debian/lenny/tdemultimedia/debian/krec-trinity.install b/debian/lenny/tdemultimedia/debian/krec-trinity.install
index 7446b200d..bbb4ed25f 100644
--- a/debian/lenny/tdemultimedia/debian/krec-trinity.install
+++ b/debian/lenny/tdemultimedia/debian/krec-trinity.install
@@ -9,7 +9,7 @@ debian/tmp/opt/trinity/lib/trinity/libkrecexport_ogg.la
 debian/tmp/opt/trinity/lib/trinity/libkrecexport_ogg.so
 debian/tmp/opt/trinity/lib/trinity/libkrecexport_wave.la
 debian/tmp/opt/trinity/lib/trinity/libkrecexport_wave.so
-debian/tmp/opt/trinity/lib/libkdeinit_krec.so
+debian/tmp/opt/trinity/lib/libtdeinit_krec.so
 debian/tmp/opt/trinity/share/applications/kde/krec.desktop
 debian/tmp/opt/trinity/share/apps/krec/icons/crystalsvg/16x16/actions/krec_record.png
 debian/tmp/opt/trinity/share/apps/krec/icons/crystalsvg/22x22/actions/krec_record.png
diff --git a/debian/lenny/tdemultimedia/debian/krec-trinity.lintian b/debian/lenny/tdemultimedia/debian/krec-trinity.lintian
index 4b6b929a1..b09b553d8 100644
--- a/debian/lenny/tdemultimedia/debian/krec-trinity.lintian
+++ b/debian/lenny/tdemultimedia/debian/krec-trinity.lintian
@@ -1,3 +1,3 @@
-krec: no-shlibs-control-file opt/trinity/lib/libkdeinit_krec.so
-krec: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
-krec: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
+krec: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
+krec: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
diff --git a/debian/lenny/tdemultimedia/debian/noatun-trinity.install b/debian/lenny/tdemultimedia/debian/noatun-trinity.install
index 21524ef0b..e7b22e4e0 100644
--- a/debian/lenny/tdemultimedia/debian/noatun-trinity.install
+++ b/debian/lenny/tdemultimedia/debian/noatun-trinity.install
@@ -38,7 +38,7 @@ debian/tmp/opt/trinity/lib/trinity/noatunsimple.la
 debian/tmp/opt/trinity/lib/trinity/noatunsimple.so
 debian/tmp/opt/trinity/lib/libartseffects.la
 debian/tmp/opt/trinity/lib/libartseffects.so
-debian/tmp/opt/trinity/lib/libkdeinit_noatun.so
+debian/tmp/opt/trinity/lib/libtdeinit_noatun.so
 debian/tmp/opt/trinity/lib/libnoatun.so.1
 debian/tmp/opt/trinity/lib/libnoatun.so.1.2.0
 debian/tmp/opt/trinity/lib/libnoatunarts.la
diff --git a/debian/lenny/tdemultimedia/debian/noatun-trinity.lintian b/debian/lenny/tdemultimedia/debian/noatun-trinity.lintian
index 2dba45ea5..89faa71aa 100644
--- a/debian/lenny/tdemultimedia/debian/noatun-trinity.lintian
+++ b/debian/lenny/tdemultimedia/debian/noatun-trinity.lintian
@@ -1,4 +1,4 @@
 noatun: shlib-missing-in-control-file libwinskinvis.so opt/trinity/lib/libwinskinvis.so
 noatun: shlib-missing-in-control-file libartseffects.so opt/trinity/lib/libartseffects.so
 noatun: shlib-missing-in-control-file libnoatunarts.so opt/trinity/lib/libnoatunarts.so
-noatun: shlib-missing-in-control-file libkdeinit_noatun.so opt/trinity/lib/libkdeinit_noatun.so
+noatun: shlib-missing-in-control-file libtdeinit_noatun.so opt/trinity/lib/libtdeinit_noatun.so
diff --git a/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install
index 343efda6f..a6b4265bd 100644
--- a/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install
+++ b/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install
@@ -151,10 +151,10 @@ debian/tmp/opt/trinity/lib/libaudiocdplugins.la
 debian/tmp/opt/trinity/lib/libaudiocdplugins.so
 debian/tmp/opt/trinity/lib/libkcddb.la
 debian/tmp/opt/trinity/lib/libkcddb.so
-debian/tmp/opt/trinity/lib/libkdeinit_kmix.la
-debian/tmp/opt/trinity/lib/libkdeinit_kmixctrl.la
-debian/tmp/opt/trinity/lib/libkdeinit_krec.la
-debian/tmp/opt/trinity/lib/libkdeinit_noatun.la
+debian/tmp/opt/trinity/lib/libtdeinit_kmix.la
+debian/tmp/opt/trinity/lib/libtdeinit_kmixctrl.la
+debian/tmp/opt/trinity/lib/libtdeinit_krec.la
+debian/tmp/opt/trinity/lib/libtdeinit_noatun.la
 debian/tmp/opt/trinity/lib/libkmidlib.la
 debian/tmp/opt/trinity/lib/libkmidlib.so
 debian/tmp/opt/trinity/lib/libmpeg.la
diff --git a/debian/lenny/tdenetwork/debian/kdict-trinity.install b/debian/lenny/tdenetwork/debian/kdict-trinity.install
index 24d312686..281f24270 100644
--- a/debian/lenny/tdenetwork/debian/kdict-trinity.install
+++ b/debian/lenny/tdenetwork/debian/kdict-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/kdict.la
 debian/tmp/opt/trinity/lib/trinity/kdict.so
 debian/tmp/opt/trinity/lib/trinity/kdict_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/kdict_panelapplet.so
-debian/tmp/opt/trinity/lib/libkdeinit_kdict.so
+debian/tmp/opt/trinity/lib/libtdeinit_kdict.so
 debian/tmp/opt/trinity/share/applications/kde/kdict.desktop
 debian/tmp/opt/trinity/share/apps/kdict/icons/crystalsvg/16x16/actions/define_clip.png
 debian/tmp/opt/trinity/share/apps/kdict/icons/crystalsvg/16x16/actions/query_erase.png
diff --git a/debian/lenny/tdenetwork/debian/ksirc-trinity.install b/debian/lenny/tdenetwork/debian/ksirc-trinity.install
index 30d9f29b3..3c1146978 100644
--- a/debian/lenny/tdenetwork/debian/ksirc-trinity.install
+++ b/debian/lenny/tdenetwork/debian/ksirc-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/bin/dsirc
 debian/tmp/opt/trinity/bin/ksirc
 debian/tmp/opt/trinity/lib/trinity/ksirc.la
 debian/tmp/opt/trinity/lib/trinity/ksirc.so
-debian/tmp/opt/trinity/lib/libkdeinit_ksirc.so
+debian/tmp/opt/trinity/lib/libtdeinit_ksirc.so
 debian/tmp/opt/trinity/share/applications/kde/ksirc.desktop
 debian/tmp/opt/trinity/share/apps/ksirc/autodcc.pl
 debian/tmp/opt/trinity/share/apps/ksirc/eventsrc
diff --git a/debian/lenny/tdenetwork/debian/ksirc-trinity.lintian b/debian/lenny/tdenetwork/debian/ksirc-trinity.lintian
index d4f2f589a..265515419 100644
--- a/debian/lenny/tdenetwork/debian/ksirc-trinity.lintian
+++ b/debian/lenny/tdenetwork/debian/ksirc-trinity.lintian
@@ -1,3 +1,3 @@
-ksirc: no-shlibs-control-file opt/trinity/lib/libkdeinit_ksirc.so
-ksirc: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
-ksirc: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
+ksirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
+ksirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
+ksirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
diff --git a/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install b/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install
index eee07ec44..cc69d4cba 100644
--- a/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install
+++ b/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install
@@ -61,8 +61,8 @@ debian/tmp/opt/trinity/include/kde/rss/image.h
 debian/tmp/opt/trinity/include/kde/rss/librss.h
 debian/tmp/opt/trinity/include/kde/rss/loader.h
 debian/tmp/opt/trinity/include/kde/rss/textinput.h
-debian/tmp/opt/trinity/lib/libkdeinit_kdict.la
-debian/tmp/opt/trinity/lib/libkdeinit_ksirc.la
+debian/tmp/opt/trinity/lib/libtdeinit_kdict.la
+debian/tmp/opt/trinity/lib/libtdeinit_ksirc.la
 debian/tmp/opt/trinity/lib/libkopete.la
 debian/tmp/opt/trinity/lib/libkopete.so
 debian/tmp/opt/trinity/lib/libkopete_msn_shared.la
diff --git a/debian/lenny/tdepim/debian/changelog b/debian/lenny/tdepim/debian/changelog
index 4dac80686..24807570c 100644
--- a/debian/lenny/tdepim/debian/changelog
+++ b/debian/lenny/tdepim/debian/changelog
@@ -943,7 +943,7 @@ tdepim (4:3.4.3-1) unstable; urgency=low
     + Fixes a FTBFS with newer versions of g++-4.0.
   * Rename libmimelib1c2 to libmimelib1c2a due to C++ allocator changes.
   * New patch 13_mimelib_self_contained.diff:
-    + Link against libkdefakes_pic.a instead of -lkdefakes to
+    + Link against libtdefakes_pic.a instead of -ltdefakes to
       eliminate mimelib's dependency on tdelibs.
     + Fix mimelib/config.h not to require the KDE or QT headers again.
       This allows dropping the libtdepim-dev dependency from
@@ -1106,7 +1106,7 @@ tdepim (4:3.4.2-1) unstable; urgency=low
     + Rename libmimelib1a -> libmimelib1c2 in order not to break
       lurker.  Also split out libkmime2 from this package while I'm
       at it so that lurker users don't have to install tdelibs4 --
-      at least, they won't have to once I can link libkdefakes statically
+      at least, they won't have to once I can link libtdefakes statically
       into mimelib (see bug #326113).
   * Add Vietnamese debconf translation.  Closes: #312159.
   * Remove 10_korganizer_makefile.diff, which has been applied in
diff --git a/debian/lenny/tdesdk/debian/cervisia-trinity.install b/debian/lenny/tdesdk/debian/cervisia-trinity.install
index 8bbaccc5d..b4087e1c1 100644
--- a/debian/lenny/tdesdk/debian/cervisia-trinity.install
+++ b/debian/lenny/tdesdk/debian/cervisia-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/bin/cervisia
-debian/tmp/opt/trinity/lib/libkdeinit_cervisia.la
-debian/tmp/opt/trinity/lib/libkdeinit_cervisia.so
+debian/tmp/opt/trinity/lib/libtdeinit_cervisia.la
+debian/tmp/opt/trinity/lib/libtdeinit_cervisia.so
 debian/tmp/opt/trinity/lib/trinity/cervisia.la
 debian/tmp/opt/trinity/lib/trinity/cervisia.so
 debian/tmp/opt/trinity/lib/trinity/libcervisiapart.la
diff --git a/debian/lenny/tdesdk/debian/cervisia-trinity.lintian b/debian/lenny/tdesdk/debian/cervisia-trinity.lintian
index d7a490dae..4e79c02c5 100644
--- a/debian/lenny/tdesdk/debian/cervisia-trinity.lintian
+++ b/debian/lenny/tdesdk/debian/cervisia-trinity.lintian
@@ -2,8 +2,8 @@
 cervisia: script-not-executable ./usr/share/apps/kconf_update/change_colors.pl
 cervisia: script-not-executable ./usr/share/apps/kconf_update/move_repositories.pl
 
-# This is from kdeinit black magic.
-cervisia: no-shlibs-control-file opt/trinity/lib/libkdeinit_cervisia.so
-cervisia: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_cervisia.so
-cervisia: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_cervisia.so
-cervisia: package-name-doesnt-match-sonames libkdeinit-cervisia
+# This is from tdeinit black magic.
+cervisia: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
+cervisia: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia: package-name-doesnt-match-sonames libtdeinit-cervisia
diff --git a/debian/lenny/tdesdk/debian/changelog b/debian/lenny/tdesdk/debian/changelog
index e041b19d5..288f761e6 100644
--- a/debian/lenny/tdesdk/debian/changelog
+++ b/debian/lenny/tdesdk/debian/changelog
@@ -476,7 +476,7 @@ tdesdk (4:3.4.2-2.1) unstable; urgency=medium
 tdesdk (4:3.4.2-2) unstable; urgency=low
 
   * Built against libfam-dev, not libgamin-dev (closes: #326547).
-  * Updated overrides files to account for kdeinit black magic.
+  * Updated overrides files to account for tdeinit black magic.
 
  -- Ben Burton <bab@debian.org>  Sun,  4 Sep 2005 10:58:17 +1000
 
@@ -536,8 +536,8 @@ tdesdk (4:3.4.1-0ubuntu3) breezy; urgency=low
 
 tdesdk (4:3.4.1-0ubuntu2) breezy; urgency=low
 
-  * Add libkdeinit_cvsservice.so to libcvsservice0.install
-  * Add cervisia.so and libkdeinit_cervisia.so to cervisia.install
+  * Add libtdeinit_cvsservice.so to libcvsservice0.install
+  * Add cervisia.so and libtdeinit_cervisia.so to cervisia.install
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu,  2 Jun 2005 01:33:59 +0000
 
diff --git a/debian/lenny/tdesdk/debian/desktop-i18n/findfiles b/debian/lenny/tdesdk/debian/desktop-i18n/findfiles
index 397948556..62e5012c2 100644
--- a/debian/lenny/tdesdk/debian/desktop-i18n/findfiles
+++ b/debian/lenny/tdesdk/debian/desktop-i18n/findfiles
@@ -28,7 +28,7 @@ find ./kimgio -name \*.kimgio -print 2>/dev/null | grep -v debian >> $filelist
 find ./noatun -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
 find ./noatun-plugins -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
 find ./amor/data -name \*rc -print 2>/dev/null | grep -v debian >> $filelist
-find ./kdeprint -name \*.print -print 2>/dev/null | grep -v debian >> $filelist 
+find ./tdeprint -name \*.print -print 2>/dev/null | grep -v debian >> $filelist 
 find . -name \*.kksrc -print 2>/dev/null | grep -v debian >> $filelist
 find ./kopete -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
 find . -name \*.kdevtemplate -print 2>/dev/null | grep -v debian >> $filelist
diff --git a/debian/lenny/tdesdk/debian/libcvsservice-trinity-dev.install b/debian/lenny/tdesdk/debian/libcvsservice-trinity-dev.install
index ee6134374..ac87e6efb 100644
--- a/debian/lenny/tdesdk/debian/libcvsservice-trinity-dev.install
+++ b/debian/lenny/tdesdk/debian/libcvsservice-trinity-dev.install
@@ -3,5 +3,5 @@ debian/tmp/opt/trinity/include/kde/cvsservice_stub.h
 debian/tmp/opt/trinity/include/kde/repository_stub.h
 debian/tmp/opt/trinity/lib/libcvsservice.la
 debian/tmp/opt/trinity/lib/libcvsservice.so
-debian/tmp/opt/trinity/lib/libkdeinit_cvsaskpass.la
-debian/tmp/opt/trinity/lib/libkdeinit_cvsservice.la
+debian/tmp/opt/trinity/lib/libtdeinit_cvsaskpass.la
+debian/tmp/opt/trinity/lib/libtdeinit_cvsservice.la
diff --git a/debian/lenny/tdesdk/debian/libcvsservice0-trinity.install b/debian/lenny/tdesdk/debian/libcvsservice0-trinity.install
index c1649ddd2..6f6370493 100644
--- a/debian/lenny/tdesdk/debian/libcvsservice0-trinity.install
+++ b/debian/lenny/tdesdk/debian/libcvsservice0-trinity.install
@@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/cvsaskpass
 debian/tmp/opt/trinity/bin/cvsservice
 debian/tmp/opt/trinity/lib/libcvsservice.so.0
 debian/tmp/opt/trinity/lib/libcvsservice.so.0.0.1
-debian/tmp/opt/trinity/lib/libkdeinit_cvsaskpass.so
-debian/tmp/opt/trinity/lib/libkdeinit_cvsservice.so
+debian/tmp/opt/trinity/lib/libtdeinit_cvsaskpass.so
+debian/tmp/opt/trinity/lib/libtdeinit_cvsservice.so
 debian/tmp/opt/trinity/lib/trinity/cvsaskpass.la
 debian/tmp/opt/trinity/lib/trinity/cvsaskpass.so
 debian/tmp/opt/trinity/lib/trinity/cvsservice.la
diff --git a/debian/lenny/tdesdk/debian/libcvsservice0-trinity.lintian b/debian/lenny/tdesdk/debian/libcvsservice0-trinity.lintian
index 1430a5540..f3a4e3325 100644
--- a/debian/lenny/tdesdk/debian/libcvsservice0-trinity.lintian
+++ b/debian/lenny/tdesdk/debian/libcvsservice0-trinity.lintian
@@ -1,3 +1,3 @@
-# This is from kdeinit black magic.
-libcvsservice0: shlib-missing-in-control-file libkdeinit_cvsaskpass.so opt/trinity/lib/libkdeinit_cvsaskpass.so
-libcvsservice0: shlib-missing-in-control-file libkdeinit_cvsservice.so opt/trinity/lib/libkdeinit_cvsservice.so
+# This is from tdeinit black magic.
+libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
+libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
diff --git a/debian/lenny/tdesdk/debian/man/kdekillall.1 b/debian/lenny/tdesdk/debian/man/kdekillall.1
index 2a2c5c8a5..2bd5eb224 100644
--- a/debian/lenny/tdesdk/debian/man/kdekillall.1
+++ b/debian/lenny/tdesdk/debian/man/kdekillall.1
@@ -16,14 +16,14 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kdekillall \- kills processes started with kdeinit
+kdekillall \- kills processes started with tdeinit
 .SH SYNOPSIS
 .B kdekillall
 [ \fB\-\fP\fIsignal\fP ] \fIprocess-name\fP
 .SH DESCRIPTION
 \fBkdekillall\fP kills all processes with a particular name
-that were started through kdeinit.  Specifically, it kills all processes
-\fBkdeinit:\fP \fIprocess-name\fP.
+that were started through tdeinit.  Specifically, it kills all processes
+\fBtdeinit:\fP \fIprocess-name\fP.
 .PP
 This utility is part of the KDE Software Development Kit.
 .SH OPTIONS
diff --git a/debian/lenny/tdetoys/debian/kweather-trinity.install b/debian/lenny/tdetoys/debian/kweather-trinity.install
index 199f52605..ef03fcd89 100644
--- a/debian/lenny/tdetoys/debian/kweather-trinity.install
+++ b/debian/lenny/tdetoys/debian/kweather-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kweatherservice
 debian/tmp/opt/trinity/bin/kweatherreport
-debian/tmp/opt/trinity/lib/libkdeinit_kweatherreport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kweatherreport.la
+debian/tmp/opt/trinity/lib/libtdeinit_kweatherreport.so
+debian/tmp/opt/trinity/lib/libtdeinit_kweatherreport.la
 debian/tmp/opt/trinity/lib/trinity/kcm_weather.so
 debian/tmp/opt/trinity/lib/trinity/kcm_weather.la
 debian/tmp/opt/trinity/lib/trinity/kcm_weatherservice.so
diff --git a/debian/lenny/tdetoys/debian/kweather-trinity.lintian b/debian/lenny/tdetoys/debian/kweather-trinity.lintian
index e6fb3080a..b6c7e13d9 100644
--- a/debian/lenny/tdetoys/debian/kweather-trinity.lintian
+++ b/debian/lenny/tdetoys/debian/kweather-trinity.lintian
@@ -1,2 +1,2 @@
-kweather: no-shlibs-control-file usr/lib/trinity/libkdeinit_kweatherreport.so
-kweather: package-name-doesnt-match-sonames libkdeinit-kweatherreport
+kweather: no-shlibs-control-file usr/lib/trinity/libtdeinit_kweatherreport.so
+kweather: package-name-doesnt-match-sonames libtdeinit-kweatherreport
diff --git a/debian/lenny/tdeutils/debian/ark-trinity-trinity.lintian b/debian/lenny/tdeutils/debian/ark-trinity-trinity.lintian
index 7c958e5e4..2b8d3a553 100644
--- a/debian/lenny/tdeutils/debian/ark-trinity-trinity.lintian
+++ b/debian/lenny/tdeutils/debian/ark-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-ark: no-shlibs-control-file opt/trinity/lib/libkdeinit_ark.so
-ark: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
-ark: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
+ark: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
+ark: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
diff --git a/debian/lenny/tdeutils/debian/ark-trinity.install b/debian/lenny/tdeutils/debian/ark-trinity.install
index bb908c9c3..fd8123f1a 100644
--- a/debian/lenny/tdeutils/debian/ark-trinity.install
+++ b/debian/lenny/tdeutils/debian/ark-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/ark.la
 debian/tmp/opt/trinity/lib/trinity/ark.so
 debian/tmp/opt/trinity/lib/trinity/libarkpart.la
 debian/tmp/opt/trinity/lib/trinity/libarkpart.so
-debian/tmp/opt/trinity/lib/libkdeinit_ark.so
+debian/tmp/opt/trinity/lib/libtdeinit_ark.so
 debian/tmp/opt/trinity/share/applications/kde/ark.desktop
 debian/tmp/opt/trinity/share/apps/ark/ark_part.rc
 debian/tmp/opt/trinity/share/apps/ark/ark_part_readonly.rc
diff --git a/debian/lenny/tdeutils/debian/kcalc-trinity-trinity.lintian b/debian/lenny/tdeutils/debian/kcalc-trinity-trinity.lintian
index d05acaa86..075ce6c50 100644
--- a/debian/lenny/tdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/debian/lenny/tdeutils/debian/kcalc-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-kcalc: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcalc.so
-kcalc: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
-kcalc: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
+kcalc: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
+kcalc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
diff --git a/debian/lenny/tdeutils/debian/kcalc-trinity.install b/debian/lenny/tdeutils/debian/kcalc-trinity.install
index bf44a2749..b4806f5f0 100644
--- a/debian/lenny/tdeutils/debian/kcalc-trinity.install
+++ b/debian/lenny/tdeutils/debian/kcalc-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kcalc
 debian/tmp/opt/trinity/lib/trinity/kcalc.la
 debian/tmp/opt/trinity/lib/trinity/kcalc.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcalc.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcalc.so
 debian/tmp/opt/trinity/share/applications/kde/kcalc.desktop
 debian/tmp/opt/trinity/share/apps/kcalc/kcalcui.rc
 debian/tmp/opt/trinity/share/apps/kconf_update/kcalcrc.upd
diff --git a/debian/lenny/tdeutils/debian/kdelirc-trinity.install b/debian/lenny/tdeutils/debian/kdelirc-trinity.install
index 7753037cb..cf0ff5438 100644
--- a/debian/lenny/tdeutils/debian/kdelirc-trinity.install
+++ b/debian/lenny/tdeutils/debian/kdelirc-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/irkick.la
 debian/tmp/opt/trinity/lib/trinity/irkick.so
 debian/tmp/opt/trinity/lib/trinity/kcm_kcmlirc.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kcmlirc.so
-debian/tmp/opt/trinity/lib/libkdeinit_irkick.so
+debian/tmp/opt/trinity/lib/libtdeinit_irkick.so
 debian/tmp/opt/trinity/share/applications/kde/irkick.desktop
 debian/tmp/opt/trinity/share/applications/kde/kcmlirc.desktop
 debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/irkick.png
diff --git a/debian/lenny/tdeutils/debian/kdelirc-trinity.lintian b/debian/lenny/tdeutils/debian/kdelirc-trinity.lintian
index 51b260d6a..986b7f7d4 100644
--- a/debian/lenny/tdeutils/debian/kdelirc-trinity.lintian
+++ b/debian/lenny/tdeutils/debian/kdelirc-trinity.lintian
@@ -1,3 +1,3 @@
-kdelirc: no-shlibs-control-file opt/trinity/lib/libkdeinit_irkick.so
-kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_irkick.so
-kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_irkick.so
+kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
+kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
+kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/debian/lenny/tdeutils/debian/kedit-trinity.install b/debian/lenny/tdeutils/debian/kedit-trinity.install
index 0ecca6f75..9e70f971b 100644
--- a/debian/lenny/tdeutils/debian/kedit-trinity.install
+++ b/debian/lenny/tdeutils/debian/kedit-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kedit
 debian/tmp/opt/trinity/lib/trinity/kedit.la
 debian/tmp/opt/trinity/lib/trinity/kedit.so
-debian/tmp/opt/trinity/lib/libkdeinit_kedit.so
+debian/tmp/opt/trinity/lib/libtdeinit_kedit.so
 debian/tmp/opt/trinity/share/applications/kde/KEdit.desktop
 debian/tmp/opt/trinity/share/apps/kedit/keditui.rc
 debian/tmp/opt/trinity/share/config.kcfg/kedit.kcfg
diff --git a/debian/lenny/tdeutils/debian/kedit-trinity.lintian b/debian/lenny/tdeutils/debian/kedit-trinity.lintian
index 864682bca..a2a63b3ba 100644
--- a/debian/lenny/tdeutils/debian/kedit-trinity.lintian
+++ b/debian/lenny/tdeutils/debian/kedit-trinity.lintian
@@ -1,3 +1,3 @@
-kedit: no-shlibs-control-file opt/trinity/lib/libkdeinit_kedit.so
-kedit: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
-kedit: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
+kedit: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
+kedit: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
diff --git a/debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install b/debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install
index e6ba996f4..a3c425a38 100644
--- a/debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install
+++ b/debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install
@@ -15,10 +15,10 @@ debian/tmp/opt/trinity/include/kde/ksim/themetypes.h
 debian/tmp/opt/trinity/include/kde/kwidgetstreamer.h
 debian/tmp/opt/trinity/lib/libkcmlaptop.la
 debian/tmp/opt/trinity/lib/libkcmlaptop.so
-debian/tmp/opt/trinity/lib/libkdeinit_ark.la
-debian/tmp/opt/trinity/lib/libkdeinit_irkick.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcalc.la
-debian/tmp/opt/trinity/lib/libkdeinit_kedit.la
+debian/tmp/opt/trinity/lib/libtdeinit_ark.la
+debian/tmp/opt/trinity/lib/libtdeinit_irkick.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcalc.la
+debian/tmp/opt/trinity/lib/libtdeinit_kedit.la
 debian/tmp/opt/trinity/lib/libkmilo.la
 debian/tmp/opt/trinity/lib/libkmilo.so
 debian/tmp/opt/trinity/lib/libkregexpeditorcommon.la
diff --git a/debian/squeeze/applications/adept/debian/changelog b/debian/squeeze/applications/adept/debian/changelog
index ec12c0119..332ec5674 100644
--- a/debian/squeeze/applications/adept/debian/changelog
+++ b/debian/squeeze/applications/adept/debian/changelog
@@ -378,7 +378,7 @@ adept (2.1.2ubuntu13) feisty; urgency=low
 
   * Add kubuntu_08_no_unique_application.diff don't use a unique application,
     stops it forking which broke xauthority and means debconf can't work in X mode
-  * Add kubuntu_09_no_double_kdesu.diff stop using kdesu twice
+  * Add kubuntu_09_no_double_tdesu.diff stop using tdesu twice
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Feb 2007 12:38:42 +0000
 
@@ -674,7 +674,7 @@ ept (0.4) experimental; urgency=low
   * Easy Tag filter.
   * Ship own copies of nuvola icons.
   * Fix segfaulting extenders.
-  * Use kdesu for .desktop entries.
+  * Use tdesu for .desktop entries.
   * Fix crasher on cache reload with active tag filter.
   * Major speedup of the tag menu.
   * Improve handling of comments in sources.list editor.
diff --git a/debian/squeeze/applications/amarok.cmake/debian/changelog b/debian/squeeze/applications/amarok.cmake/debian/changelog
index e72612a70..c2bf1ae55 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/changelog
+++ b/debian/squeeze/applications/amarok.cmake/debian/changelog
@@ -284,7 +284,7 @@ amarok (2:1.4.8-0ubuntu3) hardy; urgency=low
 
   [ Sarah Hobbs ]
   * Sponsored upload.  (Closes LP: #187406)
-  * Reworked patch to avoid setting absolute paths (eg /usr/bin/kdesu) 
+  * Reworked patch to avoid setting absolute paths (eg /usr/bin/tdesu) 
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 12 Mar 2008 00:50:22 +1100
 
diff --git a/debian/squeeze/applications/amarok.cmake/debian/install-mp3 b/debian/squeeze/applications/amarok.cmake/debian/install-mp3
index 7b06cbd2f..ae0663182 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/install-mp3
+++ b/debian/squeeze/applications/amarok.cmake/debian/install-mp3
@@ -27,8 +27,8 @@ INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install`
 
 #is available, not installed
 if [ -z "$INSTALLED" ]; then
-  if [ -x /opt/trinity/bin/kdesu ] && [ -x /usr/bin/install-package ]; then
-    /opt/trinity/bin/kdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
+  if [ -x /opt/trinity/bin/tdesu ] && [ -x /usr/bin/install-package ]; then
+    /opt/trinity/bin/tdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
   elif [ -x /usr/bin/gksudo ] && [ -x /usr/sbin/synaptic ]; then
     gksudo "sh -c 'echo \"libxine1-ffmpeg i\"|synaptic --non-interactive --set-selections'"
   else
diff --git a/debian/squeeze/applications/amarok/debian/changelog b/debian/squeeze/applications/amarok/debian/changelog
index e72612a70..c2bf1ae55 100644
--- a/debian/squeeze/applications/amarok/debian/changelog
+++ b/debian/squeeze/applications/amarok/debian/changelog
@@ -284,7 +284,7 @@ amarok (2:1.4.8-0ubuntu3) hardy; urgency=low
 
   [ Sarah Hobbs ]
   * Sponsored upload.  (Closes LP: #187406)
-  * Reworked patch to avoid setting absolute paths (eg /usr/bin/kdesu) 
+  * Reworked patch to avoid setting absolute paths (eg /usr/bin/tdesu) 
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 12 Mar 2008 00:50:22 +1100
 
diff --git a/debian/squeeze/applications/amarok/debian/install-mp3 b/debian/squeeze/applications/amarok/debian/install-mp3
index 7b06cbd2f..ae0663182 100644
--- a/debian/squeeze/applications/amarok/debian/install-mp3
+++ b/debian/squeeze/applications/amarok/debian/install-mp3
@@ -27,8 +27,8 @@ INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install`
 
 #is available, not installed
 if [ -z "$INSTALLED" ]; then
-  if [ -x /opt/trinity/bin/kdesu ] && [ -x /usr/bin/install-package ]; then
-    /opt/trinity/bin/kdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
+  if [ -x /opt/trinity/bin/tdesu ] && [ -x /usr/bin/install-package ]; then
+    /opt/trinity/bin/tdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
   elif [ -x /usr/bin/gksudo ] && [ -x /usr/sbin/synaptic ]; then
     gksudo "sh -c 'echo \"libxine1-ffmpeg i\"|synaptic --non-interactive --set-selections'"
   else
diff --git a/debian/squeeze/applications/digikam/debian/changelog b/debian/squeeze/applications/digikam/debian/changelog
index 86611e634..4e7505827 100644
--- a/debian/squeeze/applications/digikam/debian/changelog
+++ b/debian/squeeze/applications/digikam/debian/changelog
@@ -772,7 +772,7 @@ digikam (0.7.4-5) unstable; urgency=low
     (Closes: #326786)
   * debian/rules enable DEB_CONFIGURE_USER_FLAGS
   * Renable debian/patches/visibility.diff for 0.7.4
-  * Recommends: kdeprint, konqueror
+  * Recommends: tdeprint, konqueror
 
  -- Mark Purcell <msp@debian.org>  Sat, 17 Sep 2005 22:09:19 +0100
 
diff --git a/debian/squeeze/applications/digikam/debian/control b/debian/squeeze/applications/digikam/debian/control
index 86a3c0874..94ae91fef 100644
--- a/debian/squeeze/applications/digikam/debian/control
+++ b/debian/squeeze/applications/digikam/debian/control
@@ -16,7 +16,7 @@ Homepage: http://www.digikam.org
 Package: digikam-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: kipi-plugins-trinity, kdeprint-trinity, konqueror-trinity
+Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Suggests: digikam-trinity-doc
 Description: digital photo management application for KDE [Trinity]
  An easy to use and powerful digital photo management
@@ -42,7 +42,7 @@ Package: showfoto-trinity
 Architecture: any
 Section: graphics
 Depends: ${shlibs:Depends}, digikam-trinity
-Recommends: kipi-plugins-trinity, kdeprint-trinity, konqueror-trinity
+Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Description: image viewer/editor for KDE [Trinity]
  Showphoto is part of the Digikam project.
  It allows to browse your photo collection and edit them with ease.
diff --git a/debian/squeeze/applications/digikam/debian/control.in b/debian/squeeze/applications/digikam/debian/control.in
index f0c7fd2cb..6905744a8 100644
--- a/debian/squeeze/applications/digikam/debian/control.in
+++ b/debian/squeeze/applications/digikam/debian/control.in
@@ -16,7 +16,7 @@ Homepage: http://www.digikam.org
 Package: digikam-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: kipi-plugins-trinity, kdeprint-trinity, konqueror-trinity
+Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Suggests: digikam-trinity-doc
 Description: digital photo management application for KDE [Trinity]
  An easy to use and powerful digital photo management
@@ -42,7 +42,7 @@ Package: showfoto-trinity
 Architecture: any
 Section: graphics
 Depends: ${shlibs:Depends}, digikam-trinity
-Recommends: kipi-plugins-trinity, kdeprint-trinity, konqueror-trinity
+Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Description: image viewer/editor for KDE [Trinity]
  Showphoto is part of the Digikam project.
  It allows to browse your photo collection and edit them with ease.
diff --git a/debian/squeeze/applications/gwenview/debian/changelog b/debian/squeeze/applications/gwenview/debian/changelog
index 0ebf36378..25741414f 100644
--- a/debian/squeeze/applications/gwenview/debian/changelog
+++ b/debian/squeeze/applications/gwenview/debian/changelog
@@ -157,7 +157,7 @@ gwenview (1.1.8+1.2.0pre1-1) unstable; urgency=low
   * New upstream release.
     + Fixes crash when double-clicking on an image using the konqueror kpart.
       (Closes: #290097)
-    + Gwenview is now a kdeinit module - added appropriate lintian override.
+    + Gwenview is now a tdeinit module - added appropriate lintian override.
 
  -- Christopher Martin <chrsmrtn@freeshell.org>  Wed, 26 Jan 2005 09:45:17 -0500
 
diff --git a/debian/squeeze/applications/gwenview/debian/gwenview.lintian b/debian/squeeze/applications/gwenview/debian/gwenview.lintian
index 91d566d75..6fdaead63 100644
--- a/debian/squeeze/applications/gwenview/debian/gwenview.lintian
+++ b/debian/squeeze/applications/gwenview/debian/gwenview.lintian
@@ -1,3 +1,3 @@
 gwenview binary: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libgwenviewcore.so.1.0.0 opt/trinity/lib/libgwenviewcore.so
-gwenview binary: shlib-missing-in-control-file libkdeinit_gwenview.so for opt/trinity/lib/libkdeinit_gwenview.so
-gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libkdeinit-gwenview
+gwenview binary: shlib-missing-in-control-file libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
+gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-gwenview
diff --git a/debian/squeeze/applications/kaffeine/debian/install-codecs b/debian/squeeze/applications/kaffeine/debian/install-codecs
index 271285c4e..720dfcd4c 100644
--- a/debian/squeeze/applications/kaffeine/debian/install-codecs
+++ b/debian/squeeze/applications/kaffeine/debian/install-codecs
@@ -102,7 +102,7 @@ class CodecInstallerWidget(QDialog, apt.OpProgress):
         return True
 
     def install_cache_package(self, pkg):
-        if os.system('kdesu -d \'adept_batch install ' + pkg.name + '\'') != 0:
+        if os.system('tdesu -d \'adept_batch install ' + pkg.name + '\'') != 0:
             QApplication.exit(1)
             return
 
diff --git a/debian/squeeze/applications/kdiff3/debian/rules b/debian/squeeze/applications/kdiff3/debian/rules
index 09511bd51..90b33c108 100755
--- a/debian/squeeze/applications/kdiff3/debian/rules
+++ b/debian/squeeze/applications/kdiff3/debian/rules
@@ -45,7 +45,7 @@ build: build-stamp
 build-stamp:  config.status
 	dh_testdir
 
-	$(MAKE) LDFLAGS="-lkdecore -lkdeui" LIBS=""
+	$(MAKE) LDFLAGS="-ltdecore -ltdeui" LIBS=""
 	/usr/bin/docbook-to-man debian/kdiff3.sgml > doc/en/kdiff3.1
 	touch build-stamp
 
diff --git a/debian/squeeze/applications/kerry/debian/rules b/debian/squeeze/applications/kerry/debian/rules
index e3861ca8d..0d08e83f9 100755
--- a/debian/squeeze/applications/kerry/debian/rules
+++ b/debian/squeeze/applications/kerry/debian/rules
@@ -23,7 +23,7 @@ clean::
 	rm -f kerry.1
 
 binary-post-install/kerry-trinity::
-	chrpath -d debian/kerry-trinity/opt/trinity/lib/libkdeinit_kerry.so
+	chrpath -d debian/kerry-trinity/opt/trinity/lib/libtdeinit_kerry.so
 	chrpath -d debian/kerry-trinity/opt/trinity/bin/kerry
 	chrpath -d debian/kerry-trinity/opt/trinity/lib/trinity/kerry.so
 	chrpath -d debian/kerry-trinity/opt/trinity/lib/trinity/kcm_beagle.so
diff --git a/debian/squeeze/applications/kmplayer/debian/kmplayer-trinity.install b/debian/squeeze/applications/kmplayer/debian/kmplayer-trinity.install
index 3c2a5f5ff..f25460f29 100644
--- a/debian/squeeze/applications/kmplayer/debian/kmplayer-trinity.install
+++ b/debian/squeeze/applications/kmplayer/debian/kmplayer-trinity.install
@@ -1,4 +1,4 @@
-opt/trinity/lib/libkdeinit_kmplayer.so
+opt/trinity/lib/libtdeinit_kmplayer.so
 opt/trinity/lib/trinity/kmplayer.so
 opt/trinity/bin/kmplayer
 opt/trinity/bin/kxvplayer
diff --git a/debian/squeeze/applications/kmymoney/debian/changelog b/debian/squeeze/applications/kmymoney/debian/changelog
index 36986fd74..a7240314d 100644
--- a/debian/squeeze/applications/kmymoney/debian/changelog
+++ b/debian/squeeze/applications/kmymoney/debian/changelog
@@ -246,7 +246,7 @@ kmymoney2 (0.8.4-4) unstable; urgency=low
 
 kmymoney2 (0.8.4-3) unstable; urgency=low
 
-  * export LDFLAGS=-lgwenhywfar -laqbanking -lqbanking -lkdeui
+  * export LDFLAGS=-lgwenhywfar -laqbanking -lqbanking -ltdeui
    -- Fixes: FTBFS in sid (problem with kbanking) (Closes: #373707)
 
  -- Mark Purcell <msp@debian.org>  Wed, 21 Jun 2006 16:34:03 +0100
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides b/debian/squeeze/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
index 9ae01a92b..b5316fc73 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
+++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
@@ -1,2 +1,2 @@
-network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager
-network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so
+network-manager-kde: package-name-doesnt-match-sonames libtdeinit-knetworkmanager
+network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libtdeinit_knetworkmanager.so libtdeinit_knetworkmanager.so
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides b/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
index 9ae01a92b..b5316fc73 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
+++ b/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
@@ -1,2 +1,2 @@
-network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager
-network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so
+network-manager-kde: package-name-doesnt-match-sonames libtdeinit-knetworkmanager
+network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libtdeinit_knetworkmanager.so libtdeinit_knetworkmanager.so
diff --git a/debian/squeeze/applications/koffice/debian/chalk-trinity.install b/debian/squeeze/applications/koffice/debian/chalk-trinity.install
index a36c77eb8..4df24b77e 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/chalk-trinity.install
@@ -142,7 +142,7 @@ debian/tmp/opt/trinity/lib/trinity/libchalktiffexport.la
 debian/tmp/opt/trinity/lib/trinity/libchalktiffexport.so
 debian/tmp/opt/trinity/lib/trinity/libchalktiffimport.la
 debian/tmp/opt/trinity/lib/trinity/libchalktiffimport.so
-debian/tmp/opt/trinity/lib/libkdeinit_chalk.so
+debian/tmp/opt/trinity/lib/libtdeinit_chalk.so
 debian/tmp/opt/trinity/lib/libchalk_cmyk_*.so.*
 debian/tmp/opt/trinity/lib/libchalkcolor.so.*
 debian/tmp/opt/trinity/lib/libchalkcommon.so.*
diff --git a/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian b/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian
index 40bb7a6ee..08adc5291 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian
@@ -1,4 +1,4 @@
-chalk: shlib-missing-in-control-file libkdeinit_chalk.so for usr/lib/libkdeinit_chalk.so
+chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so
 chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libkdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
+chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
 
diff --git a/debian/squeeze/applications/koffice/debian/karbon-trinity.install b/debian/squeeze/applications/koffice/debian/karbon-trinity.install
index 363bf04dc..653f730e0 100644
--- a/debian/squeeze/applications/koffice/debian/karbon-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/karbon-trinity.install
@@ -45,7 +45,7 @@ debian/tmp/opt/trinity/lib/trinity/libwmfexport.so
 debian/tmp/opt/trinity/lib/trinity/libwmfimport.la
 debian/tmp/opt/trinity/lib/trinity/libwmfimport.so
 debian/tmp/opt/trinity/lib/libkarboncommon.so.*
-debian/tmp/opt/trinity/lib/libkdeinit_karbon.so
+debian/tmp/opt/trinity/lib/libtdeinit_karbon.so
 debian/tmp/opt/trinity/share/applications/kde/karbon.desktop
 debian/tmp/opt/trinity/share/apps/karbon
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/karbon_konqi.desktop
diff --git a/debian/squeeze/applications/koffice/debian/karbon-trinity.lintian b/debian/squeeze/applications/koffice/debian/karbon-trinity.lintian
index e8e11eff0..9733b0a93 100644
--- a/debian/squeeze/applications/koffice/debian/karbon-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/karbon-trinity.lintian
@@ -1,2 +1,2 @@
-karbon: shlib-missing-in-control-file libkdeinit_karbon.so for usr/lib/libkdeinit_karbon.so
-karbon: package-name-doesnt-match-sonames libkarboncommon0 libkdeinit-karbon
+karbon: shlib-missing-in-control-file libtdeinit_karbon.so for usr/lib/libtdeinit_karbon.so
+karbon: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon
diff --git a/debian/squeeze/applications/koffice/debian/kchart-trinity.install b/debian/squeeze/applications/koffice/debian/kchart-trinity.install
index 095261d9f..443a6acbf 100644
--- a/debian/squeeze/applications/koffice/debian/kchart-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/kchart-trinity.install
@@ -21,7 +21,7 @@ debian/tmp/opt/trinity/lib/trinity/libkchartxpmexport.so
 debian/tmp/opt/trinity/lib/libkchartcommon.so.*
 debian/tmp/opt/trinity/lib/libkchartimageexport.so.*
 debian/tmp/opt/trinity/lib/libkdchart.*
-debian/tmp/opt/trinity/lib/libkdeinit_kchart.so
+debian/tmp/opt/trinity/lib/libtdeinit_kchart.so
 debian/tmp/opt/trinity/share/applications/kde/kchart.desktop
 debian/tmp/opt/trinity/share/apps/kchart
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kchart_konqi.desktop
diff --git a/debian/squeeze/applications/koffice/debian/kchart-trinity.lintian b/debian/squeeze/applications/koffice/debian/kchart-trinity.lintian
index 1c399d1f3..4a9df9c9e 100644
--- a/debian/squeeze/applications/koffice/debian/kchart-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kchart-trinity.lintian
@@ -1,5 +1,5 @@
 # There is no -dev package.
 kchart: non-dev-pkg-with-shlib-symlink usr/lib/libkdchart.so.0.0.0 usr/lib/libkdchart.so
-kchart: shlib-missing-in-control-file libkdeinit_kchart.so for usr/lib/libkdeinit_kchart.so
-kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libkdeinit-kchart
+kchart: shlib-missing-in-control-file libtdeinit_kchart.so for usr/lib/libtdeinit_kchart.so
+kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-kchart
 
diff --git a/debian/squeeze/applications/koffice/debian/kexi-trinity.install b/debian/squeeze/applications/koffice/debian/kexi-trinity.install
index fc645134d..a0b259950 100644
--- a/debian/squeeze/applications/koffice/debian/kexi-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/kexi-trinity.install
@@ -46,7 +46,7 @@ debian/tmp/opt/trinity/lib/trinity/krosskexiapp.la
 debian/tmp/opt/trinity/lib/trinity/krosskexiapp.so
 debian/tmp/opt/trinity/lib/trinity/krosskexidb.la
 debian/tmp/opt/trinity/lib/trinity/krosskexidb.so
-debian/tmp/opt/trinity/lib/libkdeinit_kexi.so
+debian/tmp/opt/trinity/lib/libtdeinit_kexi.so
 debian/tmp/opt/trinity/lib/libkexicore.so.*
 debian/tmp/opt/trinity/lib/libkexidatatable.so.*
 debian/tmp/opt/trinity/lib/libkexidbparser.so.*
diff --git a/debian/squeeze/applications/koffice/debian/kexi-trinity.lintian b/debian/squeeze/applications/koffice/debian/kexi-trinity.lintian
index d1dfd14c2..5288fb87d 100644
--- a/debian/squeeze/applications/koffice/debian/kexi-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kexi-trinity.lintian
@@ -1,4 +1,4 @@
-kexi: shlib-missing-in-control-file libkdeinit_kexi.so for usr/lib/libkdeinit_kexi.so
+kexi: shlib-missing-in-control-file libtdeinit_kexi.so for usr/lib/libtdeinit_kexi.so
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/importxhtml/ImportXHTML.py
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/readme.html
@@ -11,4 +11,4 @@ kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/Copy
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/kross/python/kexiapp/__init__.py
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/exportxhtml/ExportXHTML.rc
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenter.py
-kexi: package-name-doesnt-match-sonames libkdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
+kexi: package-name-doesnt-match-sonames libtdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
diff --git a/debian/squeeze/applications/koffice/debian/kformula-trinity.install b/debian/squeeze/applications/koffice/debian/kformula-trinity.install
index d9ba60a08..7c09d82a4 100644
--- a/debian/squeeze/applications/koffice/debian/kformula-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/kformula-trinity.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/lib/trinity/libkformulapart.la
 debian/tmp/opt/trinity/lib/trinity/libkformulapart.so
 debian/tmp/opt/trinity/lib/trinity/libkfosvgexport.la
 debian/tmp/opt/trinity/lib/trinity/libkfosvgexport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kformula.so
+debian/tmp/opt/trinity/lib/libtdeinit_kformula.so
 debian/tmp/opt/trinity/share/applications/kde/kformula.desktop
 debian/tmp/opt/trinity/share/apps/kformula
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kformula_konqi.desktop
diff --git a/debian/squeeze/applications/koffice/debian/kformula-trinity.lintian b/debian/squeeze/applications/koffice/debian/kformula-trinity.lintian
index 1224a3094..1062b39db 100644
--- a/debian/squeeze/applications/koffice/debian/kformula-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kformula-trinity.lintian
@@ -1,4 +1,4 @@
-kformula: no-shlibs-control-file usr/lib/libkdeinit_kformula.so
-kformula: postinst-must-call-ldconfig usr/lib/libkdeinit_kformula.so
-kformula: postrm-should-call-ldconfig usr/lib/libkdeinit_kformula.so
-kformula: package-name-doesnt-match-sonames libkdeinit-kformula
+kformula: no-shlibs-control-file usr/lib/libtdeinit_kformula.so
+kformula: postinst-must-call-ldconfig usr/lib/libtdeinit_kformula.so
+kformula: postrm-should-call-ldconfig usr/lib/libtdeinit_kformula.so
+kformula: package-name-doesnt-match-sonames libtdeinit-kformula
diff --git a/debian/squeeze/applications/koffice/debian/kivio-trinity.install b/debian/squeeze/applications/koffice/debian/kivio-trinity.install
index 510c85320..289580d09 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/kivio-trinity.install
@@ -17,5 +17,5 @@ debian/tmp/opt/trinity/lib/trinity/libkiviozoomtool.la
 debian/tmp/opt/trinity/lib/trinity/libkiviozoomtool.so
 debian/tmp/opt/trinity/lib/trinity/straight_connector.la
 debian/tmp/opt/trinity/lib/trinity/straight_connector.so
-debian/tmp/opt/trinity/lib/libkdeinit_kivio.so
+debian/tmp/opt/trinity/lib/libtdeinit_kivio.so
 debian/tmp/opt/trinity/lib/libkiviocommon.so.*
diff --git a/debian/squeeze/applications/koffice/debian/kivio-trinity.lintian b/debian/squeeze/applications/koffice/debian/kivio-trinity.lintian
index 2d8cfc583..02a07173b 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kivio-trinity.lintian
@@ -1,4 +1,4 @@
-kivio: shlib-missing-in-control-file libkdeinit_kivio.so for usr/lib/libkdeinit_kivio.so
+kivio: shlib-missing-in-control-file libtdeinit_kivio.so for usr/lib/libtdeinit_kivio.so
 kivio: menu-icon-missing /usr/share/pixmaps/kivio.xpm
-kivio: package-name-doesnt-match-sonames libkdeinit-kivio libkiviocommon0
+kivio: package-name-doesnt-match-sonames libtdeinit-kivio libkiviocommon0
 
diff --git a/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install b/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install
index c65cbd3d3..936153c99 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install
@@ -5,20 +5,20 @@ debian/tmp/opt/trinity/lib/libkchartcommon.la
 debian/tmp/opt/trinity/lib/libkchartcommon.so
 debian/tmp/opt/trinity/lib/libkchartimageexport.la
 debian/tmp/opt/trinity/lib/libkchartimageexport.so
-debian/tmp/opt/trinity/lib/libkdeinit_karbon.la
-debian/tmp/opt/trinity/lib/libkdeinit_kchart.la
-debian/tmp/opt/trinity/lib/libkdeinit_kexi.la
-debian/tmp/opt/trinity/lib/libkdeinit_kformula.la
-debian/tmp/opt/trinity/lib/libkdeinit_kivio.la
-debian/tmp/opt/trinity/lib/libkdeinit_koshell.la
-debian/tmp/opt/trinity/lib/libkdeinit_kplato.la
-debian/tmp/opt/trinity/lib/libkdeinit_kpresenter.la
-debian/tmp/opt/trinity/lib/libkdeinit_chalk.la
-debian/tmp/opt/trinity/lib/libkdeinit_kspread.la
-debian/tmp/opt/trinity/lib/libkdeinit_kthesaurus.la
-debian/tmp/opt/trinity/lib/libkdeinit_kudesigner.la
-debian/tmp/opt/trinity/lib/libkdeinit_kugar.la
-debian/tmp/opt/trinity/lib/libkdeinit_kword.la
+debian/tmp/opt/trinity/lib/libtdeinit_karbon.la
+debian/tmp/opt/trinity/lib/libtdeinit_kchart.la
+debian/tmp/opt/trinity/lib/libtdeinit_kexi.la
+debian/tmp/opt/trinity/lib/libtdeinit_kformula.la
+debian/tmp/opt/trinity/lib/libtdeinit_kivio.la
+debian/tmp/opt/trinity/lib/libtdeinit_koshell.la
+debian/tmp/opt/trinity/lib/libtdeinit_kplato.la
+debian/tmp/opt/trinity/lib/libtdeinit_kpresenter.la
+debian/tmp/opt/trinity/lib/libtdeinit_chalk.la
+debian/tmp/opt/trinity/lib/libtdeinit_kspread.la
+debian/tmp/opt/trinity/lib/libtdeinit_kthesaurus.la
+debian/tmp/opt/trinity/lib/libtdeinit_kudesigner.la
+debian/tmp/opt/trinity/lib/libtdeinit_kugar.la
+debian/tmp/opt/trinity/lib/libtdeinit_kword.la
 debian/tmp/opt/trinity/lib/libkexicore.la
 debian/tmp/opt/trinity/lib/libkexicore.so
 debian/tmp/opt/trinity/lib/libkexidatatable.la
diff --git a/debian/squeeze/applications/koffice/debian/koshell-trinity.install b/debian/squeeze/applications/koffice/debian/koshell-trinity.install
index fc8fbb841..c0399020b 100644
--- a/debian/squeeze/applications/koffice/debian/koshell-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/koshell-trinity.install
@@ -2,7 +2,7 @@ debian/koshell.xpm opt/trinity/share/pixmaps
 debian/tmp/opt/trinity/bin/koshell
 debian/tmp/opt/trinity/lib/trinity/koshell.la
 debian/tmp/opt/trinity/lib/trinity/koshell.so
-debian/tmp/opt/trinity/lib/libkdeinit_koshell.so
+debian/tmp/opt/trinity/lib/libtdeinit_koshell.so
 debian/tmp/opt/trinity/share/applications/kde/koshell.desktop
 debian/tmp/opt/trinity/share/apps/koshell/koshellui.rc
 debian/tmp/opt/trinity/share/config.kcfg/koshell.kcfg
diff --git a/debian/squeeze/applications/koffice/debian/koshell-trinity.lintian b/debian/squeeze/applications/koffice/debian/koshell-trinity.lintian
index e410a8d00..45d130a4e 100644
--- a/debian/squeeze/applications/koffice/debian/koshell-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/koshell-trinity.lintian
@@ -1,4 +1,4 @@
-koshell: no-shlibs-control-file usr/lib/libkdeinit_koshell.so
-koshell: postinst-must-call-ldconfig usr/lib/libkdeinit_koshell.so
-koshell: postrm-should-call-ldconfig usr/lib/libkdeinit_koshell.so
-koshell: package-name-doesnt-match-sonames libkdeinit-koshell
+koshell: no-shlibs-control-file usr/lib/libtdeinit_koshell.so
+koshell: postinst-must-call-ldconfig usr/lib/libtdeinit_koshell.so
+koshell: postrm-should-call-ldconfig usr/lib/libtdeinit_koshell.so
+koshell: package-name-doesnt-match-sonames libtdeinit-koshell
diff --git a/debian/squeeze/applications/koffice/debian/kplato-trinity.install b/debian/squeeze/applications/koffice/debian/kplato-trinity.install
index df01154f4..d9667f9c6 100644
--- a/debian/squeeze/applications/koffice/debian/kplato-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/kplato-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/kplato.la
 debian/tmp/opt/trinity/lib/trinity/kplato.so
 debian/tmp/opt/trinity/lib/trinity/libkplatopart.la
 debian/tmp/opt/trinity/lib/trinity/libkplatopart.so
-debian/tmp/opt/trinity/lib/libkdeinit_kplato.so
+debian/tmp/opt/trinity/lib/libtdeinit_kplato.so
 debian/tmp/opt/trinity/share/applications/kde/kplato.desktop
 debian/tmp/opt/trinity/share/apps/kplato/icons/crystalsvg/22x22/actions/accounts.png
 debian/tmp/opt/trinity/share/apps/kplato/icons/crystalsvg/22x22/actions/add_milestone.png
diff --git a/debian/squeeze/applications/koffice/debian/kplato-trinity.lintian b/debian/squeeze/applications/koffice/debian/kplato-trinity.lintian
index 62e4d82ea..f08eafe73 100644
--- a/debian/squeeze/applications/koffice/debian/kplato-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kplato-trinity.lintian
@@ -1,4 +1,4 @@
-kplato: no-shlibs-control-file usr/lib/libkdeinit_kplato.so
-kplato: postinst-must-call-ldconfig usr/lib/libkdeinit_kplato.so
-kplato: postrm-should-call-ldconfig usr/lib/libkdeinit_kplato.so
-kplato: package-name-doesnt-match-sonames libkdeinit-kplato
+kplato: no-shlibs-control-file usr/lib/libtdeinit_kplato.so
+kplato: postinst-must-call-ldconfig usr/lib/libtdeinit_kplato.so
+kplato: postrm-should-call-ldconfig usr/lib/libtdeinit_kplato.so
+kplato: package-name-doesnt-match-sonames libtdeinit-kplato
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.install b/debian/squeeze/applications/koffice/debian/kpresenter-trinity.install
index fc90edce6..5aada1cab 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/kpresenter-trinity.install
@@ -24,6 +24,6 @@ debian/tmp/opt/trinity/lib/trinity/libooimpressexport.la
 debian/tmp/opt/trinity/lib/trinity/libooimpressexport.so
 debian/tmp/opt/trinity/lib/trinity/libooimpressimport.la
 debian/tmp/opt/trinity/lib/trinity/libooimpressimport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kpresenter.so
+debian/tmp/opt/trinity/lib/libtdeinit_kpresenter.so
 debian/tmp/opt/trinity/lib/libkpresenterimageexport.so.*
 debian/tmp/opt/trinity/lib/libkpresenterprivate.so.*
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.lintian b/debian/squeeze/applications/koffice/debian/kpresenter-trinity.lintian
index d038ca914..6e7af5591 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kpresenter-trinity.lintian
@@ -1,4 +1,4 @@
 kpresenter: script-with-language-extension usr/bin/kprconverter.pl
-kpresenter: shlib-missing-in-control-file libkdeinit_kpresenter.so for usr/lib/libkdeinit_kpresenter.so
+kpresenter: shlib-missing-in-control-file libtdeinit_kpresenter.so for usr/lib/libtdeinit_kpresenter.so
 kpresenter: menu-icon-missing /usr/share/pixmaps/kpresenter.xpm
-kpresenter: package-name-doesnt-match-sonames libkdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
+kpresenter: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
diff --git a/debian/squeeze/applications/koffice/debian/kspread-trinity.install b/debian/squeeze/applications/koffice/debian/kspread-trinity.install
index 9b1251bf2..6a7228fd3 100644
--- a/debian/squeeze/applications/koffice/debian/kspread-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/kspread-trinity.install
@@ -36,7 +36,7 @@ debian/tmp/opt/trinity/lib/trinity/libopencalcimport.la
 debian/tmp/opt/trinity/lib/trinity/libopencalcimport.so
 debian/tmp/opt/trinity/lib/trinity/libqproimport.la
 debian/tmp/opt/trinity/lib/trinity/libqproimport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kspread.so
+debian/tmp/opt/trinity/lib/libtdeinit_kspread.so
 debian/tmp/opt/trinity/lib/libkspreadcommon.so.*
 debian/tmp/opt/trinity/share/applications/kde/kspread.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kspread_konqi.desktop
diff --git a/debian/squeeze/applications/koffice/debian/kspread-trinity.lintian b/debian/squeeze/applications/koffice/debian/kspread-trinity.lintian
index 6c23d706d..b47c3a364 100644
--- a/debian/squeeze/applications/koffice/debian/kspread-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kspread-trinity.lintian
@@ -1,7 +1,7 @@
-kspread: shlib-missing-in-control-file libkdeinit_kspread.so for usr/lib/libkdeinit_kspread.so
+kspread: shlib-missing-in-control-file libtdeinit_kspread.so for usr/lib/libtdeinit_kspread.so
 kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/scripteditor/ScriptEditor.rc
 kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/exporthtml/ExportHtml.rc
 kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/exporthtml/ExportHtml.py
 kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/scripteditor/ScriptEditor.py
-kspread: package-name-doesnt-match-sonames libkdeinit-kspread libkspreadcommon0
+kspread: package-name-doesnt-match-sonames libtdeinit-kspread libkspreadcommon0
 
diff --git a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.install b/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.install
index d115bcf4b..d0e29dd5c 100644
--- a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/kthesaurus
 debian/tmp/opt/trinity/lib/trinity/kthesaurus.*
 debian/tmp/opt/trinity/lib/trinity/libthesaurustool.la
 debian/tmp/opt/trinity/lib/trinity/libthesaurustool.so
-debian/tmp/opt/trinity/lib/libkdeinit_kthesaurus.so
+debian/tmp/opt/trinity/lib/libtdeinit_kthesaurus.so
 debian/tmp/opt/trinity/share/applnk/Office/KThesaurus.desktop
 debian/tmp/opt/trinity/share/apps/thesaurus
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/thesaurus/*.bz2
diff --git a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.lintian b/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.lintian
index b32d255df..7d7018a77 100644
--- a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.lintian
@@ -1,5 +1,5 @@
-kthesaurus: no-shlibs-control-file usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: postinst-must-call-ldconfig usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: postrm-should-call-ldconfig usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: package-name-doesnt-match-sonames libkdeinit-kthesaurus
+kthesaurus: no-shlibs-control-file usr/lib/libtdeinit_kthesaurus.so
+kthesaurus: postinst-must-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
+kthesaurus: postrm-should-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
+kthesaurus: package-name-doesnt-match-sonames libtdeinit-kthesaurus
 
diff --git a/debian/squeeze/applications/koffice/debian/kugar-trinity.install b/debian/squeeze/applications/koffice/debian/kugar-trinity.install
index 62c8c369f..c12230725 100644
--- a/debian/squeeze/applications/koffice/debian/kugar-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/kugar-trinity.install
@@ -11,8 +11,8 @@ debian/tmp/opt/trinity/lib/trinity/libkugarnopimport.la
 debian/tmp/opt/trinity/lib/trinity/libkugarnopimport.so
 debian/tmp/opt/trinity/lib/trinity/libkugarpart.la
 debian/tmp/opt/trinity/lib/trinity/libkugarpart.so
-debian/tmp/opt/trinity/lib/libkdeinit_kudesigner.so
-debian/tmp/opt/trinity/lib/libkdeinit_kugar.so
+debian/tmp/opt/trinity/lib/libtdeinit_kudesigner.so
+debian/tmp/opt/trinity/lib/libtdeinit_kugar.so
 debian/tmp/opt/trinity/lib/libkudesignercore.la
 debian/tmp/opt/trinity/lib/libkudesignercore.so
 debian/tmp/opt/trinity/lib/libkugarlib.so.*
diff --git a/debian/squeeze/applications/koffice/debian/kugar-trinity.lintian b/debian/squeeze/applications/koffice/debian/kugar-trinity.lintian
index e06755739..5b8ec0d77 100644
--- a/debian/squeeze/applications/koffice/debian/kugar-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kugar-trinity.lintian
@@ -1,4 +1,4 @@
-kugar: shlib-missing-in-control-file libkdeinit_kudesigner.so for usr/lib/libkdeinit_kudesigner.so
-kugar: shlib-missing-in-control-file libkdeinit_kugar.so for usr/lib/libkdeinit_kugar.so
+kugar: shlib-missing-in-control-file libtdeinit_kudesigner.so for usr/lib/libtdeinit_kudesigner.so
+kugar: shlib-missing-in-control-file libtdeinit_kugar.so for usr/lib/libtdeinit_kugar.so
 kugar: shlib-missing-in-control-file libkudesignercore.so for usr/lib/libkudesignercore.so
-kugar: package-name-doesnt-match-sonames libkdeinit-kudesigner libkdeinit-kugar libkudesignercore libkugarlib1
+kugar: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-kugar libkudesignercore libkugarlib1
diff --git a/debian/squeeze/applications/koffice/debian/kword-trinity.install b/debian/squeeze/applications/koffice/debian/kword-trinity.install
index d003812cd..7f3f2f954 100644
--- a/debian/squeeze/applications/koffice/debian/kword-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/kword-trinity.install
@@ -67,5 +67,5 @@ debian/tmp/opt/trinity/lib/trinity/libwpexport.la
 debian/tmp/opt/trinity/lib/trinity/libwpexport.so
 debian/tmp/opt/trinity/lib/trinity/libwpimport.la
 debian/tmp/opt/trinity/lib/trinity/libwpimport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kword.so
+debian/tmp/opt/trinity/lib/libtdeinit_kword.so
 debian/tmp/opt/trinity/lib/libkwordprivate.so.*
diff --git a/debian/squeeze/applications/koffice/debian/kword-trinity.lintian b/debian/squeeze/applications/koffice/debian/kword-trinity.lintian
index e18dbe8b2..5d08d84ca 100644
--- a/debian/squeeze/applications/koffice/debian/kword-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kword-trinity.lintian
@@ -1,4 +1,4 @@
-kword: shlib-missing-in-control-file libkdeinit_kword.so for usr/lib/libkdeinit_kword.so
+kword: shlib-missing-in-control-file libtdeinit_kword.so for usr/lib/libtdeinit_kword.so
 kword: menu-icon-missing /usr/share/pixmaps/kword.xpm
-kword: package-name-doesnt-match-sonames libkdeinit-kword libkwordprivate4
+kword: package-name-doesnt-match-sonames libtdeinit-kword libkwordprivate4
 
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.linda b/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
index 4d9818595..ff5153632 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
+++ b/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
@@ -1,4 +1,4 @@
 Tag: lib-not-in-shlibs
 
 Tag: no-shlib-file
-Data: /usr/trinity/lib/libkdeinit_*.so
+Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian b/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
index 1f650ceb8..edff50852 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
+++ b/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libkdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
 
diff --git a/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.linda b/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.linda
index 4d9818595..ff5153632 100644
--- a/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.linda
+++ b/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.linda
@@ -1,4 +1,4 @@
 Tag: lib-not-in-shlibs
 
 Tag: no-shlib-file
-Data: /usr/trinity/lib/libkdeinit_*.so
+Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.lintian b/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.lintian
index 1f650ceb8..edff50852 100644
--- a/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.lintian
+++ b/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libkdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
 
diff --git a/debian/squeeze/applications/krusader/debian/krusader.lintian-overrides b/debian/squeeze/applications/krusader/debian/krusader.lintian-overrides
index 74c03c669..62bf48233 100644
--- a/debian/squeeze/applications/krusader/debian/krusader.lintian-overrides
+++ b/debian/squeeze/applications/krusader/debian/krusader.lintian-overrides
@@ -1,2 +1,2 @@
-# package depends on tdebase-bin, which provides kdesu
-krusader-trinity: menu-command-not-in-package /usr/share/menu/krusader:17 kdesu
+# package depends on tdebase-bin, which provides tdesu
+krusader-trinity: menu-command-not-in-package /usr/share/menu/krusader:17 tdesu
diff --git a/debian/squeeze/applications/krusader/debian/menu b/debian/squeeze/applications/krusader/debian/menu
index 92d07892f..759ac536f 100644
--- a/debian/squeeze/applications/krusader/debian/menu
+++ b/debian/squeeze/applications/krusader/debian/menu
@@ -14,4 +14,4 @@
 	title="krusader - root-mode (File Manager)"\
 	icon32x32="/usr/share/pixmaps/krusader_root.xpm"\
 	icon16x16="/usr/share/pixmaps/krusader_root-16.xpm"\
-	command="kdesu -c /opt/trinity/bin/krusader"
+	command="tdesu -c /opt/trinity/bin/krusader"
diff --git a/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.lintian b/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.lintian
index dd274dba5..89f453cea 100644
--- a/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.lintian
+++ b/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.lintian
@@ -1,4 +1,4 @@
-kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow-trinity: package-name-doesnt-match-sonames libkdeinit-kuickshow
+kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow
diff --git a/debian/squeeze/applications/tdesudo/debian/links b/debian/squeeze/applications/tdesudo/debian/links
index 0482e1e4f..faf8013c3 100644
--- a/debian/squeeze/applications/tdesudo/debian/links
+++ b/debian/squeeze/applications/tdesudo/debian/links
@@ -1 +1 @@
-opt/trinity/bin/tdesudo opt/trinity/bin/kdesu 
+opt/trinity/bin/tdesudo opt/trinity/bin/tdesu 
diff --git a/debian/squeeze/applications/tdesudo/debian/postinst b/debian/squeeze/applications/tdesudo/debian/postinst
index b0100d96c..9164f9d4a 100644
--- a/debian/squeeze/applications/tdesudo/debian/postinst
+++ b/debian/squeeze/applications/tdesudo/debian/postinst
@@ -12,7 +12,7 @@ fi
 case "$1" in
   configure)
 	dpkg-divert --package $package_name --rename --remove \
-                /usr/trinity/bin/kdesu || true
+                /usr/trinity/bin/tdesu || true
     ;;
   abort-upgrade)
     ;;
diff --git a/debian/squeeze/applications/tdesudo/debian/postrm b/debian/squeeze/applications/tdesudo/debian/postrm
index a5b54ebf1..dfab37030 100644
--- a/debian/squeeze/applications/tdesudo/debian/postrm
+++ b/debian/squeeze/applications/tdesudo/debian/postrm
@@ -12,7 +12,7 @@ fi
 case "$1" in
   remove)
     dpkg-divert --package $package_name --rename --remove \
-                /opt/trinity/bin/kdesu
+                /opt/trinity/bin/tdesu
     ;;
   purge)
     ;;
diff --git a/debian/squeeze/applications/tdesudo/debian/preinst b/debian/squeeze/applications/tdesudo/debian/preinst
index fe6a85b58..a13492559 100644
--- a/debian/squeeze/applications/tdesudo/debian/preinst
+++ b/debian/squeeze/applications/tdesudo/debian/preinst
@@ -12,13 +12,13 @@ fi
 case "$1" in
   install)
     dpkg-divert --package $package_name \
-    --divert /opt/trinity/bin/kdesu.distrib \
-    --rename /opt/trinity/bin/kdesu
+    --divert /opt/trinity/bin/tdesu.distrib \
+    --rename /opt/trinity/bin/tdesu
     ;;
   upgrade)
     dpkg-divert --package $package_name \
-    --divert /opt/trinity/bin/kdesu.distrib \
-    --rename /opt/trinity/bin/kdesu
+    --divert /opt/trinity/bin/tdesu.distrib \
+    --rename /opt/trinity/bin/tdesu
     ;;
   abort-upgrade)
     ;;
diff --git a/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.menu b/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.menu
index dc43a7b0f..e30b43ad8 100644
--- a/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.menu
@@ -5,6 +5,6 @@
         icon32x32="/usr/share/pixmaps/wlassistant.xpm"\
         icon16x16="/usr/share/pixmaps/wlassistant-16.xpm"\
         title="wlassistant"\
-        command="/opt/trinity/bin/kdesu -X -c /opt/trinity/bin/wlassistant"
+        command="/opt/trinity/bin/tdesu -X -c /opt/trinity/bin/wlassistant"
 
 
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/changelog b/debian/squeeze/libraries/kipi-plugins/debian/changelog
index d9e80a9a4..0ba259e3b 100755
--- a/debian/squeeze/libraries/kipi-plugins/debian/changelog
+++ b/debian/squeeze/libraries/kipi-plugins/debian/changelog
@@ -297,7 +297,7 @@ kipi-plugins (0.1.1-1) unstable; urgency=low
   * New upstream release
     - Delete: debian/patches/13_10_pull_from_upstreamsvn_from_r460242.diff
   * Add debian/rules print-version & get-orig-source targets
-  * Recommends: kdeprint
+  * Recommends: tdeprint
   * Build-Depends: libmagick9++-dev | libmagick++-dev
   * Relibtoolize from /pkg-kde/trunk/common-patches/ for 3.5.2
       + patches/02_autotools_update.diff
@@ -375,7 +375,7 @@ kipi-plugins (0.1+rc1-1) unstable; urgency=low
   [ Mark Purcell ]
   * Bump Suggests: to Recommends: these would be found together in all but
   unusual situations
-    - kdeprinter - PrintWizard
+    - tdeprinter - PrintWizard
     - kmail - SendImages
     - sane-utils - AcquireImages
     - k3b - CdArchiving
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/control b/debian/squeeze/libraries/kipi-plugins/debian/control
index 2d0f17de3..fd3f5bf67 100755
--- a/debian/squeeze/libraries/kipi-plugins/debian/control
+++ b/debian/squeeze/libraries/kipi-plugins/debian/control
@@ -15,7 +15,7 @@ Package: kipi-plugins-trinity
 Replaces: digikamplugins-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kmail-trinity, kdeprint-trinity, sane-utils, kooka-trinity, konqueror-trinity, mpg123
+Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kmail-trinity, tdeprint-trinity, sane-utils, kooka-trinity, konqueror-trinity, mpg123
 Suggests: gimp, gallery, kipi-plugins-trinity-doc
 Enhances: digikam-trinity, kphotoalbum-trinity, showimg, gwenview-trinity
 Description: image manipulation/handling plugins for KIPI aware programs [Trinity]
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/control.in b/debian/squeeze/libraries/kipi-plugins/debian/control.in
index 0d68a8196..94cbc99da 100755
--- a/debian/squeeze/libraries/kipi-plugins/debian/control.in
+++ b/debian/squeeze/libraries/kipi-plugins/debian/control.in
@@ -16,7 +16,7 @@ Package: kipi-plugins-trinity
 Replaces: digikamplugins-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kmail-trinity, kdeprint-trinity, sane-utils, kooka-trinity, konqueror-trinity, mpg123
+Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kmail-trinity, tdeprint-trinity, sane-utils, kooka-trinity, konqueror-trinity, mpg123
 Suggests: gimp, gallery, kipi-plugins-trinity-doc
 Enhances: digikam-trinity, kphotoalbum-trinity, showimg, gwenview-trinity
 Description: image manipulation/handling plugins for KIPI aware programs [Trinity]
diff --git a/debian/squeeze/libraries/libkdcraw/debian/changelog b/debian/squeeze/libraries/libkdcraw/debian/changelog
index 4458e7b08..3cc18c357 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/changelog
+++ b/debian/squeeze/libraries/libkdcraw/debian/changelog
@@ -90,8 +90,8 @@ libkdcraw (0.1.1-2) unstable; urgency=low
       patches/04_am_maintainer_mode.diff
       patches/05_pedantic-errors.diff
       patches/98_buildprep.diff
-      patches/98_configure.diff: makes $LIB_QT only -lqt-mt and LIB_KDECORE
-      only -lkdecore
+      patches/98_configure.diff: makes $LIB_QT only -lqt-mt and LIB_TDECORE
+      only -ltdecore
   * Add utils.mk to debian/rules to have list-missing target
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Tue, 26 Jun 2007 07:31:15 +0100
diff --git a/debian/squeeze/libraries/libkipi/debian/changelog b/debian/squeeze/libraries/libkipi/debian/changelog
index eaec4a227..af82417d7 100644
--- a/debian/squeeze/libraries/libkipi/debian/changelog
+++ b/debian/squeeze/libraries/libkipi/debian/changelog
@@ -111,7 +111,7 @@ libkipi (0.1.2-3) unstable; urgency=low
       + debian/rules: add buildprep rule to recreate the buildpref diff
       + add 06_aclocal_update.diff: aclocal.m4 gets recreated after each
         new buildprep diff
-      + patches/10_link_to_right_libs.diff: add missing libraries -lkdecore
+      + patches/10_link_to_right_libs.diff: add missing libraries -ltdecore
         -lqt-mt
     Result: libkipi0 now depends on 5 instead of 25 packages
   * remove unnecessary build dependency on libimlib2-dev
diff --git a/debian/squeeze/tdeadmin/debian/changelog b/debian/squeeze/tdeadmin/debian/changelog
index 4c2296fcb..4fca9af79 100644
--- a/debian/squeeze/tdeadmin/debian/changelog
+++ b/debian/squeeze/tdeadmin/debian/changelog
@@ -531,7 +531,7 @@ tdeadmin (4:3.4.0-0pre2) alioth; urgency=low
 
   +++ Changes by Pierre Habouzit:
 
-  * Recommends tdebase-bin for lilo-config (kdesu in the menu command).
+  * Recommends tdebase-bin for lilo-config (tdesu in the menu command).
   * Remove kcmlinuz from Depends for tdeadmin meta package.
   * Wrote a man page for kdat.
 
diff --git a/debian/squeeze/tdeadmin/debian/control b/debian/squeeze/tdeadmin/debian/control
index 5fcf59ebb..fcf54e33e 100644
--- a/debian/squeeze/tdeadmin/debian/control
+++ b/debian/squeeze/tdeadmin/debian/control
@@ -140,7 +140,7 @@ Description: Trinity frontend for lilo configuration
  It runs out of the KDE Control Center.
  .
  If you want to use the menu entry to launch lilo-config, you need to install
- tdebase-bin since it uses the kdesu command to gain root privileges.
+ tdebase-bin since it uses the tdesu command to gain root privileges.
  .
  This package is part of Trinity, as a component of the KDE administration module.
  See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
diff --git a/debian/squeeze/tdeadmin/debian/control.in b/debian/squeeze/tdeadmin/debian/control.in
index 8fd3732e5..5d67ada60 100644
--- a/debian/squeeze/tdeadmin/debian/control.in
+++ b/debian/squeeze/tdeadmin/debian/control.in
@@ -140,7 +140,7 @@ Description: KDE frontend for lilo configuration
  It runs out of the KDE Control Center.
  .
  If you want to use the menu entry to launch lilo-config, you need to install
- tdebase-bin since it uses the kdesu command to gain root privileges.
+ tdebase-bin since it uses the tdesu command to gain root privileges.
  .
  This package is part of KDE, as a component of the KDE administration module.
  See the 'kde' and 'tdeadmin' packages for more information.
diff --git a/debian/squeeze/tdeadmin/debian/lilo-config-trinity.lintian b/debian/squeeze/tdeadmin/debian/lilo-config-trinity.lintian
index 96c770df9..dc8ec46fb 100644
--- a/debian/squeeze/tdeadmin/debian/lilo-config-trinity.lintian
+++ b/debian/squeeze/tdeadmin/debian/lilo-config-trinity.lintian
@@ -1 +1 @@
-lilo-config: menu-command-not-in-package /usr/share/menu/lilo-config:6 /opt/trinity/bin/kdesu
+lilo-config: menu-command-not-in-package /usr/share/menu/lilo-config:6 /opt/trinity/bin/tdesu
diff --git a/debian/squeeze/tdeadmin/debian/lilo-config-trinity.menu b/debian/squeeze/tdeadmin/debian/lilo-config-trinity.menu
index 3f2bfca36..6efa201f0 100644
--- a/debian/squeeze/tdeadmin/debian/lilo-config-trinity.menu
+++ b/debian/squeeze/tdeadmin/debian/lilo-config-trinity.menu
@@ -3,4 +3,4 @@
 	section="Applications/System/Administration"\
 	hints="KDE"\
 	title="lilo-config"\
-	command="/opt/trinity/bin/kdesu kcmshell lilo"
+	command="/opt/trinity/bin/tdesu kcmshell lilo"
diff --git a/debian/squeeze/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/debian/squeeze/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
index 2a94294ef..5d776fe2d 100644
--- a/debian/squeeze/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/debian/squeeze/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
@@ -24,7 +24,7 @@ binary-install/tdebase-bin::
 	install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap
 	install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap
 
---with-sudo-kdesu-backend
+--with-sudo-tdesu-backend
 
 XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/tdebase/debian
 
diff --git a/debian/squeeze/tdebase/debian/changelog b/debian/squeeze/tdebase/debian/changelog
index 348bfd069..b991c3875 100644
--- a/debian/squeeze/tdebase/debian/changelog
+++ b/debian/squeeze/tdebase/debian/changelog
@@ -635,7 +635,7 @@ tdebase (4:3.5.7.dfsg.1-1) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
   
-  * Add smbclient to suggests of kdeprint to show that it is needed to make
+  * Add smbclient to suggests of tdeprint to show that it is needed to make
     smb printers work. Also adapt the description. (Closes: #445182)
   * Lower gdb recommends to a suggests now that recommends get installed by
     default. (Closes: 442432)
@@ -866,7 +866,7 @@ tdebase (4:3.5.7-1ubuntu10) gutsy; urgency=low
 
   * Added kubuntu_99_kate_crashfix_from_svn.diff.  (LP: #122296)
   * Committed into Bzr.
-  * Added gs-esp-x to kdeprint depends and konqueror depends. (LP: #83597)
+  * Added gs-esp-x to tdeprint depends and konqueror depends. (LP: #83597)
   * Added konqueror Recommends: libxine1-ffmpeg, so that the thumbnail
     generation no longer fails on video files. (LP: #51024)
   * Added konqueror Recommends: libarts1-mpeglib, so that the thumbnail
@@ -1050,7 +1050,7 @@ tdebase (4:3.5.6.dfsg.2-1) unstable; urgency=low
       - Simplified chinese thanks to Ming Hua. (Closes: #418486)
       - Malayam thanks to Praveen A. (Closes: #418495)
       - Greek (still has a couple of fuzzy strings).
-  * Add a patch to put some quotes in kdeprintgfax to have spaces in
+  * Add a patch to put some quotes in tdeprintgfax to have spaces in
     names/numbers. Thanks to Robert Cheramy. (Closes: #247396)
   * Fix minor issues in manpage. Thanks JS Bygott. (Closes: #414270)
   * Enable kerberos in kio slaves. It seems do not break anything. 
@@ -1347,7 +1347,7 @@ tdebase (4:3.5.5a.dfsg.1-1ubuntu7) feisty; urgency=low
 
 tdebase (4:3.5.5a.dfsg.1-1ubuntu6) feisty; urgency=low
 
-  * Compile with --with-sudo-kdesu-backend
+  * Compile with --with-sudo-tdesu-backend
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Nov 2006 10:18:52 +0000
 
@@ -1425,7 +1425,7 @@ tdebase (4:3.5.5a.dfsg.1-5) unstable; urgency=high
 tdebase (4:3.5.5a.dfsg.1-4) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
-  * Add a section to man page about how to use sudo as kdesu backend 
+  * Add a section to man page about how to use sudo as tdesu backend 
     (Closes: #399823, #384416)
  
   +++ Changes by Ana Guerrero:
@@ -1713,13 +1713,13 @@ tdebase (4:3.5.5-0ubuntu1) edgy; urgency=low
   * 28_tdebase_rubberband.diff now kubuntu_28_tdebase_rubberband.diff and hunk
     removed to apply
   * kubuntu_14_hide_konquerorsu_menu_entry.diff updated
-  * kubuntu_20_kdesu_sudo.diff updated, merged upstream
+  * kubuntu_20_tdesu_sudo.diff updated, merged upstream
   * kubuntu_35_hide_klipper_menu_entry.diff updated
   * kubuntu_73_nomediaioslave_mounthelper.diff  updated
   * kubuntu_75_kicker_taskbar_resize.diff removed, fixed upstream
   * kubuntu_76_kickermedia.diff updated
   * kubuntu_83_media_desktop.diff updated
-  * Use --with-sudo-kdesu-backend and build-dep on sudo
+  * Use --with-sudo-tdesu-backend and build-dep on sudo
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:06 +0000
 
@@ -2232,7 +2232,7 @@ tdebase (4:3.5.2-0ubuntu23) dapper; urgency=low
 
 tdebase (4:3.5.2-0ubuntu22) dapper; urgency=low
 
-  * Update kubuntu_20_kdesu_sudo.diff to fix run as foo message in kdesu
+  * Update kubuntu_20_tdesu_sudo.diff to fix run as foo message in tdesu
     with -u switch (Closes: Malone #41184)
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Thu, 11 May 2006 12:12:44 +0200
@@ -2294,7 +2294,7 @@ tdebase (4:3.5.2-0ubuntu14) dapper; urgency=low
   * Removed system tab from konqueror's sidebar
   * Alter kubuntu_52_gtk_qt_engine_config.diff, don't make use of
     gtk_qt_engine if gnome or xfce are already installed (Malone #36256)
-  * Added kubuntu_61_kdeprint_admin.diff, makes kdeprint admin mode work
+  * Added kubuntu_61_tdeprint_admin.diff, makes tdeprint admin mode work
     (Malone #39867)
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 24 Apr 2006 21:16:19 +0200
@@ -2503,7 +2503,7 @@ tdebase (4:3.5.1-0ubuntu1) dapper; urgency=low
 
 tdebase (4:3.5.0-0ubuntu16) dapper; urgency=low
 
-  * Add kubuntu_43_kdesu_terminal_output.diff to make kdesu
+  * Add kubuntu_43_tdesu_terminal_output.diff to make tdesu
     have terminal output
   * Remove xlibs-static-pic from build-deps
 
@@ -2605,7 +2605,7 @@ tdebase (4:3.5.0-0ubuntu2) dapper; urgency=low
     duplicate printer .desktop files
   * Add kubuntu_35_hide_klipper_menu_entry.diff autostarts by default
   * Add kubuntu_36_hide_kjobviewer_menu_entry.diff starts when printing
-  * Add kubuntu_37_hide_kdeprintfax_menu_entry.diff kdeprintfax 
+  * Add kubuntu_37_hide_tdeprintfax_menu_entry.diff tdeprintfax 
     is available when printing with Print to Fax
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Dec 2005 21:51:29 +0000
@@ -2848,7 +2848,7 @@ tdebase (4:3.4.1-1) experimental; urgency=low
 
 tdebase (4:3.4.3-0ubuntu6) breezy-updates; urgency=low
 
-  * Add kubuntu_34_kdesu_sycoca_cache_path.diff fix administrator
+  * Add kubuntu_34_tdesu_sycoca_cache_path.diff fix administrator
     kcontrol module bug http://bugzilla.ubuntu.com/8681
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  2 Nov 2005 02:37:11 +0000
@@ -3069,7 +3069,7 @@ tdebase (4:3.4.0-0pre4) alioth; urgency=low
     fail when kpersonalizer is not present. (Closes: #309803)
 
   * Add manpages for kdialog (thanks to Bastian Kleineidam for tracking it
-    down) and my own manpage for kdesu/kdesud. (Closes: #239945)
+    down) and my own manpage for tdesu/tdesud. (Closes: #239945)
 
   +++ Changes by Adeodato Simó:
 
@@ -3090,7 +3090,7 @@ tdebase (4:3.3.2-1) unstable; urgency=low
 
   * Fix typo in tdebase-bin description. (Closes: #286587)
 
-  * Update kdeprint documentation to sync with tdelibs patches.
+  * Update tdeprint documentation to sync with tdelibs patches.
 
   * Add NEWS.Debian for kdm, explaining the "keyboard doesn't work"
     problem when upgrading to KDE 3.3, and how to deal with it.
@@ -3107,8 +3107,8 @@ tdebase (4:3.3.2-1) unstable; urgency=low
   +++ Changes by Adeodato Simó:
 
   * debian/control:
-    - make tdebase-dev depend on kwin for the libkdecorations.so ->
-      libkdecorations.so.1.0.0 symlink. (Closes: #289544)
+    - make tdebase-dev depend on kwin for the libtdecorations.so ->
+      libtdecorations.so.1.0.0 symlink. (Closes: #289544)
 
   * Included Czech po-debconf translation by Miroslav Kure.
     (Closes: #289454)
@@ -3153,7 +3153,7 @@ tdebase (4:3.4.0-0ubuntu17) hoary; urgency=low
 
 tdebase (4:3.4.0-0ubuntu16) hoary; urgency=low
 
-  * Add kubuntu_20_kdesu_sudo.diff to fix string on kdesu for sudo.
+  * Add kubuntu_20_tdesu_sudo.diff to fix string on tdesu for sudo.
     Fixes http://bugzilla.ubuntu.com/7327
 
  -- Jonathan Riddell <jr@jriddell.org>  Sat,  2 Apr 2005 17:01:37 +0100
@@ -3311,7 +3311,7 @@ tdebase (4:3.3.2-0pre1) experimental; urgency=low
   * New upstream release.
   * KDE_3_3_BRANCH update. Includes the tdebase part of the fix
     for CAN-2004-1158.
-  * Lower kdeprint's dependency on gv to a Suggests. (Closes: #269590)
+  * Lower tdeprint's dependency on gv to a Suggests. (Closes: #269590)
   * kwin is now registered as an x-window-manager. (Closes: #249162)
   * Added /usr/share/xsessions to KDM's default session path, so
     .desktop files installed there are found.
@@ -3498,7 +3498,7 @@ tdebase (4:3.1.4-1) unstable; urgency=low
   * Added patch to update autotools files.
   * Added patch to remove pedantic-errors from KDE_CHECK_FUNC_EXT since it
     causes configure checks to fail due to #line numbers being > 32767.
-  * Demote kdeprint Depends 'efax | hylafax-client | mgetty-fax' to Suggests.
+  * Demote tdeprint Depends 'efax | hylafax-client | mgetty-fax' to Suggests.
     (Closes: #142489)
   * Change kicker.menu-method to not display the empty_mime icon if a menu file
     doesn't provide an icon. (Closes: #154065)
@@ -3540,7 +3540,7 @@ tdebase (4:3.1.2-1) unstable; urgency=low
   * New upstream release.
   * Remove Build-Depends on libsasl-dev. (Closes: #189949, #193866)
   * Add libkregexpeditor to kate Recommends. (Closes: #183280)
-  * Add efax | hylafax | mgetty-fax to kdeprint Depends. (Closes: #142489)
+  * Add efax | hylafax | mgetty-fax to tdeprint Depends. (Closes: #142489)
   * Add kfind to konqueror Depends. (Closes: #192859)
   * Fix KDE GDM Session file. (Closes: #144206, #154519, #188560, #189438,
     #193274)
@@ -4289,7 +4289,7 @@ tdebase (4:2.1-beta2-0128-1) unstable; urgency=low
 tdebase (4:2.1-beta2-3) unstable; urgency=low
  
   * Don't crash when trying to load/read faulty plugins (Closes: #82983)
-  * Moving kdesu to tdebase-libs so that we can use it without needing
+  * Moving tdesu to tdebase-libs so that we can use it without needing
     tdebase installed
   * Adding autoconf and gettext to build-deps
   * Several small bug fixes from upstream
diff --git a/debian/squeeze/tdebase/debian/control b/debian/squeeze/tdebase/debian/control
index 93a1fdd65..dd8d15912 100644
--- a/debian/squeeze/tdebase/debian/control
+++ b/debian/squeeze/tdebase/debian/control
@@ -12,7 +12,7 @@ Standards-Version: 3.8.4
 Package: tdebase-trinity
 Section: kde
 Architecture: all
-Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), kdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), kwin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
+Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), kwin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
 Recommends: kdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -129,7 +129,7 @@ Description: shared data files for the KDE base module
 Package: tdebase-trinity-dev
 Section: devel
 Architecture: any
-Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), kdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), kwin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), kwin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
 Replaces: kate-trinity (<< 4:3.0.0), tdebase-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0)
 Description: development files for the KDE base module
  This package contains headers and other development files needed to
@@ -199,7 +199,7 @@ Description: password changer for KDE
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: kdeprint-trinity
+Package: tdeprint-trinity
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}, enscript, poster, psutils
diff --git a/debian/squeeze/tdebase/debian/control.in b/debian/squeeze/tdebase/debian/control.in
index c23253584..107c75b66 100644
--- a/debian/squeeze/tdebase/debian/control.in
+++ b/debian/squeeze/tdebase/debian/control.in
@@ -13,7 +13,7 @@ XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/tdebase/debian
 Package: tdebase
 Section: kde
 Architecture: all
-Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), kdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
+Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
 Recommends: kdm (>= ${Source-Version})
 Suggests: tdebase-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -121,7 +121,7 @@ Description: shared data files for the KDE base module
 Package: tdebase-dev
 Section: devel
 Architecture: any
-Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), kdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), tdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
 Replaces: kate (<< 4:3.0.0), tdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
 Description: development files for the KDE base module
  This package contains headers and other development files needed to
@@ -191,7 +191,7 @@ Description: password changer for KDE
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde' and 'tdebase' packages for more information.
 
-Package: kdeprint
+Package: tdeprint
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}, enscript, poster, psutils
diff --git a/debian/squeeze/tdebase/debian/copyright b/debian/squeeze/tdebase/debian/copyright
index 8e0933735..a17edd5c2 100644
--- a/debian/squeeze/tdebase/debian/copyright
+++ b/debian/squeeze/tdebase/debian/copyright
@@ -16,7 +16,7 @@ headings and other identifying marks.
 
 Artistic
 --------
-kdcop, kdesu, klipper
+kdcop, tdesu, klipper
 
 BSD
 ---
@@ -24,7 +24,7 @@ drkonqi, kaddressbook, kicker, ksmserver, ksplash, kwin, legacyimport
 
 GPL
 ---
-kappfinder, kate, kcheckpass, kdeprint, kdm, kfind, khelpcenter, kmenuedit,
+kappfinder, kate, kcheckpass, tdeprint, kdm, kfind, khelpcenter, kmenuedit,
 konqueror, konsole, kpager, kpersonalizer, kreadconfig, kstart, ksysguard, ktip
 
 LGPL
diff --git a/debian/squeeze/tdebase/debian/edit-as-root.desktop b/debian/squeeze/tdebase/debian/edit-as-root.desktop
index 049454ea0..e3df17006 100644
--- a/debian/squeeze/tdebase/debian/edit-as-root.desktop
+++ b/debian/squeeze/tdebase/debian/edit-as-root.desktop
@@ -9,4 +9,4 @@ Name[fr]=Editer en tant que Root
 Name[es]=Editar como Root
 Name[de]=Als root bearbeiten
 Icon=kfm
-Exec=kdesu "kwrite" "%U"
+Exec=tdesu "kwrite" "%U"
diff --git a/debian/squeeze/tdebase/debian/icons/kdeprint-16.xpm b/debian/squeeze/tdebase/debian/icons/kdeprint-16.xpm
index 4f03a0b06..58b87a90d 100644
--- a/debian/squeeze/tdebase/debian/icons/kdeprint-16.xpm
+++ b/debian/squeeze/tdebase/debian/icons/kdeprint-16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kdeprint-16[] = {
+static char *tdeprint-16[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 137 2",
 "   c black",
diff --git a/debian/squeeze/tdebase/debian/icons/kdeprint.xpm b/debian/squeeze/tdebase/debian/icons/kdeprint.xpm
index f11005860..c10da523c 100644
--- a/debian/squeeze/tdebase/debian/icons/kdeprint.xpm
+++ b/debian/squeeze/tdebase/debian/icons/kdeprint.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kdeprint[] = {
+static char *tdeprint[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 130 2",
 "   c black",
diff --git a/debian/squeeze/tdebase/debian/icons/kdeprintfax-16.xpm b/debian/squeeze/tdebase/debian/icons/kdeprintfax-16.xpm
index debb554b6..3e07385e5 100644
--- a/debian/squeeze/tdebase/debian/icons/kdeprintfax-16.xpm
+++ b/debian/squeeze/tdebase/debian/icons/kdeprintfax-16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kdeprintfax-16[] = {
+static char *tdeprintfax-16[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 168 2",
 "   c black",
diff --git a/debian/squeeze/tdebase/debian/icons/kdeprintfax.xpm b/debian/squeeze/tdebase/debian/icons/kdeprintfax.xpm
index 6af142f57..9f5d6a2e7 100644
--- a/debian/squeeze/tdebase/debian/icons/kdeprintfax.xpm
+++ b/debian/squeeze/tdebase/debian/icons/kdeprintfax.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kdeprintfax[] = {
+static char *tdeprintfax[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 94 2",
 "   c #000000",
diff --git a/debian/squeeze/tdebase/debian/kate-trinity.install b/debian/squeeze/tdebase/debian/kate-trinity.install
index bc586a595..3b65dfabc 100644
--- a/debian/squeeze/tdebase/debian/kate-trinity.install
+++ b/debian/squeeze/tdebase/debian/kate-trinity.install
@@ -9,8 +9,8 @@ debian/tmp/opt/trinity/lib/libkateinterfaces.so.0
 debian/tmp/opt/trinity/lib/libkateinterfaces.so.0.0.0
 debian/tmp/opt/trinity/lib/libkateutils.so.0
 debian/tmp/opt/trinity/lib/libkateutils.so.0.0.0
-debian/tmp/opt/trinity/lib/libkdeinit_kate.so
-debian/tmp/opt/trinity/lib/libkdeinit_kwrite.so
+debian/tmp/opt/trinity/lib/libtdeinit_kate.so
+debian/tmp/opt/trinity/lib/libtdeinit_kwrite.so
 debian/tmp/opt/trinity/share/applications/kde/kate.desktop
 debian/tmp/opt/trinity/share/applications/kde/kwrite.desktop
 debian/tmp/opt/trinity/share/apps/kate/externaltools
diff --git a/debian/squeeze/tdebase/debian/kate-trinity.lintian b/debian/squeeze/tdebase/debian/kate-trinity.lintian
index fcc9b79aa..0ad1f24b6 100644
--- a/debian/squeeze/tdebase/debian/kate-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/kate-trinity.lintian
@@ -1,2 +1,2 @@
-kate: shlib-missing-in-control-file libkdeinit_kwrite.so usr/lib/libkdeinit_kwrite.so
-kate: shlib-missing-in-control-file libkdeinit_kate.so usr/lib/libkdeinit_kate.so
+kate: shlib-missing-in-control-file libtdeinit_kwrite.so usr/lib/libtdeinit_kwrite.so
+kate: shlib-missing-in-control-file libtdeinit_kate.so usr/lib/libtdeinit_kate.so
diff --git a/debian/squeeze/tdebase/debian/kcontrol-trinity.install b/debian/squeeze/tdebase/debian/kcontrol-trinity.install
index f337002f6..71527a0c5 100644
--- a/debian/squeeze/tdebase/debian/kcontrol-trinity.install
+++ b/debian/squeeze/tdebase/debian/kcontrol-trinity.install
@@ -124,8 +124,8 @@ debian/tmp/opt/trinity/lib/trinity/libkurisearchfilter.la
 debian/tmp/opt/trinity/lib/trinity/libkurisearchfilter.so
 debian/tmp/opt/trinity/lib/trinity/liblocaldomainurifilter.la
 debian/tmp/opt/trinity/lib/trinity/liblocaldomainurifilter.so
-debian/tmp/opt/trinity/lib/libkdeinit_kaccess.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcontrol.so
+debian/tmp/opt/trinity/lib/libtdeinit_kaccess.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcontrol.so
 debian/tmp/opt/trinity/lib/libkfontinst.so.0
 debian/tmp/opt/trinity/lib/libkfontinst.so.0.0.0
 debian/tmp/opt/trinity/share/applications/kde/arts.desktop
diff --git a/debian/squeeze/tdebase/debian/kcontrol-trinity.lintian b/debian/squeeze/tdebase/debian/kcontrol-trinity.lintian
index 3c7f407c6..d18964b2d 100644
--- a/debian/squeeze/tdebase/debian/kcontrol-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/kcontrol-trinity.lintian
@@ -1,3 +1,3 @@
-kcontrol: shlib-missing-in-control-file libkdeinit_kaccess.so usr/lib/libkdeinit_kaccess.so
-kcontrol: shlib-missing-in-control-file libkdeinit_kcontrol.so usr/lib/libkdeinit_kcontrol.so
-kcontrol: shlib-missing-in-control-file libkdeinit_krandrinithack.so usr/lib/libkdeinit_krandrinithack.so
+kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so
+kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so
+kcontrol: shlib-missing-in-control-file libtdeinit_krandrinithack.so usr/lib/libtdeinit_krandrinithack.so
diff --git a/debian/squeeze/tdebase/debian/kdeprint-trinity.install b/debian/squeeze/tdebase/debian/kdeprint-trinity.install
index bd25acf54..69f67a958 100644
--- a/debian/squeeze/tdebase/debian/kdeprint-trinity.install
+++ b/debian/squeeze/tdebase/debian/kdeprint-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/bin/kdeprintfax
+debian/tmp/opt/trinity/bin/tdeprintfax
 debian/tmp/opt/trinity/bin/kjobviewer
 debian/tmp/opt/trinity/bin/kprinter
 debian/tmp/opt/trinity/lib/trinity/kcm_printmgr.la
@@ -9,126 +9,126 @@ debian/tmp/opt/trinity/lib/trinity/kjobviewer.la
 debian/tmp/opt/trinity/lib/trinity/kjobviewer.so
 debian/tmp/opt/trinity/lib/trinity/kprinter.la
 debian/tmp/opt/trinity/lib/trinity/kprinter.so
-debian/tmp/opt/trinity/lib/trinity/libkdeprint_part.la
-debian/tmp/opt/trinity/lib/trinity/libkdeprint_part.so
-debian/tmp/opt/trinity/lib/libkdeinit_kjobviewer.so
-debian/tmp/opt/trinity/lib/libkdeinit_kprinter.so
-debian/tmp/opt/trinity/share/applications/kde/kdeprintfax.desktop
+debian/tmp/opt/trinity/lib/trinity/libtdeprint_part.la
+debian/tmp/opt/trinity/lib/trinity/libtdeprint_part.so
+debian/tmp/opt/trinity/lib/libtdeinit_kjobviewer.so
+debian/tmp/opt/trinity/lib/libtdeinit_kprinter.so
+debian/tmp/opt/trinity/share/applications/kde/tdeprintfax.desktop
 debian/tmp/opt/trinity/share/applications/kde/kjobviewer.desktop
 debian/tmp/opt/trinity/share/applications/kde/printers.desktop
-debian/tmp/opt/trinity/share/apps/kdeprintfax/anytops
-debian/tmp/opt/trinity/share/apps/kdeprintfax/faxfilters
-debian/tmp/opt/trinity/share/apps/kdeprintfax/icons/crystalsvg/16x16/actions/abentry.png
-debian/tmp/opt/trinity/share/apps/kdeprintfax/kdeprintfaxui.rc
-debian/tmp/opt/trinity/share/apps/kdeprint_part/kdeprint_part.rc
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-middle-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-middle-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-top-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-top-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-centre-kdeprint.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-middle-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-middle-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-top-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-top-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/class.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/driver.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/htmlstyles.css
-debian/tmp/opt/trinity/share/apps/kdeprint/template/jobs.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/printer.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/pseudo.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/top-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/top-right-kdeprint.png
+debian/tmp/opt/trinity/share/apps/tdeprintfax/anytops
+debian/tmp/opt/trinity/share/apps/tdeprintfax/faxfilters
+debian/tmp/opt/trinity/share/apps/tdeprintfax/icons/crystalsvg/16x16/actions/abentry.png
+debian/tmp/opt/trinity/share/apps/tdeprintfax/tdeprintfaxui.rc
+debian/tmp/opt/trinity/share/apps/tdeprint_part/tdeprint_part.rc
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-middle-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-middle-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-top-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-top-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-centre-tdeprint.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-middle-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-middle-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-top-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-top-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/class.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/driver.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/htmlstyles.css
+debian/tmp/opt/trinity/share/apps/tdeprint/template/jobs.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/printer.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/pseudo.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/top-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/top-right-tdeprint.png
 debian/tmp/opt/trinity/share/apps/kjobviewer/kjobviewerui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/add-printer-wiz.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cr32-action-wizard.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard2_backendselection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan_results.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard4_networkscan_config.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cups-config.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsoptions.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browse_relay_add_button.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsingmasks_add_button.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration10_browsinggeneral.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration11_browsingconnections.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration11_browsingmasks.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration12_browsingtimeouts.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration14_browsingrelay.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration1_welcome.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration2_general.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration3_logging.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration4_directories.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration5_HTTP.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration6_encryption.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration7_miscellanious.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration8_networkgeneral.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration9_networkclients.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminauthorization.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_securityoverview.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/extensions.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/external-command.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/final-word.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/getting-started.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/highlights.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kcontrol-icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kcron_to_be_printed.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kdeprint-jobviewer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter-as-netscape-printcommand.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter_called_from_run_command.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter-kivio.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter_with_kcron_developer_special.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/lpd.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/lpr-bsd.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/lprng.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/ps-boxes.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/rlpr.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/steinbruch_scaled.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/tech-overview.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/theory.docbook
-debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/add-printer-wiz.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/common
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cr32-action-wizard.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard1.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard2_backendselection.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard3_networkscan.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard3_networkscan_results.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard4_networkscan_config.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cups-config.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsoptions.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfig_browse_relay_add_button.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfig_browsingmasks_add_button.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration10_browsinggeneral.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration11_browsingconnections.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration11_browsingmasks.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration12_browsingtimeouts.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration14_browsingrelay.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration1_welcome.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration2_general.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration3_logging.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration4_directories.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration5_HTTP.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration6_encryption.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration7_miscellanious.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration8_networkgeneral.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration9_networkclients.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaddprinters.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminauthorization.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_securityoverview.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/extensions.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/external-command.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/final-word.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/getting-started.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/highlights.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/index.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kcontrol-icon.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kcron_to_be_printed.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/tdeprint-jobviewer.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter-as-netscape-printcommand.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter_called_from_run_command.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter-kivio.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter_with_kcron_developer_special.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/lpd.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/lpr-bsd.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/lprng.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/ps-boxes.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/rlpr.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/steinbruch_scaled.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/tech-overview.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/theory.docbook
+debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kdeprintfax.svgz
+debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/tdeprintfax.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kjobviewer.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/printmgr.svgz
 debian/tmp/opt/trinity/share/mimelnk/print/class.desktop
@@ -138,13 +138,13 @@ debian/tmp/opt/trinity/share/mimelnk/print/jobs.desktop
 debian/tmp/opt/trinity/share/mimelnk/print/manager.desktop
 debian/tmp/opt/trinity/share/mimelnk/print/printer.desktop
 debian/tmp/opt/trinity/share/mimelnk/print/printermodel.desktop
-debian/tmp/opt/trinity/share/services/kdeprint_part.desktop
+debian/tmp/opt/trinity/share/services/tdeprint_part.desktop
 debian/tmp/opt/trinity/share/services/printdb.protocol
 debian/tmp/opt/trinity/share/services/print.protocol
 
 debian/icons/kjobviewer.xpm		/opt/trinity/share/pixmaps
 debian/icons/kjobviewer-16.xpm		/opt/trinity/share/pixmaps
-debian/icons/kdeprint.xpm		/opt/trinity/share/pixmaps
-debian/icons/kdeprint-16.xpm		/opt/trinity/share/pixmaps
-debian/icons/kdeprintfax.xpm		/opt/trinity/share/pixmaps
-debian/icons/kdeprintfax-16.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeprint.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeprint-16.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeprintfax.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeprintfax-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/squeeze/tdebase/debian/kdeprint-trinity.lintian b/debian/squeeze/tdebase/debian/kdeprint-trinity.lintian
index 6cac09d35..9da8261d7 100644
--- a/debian/squeeze/tdebase/debian/kdeprint-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/kdeprint-trinity.lintian
@@ -1,4 +1,4 @@
-kdeprint: no-shlibs-control-file usr/lib/libkdeinit_kjobviewer.so
-kdeprint: no-shlibs-control-file usr/lib/libkdeinit_kprinter.so
-kdeprint: postinst-must-call-ldconfig usr/lib/libkdeinit_kjobviewer.so
-kdeprint: postrm-should-call-ldconfig usr/lib/libkdeinit_kjobviewer.so
+tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kjobviewer.so
+tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kprinter.so
+tdeprint: postinst-must-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
+tdeprint: postrm-should-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
diff --git a/debian/squeeze/tdebase/debian/kdeprint-trinity.manpages b/debian/squeeze/tdebase/debian/kdeprint-trinity.manpages
index 6d4136bf9..55b9bfae7 100644
--- a/debian/squeeze/tdebase/debian/kdeprint-trinity.manpages
+++ b/debian/squeeze/tdebase/debian/kdeprint-trinity.manpages
@@ -1,3 +1,3 @@
-debian/man/kdeprintfax-trinity.1
+debian/man/tdeprintfax-trinity.1
 debian/man/kjobviewer-trinity.1
 debian/man/kprinter-trinity.1
diff --git a/debian/squeeze/tdebase/debian/kdeprint-trinity.menu b/debian/squeeze/tdebase/debian/kdeprint-trinity.menu
index 3140de34c..1268aa55c 100644
--- a/debian/squeeze/tdebase/debian/kdeprint-trinity.menu
+++ b/debian/squeeze/tdebase/debian/kdeprint-trinity.menu
@@ -1,4 +1,4 @@
-?package(kdeprint):\
+?package(tdeprint):\
 	needs="X11"\
 	section="Applications/System/Monitoring"\
 	hints="KDE"\
@@ -7,29 +7,29 @@
 	icon16x16="/opt/trinity/share/pixmaps/kjobviewer-16.xpm"\
 	command="/opt/trinity/bin/kjobviewer --show --all"
 
-?package(kdeprint):\
+?package(tdeprint):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="KDE"\
 	title="KPrinter"\
-	icon32x32="/opt/trinity/share/pixmaps/kdeprint.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kdeprint-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeprint.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeprint-16.xpm"\
 	command="/opt/trinity/bin/kprinter"
 
-?package(kdeprint):\
+?package(tdeprint):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="KDE"\
 	title="KDEPrintFax"\
-	icon32x32="/opt/trinity/share/pixmaps/kdeprintfax.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kdeprintfax-16.xpm"\
-	command="/opt/trinity/bin/kdeprintfax"
+	icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\
+	command="/opt/trinity/bin/tdeprintfax"
 
-# Icon 32x32 kdeprint/kjobviewer/cr32-app-kjobviewer.png kjobviewer.xpm
-# Icon 16x16 kdeprint/kjobviewer/cr16-app-kjobviewer.png kjobviewer-16.xpm
+# Icon 32x32 tdeprint/kjobviewer/cr32-app-kjobviewer.png kjobviewer.xpm
+# Icon 16x16 tdeprint/kjobviewer/cr16-app-kjobviewer.png kjobviewer-16.xpm
 
-# Icon 32x32 kdeprint/printmgr/cr32-app-printmgr.png kdeprint.xpm
-# Icon 16x16 kdeprint/printmgr/cr16-app-printmgr.png kdeprint-16.xpm
+# Icon 32x32 tdeprint/printmgr/cr32-app-printmgr.png tdeprint.xpm
+# Icon 16x16 tdeprint/printmgr/cr16-app-printmgr.png tdeprint-16.xpm
 
-# Icon 32x32 kdeprint/kdeprintfax/cr32-app-kdeprintfax.png kdeprintfax.xpm
-# Icon 16x16 kdeprint/kdeprintfax/cr16-app-kdeprintfax.png kdeprintfax-16.xpm
+# Icon 32x32 tdeprint/tdeprintfax/cr32-app-tdeprintfax.png tdeprintfax.xpm
+# Icon 16x16 tdeprint/tdeprintfax/cr16-app-tdeprintfax.png tdeprintfax-16.xpm
diff --git a/debian/squeeze/tdebase/debian/kdesktop-trinity.install b/debian/squeeze/tdebase/debian/kdesktop-trinity.install
index aa950c6d5..8ee3c9256 100644
--- a/debian/squeeze/tdebase/debian/kdesktop-trinity.install
+++ b/debian/squeeze/tdebase/debian/kdesktop-trinity.install
@@ -8,7 +8,7 @@ debian/tmp/opt/trinity/bin/kdesktop_lock
 debian/tmp/opt/trinity/bin/kwebdesktop
 debian/tmp/opt/trinity/lib/trinity/kdesktop.la
 debian/tmp/opt/trinity/lib/trinity/kdesktop.so
-debian/tmp/opt/trinity/lib/libkdeinit_kdesktop.so
+debian/tmp/opt/trinity/lib/libtdeinit_kdesktop.so
 debian/tmp/opt/trinity/share/apps/kdesktop/DesktopLinks/Home.desktop usr/share/apps/kdesktop/unused/
 debian/tmp/opt/trinity/share/apps/kdesktop/DesktopLinks/System.desktop usr/share/apps/kdesktop/unused/
 debian/tmp/opt/trinity/share/apps/kdesktop/directory.autostart
diff --git a/debian/squeeze/tdebase/debian/kdesktop-trinity.lintian b/debian/squeeze/tdebase/debian/kdesktop-trinity.lintian
index b652ef1a3..478f4fbc8 100644
--- a/debian/squeeze/tdebase/debian/kdesktop-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/kdesktop-trinity.lintian
@@ -1 +1 @@
-kdesktop: no-shlibs-control-file usr/lib/libkdeinit_kdesktop.so
+kdesktop: no-shlibs-control-file usr/lib/libtdeinit_kdesktop.so
diff --git a/debian/squeeze/tdebase/debian/khelpcenter-trinity.install b/debian/squeeze/tdebase/debian/khelpcenter-trinity.install
index 8e219a21f..eff975b5d 100644
--- a/debian/squeeze/tdebase/debian/khelpcenter-trinity.install
+++ b/debian/squeeze/tdebase/debian/khelpcenter-trinity.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/bin/khc_mansearch.pl
 debian/tmp/opt/trinity/bin/khelpcenter
 debian/tmp/opt/trinity/lib/trinity/khelpcenter.la
 debian/tmp/opt/trinity/lib/trinity/khelpcenter.so
-debian/tmp/opt/trinity/lib/libkdeinit_khelpcenter.so
+debian/tmp/opt/trinity/lib/libtdeinit_khelpcenter.so
 debian/tmp/opt/trinity/share/applications/kde/Help.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/glossary.html.in
 debian/tmp/opt/trinity/share/apps/khelpcenter/glossary.xslt
@@ -79,7 +79,7 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/checkxrefs
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/common
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/kdeprintingglossary.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/tdeprintingglossary.docbook
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/help.docbook
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/index.docbook
diff --git a/debian/squeeze/tdebase/debian/khelpcenter-trinity.lintian b/debian/squeeze/tdebase/debian/khelpcenter-trinity.lintian
index db8286ac4..44eb5fc11 100644
--- a/debian/squeeze/tdebase/debian/khelpcenter-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/khelpcenter-trinity.lintian
@@ -1,3 +1,3 @@
-khelpcenter: no-shlibs-control-file usr/lib/libkdeinit_khelpcenter.so
-khelpcenter: postinst-must-call-ldconfig usr/lib/libkdeinit_khelpcenter.so
-khelpcenter: postrm-should-call-ldconfig usr/lib/libkdeinit_khelpcenter.so
+khelpcenter: no-shlibs-control-file usr/lib/libtdeinit_khelpcenter.so
+khelpcenter: postinst-must-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
+khelpcenter: postrm-should-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
diff --git a/debian/squeeze/tdebase/debian/kicker-trinity.install b/debian/squeeze/tdebase/debian/kicker-trinity.install
index bdd7a8a8b..c99afee75 100644
--- a/debian/squeeze/tdebase/debian/kicker-trinity.install
+++ b/debian/squeeze/tdebase/debian/kicker-trinity.install
@@ -18,8 +18,8 @@ debian/tmp/opt/trinity/lib/trinity/kickermenu_find.la
 debian/tmp/opt/trinity/lib/trinity/kickermenu_find.so
 debian/tmp/opt/trinity/lib/trinity/kickermenu_kate.so
 debian/tmp/opt/trinity/lib/trinity/kickermenu_kate.la
-debian/tmp/opt/trinity/lib/trinity/kickermenu_kdeprint.la
-debian/tmp/opt/trinity/lib/trinity/kickermenu_kdeprint.so
+debian/tmp/opt/trinity/lib/trinity/kickermenu_tdeprint.la
+debian/tmp/opt/trinity/lib/trinity/kickermenu_tdeprint.so
 debian/tmp/opt/trinity/lib/trinity/kickermenu_konqueror.la
 debian/tmp/opt/trinity/lib/trinity/kickermenu_konqueror.so
 debian/tmp/opt/trinity/lib/trinity/kickermenu_konsole.la
@@ -59,9 +59,9 @@ debian/tmp/opt/trinity/lib/trinity/trash_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/trash_panelapplet.so
 debian/tmp/opt/trinity/lib/libkasbar.so.1
 debian/tmp/opt/trinity/lib/libkasbar.so.1.0.0
-debian/tmp/opt/trinity/lib/libkdeinit_appletproxy.so
-debian/tmp/opt/trinity/lib/libkdeinit_extensionproxy.so
-debian/tmp/opt/trinity/lib/libkdeinit_kicker.so
+debian/tmp/opt/trinity/lib/libtdeinit_appletproxy.so
+debian/tmp/opt/trinity/lib/libtdeinit_extensionproxy.so
+debian/tmp/opt/trinity/lib/libtdeinit_kicker.so
 debian/tmp/opt/trinity/lib/libkickermain.so.1
 debian/tmp/opt/trinity/lib/libkickermain.so.1.0.0
 debian/tmp/opt/trinity/lib/libtaskbar.so.1
diff --git a/debian/squeeze/tdebase/debian/kicker-trinity.lintian b/debian/squeeze/tdebase/debian/kicker-trinity.lintian
index 41de1be8e..f600f5d82 100644
--- a/debian/squeeze/tdebase/debian/kicker-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/kicker-trinity.lintian
@@ -1,3 +1,3 @@
-kicker: shlib-missing-in-control-file libkdeinit_extensionproxy.so usr/lib/libkdeinit_extensionproxy.so
-kicker: shlib-missing-in-control-file libkdeinit_kicker.so usr/lib/libkdeinit_kicker.so
-kicker: shlib-missing-in-control-file libkdeinit_appletproxy.so usr/lib/libkdeinit_appletproxy.so
+kicker: shlib-missing-in-control-file libtdeinit_extensionproxy.so usr/lib/libtdeinit_extensionproxy.so
+kicker: shlib-missing-in-control-file libtdeinit_kicker.so usr/lib/libtdeinit_kicker.so
+kicker: shlib-missing-in-control-file libtdeinit_appletproxy.so usr/lib/libtdeinit_appletproxy.so
diff --git a/debian/squeeze/tdebase/debian/klipper-trinity.install b/debian/squeeze/tdebase/debian/klipper-trinity.install
index e84bf502b..467dd6710 100644
--- a/debian/squeeze/tdebase/debian/klipper-trinity.install
+++ b/debian/squeeze/tdebase/debian/klipper-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/lib/trinity/klipper.la
 debian/tmp/opt/trinity/lib/trinity/klipper_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/klipper_panelapplet.so
 debian/tmp/opt/trinity/lib/trinity/klipper.so
-debian/tmp/opt/trinity/lib/libkdeinit_klipper.so
+debian/tmp/opt/trinity/lib/libtdeinit_klipper.so
 debian/tmp/opt/trinity/share/applications/kde/klipper.desktop
 debian/tmp/opt/trinity/share/apps/kconf_update/klipper-1-2.pl
 debian/tmp/opt/trinity/share/apps/kconf_update/klipper-trinity1.sh
diff --git a/debian/squeeze/tdebase/debian/klipper-trinity.lintian b/debian/squeeze/tdebase/debian/klipper-trinity.lintian
index 710a50459..f7bcf9946 100644
--- a/debian/squeeze/tdebase/debian/klipper-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/klipper-trinity.lintian
@@ -1,3 +1,3 @@
-klipper: no-shlibs-control-file usr/lib/libkdeinit_klipper.so
-klipper: postinst-must-call-ldconfig usr/lib/libkdeinit_klipper.so
-klipper: postrm-should-call-ldconfig usr/lib/libkdeinit_klipper.so
+klipper: no-shlibs-control-file usr/lib/libtdeinit_klipper.so
+klipper: postinst-must-call-ldconfig usr/lib/libtdeinit_klipper.so
+klipper: postrm-should-call-ldconfig usr/lib/libtdeinit_klipper.so
diff --git a/debian/squeeze/tdebase/debian/kmenuedit-trinity.install b/debian/squeeze/tdebase/debian/kmenuedit-trinity.install
index 140ea409b..49711b6e4 100644
--- a/debian/squeeze/tdebase/debian/kmenuedit-trinity.install
+++ b/debian/squeeze/tdebase/debian/kmenuedit-trinity.install
@@ -4,8 +4,8 @@ debian/tmp/opt/trinity/lib/trinity/kcontroledit.la
 debian/tmp/opt/trinity/lib/trinity/kcontroledit.so
 debian/tmp/opt/trinity/lib/trinity/kmenuedit.la
 debian/tmp/opt/trinity/lib/trinity/kmenuedit.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcontroledit.so
-debian/tmp/opt/trinity/lib/libkdeinit_kmenuedit.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcontroledit.so
+debian/tmp/opt/trinity/lib/libtdeinit_kmenuedit.so
 debian/tmp/opt/trinity/share/applications/kde/kmenuedit.desktop
 debian/tmp/opt/trinity/share/applnk/System/kmenuedit.desktop
 debian/tmp/opt/trinity/share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png
diff --git a/debian/squeeze/tdebase/debian/kmenuedit-trinity.lintian b/debian/squeeze/tdebase/debian/kmenuedit-trinity.lintian
index 075ffc823..154077ad9 100644
--- a/debian/squeeze/tdebase/debian/kmenuedit-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/kmenuedit-trinity.lintian
@@ -1,4 +1,4 @@
-kmenuedit: no-shlibs-control-file usr/lib/libkdeinit_kcontroledit.so
-kmenuedit: no-shlibs-control-file usr/lib/libkdeinit_kmenuedit.so
-kmenuedit: postinst-must-call-ldconfig usr/lib/libkdeinit_kcontroledit.so
-kmenuedit: postrm-should-call-ldconfig usr/lib/libkdeinit_kcontroledit.so
+kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kcontroledit.so
+kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kmenuedit.so
+kmenuedit: postinst-must-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
+kmenuedit: postrm-should-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
diff --git a/debian/squeeze/tdebase/debian/konqueror-trinity.install b/debian/squeeze/tdebase/debian/konqueror-trinity.install
index 11d8a57c1..ece23b00f 100644
--- a/debian/squeeze/tdebase/debian/konqueror-trinity.install
+++ b/debian/squeeze/tdebase/debian/konqueror-trinity.install
@@ -37,9 +37,9 @@ debian/tmp/opt/trinity/lib/trinity/konqueror.la
 debian/tmp/opt/trinity/lib/trinity/konqueror.so
 debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.la
 debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.so
-debian/tmp/opt/trinity/lib/libkdeinit_keditbookmarks.so
-debian/tmp/opt/trinity/lib/libkdeinit_kfmclient.so
-debian/tmp/opt/trinity/lib/libkdeinit_konqueror.so
+debian/tmp/opt/trinity/lib/libtdeinit_keditbookmarks.so
+debian/tmp/opt/trinity/lib/libtdeinit_kfmclient.so
+debian/tmp/opt/trinity/lib/libtdeinit_konqueror.so
 debian/tmp/opt/trinity/lib/libkonqsidebarplugin.so.1
 debian/tmp/opt/trinity/lib/libkonqsidebarplugin.so.1.2.0
 debian/tmp/opt/trinity/share/applications/kde/Home.desktop
diff --git a/debian/squeeze/tdebase/debian/konqueror-trinity.lintian b/debian/squeeze/tdebase/debian/konqueror-trinity.lintian
index 27e528d84..243cafb9f 100644
--- a/debian/squeeze/tdebase/debian/konqueror-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/konqueror-trinity.lintian
@@ -1,3 +1,3 @@
-konqueror: shlib-missing-in-control-file libkdeinit_keditbookmarks.so usr/lib/libkdeinit_keditbookmarks.so
-konqueror: shlib-missing-in-control-file libkdeinit_kfmclient.so usr/lib/libkdeinit_kfmclient.so
-konqueror: shlib-missing-in-control-file libkdeinit_konqueror.so usr/lib/libkdeinit_konqueror.so
+konqueror: shlib-missing-in-control-file libtdeinit_keditbookmarks.so usr/lib/libtdeinit_keditbookmarks.so
+konqueror: shlib-missing-in-control-file libtdeinit_kfmclient.so usr/lib/libtdeinit_kfmclient.so
+konqueror: shlib-missing-in-control-file libtdeinit_konqueror.so usr/lib/libtdeinit_konqueror.so
diff --git a/debian/squeeze/tdebase/debian/konsole-trinity.install b/debian/squeeze/tdebase/debian/konsole-trinity.install
index 0fb1e3a22..69e1c7699 100644
--- a/debian/squeeze/tdebase/debian/konsole-trinity.install
+++ b/debian/squeeze/tdebase/debian/konsole-trinity.install
@@ -7,7 +7,7 @@ debian/tmp/opt/trinity/lib/trinity/konsole.la
 debian/tmp/opt/trinity/lib/trinity/konsole.so
 debian/tmp/opt/trinity/lib/trinity/libkonsolepart.la
 debian/tmp/opt/trinity/lib/trinity/libkonsolepart.so
-debian/tmp/opt/trinity/lib/libkdeinit_konsole.so
+debian/tmp/opt/trinity/lib/libtdeinit_konsole.so
 debian/tmp/opt/trinity/share/applications/kde/konsole.desktop
 debian/tmp/opt/trinity/share/applications/kde/konsolesu.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kcmkonsole.desktop
diff --git a/debian/squeeze/tdebase/debian/konsole-trinity.lintian b/debian/squeeze/tdebase/debian/konsole-trinity.lintian
index 95c2d012e..765754c3e 100644
--- a/debian/squeeze/tdebase/debian/konsole-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/konsole-trinity.lintian
@@ -1,3 +1,3 @@
-konsole: no-shlibs-control-file usr/lib/libkdeinit_konsole.so
-konsole: postinst-must-call-ldconfig usr/lib/libkdeinit_konsole.so
-konsole: postrm-should-call-ldconfig usr/lib/libkdeinit_konsole.so
+konsole: no-shlibs-control-file usr/lib/libtdeinit_konsole.so
+konsole: postinst-must-call-ldconfig usr/lib/libtdeinit_konsole.so
+konsole: postrm-should-call-ldconfig usr/lib/libtdeinit_konsole.so
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.install b/debian/squeeze/tdebase/debian/ksmserver-trinity.install
index f5200691f..0946d8a57 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.install
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/ksmserver
 debian/tmp/opt/trinity/bin/startkde
 debian/tmp/opt/trinity/lib/trinity/ksmserver.la
 debian/tmp/opt/trinity/lib/trinity/ksmserver.so
-debian/tmp/opt/trinity/lib/libkdeinit_ksmserver.so
+debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.so
 debian/tmp/opt/trinity/share/apps/kconf_update/ksmserver.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/move_session_config.sh
 debian/tmp/opt/trinity/share/apps/ksmserver/pics/shutdownkonq.png
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.lintian b/debian/squeeze/tdebase/debian/ksmserver-trinity.lintian
index 669919e49..20f94f8ee 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.lintian
@@ -1,2 +1,2 @@
-ksmserver: no-shlibs-control-file usr/lib/libkdeinit_ksmserver.so
-ksmserver: postinst-must-call-ldconfig usr/lib/libkdeinit_ksmserver.so
+ksmserver: no-shlibs-control-file usr/lib/libtdeinit_ksmserver.so
+ksmserver: postinst-must-call-ldconfig usr/lib/libtdeinit_ksmserver.so
diff --git a/debian/squeeze/tdebase/debian/kwin-trinity.install b/debian/squeeze/tdebase/debian/kwin-trinity.install
index 6ebdc3c30..a6fde0638 100644
--- a/debian/squeeze/tdebase/debian/kwin-trinity.install
+++ b/debian/squeeze/tdebase/debian/kwin-trinity.install
@@ -44,10 +44,10 @@ debian/tmp/opt/trinity/lib/trinity/kwin_quartz_config.so
 debian/tmp/opt/trinity/lib/trinity/kwin_rules_dialog.la
 debian/tmp/opt/trinity/lib/trinity/kwin_rules_dialog.so
 debian/tmp/opt/trinity/lib/trinity/kwin.so
-debian/tmp/opt/trinity/lib/libkdecorations.so.1
-debian/tmp/opt/trinity/lib/libkdecorations.so.1.0.0
-debian/tmp/opt/trinity/lib/libkdeinit_kwin_rules_dialog.so
-debian/tmp/opt/trinity/lib/libkdeinit_kwin.so
+debian/tmp/opt/trinity/lib/libtdecorations.so.1
+debian/tmp/opt/trinity/lib/libtdecorations.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdeinit_kwin_rules_dialog.so
+debian/tmp/opt/trinity/lib/libtdeinit_kwin.so
 debian/tmp/opt/trinity/share/applications/kde/showdesktop.desktop
 debian/tmp/opt/trinity/share/applications/kde/kwindecoration.desktop
 debian/tmp/opt/trinity/share/applications/kde/kwinoptions.desktop
diff --git a/debian/squeeze/tdebase/debian/kwin-trinity.lintian b/debian/squeeze/tdebase/debian/kwin-trinity.lintian
index 1bf281c8a..ab81fccc0 100644
--- a/debian/squeeze/tdebase/debian/kwin-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/kwin-trinity.lintian
@@ -1,2 +1,2 @@
-kwin: shlib-missing-in-control-file libkdeinit_kwin.so usr/lib/libkdeinit_kwin.so
-kwin: shlib-missing-in-control-file libkdeinit_kwin_rules_dialog.so usr/lib/libkdeinit_kwin_rules_dialog.so
+kwin: shlib-missing-in-control-file libtdeinit_kwin.so usr/lib/libtdeinit_kwin.so
+kwin: shlib-missing-in-control-file libtdeinit_kwin_rules_dialog.so usr/lib/libtdeinit_kwin_rules_dialog.so
diff --git a/debian/squeeze/tdebase/debian/man/drkonqi-trinity.1 b/debian/squeeze/tdebase/debian/man/drkonqi-trinity.1
index c1a7a8936..9371c2d9f 100644
--- a/debian/squeeze/tdebase/debian/man/drkonqi-trinity.1
+++ b/debian/squeeze/tdebase/debian/man/drkonqi-trinity.1
@@ -34,8 +34,8 @@ The PID of the program
 .B  \-\-startupid  <id>
 Startup ID of the program
 .TP
-.B  \-\-kdeinit  
-The program was started by kdeinit
+.B  \-\-tdeinit  
+The program was started by tdeinit
 .TP
 .B  \-\-safer  
 Disable arbitrary disk access
diff --git a/debian/squeeze/tdebase/debian/man/kdeprintfax-trinity.1 b/debian/squeeze/tdebase/debian/man/kdeprintfax-trinity.1
index 0308ac1d8..353fb6529 100644
--- a/debian/squeeze/tdebase/debian/man/kdeprintfax-trinity.1
+++ b/debian/squeeze/tdebase/debian/man/kdeprintfax-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDEPRINTFAX 1 "June 2006" "K Desktop Environment" "A fax utility"
+.TH TDEPRINTFAX 1 "June 2006" "K Desktop Environment" "A fax utility"
 .SH NAME
-kdeprintfax
+tdeprintfax
 \- a interface to fax-packages
 .SH SYNOPSIS
-\fBkdeprintfax\fP [Qt\-options] [KDE\-options] [options] [file] 
+\fBtdeprintfax\fP [Qt\-options] [KDE\-options] [options] [file] 
 .SH DESCRIPTION
-\fBkdeprintfax\fP is a small fax utility to be used with kdeprint.
+\fBtdeprintfax\fP is a small fax utility to be used with tdeprint.
 .SH OPTIONS
 .SS
 .SS Arguments:
@@ -148,7 +148,7 @@ sets the client geometry of the main widget \- see man X for the argument format
 
 .SH AUTHORS
 .nf
-Michael Goffioul <kdeprint@swing.be>
+Michael Goffioul <tdeprint@swing.be>
 .br
 
 .br
diff --git a/debian/squeeze/tdebase/debian/man/kdesu-trinity.1 b/debian/squeeze/tdebase/debian/man/kdesu-trinity.1
index e552d288c..8befa3c39 100644
--- a/debian/squeeze/tdebase/debian/man/kdesu-trinity.1
+++ b/debian/squeeze/tdebase/debian/man/kdesu-trinity.1
@@ -1,16 +1,16 @@
-.TH KDESU 1 "May 2005" "K Desktop Environment" "Runs a program with elevated privileges."
+.TH TDESU 1 "May 2005" "K Desktop Environment" "Runs a program with elevated privileges."
 .SH NAME
-kdesu \- Runs a program with elevated privileges.
+tdesu \- Runs a program with elevated privileges.
 .SH SYNOPSIS
-\fBkdesu\fR [Qt\-options] [KDE\-options] [kdesu options] command 
+\fBtdesu\fR [Qt\-options] [KDE\-options] [tdesu options] command 
 .SH DESCRIPTION
 Runs a program with elevated privileges.
 .PP
 KDE su is a graphical front end to the Unix \fBsu\fR utility. It allows you to run programs as another user by entering their password. It is not a SUID root program, but runs unprivileged. The system program \fBsu\fR is used for acquiring special privileges.
 .PP
-\fBkdesu\fR has the ability to store passwords for the convenience of users. The passwords are NOT written to disk, but stored in memory using a special program, \fBkdesud\fR. This is only done if the user specifies that the password be remembered. In this case, passwords are stored in memory for a certain period of time before being removed. \fBkdesud\fR runs in such a way that only the user who entered the password originally can use it, though no one, not even the user who originally entered the password, can retrieve the password that is stored by \fBkdesud\fR. Through these measures, users can avoid having to repeatedly enter root passwords or other passwords, without a significant risk to overall system security.
+\fBtdesu\fR has the ability to store passwords for the convenience of users. The passwords are NOT written to disk, but stored in memory using a special program, \fBtdesud\fR. This is only done if the user specifies that the password be remembered. In this case, passwords are stored in memory for a certain period of time before being removed. \fBtdesud\fR runs in such a way that only the user who entered the password originally can use it, though no one, not even the user who originally entered the password, can retrieve the password that is stored by \fBtdesud\fR. Through these measures, users can avoid having to repeatedly enter root passwords or other passwords, without a significant risk to overall system security.
 .PP
-\fBkdesu\fR uses normally \fBsu\fR to gain root by using the root password. \fBkdesu\fR can also be configured to use other commands to gain root like sudo to use users password.
+\fBtdesu\fR uses normally \fBsu\fR to gain root by using the root password. \fBtdesu\fR can also be configured to use other commands to gain root like sudo to use users password.
 .SH OPTIONS
 .SS Generic options:
 .TP
@@ -35,7 +35,7 @@ Show version information
 .B  --license
 Show license information
 .SS
-.SS kdesu Options:
+.SS tdesu Options:
 .TP
 .TP
 .B -c <command>
@@ -78,7 +78,7 @@ Specifies the command to run
 
 .SH CONFIGURATION FILES
 .PP
-\fBkdesu\fR can be configured with a default configuration file /etc/trinity/kdesurc and with a per user configuration file in .kde/share/config/kdesurc. Alternative a section could be added to kdeglobals.
+\fBtdesu\fR can be configured with a default configuration file /etc/trinity/tdesurc and with a per user configuration file in .kde/share/config/tdesurc. Alternative a section could be added to kdeglobals.
 .SH EXAMPLE
 The configuration item for the configuration files is the following:
 .br
@@ -88,9 +88,9 @@ super-user-command=sudo
 
 .SH SEE ALSO
 Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kdesu/
+.BR help:/tdesu/
 directly into konqueror or you can run 
-.BR "`khelpcenter help:/kdesu/'"
+.BR "`khelpcenter help:/tdesu/'"
 from the command-line.
 .br
 .SH AUTHORS
diff --git a/debian/squeeze/tdebase/debian/man/kjobviewer-trinity.1 b/debian/squeeze/tdebase/debian/man/kjobviewer-trinity.1
index 767d4ab1f..04ebe8a44 100644
--- a/debian/squeeze/tdebase/debian/man/kjobviewer-trinity.1
+++ b/debian/squeeze/tdebase/debian/man/kjobviewer-trinity.1
@@ -190,7 +190,7 @@ from the command\-line.
 .br
 .SH AUTHORS
 .nf
-Michael Goffioul <kdeprint@swing.be>
+Michael Goffioul <tdeprint@swing.be>
 .br
 
 .br
diff --git a/debian/squeeze/tdebase/debian/man/kprinter-trinity.1 b/debian/squeeze/tdebase/debian/man/kprinter-trinity.1
index 340bd84d1..8eaf6c4fb 100644
--- a/debian/squeeze/tdebase/debian/man/kprinter-trinity.1
+++ b/debian/squeeze/tdebase/debian/man/kprinter-trinity.1
@@ -198,7 +198,7 @@ from the command\-line.
 .br
 .SH AUTHORS
 .nf
-Michael Goffioul <kdeprint@swing.be>
+Michael Goffioul <tdeprint@swing.be>
 
 .br
 .fi
diff --git a/debian/squeeze/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules
index cb172b726..20a5315f2 100755
--- a/debian/squeeze/tdebase/debian/rules
+++ b/debian/squeeze/tdebase/debian/rules
@@ -21,19 +21,19 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -
 
 DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
 -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DKDM_PAM_SERVICE="kdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
--DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_KDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON"
+-DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
 DEB_BUILD_PARALLEL = true
 
 DEB_FIXPERMS_EXCLUDE := \
-	opt/trinity/bin/kdesud    \
+	opt/trinity/bin/tdesud    \
 	opt/trinity/bin/kdmtsak
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdebase-trinity-dbg
 
-DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter kdesu knetattach kioslave kxkb kdebugdialog kdcop
+DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach kioslave kxkb kdebugdialog kdcop
 
 PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
 			ksysguard-trinity kwin-trinity libkonq4-trinity
diff --git a/debian/squeeze/tdebase/debian/tdebase-doc-html.doc-base.kdeprint b/debian/squeeze/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
index f43d9196b..7610a4313 100644
--- a/debian/squeeze/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
+++ b/debian/squeeze/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
@@ -1,10 +1,10 @@
-Document: tdebase-doc-html-kdeprint
+Document: tdebase-doc-html-tdeprint
 Title: KDEPrint Handbook
 Author: Kurt Pfeifle
 Abstract: KDEPrint is the official printing system of KDE. 
 Section: Apps/Tools 
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kdeprint/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kdeprint/*.html
+Index: /opt/trinity/share/doc/kde/HTML/en/tdeprint/index.html
+Files: /opt/trinity/share/doc/kde/HTML/en/tdeprint/*.html
 
diff --git a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install
index 2322b0008..fd0d3ac41 100644
--- a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install
+++ b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install
@@ -13,8 +13,8 @@ debian/tmp/opt/trinity/bin/kcheckpass
 debian/tmp/opt/trinity/bin/kcminit
 debian/tmp/opt/trinity/bin/kcminit_startup
 debian/tmp/opt/trinity/bin/kdcop
-debian/tmp/opt/trinity/bin/kdesu
-debian/tmp/opt/trinity/bin/kdesud
+debian/tmp/opt/trinity/bin/tdesu
+debian/tmp/opt/trinity/bin/tdesud
 debian/tmp/opt/trinity/bin/kdialog
 debian/tmp/opt/trinity/bin/khotkeys
 debian/tmp/opt/trinity/bin/knetattach
@@ -44,11 +44,11 @@ debian/tmp/opt/trinity/lib/trinity/khotkeys_arts.la
 debian/tmp/opt/trinity/lib/trinity/khotkeys_arts.so
 debian/tmp/opt/trinity/lib/trinity/kxkb.la
 debian/tmp/opt/trinity/lib/trinity/kxkb.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcminit.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcminit_startup.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcminit_startup.so
-debian/tmp/opt/trinity/lib/libkdeinit_khotkeys.so
-debian/tmp/opt/trinity/lib/libkdeinit_kxkb.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcminit.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcminit_startup.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcminit_startup.so
+debian/tmp/opt/trinity/lib/libtdeinit_khotkeys.so
+debian/tmp/opt/trinity/lib/libtdeinit_kxkb.so
 debian/tmp/opt/trinity/lib/libkhotkeys_shared.so.1
 debian/tmp/opt/trinity/lib/libkhotkeys_shared.so.1.0.0
 debian/tmp/opt/trinity/share/applications/kde/keyboard.desktop
@@ -74,9 +74,9 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdcop/index.docbook
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebugdialog/common
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebugdialog/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebugdialog/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesu/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesu/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesu/index.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesu/common
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesu/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesu/index.docbook
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/common
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/index.docbook
diff --git a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.links b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.links
index ae21842e4..2c6c3384a 100644
--- a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.links
+++ b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.links
@@ -1 +1 @@
-opt/trinity/share/man/man1/kdesu.1.gz opt/trinity/share/man/man1/kdesud.1.gz
+opt/trinity/share/man/man1/tdesu.1.gz opt/trinity/share/man/man1/tdesud.1.gz
diff --git a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.lintian b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.lintian
index 1b1985b6d..3f56c6d4a 100644
--- a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.lintian
+++ b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.lintian
@@ -1,6 +1,6 @@
-tdebase-bin: setgid-binary usr/bin/kdesud 2755 root/nogroup
-tdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kcminit.so
-tdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_khotkeys.so
-tdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kxkb.so
-tdebase-bin: postinst-must-call-ldconfig usr/lib/libkdeinit_khotkeys.so
-tdebase-bin: postrm-should-call-ldconfig usr/lib/libkdeinit_khotkeys.so
+tdebase-bin: setgid-binary usr/bin/tdesud 2755 root/nogroup
+tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kcminit.so
+tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_khotkeys.so
+tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kxkb.so
+tdebase-bin: postinst-must-call-ldconfig usr/lib/libtdeinit_khotkeys.so
+tdebase-bin: postrm-should-call-ldconfig usr/lib/libtdeinit_khotkeys.so
diff --git a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.manpages b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.manpages
index b801c202a..ebb07daf7 100644
--- a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.manpages
+++ b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.manpages
@@ -4,7 +4,7 @@ debian/man/kcheckpass-trinity.1
 debian/man/kcminit-trinity.1
 debian/man/kdcop-trinity.1
 debian/man/kdebugdialog-trinity.1
-debian/man/kdesu-trinity.1
+debian/man/tdesu-trinity.1
 debian/man/kdialog-trinity.1
 debian/man/khotkeys-trinity.1
 debian/man/kio_system_documenthelper-trinity.1
diff --git a/debian/squeeze/tdebase/debian/tdebase-trinity-dev.install b/debian/squeeze/tdebase/debian/tdebase-trinity-dev.install
index d9759729d..4328f203e 100644
--- a/debian/squeeze/tdebase/debian/tdebase-trinity-dev.install
+++ b/debian/squeeze/tdebase/debian/tdebase-trinity-dev.install
@@ -43,32 +43,32 @@ debian/tmp/opt/trinity/lib/libkateinterfaces.la
 debian/tmp/opt/trinity/lib/libkateinterfaces.so
 debian/tmp/opt/trinity/lib/libkateutils.la
 debian/tmp/opt/trinity/lib/libkateutils.so
-debian/tmp/opt/trinity/lib/libkdecorations.la
-debian/tmp/opt/trinity/lib/libkdecorations.so
-debian/tmp/opt/trinity/lib/libkdeinit_appletproxy.la
-debian/tmp/opt/trinity/lib/libkdeinit_extensionproxy.la
-debian/tmp/opt/trinity/lib/libkdeinit_kaccess.la
-debian/tmp/opt/trinity/lib/libkdeinit_kate.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcminit.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcontroledit.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcontrol.la
-debian/tmp/opt/trinity/lib/libkdeinit_kdesktop.la
-debian/tmp/opt/trinity/lib/libkdeinit_keditbookmarks.la
-debian/tmp/opt/trinity/lib/libkdeinit_kfmclient.la
-debian/tmp/opt/trinity/lib/libkdeinit_khelpcenter.la
-debian/tmp/opt/trinity/lib/libkdeinit_khotkeys.la
-debian/tmp/opt/trinity/lib/libkdeinit_kicker.la
-debian/tmp/opt/trinity/lib/libkdeinit_kjobviewer.la
-debian/tmp/opt/trinity/lib/libkdeinit_klipper.la
-debian/tmp/opt/trinity/lib/libkdeinit_kmenuedit.la
-debian/tmp/opt/trinity/lib/libkdeinit_konqueror.la
-debian/tmp/opt/trinity/lib/libkdeinit_konsole.la
-debian/tmp/opt/trinity/lib/libkdeinit_kprinter.la
-debian/tmp/opt/trinity/lib/libkdeinit_ksmserver.la
-debian/tmp/opt/trinity/lib/libkdeinit_kwin.la
-debian/tmp/opt/trinity/lib/libkdeinit_kwin_rules_dialog.la
-debian/tmp/opt/trinity/lib/libkdeinit_kwrite.la
-debian/tmp/opt/trinity/lib/libkdeinit_kxkb.la
+debian/tmp/opt/trinity/lib/libtdecorations.la
+debian/tmp/opt/trinity/lib/libtdecorations.so
+debian/tmp/opt/trinity/lib/libtdeinit_appletproxy.la
+debian/tmp/opt/trinity/lib/libtdeinit_extensionproxy.la
+debian/tmp/opt/trinity/lib/libtdeinit_kaccess.la
+debian/tmp/opt/trinity/lib/libtdeinit_kate.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcminit.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcontroledit.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcontrol.la
+debian/tmp/opt/trinity/lib/libtdeinit_kdesktop.la
+debian/tmp/opt/trinity/lib/libtdeinit_keditbookmarks.la
+debian/tmp/opt/trinity/lib/libtdeinit_kfmclient.la
+debian/tmp/opt/trinity/lib/libtdeinit_khelpcenter.la
+debian/tmp/opt/trinity/lib/libtdeinit_khotkeys.la
+debian/tmp/opt/trinity/lib/libtdeinit_kicker.la
+debian/tmp/opt/trinity/lib/libtdeinit_kjobviewer.la
+debian/tmp/opt/trinity/lib/libtdeinit_klipper.la
+debian/tmp/opt/trinity/lib/libtdeinit_kmenuedit.la
+debian/tmp/opt/trinity/lib/libtdeinit_konqueror.la
+debian/tmp/opt/trinity/lib/libtdeinit_konsole.la
+debian/tmp/opt/trinity/lib/libtdeinit_kprinter.la
+debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.la
+debian/tmp/opt/trinity/lib/libtdeinit_kwin.la
+debian/tmp/opt/trinity/lib/libtdeinit_kwin_rules_dialog.la
+debian/tmp/opt/trinity/lib/libtdeinit_kwrite.la
+debian/tmp/opt/trinity/lib/libtdeinit_kxkb.la
 debian/tmp/opt/trinity/lib/libkfontinst.la
 debian/tmp/opt/trinity/lib/libkfontinst.so
 debian/tmp/opt/trinity/lib/libkhotkeys_shared.la
diff --git a/debian/squeeze/tdebindings/debian/local/krubyinit.1 b/debian/squeeze/tdebindings/debian/local/krubyinit.1
index 21cd93112..cca53af30 100644
--- a/debian/squeeze/tdebindings/debian/local/krubyinit.1
+++ b/debian/squeeze/tdebindings/debian/local/krubyinit.1
@@ -7,7 +7,7 @@ krubyinit \- Start Korundum Ruby Scripts Faster
 .SH DESCRIPTION
 Krubyinit is a wrapper around the ruby interpreter for executing Ruby
 scripts using the Korundum library ( the Ruby KDE bindings ).  It uses
-the kdeinit system to start the app so that they start a little bit
+the tdeinit system to start the app so that they start a little bit
 faster when started in a running KDE session.
 
 The script takes exactly the same options as the ruby(1) program.
diff --git a/debian/squeeze/tdebindings/debian/local/qtrubyinit.1 b/debian/squeeze/tdebindings/debian/local/qtrubyinit.1
index 61a505863..52b099b0e 100644
--- a/debian/squeeze/tdebindings/debian/local/qtrubyinit.1
+++ b/debian/squeeze/tdebindings/debian/local/qtrubyinit.1
@@ -6,7 +6,7 @@ qtrubyinit \- Start Qt Ruby Scripts Faster
 [switches] [--] [programfile] [arguments]
 .SH DESCRIPTION
 Qtrubyinit is a wrapper around the ruby interpreter for executing Ruby
-scripts using the QtRuby library.  It uses the kdeinit system to start
+scripts using the QtRuby library.  It uses the tdeinit system to start
 the app so that they start a little bit faster when started in a
 running KDE session.
 
diff --git a/debian/squeeze/tdegames/debian/kolf-trinity.install b/debian/squeeze/tdegames/debian/kolf-trinity.install
index 7ca84b810..beb920191 100644
--- a/debian/squeeze/tdegames/debian/kolf-trinity.install
+++ b/debian/squeeze/tdegames/debian/kolf-trinity.install
@@ -11,8 +11,8 @@
 /opt/trinity/share/icons/hicolor/128x128/apps/kolf.png
 /opt/trinity/share/mimelnk/application/x-kolf.desktop
 /opt/trinity/share/mimelnk/application/x-kourse.desktop
-/opt/trinity/lib/libkdeinit_kolf.so
-/opt/trinity/lib/libkdeinit_kolf.la
+/opt/trinity/lib/libtdeinit_kolf.so
+/opt/trinity/lib/libtdeinit_kolf.la
 /opt/trinity/lib/trinity/kolf.la
 /opt/trinity/lib/trinity/kolf.so
 /opt/trinity/lib/libkolf.la
diff --git a/debian/squeeze/tdegraphics/debian/kmrml-trinity.install b/debian/squeeze/tdegraphics/debian/kmrml-trinity.install
index 99491c4e7..bdbbef7c6 100644
--- a/debian/squeeze/tdegraphics/debian/kmrml-trinity.install
+++ b/debian/squeeze/tdegraphics/debian/kmrml-trinity.install
@@ -9,7 +9,7 @@ debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.la
 debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.so
 debian/tmp/opt/trinity/lib/trinity/mrmlsearch.la
 debian/tmp/opt/trinity/lib/trinity/mrmlsearch.so
-debian/tmp/opt/trinity/lib/libkdeinit_mrmlsearch.so
+debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.so
 debian/tmp/opt/trinity/share/applications/kde/kcmkmrml.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/mrml-servicemenu.desktop
 debian/tmp/opt/trinity/share/mimelnk/text/mrml.desktop
diff --git a/debian/squeeze/tdegraphics/debian/kmrml-trinity.lintian b/debian/squeeze/tdegraphics/debian/kmrml-trinity.lintian
index 5c83f447b..e3a5ddb8a 100644
--- a/debian/squeeze/tdegraphics/debian/kmrml-trinity.lintian
+++ b/debian/squeeze/tdegraphics/debian/kmrml-trinity.lintian
@@ -1,4 +1,4 @@
-kmrml: no-shlibs-control-file opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: package-name-doesnt-match-sonames libkdeinit-mrmlsearch
+kmrml: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml: package-name-doesnt-match-sonames libtdeinit-mrmlsearch
diff --git a/debian/squeeze/tdegraphics/debian/kuickshow-trinity.install b/debian/squeeze/tdegraphics/debian/kuickshow-trinity.install
index 07929cfa2..d9ef57977 100644
--- a/debian/squeeze/tdegraphics/debian/kuickshow-trinity.install
+++ b/debian/squeeze/tdegraphics/debian/kuickshow-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kuickshow
 debian/tmp/opt/trinity/lib/trinity/kuickshow.la
 debian/tmp/opt/trinity/lib/trinity/kuickshow.so
-debian/tmp/opt/trinity/lib/libkdeinit_kuickshow.so
+debian/tmp/opt/trinity/lib/libtdeinit_kuickshow.so
 debian/tmp/opt/trinity/share/applications/kde/kuickshow.desktop
 debian/tmp/opt/trinity/share/apps/kuickshow/im_palette.pal
 debian/tmp/opt/trinity/share/apps/kuickshow/pics/about.png
diff --git a/debian/squeeze/tdegraphics/debian/kuickshow-trinity.lintian b/debian/squeeze/tdegraphics/debian/kuickshow-trinity.lintian
index 61cb450ac..4551b5f0c 100644
--- a/debian/squeeze/tdegraphics/debian/kuickshow-trinity.lintian
+++ b/debian/squeeze/tdegraphics/debian/kuickshow-trinity.lintian
@@ -1,4 +1,4 @@
-kuickshow: no-shlibs-control-file opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: package-name-doesnt-match-sonames libkdeinit-kuickshow
+kuickshow: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow: package-name-doesnt-match-sonames libtdeinit-kuickshow
diff --git a/debian/squeeze/tdegraphics/debian/kview-trinity.install b/debian/squeeze/tdegraphics/debian/kview-trinity.install
index 0efbbd7b5..ca570ad61 100644
--- a/debian/squeeze/tdegraphics/debian/kview-trinity.install
+++ b/debian/squeeze/tdegraphics/debian/kview-trinity.install
@@ -21,7 +21,7 @@ debian/tmp/opt/trinity/lib/trinity/libkviewcanvas.la
 debian/tmp/opt/trinity/lib/trinity/libkviewcanvas.so
 debian/tmp/opt/trinity/lib/trinity/libkviewviewer.la
 debian/tmp/opt/trinity/lib/trinity/libkviewviewer.so
-debian/tmp/opt/trinity/lib/libkdeinit_kview.so
+debian/tmp/opt/trinity/lib/libtdeinit_kview.so
 debian/tmp/opt/trinity/lib/libkimageviewer.so.0
 debian/tmp/opt/trinity/lib/libkimageviewer.so.0.0.0
 debian/tmp/opt/trinity/lib/trinity/libphotobook.la
diff --git a/debian/squeeze/tdegraphics/debian/kview-trinity.lintian b/debian/squeeze/tdegraphics/debian/kview-trinity.lintian
index 8314a8155..b81a18ccc 100644
--- a/debian/squeeze/tdegraphics/debian/kview-trinity.lintian
+++ b/debian/squeeze/tdegraphics/debian/kview-trinity.lintian
@@ -1,3 +1,3 @@
 kview: shlib-missing-in-control-file libphotobook.so opt/trinity/lib/libphotobook.so
-kview: shlib-missing-in-control-file libkdeinit_kview.so opt/trinity/lib/libkdeinit_kview.so
-kview: package-name-doesnt-match-sonames libkdeinit-kview libkimageviewer0
+kview: shlib-missing-in-control-file libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so
+kview: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0
diff --git a/debian/squeeze/tdegraphics/debian/rules b/debian/squeeze/tdegraphics/debian/rules
index 42330d01a..caff9212a 100755
--- a/debian/squeeze/tdegraphics/debian/rules
+++ b/debian/squeeze/tdegraphics/debian/rules
@@ -35,7 +35,7 @@ DEB_DH_MAKESHLIBS_ARGS_libkscan1-trinity	:= -V'libkscan1-trinity (>= 4:3.5.5-1)'
 
 binary-post-install/kuickshow-trinity::
 ifeq ($(DEB_HOST_ARCH), powerpc)
-	chrpath -d -k debian/kuickshow-trinity/opt/trinity/lib/libkdeinit_kuickshow.so
+	chrpath -d -k debian/kuickshow-trinity/opt/trinity/lib/libtdeinit_kuickshow.so
 endif
 
 #shlibs_ver = 4:3.5.0-1
diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-dev-trinity.install b/debian/squeeze/tdegraphics/debian/tdegraphics-dev-trinity.install
index 3c15273ee..608149acc 100644
--- a/debian/squeeze/tdegraphics/debian/tdegraphics-dev-trinity.install
+++ b/debian/squeeze/tdegraphics/debian/tdegraphics-dev-trinity.install
@@ -179,8 +179,8 @@ debian/tmp/opt/trinity/include/kde/kviewshell/zoomlimits.h
 debian/tmp/opt/trinity/include/kde/libtext2path-0.1/BezierPath.h
 debian/tmp/opt/trinity/include/kde/libtext2path-0.1/Glyph.h
 debian/tmp/opt/trinity/include/kde/libtext2path-0.1/GlyphTracer.h
-debian/tmp/opt/trinity/lib/libkdeinit_kview.la
-debian/tmp/opt/trinity/lib/libkdeinit_mrmlsearch.la
+debian/tmp/opt/trinity/lib/libtdeinit_kview.la
+debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.la
 debian/tmp/opt/trinity/lib/libkghostviewlib.la
 debian/tmp/opt/trinity/lib/libkghostviewlib.so
 debian/tmp/opt/trinity/lib/libkimageviewer.la
diff --git a/debian/squeeze/tdelibs/debian/changelog b/debian/squeeze/tdelibs/debian/changelog
index ff494b112..936097e90 100644
--- a/debian/squeeze/tdelibs/debian/changelog
+++ b/debian/squeeze/tdelibs/debian/changelog
@@ -136,12 +136,12 @@ tdelibs (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
 tdelibs (4:3.5.9-0ubuntu7.1) hardy-security; urgency=low
 
-  * SECURITY UPDATE: integer overflow in start_kdeinit. The start_kdeinit
+  * SECURITY UPDATE: integer overflow in start_tdeinit. The start_tdeinit
     processing of user-influenceable input is faulty.  A local user
     might be able to send unix signals to other processes, cause
     a denial of service or even possibly execute arbitrary code.
   * Add kubuntu_9903_kinit_integer_overflow.diff, edits
-    kinit/start_kdeinit.c, patch from upstream KDE
+    kinit/start_tdeinit.c, patch from upstream KDE
   * References
     http://www.kde.org/info/security/advisory-20080426-2.txt
     CVE-2008-1671
@@ -321,7 +321,7 @@ tdelibs (4:3.5.8-3ubuntu1) hardy; urgency=low
    - remove tdelibs4c2a depends on menu-xdg
    - include kubuntu_01_kdepot.diff and kde.pot in debian/patches/common
    - use a local copy of kde.mk without the common-install-prehook-impl:: rule; edit debian-qt-kde.mk to include debian/cdbs/kde.mk
-   - build with --with-sudo-kdesu-backend and build-dep on sudo and make tdelibs4c2a depend on sudo
+   - build with --with-sudo-tdesu-backend and build-dep on sudo and make tdelibs4c2a depend on sudo
    - tdelibs-data.install : Add nzb mimetype
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 13 Nov 2007 18:18:05 +0000
@@ -348,8 +348,8 @@ tdelibs (4:3.5.8.dfsg.1-1) unstable; urgency=low
   * New upstream release (Closes: #444383, #328479, #425741)
   * Resync patches:
     - Remove, applied upstream:
-      01_branch_kate_redo_save_fix, 01_branch_wait_for_kdeinit_to_finish,
-      48_cups13, 55_several-CVE-tdelibs-kdecore.
+      01_branch_kate_redo_save_fix, 01_branch_wait_for_tdeinit_to_finish,
+      48_cups13, 55_several-CVE-tdelibs-tdecore.
   * Update *.install files. 
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 13 Oct 2007 11:53:45 +0200
@@ -364,7 +364,7 @@ tdelibs (4:3.5.7.dfsg.1-7) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
-  * Add patch 55_several-CVE-tdelibs-kdecore.diff to make Konqueror address
+  * Add patch 55_several-CVE-tdelibs-tdecore.diff to make Konqueror address
     bar more robust against addressbar spoofing.
     Related CVEs: CVE-2007-4224, CVE-2007-4225, CVE-2007-3820.
 
@@ -420,7 +420,7 @@ tdelibs (4:3.5.7.dfsg.1-2) unstable; urgency=low
   * Better error messages when opening a tty fails. Thanks to Robert Millan.
     (Closes: #334974)
   * Don't refer to help:/kcmshell in kcmshell manpage. (Closes: #408470)
-  * Make sure kdeinit closes all files before terminating kde. (Closes: #425314)
+  * Make sure tdeinit closes all files before terminating kde. (Closes: #425314)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 19 Jul 2007 22:52:17 +0200
 
@@ -690,7 +690,7 @@ tdelibs (4:3.5.6-0ubuntu8) feisty; urgency=low
 
 tdelibs (4:3.5.6-0ubuntu7) feisty; urgency=low
 
-  * Add kubuntu_92_kdeprint_filter.diff, closes Malone
+  * Add kubuntu_92_tdeprint_filter.diff, closes Malone
     #51354. Patch from Marcus Trautwig
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 22 Feb 2007 17:27:47 +0100
@@ -739,11 +739,11 @@ tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low
 
 tdelibs (4:3.5.6-0ubuntu1) feisty; urgency=low
 
-  * Remove 02_kate_kdeprint_fixes_branch.diff
+  * Remove 02_kate_tdeprint_fixes_branch.diff
   * Update 27_kdnssd_avahi.dif
   * Remove 33_cups12_kprinter_fixes.diff
   * Remove 35_cups_unify_ipp_uri_assembling.diff
-  * Remove 36_kdeprintd_64bit_fix.diff
+  * Remove 36_tdeprintd_64bit_fix.diff
   * Remove 41_x_kde_getactionmenu_no_timeout.diff
   * Remove kubuntu_63_ark.diff
   * Remove kubuntu_65_kstyle_password_noasterisk
@@ -788,7 +788,7 @@ tdelibs (4:3.5.5a.dfsg.1-3ubuntu5) feisty; urgency=low
 
 tdelibs (4:3.5.5a.dfsg.1-3ubuntu4) feisty; urgency=low
 
-  * Compile with --with-sudo-kdesu-backend
+  * Compile with --with-sudo-tdesu-backend
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Nov 2006 10:16:08 +0000
 
@@ -924,8 +924,8 @@ tdelibs (4:3.5.5a.dfsg.1-3) unstable; urgency=medium
       when there are no printers.
     * 35_cups_unify_ipp_uri_assembling.diff - ensure proper IPP URI
       generation when CUPS is accessed via a UNIX socket. (Closes: #379216)
-  * Add 36_kdeprintd_64bit_fix.diff - fix a bug on 64bit arches when kdeprint
-    is not able to get a configuration file from CUPS server because kdeprintd
+  * Add 36_tdeprintd_64bit_fix.diff - fix a bug on 64bit arches when tdeprint
+    is not able to get a configuration file from CUPS server because tdeprintd
     fails to retreive the password from kpasswdserver.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  2 Nov 2006 17:54:30 -0500
@@ -953,7 +953,7 @@ tdelibs (4:3.5.5a-2) unstable; urgency=medium
 
   * Grab two more fixes from KDE_3_5_BRANCH.
     + Fix kate's indentation of C/C++ files.
-    + Fix kdeprint's timeout when trying to find cupsd.
+    + Fix tdeprint's timeout when trying to find cupsd.
       (Closes: #392052, #392052)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 13 Oct 2006 17:04:21 -0400
@@ -1026,7 +1026,7 @@ tdelibs (4:3.5.4-1) unstable; urgency=low
     tdelibs-data.
 
   * Add a number of patches, courtesy of Debian, which attempt to get
-    kdeprint working reasonably well with CUPS 1.2.x. These patches should
+    tdeprint working reasonably well with CUPS 1.2.x. These patches should
     resolve a number of user glitches, such as cryptic errors popping up when
     no printer has yet been added to CUPS.
     (Closes: #369140, #370403, #375477, #379216)
@@ -1050,7 +1050,7 @@ tdelibs (4:3.5.5-0ubuntu3) edgy; urgency=low
 
 tdelibs (4:3.5.5-0ubuntu2) edgy; urgency=low
 
-  * Revert kdeprint directory and patches to those from kde 3.5.4 packages
+  * Revert tdeprint directory and patches to those from kde 3.5.4 packages
     closes malone No 65665
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 14 Oct 2006 01:54:33 +0000
@@ -1065,8 +1065,8 @@ tdelibs (4:3.5.5-0ubuntu1) edgy; urgency=low
    - kubuntu_48_cups12_cupsdconf.diff
    - kubuntu_54_mouse_scroll_speed.diff
    - cups 1.2 domain socket fixed upstream
-  * Remove kubuntu_01_kdesu_sudo.diff, and kubuntu_50_kdesu_non_root.patch
-    patches gone upstream, use new --with-sudo-kdesu-backend
+  * Remove kubuntu_01_tdesu_sudo.diff, and kubuntu_50_tdesu_non_root.patch
+    patches gone upstream, use new --with-sudo-tdesu-backend
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 11:23:11 +0000
 
@@ -1469,8 +1469,8 @@ tdelibs (4:3.5.2-0ubuntu18) dapper; urgency=low
 
 tdelibs (4:3.5.2-0ubuntu17) dapper; urgency=low
 
-  * Add kubuntu_50_kdesu_non_root.patch to fix running commands as non-root
-    with kdesu with su instead of sudo (Malone #41184)
+  * Add kubuntu_50_tdesu_non_root.patch to fix running commands as non-root
+    with tdesu with su instead of sudo (Malone #41184)
 
  -- Luka Renko <lure.net@gmail.net>  Wed, 10 May 2006 22:45:27 +0200
 
@@ -1575,7 +1575,7 @@ tdelibs (4:3.5.2-0ubuntu4) dapper; urgency=low
 
 tdelibs (4:3.5.2-0ubuntu3) dapper; urgency=low
 
-  * Add kubuntu_35_kdeprint_branch.diff to fix compile error
+  * Add kubuntu_35_tdeprint_branch.diff to fix compile error
     with CUPS 1.2, remove my random hack from kubuntu_34_cups12.diff 
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Apr 2006 18:53:24 +0100
@@ -1781,20 +1781,20 @@ tdelibs (4:3.5-rc2-0ubuntu5) dapper; urgency=low
 
 tdelibs (4:3.5-rc2-0ubuntu4) dapper; urgency=low
 
-  * Add debian/patches/kubuntu_06_fix_kdeprint_cups12_fix.diff, fix kdeprint compile error properly
+  * Add debian/patches/kubuntu_06_fix_tdeprint_cups12_fix.diff, fix tdeprint compile error properly
   * Add common/kubuntu_01_kdepot.diff and common/kde.pot, fix .pot generation
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 25 Nov 2005 22:11:51 +0000
 
 tdelibs (4:3.5-rc2-0ubuntu3) dapper; urgency=low
 
-  * Fix broken kubuntu_06_fix_kdeprint_compile_hack.diff
+  * Fix broken kubuntu_06_fix_tdeprint_compile_hack.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 25 Nov 2005 18:44:54 +0000
 
 tdelibs (4:3.5-rc2-0ubuntu2) dapper; urgency=low
 
-  * Add kubuntu_06_fix_kdeprint_compile_hack.diff, quick patch until I
+  * Add kubuntu_06_fix_tdeprint_compile_hack.diff, quick patch until I
     work out how to fix it properly
   * Fix tdelibs4-doc.install for correct path of files
 
@@ -1831,8 +1831,8 @@ tdelibs (4:3.4.3-1) experimental; urgency=low
   * Tweak the rounded text selection patch to avoid it causing icon spacing
     issues in Konqueror. (Closes: #329404)
 
-  * Add a patch to generate a PIC static libkdefakes, libkdefakes_pic.a.
-    This will allow other libraries, such as mimelib, to use libkdefakes,
+  * Add a patch to generate a PIC static libtdefakes, libtdefakes_pic.a.
+    This will allow other libraries, such as mimelib, to use libtdefakes,
     without acquiring non-PIC code or a dependency upon the full tdelibs.
     (Closes: #326113)
 
@@ -2203,7 +2203,7 @@ tdelibs (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
 
 tdelibs (4:3.4.0~rc1-1ubuntu0.2) hoary; urgency=low
 
-  * Add sudo for kdesu patch kubuntu_01_kdesu_sudo.diff
+  * Add sudo for tdesu patch kubuntu_01_tdesu_sudo.diff
   * Add applications.menu move patch to stop collisions with Gnome kubuntu_02_applications_menu_rename.diff
 
  -- Jonathan Riddell <jr@jriddell.org>  Sat,  5 Mar 2005 21:00:03 +0000
@@ -2310,7 +2310,7 @@ tdelibs (4:3.3.2-2) unstable; urgency=high
 
   * Add patch from upstream that solves the problem wherein programs whose
     .desktop entry contained their full path, rather than just the binary
-    to be executed (mainly games), confused kdeinit.
+    to be executed (mainly games), confused tdeinit.
     (Closes: #270592, #290323)
 
   * debian/control: Add necessary tdelibs-data Replaces for old
@@ -2379,7 +2379,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low
 
   * New patches:
     - 06_automake-1.9.diff
-    - 12_cups_docroot.diff: changed the CUPS document path in kdeprint to
+    - 12_cups_docroot.diff: changed the CUPS document path in tdeprint to
       reflect the Debian default. [CM]
 
   * Updated dcop.1 manpage with patch by Helge Kreutzman. (Closes: #250631)
@@ -3323,7 +3323,7 @@ tdelibs (4:2.1-20010109-1) unstable; urgency=low
    * This was definatly built with the same dpkg that tdelibs-crypto was so
      I'm assuming this just squeaked by dinstall...so just to be sure...
    * Java should work again
-   * Fix kdesud security by
+   * Fix tdesud security by
      a) Not creating the socket under /tmp
      b) Verifying afterwards that it was our own socket
  
@@ -3332,7 +3332,7 @@ tdelibs (4:2.1-20010109-1) unstable; urgency=low
 tdelibs (4:2.1-20010106-1) unstable; urgency=low
  
    * more upstream bug fixes
-   * Contains both the symlink/sniff attack fix for kdesu
+   * Contains both the symlink/sniff attack fix for tdesu
    * Moving conflicts for task-* packages to tdebase
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 06 Jan 2001 15:00:00 -0700
diff --git a/debian/squeeze/tdelibs/debian/copyright b/debian/squeeze/tdelibs/debian/copyright
index c622c0cf8..7c67eaede 100644
--- a/debian/squeeze/tdelibs/debian/copyright
+++ b/debian/squeeze/tdelibs/debian/copyright
@@ -14,8 +14,8 @@ systems, the complete text of the BSD, GPL and LGPL licenses can be found
 in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and
 /usr/share/common-licenses/LGPL files.
 
-libartskde, interfaces, kabc, kate, kcert, kconf_update, kdecore, kded, kdefx,
-kdeprint, kdesu, kdeui, kdewidgets, khtml, kimgio, kinit, kio, kioslave, kjs,
+libartskde, interfaces, kabc, kate, kcert, kconf_update, tdecore, kded, tdefx,
+tdeprint, tdesu, tdeui, kdewidgets, khtml, kimgio, kinit, kio, kioslave, kjs,
 kparts, ksmartcard, kspell, kstyles, libkmid, libkscreensaver
 ------------------------------------------------------------------------------
 LGPL
diff --git a/debian/squeeze/tdelibs/debian/kubuntu-desktop-i18n/findfiles b/debian/squeeze/tdelibs/debian/kubuntu-desktop-i18n/findfiles
index 59a1d97a2..e53ad2bee 100644
--- a/debian/squeeze/tdelibs/debian/kubuntu-desktop-i18n/findfiles
+++ b/debian/squeeze/tdelibs/debian/kubuntu-desktop-i18n/findfiles
@@ -31,7 +31,7 @@ for file in `cat ./kolf/courses.list 2>/dev/null`; do
 	cat ./kolf/$file 2>/dev/null | grep -v debian >> $filelist
 done
 find ./amor/data -name \*rc -print 2>/dev/null | grep -v debian >> $filelist
-find ./kdeprint -name \*.print -print 2>/dev/null | grep -v debian >> $filelist 
+find ./tdeprint -name \*.print -print 2>/dev/null | grep -v debian >> $filelist 
 find . -name \*.kksrc -print 2>/dev/null | grep -v debian >> $filelist
 find ./kopete -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
 find . -name \*.kdevtemplate -print 2>/dev/null | grep -v debian >> $filelist
diff --git a/debian/squeeze/tdelibs/debian/man/cupsdoprint-trinity.1 b/debian/squeeze/tdelibs/debian/man/cupsdoprint-trinity.1
index a79649057..52275e6f8 100644
--- a/debian/squeeze/tdelibs/debian/man/cupsdoprint-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/cupsdoprint-trinity.1
@@ -49,7 +49,7 @@ Information about printing under UNIX
 .BR lp (1),\  lpr (1),\  lpoptions (1)
 .SH AUTHORS
 .nf
-Michael Goffioul <kdeprint@swing.be>
+Michael Goffioul <tdeprint@swing.be>
 
 .br
 .fi
diff --git a/debian/squeeze/tdelibs/debian/man/kdeinit-trinity.1 b/debian/squeeze/tdelibs/debian/man/kdeinit-trinity.1
index 1e1e10adf..1c3861783 100644
--- a/debian/squeeze/tdelibs/debian/man/kdeinit-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/kdeinit-trinity.1
@@ -1,21 +1,21 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDEINIT 1 "Jun 2006" "K Desktop Environment" "process launcher"
+.TH TDEINIT 1 "Jun 2006" "K Desktop Environment" "process launcher"
 .SH NAME
-kdeinit
+tdeinit
 \- KDE process launcher
 .SH SYNOPSIS
-\fBkdeinit\fP [options]
+\fBtdeinit\fP [options]
 .SH DESCRIPTION
-\fBkdeinit\fP is a process launcher similar to \fBinit\fP used for booting UNIX.
+\fBtdeinit\fP is a process launcher similar to \fBinit\fP used for booting UNIX.
 .sp 1
-\fBkdeinit\fP is used to start all other KDE programs. It can start binary program files as well as kdeinit loadable modules (KLMs).
+\fBtdeinit\fP is used to start all other KDE programs. It can start binary program files as well as tdeinit loadable modules (KLMs).
 .sp 1
-When \fBkdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstartkde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
+When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstartkde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
 .sp 1
-The \fBkdeinit\fP master process can be used to start additional KDE programs via \fBkdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
+The \fBtdeinit\fP master process can be used to start additional KDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
 .sp 1
 KLMs are dynamic libraries that work like binary programs but can be started more efficiently.
-Starting KLMs via \fBkdeinit\fP is much faster and more memory efficient because \fBkdeinit\fP is linked against all libraries a standard KDE application needs. To start a KLM \fBkdeinit\fP forks and loads the dynamic library.
+Starting KLMs via \fBtdeinit\fP is much faster and more memory efficient because \fBtdeinit\fP is linked against all libraries a standard KDE application needs. To start a KLM \fBtdeinit\fP forks and loads the dynamic library.
 .SH OPTIONS
 .TP
 .B \-\-no\-kded
@@ -27,9 +27,9 @@ Terminate when no KDE applications are left running
 .SH FILES
 .TP
 .I /usr/lib/trinity
-directory with KLMs (kdeinit loadable modules)
+directory with KLMs (tdeinit loadable modules)
 .SH SEE ALSO
-.BR dcopserver (1),\  kded (1),\  kcminit (1),\  kdeinit_wrapper (1),\  klauncher (1),\  kshell (1),\  kwrapper (1),\  startkde (1)
+.BR dcopserver (1),\  kded (1),\  kcminit (1),\  tdeinit_wrapper (1),\  klauncher (1),\  kshell (1),\  kwrapper (1),\  startkde (1)
 .SH AUTHORS
 .nf
 Waldo Bastian <bastian@kde.org>
diff --git a/debian/squeeze/tdelibs/debian/man/kdeinit_shutdown-trinity.1 b/debian/squeeze/tdelibs/debian/man/kdeinit_shutdown-trinity.1
index 11081656a..679666846 100644
--- a/debian/squeeze/tdelibs/debian/man/kdeinit_shutdown-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/kdeinit_shutdown-trinity.1
@@ -1,14 +1,14 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDEINIT_SHUTDOWN 1 "Jun 2006" "K Desktop Environment" ""
+.TH TDEINIT_SHUTDOWN 1 "Jun 2006" "K Desktop Environment" ""
 .SH NAME
-kdeinit_shutdown
-\- shuts down kdeinit master process
+tdeinit_shutdown
+\- shuts down tdeinit master process
 .SH SYNOPSIS
-\fBkdeinit_shutdown
+\fBtdeinit_shutdown
 .SH DESCRIPTION
-\fBkdeinit_shutdown\fP shuts down kdeinit master process and terminates all processes spawned from it.
+\fBtdeinit_shutdown\fP shuts down tdeinit master process and terminates all processes spawned from it.
 .SH SEE ALSO
-.BR kdeinit (1)
+.BR tdeinit (1)
 .SH AUTHORS
 .nf
 The KDE project
diff --git a/debian/squeeze/tdelibs/debian/man/kdesu_stub-trinity.1 b/debian/squeeze/tdelibs/debian/man/kdesu_stub-trinity.1
index 7a3800513..f21330cc4 100644
--- a/debian/squeeze/tdelibs/debian/man/kdesu_stub-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/kdesu_stub-trinity.1
@@ -1,23 +1,23 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDESU_STUB 1 "Jun 2006" "K Desktop Environment" "KDE internal"
+.TH TDESU_STUB 1 "Jun 2006" "K Desktop Environment" "KDE internal"
 .SH NAME
-kdesu_stub
+tdesu_stub
 \- used by KDE su
 .SH DESCRIPTION
-!!! \fBkdesu_stub\fP is for KDE internal use only !!!
+!!! \fBtdesu_stub\fP is for KDE internal use only !!!
 .sp 1
-KDE su executes \fBkdesu_stub\fP through su or ssh. The stub is running as the target user. After some information is sent via stdin and stdout the stub executes the target program.
+KDE su executes \fBtdesu_stub\fP through su or ssh. The stub is running as the target user. After some information is sent via stdin and stdout the stub executes the target program.
 .br
 The information passed over are the X display, a X authentication cookie (if available), the PATH and the command to run.
 .sp 1
 KDE su uses a stub program because the X cookie is private information and therefore cannot be passed on the command line.
 .SH SEE ALSO
-.BR kdesu (1)
+.BR tdesu (1)
 .sp 1
 Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kdesu/
+.BR help:/tdesu/
 directly into konqueror or you can run 
-.BR "`khelpcenter help:/kdesu/'"
+.BR "`khelpcenter help:/tdesu/'"
 from the command\-line.
 .br
 .SH AUTHORS
diff --git a/debian/squeeze/tdelibs/debian/man/klauncher-trinity.1 b/debian/squeeze/tdelibs/debian/man/klauncher-trinity.1
index f8274aea6..240dab5e3 100644
--- a/debian/squeeze/tdelibs/debian/man/klauncher-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/klauncher-trinity.1
@@ -4,15 +4,15 @@
 klauncher
 \- daemon for service activation in KDE
 .SH DESCRIPTION
-!!! \fBklauncher\fP is started automatically by kdeinit. It is not supposed to be started manually. !!!
+!!! \fBklauncher\fP is started automatically by tdeinit. It is not supposed to be started manually. !!!
 .sp 1
-\fBklauncher\fP is a daemon responsible for service activation in KDE. It operates closely together with the kdeinit master process to start new processes. KDE applications communicate with \fBklauncher\fP via DCOP to start new applications or services.
+\fBklauncher\fP is a daemon responsible for service activation in KDE. It operates closely together with the tdeinit master process to start new processes. KDE applications communicate with \fBklauncher\fP via DCOP to start new applications or services.
 .sp 1
 The error message "KLauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBklauncher\fP crashed.
 .sp 1
 Note: \fBklauncher\fP is not the "run command" dialog (Alt+F2)!
 .SH SEE ALSO
-.BR dcopserver (1),\  kdeinit (1)
+.BR dcopserver (1),\  tdeinit (1)
 .SH AUTHORS
 .nf
 Waldo Bastian <bastian@kde.org>
diff --git a/debian/squeeze/tdelibs/debian/man/kshell-trinity.1 b/debian/squeeze/tdelibs/debian/man/kshell-trinity.1
index acbe215c8..5afbc3048 100644
--- a/debian/squeeze/tdelibs/debian/man/kshell-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/kshell-trinity.1
@@ -1,21 +1,21 @@
 .TH KSHELL 1 "Jun 2006" "K Desktop Environment" ""
 .SH NAME
-kdeinit_wrapper, kshell, kwrapper
-\- start applications via kdeinit
+tdeinit_wrapper, kshell, kwrapper
+\- start applications via tdeinit
 .SH SYNOPSIS
-\fBkdeinit_wrapper\fP application [arguments]
+\fBtdeinit_wrapper\fP application [arguments]
 .sp 1
 \fBkshell\fP application [arguments]
 .sp 1
 \fBkwrapper\fP application [arguments]
 .SH DESCRIPTION
-\fBkdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP start applications via \fBkdeinit\fP.
+\fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP start applications via \fBtdeinit\fP.
 .sp 1
-\fBkdeinit_wrapper\fP simply passes application name and arguments to \fBkdeinit\fP.
+\fBtdeinit_wrapper\fP simply passes application name and arguments to \fBtdeinit\fP.
 .sp 1
-\fBkshell\fP passes application name, arguments, complete environment and current working directory to \fBkdeinit\fP.
+\fBkshell\fP passes application name, arguments, complete environment and current working directory to \fBtdeinit\fP.
 .sp 1
-\fBkwrapper\fP tries to make the application look like it was actually started directly and not via \fBkdeinit\fP. Like \fBkshell\fP it passes application name, arguments, complete environment and current working directory to \fBkdeinit\fP.
+\fBkwrapper\fP tries to make the application look like it was actually started directly and not via \fBtdeinit\fP. Like \fBkshell\fP it passes application name, arguments, complete environment and current working directory to \fBtdeinit\fP.
 .br
 Additionally it
 .IP "    \-"
@@ -37,7 +37,7 @@ application to start
 arguments of application to start
 .SS 
 .SH SEE ALSO
-.BR kdeinit (1)
+.BR tdeinit (1)
 .br
 .SH AUTHORS
 .nf
@@ -45,7 +45,7 @@ arguments of application to start
 .br
 Oswald Buddenhagen <ossi@kde.org>
 
-\fBkwrapper\fP and \fBkdeinit_wrapper\fP:
+\fBkwrapper\fP and \fBtdeinit_wrapper\fP:
 .br
 Waldo Bastian <bastian@kde.org>
 Mario Weilguni <mweilguni@sime.org>
diff --git a/debian/squeeze/tdelibs/debian/man/make_driver_db_cups-trinity.1 b/debian/squeeze/tdelibs/debian/man/make_driver_db_cups-trinity.1
index e4eb8251f..0201523ce 100644
--- a/debian/squeeze/tdelibs/debian/man/make_driver_db_cups-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/make_driver_db_cups-trinity.1
@@ -25,7 +25,7 @@ directory with ppd files
 write printer database into this file
 .SH FILES
 .TP
-.I $KDEHOME/share/apps/kdeprint/printerdb_cups.txt
+.I $KDEHOME/share/apps/tdeprint/printerdb_cups.txt
 KDE printer database
 .br
 (if $KDEHOME is not set ~/.kde is used)
diff --git a/debian/squeeze/tdelibs/debian/rules b/debian/squeeze/tdelibs/debian/rules
index 4cdb2747a..119f2a4fe 100755
--- a/debian/squeeze/tdelibs/debian/rules
+++ b/debian/squeeze/tdelibs/debian/rules
@@ -31,7 +31,7 @@ DEB_FIXPERMS_EXCLUDE := \
 	opt/trinity/bin/fileshareset	\
 	opt/trinity/bin/kgrantpty	\
 	opt/trinity/bin/kpac_dhcp_helper \
-	opt/trinity/bin/start_kdeinit
+	opt/trinity/bin/start_tdeinit
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdelibs-trinity-dbg
 
@@ -40,7 +40,7 @@ DEB_DH_MAKESHLIBS_ARGS_tdelibs4c2a-trinity := -V'tdelibs4c2a-trinity (>= 4:3.5.8
 binary-install/tdelibs-data-trinity::
 	install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu
 	install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf
-	uudecode debian/icons/aboutkde-kubuntu.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/apps/kdeui/pics/aboutkde.png
+	uudecode debian/icons/aboutkde-kubuntu.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/apps/tdeui/pics/aboutkde.png
 
 	uudecode debian/icons/cr16-device-system.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/16x16/devices/system.png
 	uudecode debian/icons/cr22-device-system.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/22x22/devices/system.png
diff --git a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
index 22d939e81..6cd2a864c 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
@@ -8,7 +8,7 @@ debian/tmp/etc/trinity/katefiletyperc
 debian/tmp/etc/trinity/katesyntaxhighlightingrc
 debian/tmp/etc/trinity/kdebug.areas
 debian/tmp/etc/trinity/kdebugrc
-debian/tmp/etc/trinity/kdeprintrc
+debian/tmp/etc/trinity/tdeprintrc
 debian/tmp/etc/trinity/kio_isorc
 debian/tmp/etc/trinity/ksslcalist
 debian/tmp/etc/trinity/kthemestylerc
@@ -40,152 +40,152 @@ debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_instantmessenger.desk
 debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_ktexteditor.desktop
 debian/tmp/opt/trinity/share/apps/kconf_update/kcookiescfg.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/kded.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kdeprintrc.upd
+debian/tmp/opt/trinity/share/apps/kconf_update/tdeprintrc.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/kio_help.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/kioslave.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/move_kio_help_cache.sh
 debian/tmp/opt/trinity/share/apps/kconf_update/proxytype.pl
 debian/tmp/opt/trinity/share/apps/kconf_update/useragent.pl
-debian/tmp/opt/trinity/share/apps/kdeprint/apsdriver1
-debian/tmp/opt/trinity/share/apps/kdeprint/apsdriver2
-debian/tmp/opt/trinity/share/apps/kdeprint/cupsd.conf.template
-debian/tmp/opt/trinity/share/apps/kdeprint/cups_logo.png
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/enscript.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/enscript.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/imagetops.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/imagetops.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/pdf2ps.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/pdf2ps.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/pdfwrite.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/pdfwrite.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/poster.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/poster.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/ps2pdf.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/ps2pdf.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook1.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook1.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook2.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook2.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psnup.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psnup.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psselect.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psselect.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/actions/filterstop.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/actions/kdeprint_restartsrv.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/actions/kdeprint_uploadsmb.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_computer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_cancelled.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_completed.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_error.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_class.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_class_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_class_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_defect.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_remote.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_remote_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_remote_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/history.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_addprinter.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_addpseudo.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_configmgr.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_configsrv.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_defaulthard.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_defaultsoft.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_enableprinter.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_printer_infos.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_printstate.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_queuestate.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_report.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_restartsrv.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_stopprinter.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_testprinter.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_uploadsmb.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/package_utilities.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/actions/kdeprint_inklevel.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_defect.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_users.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/48x48/apps/kdeprint_printer_class.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/48x48/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer_class.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/kde_logo.png
-debian/tmp/opt/trinity/share/apps/kdeprint/lprngtooldriver1
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_collate.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_collate_reverse.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_color.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_duplex_long.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_duplex_none.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_duplex_short.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_grayscale.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_landscape.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_nup1.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_nup2.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_nup4.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_nupother.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_portrait.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_prettyprint.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_revlandscape.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_revportrait.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_uncollate.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_uncollate_reverse.png
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/cups.print
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/ext.print
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/lpdunix.print
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/lpr.print
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/rlpr.print
-debian/tmp/opt/trinity/share/apps/kdeprint/preview-mini.png
-debian/tmp/opt/trinity/share/apps/kdeprint/preview.png
-debian/tmp/opt/trinity/share/apps/kdeprint/side.png
-debian/tmp/opt/trinity/share/apps/kdeprint/specials.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/testprint.ps
-debian/tmp/opt/trinity/share/apps/kdeprint/tiledown.png
-debian/tmp/opt/trinity/share/apps/kdeprint/tileup.png
-debian/tmp/opt/trinity/share/apps/kdeprint/tools/escputil.desktop
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-middle-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-middle-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-top-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-top-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-middle-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-middle-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-top-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-top-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/kde_infopage.css
-debian/tmp/opt/trinity/share/apps/kdeui/about/kde_infopage_rtl.css
-debian/tmp/opt/trinity/share/apps/kdeui/about/top-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/pics/aboutkde.png
-debian/tmp/opt/trinity/share/apps/kdeui/pics/ktip-background.png
-debian/tmp/opt/trinity/share/apps/kdeui/pics/ktip-bulb.png
+debian/tmp/opt/trinity/share/apps/tdeprint/apsdriver1
+debian/tmp/opt/trinity/share/apps/tdeprint/apsdriver2
+debian/tmp/opt/trinity/share/apps/tdeprint/cupsd.conf.template
+debian/tmp/opt/trinity/share/apps/tdeprint/cups_logo.png
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/enscript.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/enscript.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/imagetops.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/imagetops.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/pdf2ps.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/pdf2ps.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/pdfwrite.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/pdfwrite.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/poster.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/poster.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/ps2pdf.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/ps2pdf.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook1.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook1.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook2.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook2.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psnup.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psnup.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psselect.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psselect.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/actions/filterstop.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/actions/tdeprint_restartsrv.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/actions/tdeprint_uploadsmb.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_computer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_cancelled.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_completed.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_error.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_class.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_class_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_class_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_defect.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_remote.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_remote_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_remote_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/history.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_addprinter.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_addpseudo.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_configmgr.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_configsrv.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_defaulthard.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_defaultsoft.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_enableprinter.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_printer_infos.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_printstate.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_queuestate.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_report.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_restartsrv.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_stopprinter.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_testprinter.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_uploadsmb.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/package_utilities.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/actions/tdeprint_inklevel.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_class.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_class_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_class_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_defect.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_remote.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_remote_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_remote_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_users.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/48x48/apps/tdeprint_printer_class.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/48x48/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/64x64/apps/tdeprint_printer_class.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/64x64/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/kde_logo.png
+debian/tmp/opt/trinity/share/apps/tdeprint/lprngtooldriver1
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_collate.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_collate_reverse.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_color.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_duplex_long.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_duplex_none.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_duplex_short.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_grayscale.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_landscape.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_nup1.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_nup2.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_nup4.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_nupother.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_portrait.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_prettyprint.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_revlandscape.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_revportrait.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_uncollate.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_uncollate_reverse.png
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/cups.print
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/ext.print
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/lpdunix.print
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/lpr.print
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/rlpr.print
+debian/tmp/opt/trinity/share/apps/tdeprint/preview-mini.png
+debian/tmp/opt/trinity/share/apps/tdeprint/preview.png
+debian/tmp/opt/trinity/share/apps/tdeprint/side.png
+debian/tmp/opt/trinity/share/apps/tdeprint/specials.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/testprint.ps
+debian/tmp/opt/trinity/share/apps/tdeprint/tiledown.png
+debian/tmp/opt/trinity/share/apps/tdeprint/tileup.png
+debian/tmp/opt/trinity/share/apps/tdeprint/tools/escputil.desktop
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-middle-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-middle-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-middle-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-middle-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage.css
+debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage_rtl.css
+debian/tmp/opt/trinity/share/apps/tdeui/about/top-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/pics/aboutkde.png
+debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-background.png
+debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-bulb.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kactionselector.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kactivelabel.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kcharselect.png
@@ -3572,7 +3572,7 @@ debian/tmp/opt/trinity/share/services/katepart.desktop
 debian/tmp/opt/trinity/share/services/kbzip2filter.desktop
 debian/tmp/opt/trinity/share/services/kcertpart.desktop
 debian/tmp/opt/trinity/share/services/kded/kcookiejar.desktop
-debian/tmp/opt/trinity/share/services/kded/kdeprintd.desktop
+debian/tmp/opt/trinity/share/services/kded/tdeprintd.desktop
 debian/tmp/opt/trinity/share/services/kded/kdetrayproxy.desktop
 debian/tmp/opt/trinity/share/services/kded/kpasswdserver.desktop
 debian/tmp/opt/trinity/share/services/kded/kssld.desktop
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
index b065921dd..8f84589d6 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -204,33 +204,33 @@ debian/tmp/opt/trinity/include/kde_file.h
 debian/tmp/opt/trinity/include/tdelibs_export.h
 debian/tmp/opt/trinity/include/kdemacros.h
 debian/tmp/opt/trinity/include/kde.pot
-debian/tmp/opt/trinity/include/kdeprint/driver.h
-debian/tmp/opt/trinity/include/kdeprint/kiconselectaction.h
-debian/tmp/opt/trinity/include/kdeprint/kmjob.h
-debian/tmp/opt/trinity/include/kdeprint/kmjobmanager.h
-debian/tmp/opt/trinity/include/kdeprint/kmjobviewer.h
-debian/tmp/opt/trinity/include/kdeprint/kmmainview.h
-debian/tmp/opt/trinity/include/kdeprint/kmmanager.h
-debian/tmp/opt/trinity/include/kdeprint/kmobject.h
-debian/tmp/opt/trinity/include/kdeprint/kmprinter.h
-debian/tmp/opt/trinity/include/kdeprint/kmprinterpage.h
-debian/tmp/opt/trinity/include/kdeprint/kmtimer.h
-debian/tmp/opt/trinity/include/kdeprint/kpreloadobject.h
-debian/tmp/opt/trinity/include/kdeprint/kprintdialog.h
-debian/tmp/opt/trinity/include/kdeprint/kprintdialogpage.h
-debian/tmp/opt/trinity/include/kdeprint/lpr/lprhandler.h
-debian/tmp/opt/trinity/include/kdeprint/lpr/lprsettings.h
-debian/tmp/opt/trinity/include/kdeprint/lpr/printcapentry.h
+debian/tmp/opt/trinity/include/tdeprint/driver.h
+debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h
+debian/tmp/opt/trinity/include/tdeprint/kmjob.h
+debian/tmp/opt/trinity/include/tdeprint/kmjobmanager.h
+debian/tmp/opt/trinity/include/tdeprint/kmjobviewer.h
+debian/tmp/opt/trinity/include/tdeprint/kmmainview.h
+debian/tmp/opt/trinity/include/tdeprint/kmmanager.h
+debian/tmp/opt/trinity/include/tdeprint/kmobject.h
+debian/tmp/opt/trinity/include/tdeprint/kmprinter.h
+debian/tmp/opt/trinity/include/tdeprint/kmprinterpage.h
+debian/tmp/opt/trinity/include/tdeprint/kmtimer.h
+debian/tmp/opt/trinity/include/tdeprint/kpreloadobject.h
+debian/tmp/opt/trinity/include/tdeprint/kprintdialog.h
+debian/tmp/opt/trinity/include/tdeprint/kprintdialogpage.h
+debian/tmp/opt/trinity/include/tdeprint/lpr/lprhandler.h
+debian/tmp/opt/trinity/include/tdeprint/lpr/lprsettings.h
+debian/tmp/opt/trinity/include/tdeprint/lpr/printcapentry.h
 debian/tmp/opt/trinity/include/kdesktopfile.h
-debian/tmp/opt/trinity/include/kdesu/client.h
-debian/tmp/opt/trinity/include/kdesu/defaults.h
-debian/tmp/opt/trinity/include/kdesu/kcookie.h
-debian/tmp/opt/trinity/include/kdesu/kdesu_pty.h
-debian/tmp/opt/trinity/include/kdesu/process.h
-debian/tmp/opt/trinity/include/kdesu/pty.h
-debian/tmp/opt/trinity/include/kdesu/ssh.h
-debian/tmp/opt/trinity/include/kdesu/stub.h
-debian/tmp/opt/trinity/include/kdesu/su.h
+debian/tmp/opt/trinity/include/tdesu/client.h
+debian/tmp/opt/trinity/include/tdesu/defaults.h
+debian/tmp/opt/trinity/include/tdesu/kcookie.h
+debian/tmp/opt/trinity/include/tdesu/tdesu_pty.h
+debian/tmp/opt/trinity/include/tdesu/process.h
+debian/tmp/opt/trinity/include/tdesu/pty.h
+debian/tmp/opt/trinity/include/tdesu/ssh.h
+debian/tmp/opt/trinity/include/tdesu/stub.h
+debian/tmp/opt/trinity/include/tdesu/su.h
 debian/tmp/opt/trinity/include/kde_terminal_interface.h
 debian/tmp/opt/trinity/include/kdeversion.h
 debian/tmp/opt/trinity/include/kdialogbase.h
@@ -324,7 +324,7 @@ debian/tmp/opt/trinity/include/kio/http_slave_defaults.h
 debian/tmp/opt/trinity/include/kio/ioslave_defaults.h
 debian/tmp/opt/trinity/include/kio/jobclasses.h
 debian/tmp/opt/trinity/include/kio/job.h
-debian/tmp/opt/trinity/include/kio/kdesasl.h
+debian/tmp/opt/trinity/include/kio/tdesasl.h
 debian/tmp/opt/trinity/include/kio/kmdbase.h
 debian/tmp/opt/trinity/include/kio/kmdcodec.h
 debian/tmp/opt/trinity/include/kio/kntlm.h
@@ -743,35 +743,35 @@ debian/tmp/opt/trinity/lib/libkabc_ldapkio.so
 debian/tmp/opt/trinity/lib/libkabc.so
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.la
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so
-debian/tmp/opt/trinity/lib/libkdecore.la
-debian/tmp/opt/trinity/lib/libkdecore.so
-debian/tmp/opt/trinity/lib/libkdefakes.la
-debian/tmp/opt/trinity/lib/libkdefakes_nonpic.a
-debian/tmp/opt/trinity/lib/libkdefakes_pic.a
-debian/tmp/opt/trinity/lib/libkdefakes.so
-debian/tmp/opt/trinity/lib/libkdefx.la
-debian/tmp/opt/trinity/lib/libkdefx.so
-debian/tmp/opt/trinity/lib/libkdeinit_cupsdconf.la
-debian/tmp/opt/trinity/lib/libkdeinit_dcopserver.la
-debian/tmp/opt/trinity/lib/libkdeinit_kaddprinterwizard.la
-debian/tmp/opt/trinity/lib/libkdeinit_kbuildsycoca.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcmshell.la
-debian/tmp/opt/trinity/lib/libkdeinit_kconf_update.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcookiejar.la
-debian/tmp/opt/trinity/lib/libkdeinit_kded.la
-debian/tmp/opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.la
-debian/tmp/opt/trinity/lib/libkdeinit_kio_uiserver.la
-debian/tmp/opt/trinity/lib/libkdeinit_klauncher.la
-debian/tmp/opt/trinity/lib/libkdeprint.la
-debian/tmp/opt/trinity/lib/libkdeprint_management.la
-debian/tmp/opt/trinity/lib/libkdeprint_management.so
-debian/tmp/opt/trinity/lib/libkdeprint.so
-debian/tmp/opt/trinity/lib/libkdesasl.la
-debian/tmp/opt/trinity/lib/libkdesasl.so
-debian/tmp/opt/trinity/lib/libkdesu.la
-debian/tmp/opt/trinity/lib/libkdesu.so
-debian/tmp/opt/trinity/lib/libkdeui.la
-debian/tmp/opt/trinity/lib/libkdeui.so
+debian/tmp/opt/trinity/lib/libtdecore.la
+debian/tmp/opt/trinity/lib/libtdecore.so
+debian/tmp/opt/trinity/lib/libtdefakes.la
+debian/tmp/opt/trinity/lib/libtdefakes_nonpic.a
+debian/tmp/opt/trinity/lib/libtdefakes_pic.a
+debian/tmp/opt/trinity/lib/libtdefakes.so
+debian/tmp/opt/trinity/lib/libtdefx.la
+debian/tmp/opt/trinity/lib/libtdefx.so
+debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.la
+debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.la
+debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.la
+debian/tmp/opt/trinity/lib/libtdeinit_kbuildsycoca.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcmshell.la
+debian/tmp/opt/trinity/lib/libtdeinit_kconf_update.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcookiejar.la
+debian/tmp/opt/trinity/lib/libtdeinit_kded.la
+debian/tmp/opt/trinity/lib/libtdeinit_kio_http_cache_cleaner.la
+debian/tmp/opt/trinity/lib/libtdeinit_kio_uiserver.la
+debian/tmp/opt/trinity/lib/libtdeinit_klauncher.la
+debian/tmp/opt/trinity/lib/libtdeprint.la
+debian/tmp/opt/trinity/lib/libtdeprint_management.la
+debian/tmp/opt/trinity/lib/libtdeprint_management.so
+debian/tmp/opt/trinity/lib/libtdeprint.so
+debian/tmp/opt/trinity/lib/libtdesasl.la
+debian/tmp/opt/trinity/lib/libtdesasl.so
+debian/tmp/opt/trinity/lib/libtdesu.la
+debian/tmp/opt/trinity/lib/libtdesu.so
+debian/tmp/opt/trinity/lib/libtdeui.la
+debian/tmp/opt/trinity/lib/libtdeui.so
 debian/tmp/opt/trinity/lib/libkdnssd.la
 debian/tmp/opt/trinity/lib/libkdnssd.so
 debian/tmp/opt/trinity/lib/libkhtml.la
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install
index 6ee941938..91c12cb5b 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -20,12 +20,12 @@ debian/tmp/opt/trinity/bin/kconf_update
 debian/tmp/opt/trinity/bin/kcookiejar
 debian/tmp/opt/trinity/bin/kde-config
 debian/tmp/opt/trinity/bin/kded
-debian/tmp/opt/trinity/bin/kdeinit
-debian/tmp/opt/trinity/bin/kdeinit_shutdown
-debian/tmp/opt/trinity/bin/kdeinit_wrapper
+debian/tmp/opt/trinity/bin/tdeinit
+debian/tmp/opt/trinity/bin/tdeinit_shutdown
+debian/tmp/opt/trinity/bin/tdeinit_wrapper
 debian/tmp/opt/trinity/bin/kdetcompmgr
 debian/tmp/opt/trinity/bin/kde-menu
-debian/tmp/opt/trinity/bin/kdesu_stub
+debian/tmp/opt/trinity/bin/tdesu_stub
 debian/tmp/opt/trinity/bin/kdontchangethehostname
 debian/tmp/opt/trinity/bin/kdostartupconfig
 debian/tmp/opt/trinity/bin/kfile
@@ -50,8 +50,8 @@ debian/tmp/opt/trinity/bin/lnusertemp
 debian/tmp/opt/trinity/bin/make_driver_db_cups
 debian/tmp/opt/trinity/bin/make_driver_db_lpr
 debian/tmp/opt/trinity/bin/meinproc
-debian/tmp/opt/trinity/bin/start_kdeinit
-debian/tmp/opt/trinity/bin/start_kdeinit_wrapper
+debian/tmp/opt/trinity/bin/start_tdeinit
+debian/tmp/opt/trinity/bin/start_tdeinit_wrapper
 debian/tmp/opt/trinity/lib/trinity/cupsdconf.la
 debian/tmp/opt/trinity/lib/trinity/cupsdconf.so
 debian/tmp/opt/trinity/lib/trinity/dcopserver.la
@@ -83,8 +83,8 @@ debian/tmp/opt/trinity/lib/trinity/kcookiejar.la
 debian/tmp/opt/trinity/lib/trinity/kcookiejar.so
 debian/tmp/opt/trinity/lib/trinity/kded_kcookiejar.la
 debian/tmp/opt/trinity/lib/trinity/kded_kcookiejar.so
-debian/tmp/opt/trinity/lib/trinity/kded_kdeprintd.la
-debian/tmp/opt/trinity/lib/trinity/kded_kdeprintd.so
+debian/tmp/opt/trinity/lib/trinity/kded_tdeprintd.la
+debian/tmp/opt/trinity/lib/trinity/kded_tdeprintd.so
 debian/tmp/opt/trinity/lib/trinity/kded_kdetrayproxy.la
 debian/tmp/opt/trinity/lib/trinity/kded_kdetrayproxy.so
 debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.la
@@ -97,18 +97,18 @@ debian/tmp/opt/trinity/lib/trinity/kded.la
 debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.la
 debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.so
 debian/tmp/opt/trinity/lib/trinity/kded.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_cups.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_cups.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_ext.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_ext.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_lpdunix.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_lpdunix.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_lpr.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_lpr.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_rlpr.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_rlpr.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_tool_escputil.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_tool_escputil.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_cups.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_cups.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_ext.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_ext.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_lpdunix.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_lpdunix.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_lpr.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_lpr.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_rlpr.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_rlpr.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_tool_escputil.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_tool_escputil.so
 debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.la
 debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.so
 debian/tmp/opt/trinity/lib/trinity/kgzipfilter.la
@@ -187,8 +187,8 @@ debian/tmp/opt/trinity/lib/trinity/libkatepart.la
 debian/tmp/opt/trinity/lib/trinity/libkatepart.so
 debian/tmp/opt/trinity/lib/trinity/libkcertpart.la
 debian/tmp/opt/trinity/lib/trinity/libkcertpart.so
-debian/tmp/opt/trinity/lib/trinity/libkdeprint_management_module.la
-debian/tmp/opt/trinity/lib/trinity/libkdeprint_management_module.so
+debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.la
+debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.so
 debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.la
 debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.so
 debian/tmp/opt/trinity/lib/trinity/libkmultipart.la
@@ -235,33 +235,33 @@ debian/tmp/opt/trinity/lib/libkabc.so.1
 debian/tmp/opt/trinity/lib/libkabc.so.1.2.0
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0.0.0
-debian/tmp/opt/trinity/lib/libkdecore.so.4
-debian/tmp/opt/trinity/lib/libkdecore.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdefakes.so.4
-debian/tmp/opt/trinity/lib/libkdefakes.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdefx.so.4
-debian/tmp/opt/trinity/lib/libkdefx.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdeinit_cupsdconf.so
-debian/tmp/opt/trinity/lib/libkdeinit_dcopserver.so
-debian/tmp/opt/trinity/lib/libkdeinit_kaddprinterwizard.so
-debian/tmp/opt/trinity/lib/libkdeinit_kbuildsycoca.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcmshell.so
-debian/tmp/opt/trinity/lib/libkdeinit_kconf_update.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcookiejar.so
-debian/tmp/opt/trinity/lib/libkdeinit_kded.so
-debian/tmp/opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.so
-debian/tmp/opt/trinity/lib/libkdeinit_kio_uiserver.so
-debian/tmp/opt/trinity/lib/libkdeinit_klauncher.so
-debian/tmp/opt/trinity/lib/libkdeprint_management.so.4
-debian/tmp/opt/trinity/lib/libkdeprint_management.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdeprint.so.4
-debian/tmp/opt/trinity/lib/libkdeprint.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdesasl.so.1
-debian/tmp/opt/trinity/lib/libkdesasl.so.1.2.0
-debian/tmp/opt/trinity/lib/libkdesu.so.4
-debian/tmp/opt/trinity/lib/libkdesu.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdeui.so.4
-debian/tmp/opt/trinity/lib/libkdeui.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdecore.so.4
+debian/tmp/opt/trinity/lib/libtdecore.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdefakes.so.4
+debian/tmp/opt/trinity/lib/libtdefakes.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdefx.so.4
+debian/tmp/opt/trinity/lib/libtdefx.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.so
+debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.so
+debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+debian/tmp/opt/trinity/lib/libtdeinit_kbuildsycoca.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcmshell.so
+debian/tmp/opt/trinity/lib/libtdeinit_kconf_update.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcookiejar.so
+debian/tmp/opt/trinity/lib/libtdeinit_kded.so
+debian/tmp/opt/trinity/lib/libtdeinit_kio_http_cache_cleaner.so
+debian/tmp/opt/trinity/lib/libtdeinit_kio_uiserver.so
+debian/tmp/opt/trinity/lib/libtdeinit_klauncher.so
+debian/tmp/opt/trinity/lib/libtdeprint_management.so.4
+debian/tmp/opt/trinity/lib/libtdeprint_management.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeprint.so.4
+debian/tmp/opt/trinity/lib/libtdeprint.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdesasl.so.1
+debian/tmp/opt/trinity/lib/libtdesasl.so.1.2.0
+debian/tmp/opt/trinity/lib/libtdesu.so.4
+debian/tmp/opt/trinity/lib/libtdesu.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeui.so.4
+debian/tmp/opt/trinity/lib/libtdeui.so.4.2.0
 debian/tmp/opt/trinity/lib/libkdnssd.so.1
 debian/tmp/opt/trinity/lib/libkdnssd.so.1.0.0
 debian/tmp/opt/trinity/lib/libkhtml.so.4
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.lintian b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.lintian
index 68997d62e..593ec30ed 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.lintian
+++ b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.lintian
@@ -1,15 +1,15 @@
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kaddprinterwizard.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_cupsdconf.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_dcopserver.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcmshell.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kbuildsycoca.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kded.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcookiejar.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_klauncher.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kconf_update.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_uiserver.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcmshell.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kio_http_cache_cleaner.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kbuildsycoca.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_klauncher.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kconf_update.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kio_uiserver.so
 tdelibs4c2a binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
 tdelibs4c2a binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
 tdelibs4c2a binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/start_kdeinit 4755 root/root
+tdelibs4c2a binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.manpages b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.manpages
index eba677adb..00ed3a04e 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.manpages
+++ b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.manpages
@@ -20,7 +20,7 @@ debian/man/out/ksendbugmail-trinity.1
 debian/man/out/ktelnetservice-trinity.1
 debian/man/out/lnusertemp-trinity.1
 debian/man/out/meinproc-trinity.1
-./debian/man/kdeinit-trinity.1
+./debian/man/tdeinit-trinity.1
 ./debian/man/cupsdoprint-trinity.1
 ./debian/man/dcopclient-trinity.1
 ./debian/man/dcopobject-trinity.1
@@ -31,9 +31,9 @@ debian/man/out/meinproc-trinity.1
 ./debian/man/imagetops-trinity.1
 ./debian/man/kab2kabc-trinity.1
 ./debian/man/kcmshell-trinity.1
-./debian/man/kdeinit_shutdown-trinity.1
+./debian/man/tdeinit_shutdown-trinity.1
 ./debian/man/kde-menu-trinity.1
-./debian/man/kdesu_stub-trinity.1
+./debian/man/tdesu_stub-trinity.1
 ./debian/man/kgrantpty-trinity.1
 ./debian/man/khotnewstuff-trinity.1
 ./debian/man/kioexec-trinity.1
diff --git a/debian/squeeze/tdemultimedia/debian/kmix-trinity.install b/debian/squeeze/tdemultimedia/debian/kmix-trinity.install
index 742bd3f9c..79dfc1cef 100644
--- a/debian/squeeze/tdemultimedia/debian/kmix-trinity.install
+++ b/debian/squeeze/tdemultimedia/debian/kmix-trinity.install
@@ -6,8 +6,8 @@ debian/tmp/opt/trinity/lib/trinity/kmix_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/kmix_panelapplet.so
 debian/tmp/opt/trinity/lib/trinity/kmixctrl.la
 debian/tmp/opt/trinity/lib/trinity/kmixctrl.so
-debian/tmp/opt/trinity/lib/libkdeinit_kmix.so
-debian/tmp/opt/trinity/lib/libkdeinit_kmixctrl.so
+debian/tmp/opt/trinity/lib/libtdeinit_kmix.so
+debian/tmp/opt/trinity/lib/libtdeinit_kmixctrl.so
 debian/tmp/opt/trinity/share/applications/kde/kmix.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/kmixapplet.desktop
 debian/tmp/opt/trinity/share/apps/kmix/kmixui.rc
diff --git a/debian/squeeze/tdemultimedia/debian/kmix-trinity.lintian b/debian/squeeze/tdemultimedia/debian/kmix-trinity.lintian
index 6f97d1c92..a2a96f9ee 100644
--- a/debian/squeeze/tdemultimedia/debian/kmix-trinity.lintian
+++ b/debian/squeeze/tdemultimedia/debian/kmix-trinity.lintian
@@ -1,4 +1,4 @@
-kmix: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmixctrl.so
-kmix: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmix.so
-kmix: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
-kmix: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
+kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
+kmix: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
diff --git a/debian/squeeze/tdemultimedia/debian/krec-trinity.install b/debian/squeeze/tdemultimedia/debian/krec-trinity.install
index 7446b200d..bbb4ed25f 100644
--- a/debian/squeeze/tdemultimedia/debian/krec-trinity.install
+++ b/debian/squeeze/tdemultimedia/debian/krec-trinity.install
@@ -9,7 +9,7 @@ debian/tmp/opt/trinity/lib/trinity/libkrecexport_ogg.la
 debian/tmp/opt/trinity/lib/trinity/libkrecexport_ogg.so
 debian/tmp/opt/trinity/lib/trinity/libkrecexport_wave.la
 debian/tmp/opt/trinity/lib/trinity/libkrecexport_wave.so
-debian/tmp/opt/trinity/lib/libkdeinit_krec.so
+debian/tmp/opt/trinity/lib/libtdeinit_krec.so
 debian/tmp/opt/trinity/share/applications/kde/krec.desktop
 debian/tmp/opt/trinity/share/apps/krec/icons/crystalsvg/16x16/actions/krec_record.png
 debian/tmp/opt/trinity/share/apps/krec/icons/crystalsvg/22x22/actions/krec_record.png
diff --git a/debian/squeeze/tdemultimedia/debian/krec-trinity.lintian b/debian/squeeze/tdemultimedia/debian/krec-trinity.lintian
index 4b6b929a1..b09b553d8 100644
--- a/debian/squeeze/tdemultimedia/debian/krec-trinity.lintian
+++ b/debian/squeeze/tdemultimedia/debian/krec-trinity.lintian
@@ -1,3 +1,3 @@
-krec: no-shlibs-control-file opt/trinity/lib/libkdeinit_krec.so
-krec: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
-krec: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
+krec: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
+krec: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
diff --git a/debian/squeeze/tdemultimedia/debian/noatun-trinity.install b/debian/squeeze/tdemultimedia/debian/noatun-trinity.install
index 21524ef0b..e7b22e4e0 100644
--- a/debian/squeeze/tdemultimedia/debian/noatun-trinity.install
+++ b/debian/squeeze/tdemultimedia/debian/noatun-trinity.install
@@ -38,7 +38,7 @@ debian/tmp/opt/trinity/lib/trinity/noatunsimple.la
 debian/tmp/opt/trinity/lib/trinity/noatunsimple.so
 debian/tmp/opt/trinity/lib/libartseffects.la
 debian/tmp/opt/trinity/lib/libartseffects.so
-debian/tmp/opt/trinity/lib/libkdeinit_noatun.so
+debian/tmp/opt/trinity/lib/libtdeinit_noatun.so
 debian/tmp/opt/trinity/lib/libnoatun.so.1
 debian/tmp/opt/trinity/lib/libnoatun.so.1.2.0
 debian/tmp/opt/trinity/lib/libnoatunarts.la
diff --git a/debian/squeeze/tdemultimedia/debian/noatun-trinity.lintian b/debian/squeeze/tdemultimedia/debian/noatun-trinity.lintian
index 2dba45ea5..89faa71aa 100644
--- a/debian/squeeze/tdemultimedia/debian/noatun-trinity.lintian
+++ b/debian/squeeze/tdemultimedia/debian/noatun-trinity.lintian
@@ -1,4 +1,4 @@
 noatun: shlib-missing-in-control-file libwinskinvis.so opt/trinity/lib/libwinskinvis.so
 noatun: shlib-missing-in-control-file libartseffects.so opt/trinity/lib/libartseffects.so
 noatun: shlib-missing-in-control-file libnoatunarts.so opt/trinity/lib/libnoatunarts.so
-noatun: shlib-missing-in-control-file libkdeinit_noatun.so opt/trinity/lib/libkdeinit_noatun.so
+noatun: shlib-missing-in-control-file libtdeinit_noatun.so opt/trinity/lib/libtdeinit_noatun.so
diff --git a/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install
index 343efda6f..a6b4265bd 100644
--- a/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install
+++ b/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install
@@ -151,10 +151,10 @@ debian/tmp/opt/trinity/lib/libaudiocdplugins.la
 debian/tmp/opt/trinity/lib/libaudiocdplugins.so
 debian/tmp/opt/trinity/lib/libkcddb.la
 debian/tmp/opt/trinity/lib/libkcddb.so
-debian/tmp/opt/trinity/lib/libkdeinit_kmix.la
-debian/tmp/opt/trinity/lib/libkdeinit_kmixctrl.la
-debian/tmp/opt/trinity/lib/libkdeinit_krec.la
-debian/tmp/opt/trinity/lib/libkdeinit_noatun.la
+debian/tmp/opt/trinity/lib/libtdeinit_kmix.la
+debian/tmp/opt/trinity/lib/libtdeinit_kmixctrl.la
+debian/tmp/opt/trinity/lib/libtdeinit_krec.la
+debian/tmp/opt/trinity/lib/libtdeinit_noatun.la
 debian/tmp/opt/trinity/lib/libkmidlib.la
 debian/tmp/opt/trinity/lib/libkmidlib.so
 debian/tmp/opt/trinity/lib/libmpeg.la
diff --git a/debian/squeeze/tdenetwork/debian/kdict-trinity.install b/debian/squeeze/tdenetwork/debian/kdict-trinity.install
index 24d312686..281f24270 100644
--- a/debian/squeeze/tdenetwork/debian/kdict-trinity.install
+++ b/debian/squeeze/tdenetwork/debian/kdict-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/kdict.la
 debian/tmp/opt/trinity/lib/trinity/kdict.so
 debian/tmp/opt/trinity/lib/trinity/kdict_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/kdict_panelapplet.so
-debian/tmp/opt/trinity/lib/libkdeinit_kdict.so
+debian/tmp/opt/trinity/lib/libtdeinit_kdict.so
 debian/tmp/opt/trinity/share/applications/kde/kdict.desktop
 debian/tmp/opt/trinity/share/apps/kdict/icons/crystalsvg/16x16/actions/define_clip.png
 debian/tmp/opt/trinity/share/apps/kdict/icons/crystalsvg/16x16/actions/query_erase.png
diff --git a/debian/squeeze/tdenetwork/debian/ksirc-trinity.install b/debian/squeeze/tdenetwork/debian/ksirc-trinity.install
index 30d9f29b3..3c1146978 100644
--- a/debian/squeeze/tdenetwork/debian/ksirc-trinity.install
+++ b/debian/squeeze/tdenetwork/debian/ksirc-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/bin/dsirc
 debian/tmp/opt/trinity/bin/ksirc
 debian/tmp/opt/trinity/lib/trinity/ksirc.la
 debian/tmp/opt/trinity/lib/trinity/ksirc.so
-debian/tmp/opt/trinity/lib/libkdeinit_ksirc.so
+debian/tmp/opt/trinity/lib/libtdeinit_ksirc.so
 debian/tmp/opt/trinity/share/applications/kde/ksirc.desktop
 debian/tmp/opt/trinity/share/apps/ksirc/autodcc.pl
 debian/tmp/opt/trinity/share/apps/ksirc/eventsrc
diff --git a/debian/squeeze/tdenetwork/debian/ksirc-trinity.lintian b/debian/squeeze/tdenetwork/debian/ksirc-trinity.lintian
index d4f2f589a..265515419 100644
--- a/debian/squeeze/tdenetwork/debian/ksirc-trinity.lintian
+++ b/debian/squeeze/tdenetwork/debian/ksirc-trinity.lintian
@@ -1,3 +1,3 @@
-ksirc: no-shlibs-control-file opt/trinity/lib/libkdeinit_ksirc.so
-ksirc: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
-ksirc: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
+ksirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
+ksirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
+ksirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
diff --git a/debian/squeeze/tdenetwork/debian/tdenetwork-trinity-dev.install b/debian/squeeze/tdenetwork/debian/tdenetwork-trinity-dev.install
index eee07ec44..cc69d4cba 100644
--- a/debian/squeeze/tdenetwork/debian/tdenetwork-trinity-dev.install
+++ b/debian/squeeze/tdenetwork/debian/tdenetwork-trinity-dev.install
@@ -61,8 +61,8 @@ debian/tmp/opt/trinity/include/kde/rss/image.h
 debian/tmp/opt/trinity/include/kde/rss/librss.h
 debian/tmp/opt/trinity/include/kde/rss/loader.h
 debian/tmp/opt/trinity/include/kde/rss/textinput.h
-debian/tmp/opt/trinity/lib/libkdeinit_kdict.la
-debian/tmp/opt/trinity/lib/libkdeinit_ksirc.la
+debian/tmp/opt/trinity/lib/libtdeinit_kdict.la
+debian/tmp/opt/trinity/lib/libtdeinit_ksirc.la
 debian/tmp/opt/trinity/lib/libkopete.la
 debian/tmp/opt/trinity/lib/libkopete.so
 debian/tmp/opt/trinity/lib/libkopete_msn_shared.la
diff --git a/debian/squeeze/tdepim/debian/changelog b/debian/squeeze/tdepim/debian/changelog
index 4dac80686..24807570c 100644
--- a/debian/squeeze/tdepim/debian/changelog
+++ b/debian/squeeze/tdepim/debian/changelog
@@ -943,7 +943,7 @@ tdepim (4:3.4.3-1) unstable; urgency=low
     + Fixes a FTBFS with newer versions of g++-4.0.
   * Rename libmimelib1c2 to libmimelib1c2a due to C++ allocator changes.
   * New patch 13_mimelib_self_contained.diff:
-    + Link against libkdefakes_pic.a instead of -lkdefakes to
+    + Link against libtdefakes_pic.a instead of -ltdefakes to
       eliminate mimelib's dependency on tdelibs.
     + Fix mimelib/config.h not to require the KDE or QT headers again.
       This allows dropping the libtdepim-dev dependency from
@@ -1106,7 +1106,7 @@ tdepim (4:3.4.2-1) unstable; urgency=low
     + Rename libmimelib1a -> libmimelib1c2 in order not to break
       lurker.  Also split out libkmime2 from this package while I'm
       at it so that lurker users don't have to install tdelibs4 --
-      at least, they won't have to once I can link libkdefakes statically
+      at least, they won't have to once I can link libtdefakes statically
       into mimelib (see bug #326113).
   * Add Vietnamese debconf translation.  Closes: #312159.
   * Remove 10_korganizer_makefile.diff, which has been applied in
diff --git a/debian/squeeze/tdesdk/debian/cervisia-trinity.install b/debian/squeeze/tdesdk/debian/cervisia-trinity.install
index 8bbaccc5d..b4087e1c1 100644
--- a/debian/squeeze/tdesdk/debian/cervisia-trinity.install
+++ b/debian/squeeze/tdesdk/debian/cervisia-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/bin/cervisia
-debian/tmp/opt/trinity/lib/libkdeinit_cervisia.la
-debian/tmp/opt/trinity/lib/libkdeinit_cervisia.so
+debian/tmp/opt/trinity/lib/libtdeinit_cervisia.la
+debian/tmp/opt/trinity/lib/libtdeinit_cervisia.so
 debian/tmp/opt/trinity/lib/trinity/cervisia.la
 debian/tmp/opt/trinity/lib/trinity/cervisia.so
 debian/tmp/opt/trinity/lib/trinity/libcervisiapart.la
diff --git a/debian/squeeze/tdesdk/debian/cervisia-trinity.lintian b/debian/squeeze/tdesdk/debian/cervisia-trinity.lintian
index d7a490dae..4e79c02c5 100644
--- a/debian/squeeze/tdesdk/debian/cervisia-trinity.lintian
+++ b/debian/squeeze/tdesdk/debian/cervisia-trinity.lintian
@@ -2,8 +2,8 @@
 cervisia: script-not-executable ./usr/share/apps/kconf_update/change_colors.pl
 cervisia: script-not-executable ./usr/share/apps/kconf_update/move_repositories.pl
 
-# This is from kdeinit black magic.
-cervisia: no-shlibs-control-file opt/trinity/lib/libkdeinit_cervisia.so
-cervisia: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_cervisia.so
-cervisia: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_cervisia.so
-cervisia: package-name-doesnt-match-sonames libkdeinit-cervisia
+# This is from tdeinit black magic.
+cervisia: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
+cervisia: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia: package-name-doesnt-match-sonames libtdeinit-cervisia
diff --git a/debian/squeeze/tdesdk/debian/changelog b/debian/squeeze/tdesdk/debian/changelog
index e041b19d5..288f761e6 100644
--- a/debian/squeeze/tdesdk/debian/changelog
+++ b/debian/squeeze/tdesdk/debian/changelog
@@ -476,7 +476,7 @@ tdesdk (4:3.4.2-2.1) unstable; urgency=medium
 tdesdk (4:3.4.2-2) unstable; urgency=low
 
   * Built against libfam-dev, not libgamin-dev (closes: #326547).
-  * Updated overrides files to account for kdeinit black magic.
+  * Updated overrides files to account for tdeinit black magic.
 
  -- Ben Burton <bab@debian.org>  Sun,  4 Sep 2005 10:58:17 +1000
 
@@ -536,8 +536,8 @@ tdesdk (4:3.4.1-0ubuntu3) breezy; urgency=low
 
 tdesdk (4:3.4.1-0ubuntu2) breezy; urgency=low
 
-  * Add libkdeinit_cvsservice.so to libcvsservice0.install
-  * Add cervisia.so and libkdeinit_cervisia.so to cervisia.install
+  * Add libtdeinit_cvsservice.so to libcvsservice0.install
+  * Add cervisia.so and libtdeinit_cervisia.so to cervisia.install
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu,  2 Jun 2005 01:33:59 +0000
 
diff --git a/debian/squeeze/tdesdk/debian/desktop-i18n/findfiles b/debian/squeeze/tdesdk/debian/desktop-i18n/findfiles
index 397948556..62e5012c2 100644
--- a/debian/squeeze/tdesdk/debian/desktop-i18n/findfiles
+++ b/debian/squeeze/tdesdk/debian/desktop-i18n/findfiles
@@ -28,7 +28,7 @@ find ./kimgio -name \*.kimgio -print 2>/dev/null | grep -v debian >> $filelist
 find ./noatun -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
 find ./noatun-plugins -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
 find ./amor/data -name \*rc -print 2>/dev/null | grep -v debian >> $filelist
-find ./kdeprint -name \*.print -print 2>/dev/null | grep -v debian >> $filelist 
+find ./tdeprint -name \*.print -print 2>/dev/null | grep -v debian >> $filelist 
 find . -name \*.kksrc -print 2>/dev/null | grep -v debian >> $filelist
 find ./kopete -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
 find . -name \*.kdevtemplate -print 2>/dev/null | grep -v debian >> $filelist
diff --git a/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install b/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install
index ee6134374..ac87e6efb 100644
--- a/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install
+++ b/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install
@@ -3,5 +3,5 @@ debian/tmp/opt/trinity/include/kde/cvsservice_stub.h
 debian/tmp/opt/trinity/include/kde/repository_stub.h
 debian/tmp/opt/trinity/lib/libcvsservice.la
 debian/tmp/opt/trinity/lib/libcvsservice.so
-debian/tmp/opt/trinity/lib/libkdeinit_cvsaskpass.la
-debian/tmp/opt/trinity/lib/libkdeinit_cvsservice.la
+debian/tmp/opt/trinity/lib/libtdeinit_cvsaskpass.la
+debian/tmp/opt/trinity/lib/libtdeinit_cvsservice.la
diff --git a/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.install b/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.install
index c1649ddd2..6f6370493 100644
--- a/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.install
+++ b/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.install
@@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/cvsaskpass
 debian/tmp/opt/trinity/bin/cvsservice
 debian/tmp/opt/trinity/lib/libcvsservice.so.0
 debian/tmp/opt/trinity/lib/libcvsservice.so.0.0.1
-debian/tmp/opt/trinity/lib/libkdeinit_cvsaskpass.so
-debian/tmp/opt/trinity/lib/libkdeinit_cvsservice.so
+debian/tmp/opt/trinity/lib/libtdeinit_cvsaskpass.so
+debian/tmp/opt/trinity/lib/libtdeinit_cvsservice.so
 debian/tmp/opt/trinity/lib/trinity/cvsaskpass.la
 debian/tmp/opt/trinity/lib/trinity/cvsaskpass.so
 debian/tmp/opt/trinity/lib/trinity/cvsservice.la
diff --git a/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.lintian b/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.lintian
index 1430a5540..f3a4e3325 100644
--- a/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.lintian
+++ b/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.lintian
@@ -1,3 +1,3 @@
-# This is from kdeinit black magic.
-libcvsservice0: shlib-missing-in-control-file libkdeinit_cvsaskpass.so opt/trinity/lib/libkdeinit_cvsaskpass.so
-libcvsservice0: shlib-missing-in-control-file libkdeinit_cvsservice.so opt/trinity/lib/libkdeinit_cvsservice.so
+# This is from tdeinit black magic.
+libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
+libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
diff --git a/debian/squeeze/tdesdk/debian/man/kdekillall.1 b/debian/squeeze/tdesdk/debian/man/kdekillall.1
index 2a2c5c8a5..2bd5eb224 100644
--- a/debian/squeeze/tdesdk/debian/man/kdekillall.1
+++ b/debian/squeeze/tdesdk/debian/man/kdekillall.1
@@ -16,14 +16,14 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kdekillall \- kills processes started with kdeinit
+kdekillall \- kills processes started with tdeinit
 .SH SYNOPSIS
 .B kdekillall
 [ \fB\-\fP\fIsignal\fP ] \fIprocess-name\fP
 .SH DESCRIPTION
 \fBkdekillall\fP kills all processes with a particular name
-that were started through kdeinit.  Specifically, it kills all processes
-\fBkdeinit:\fP \fIprocess-name\fP.
+that were started through tdeinit.  Specifically, it kills all processes
+\fBtdeinit:\fP \fIprocess-name\fP.
 .PP
 This utility is part of the KDE Software Development Kit.
 .SH OPTIONS
diff --git a/debian/squeeze/tdetoys/debian/kweather-trinity.install b/debian/squeeze/tdetoys/debian/kweather-trinity.install
index 199f52605..ef03fcd89 100644
--- a/debian/squeeze/tdetoys/debian/kweather-trinity.install
+++ b/debian/squeeze/tdetoys/debian/kweather-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kweatherservice
 debian/tmp/opt/trinity/bin/kweatherreport
-debian/tmp/opt/trinity/lib/libkdeinit_kweatherreport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kweatherreport.la
+debian/tmp/opt/trinity/lib/libtdeinit_kweatherreport.so
+debian/tmp/opt/trinity/lib/libtdeinit_kweatherreport.la
 debian/tmp/opt/trinity/lib/trinity/kcm_weather.so
 debian/tmp/opt/trinity/lib/trinity/kcm_weather.la
 debian/tmp/opt/trinity/lib/trinity/kcm_weatherservice.so
diff --git a/debian/squeeze/tdetoys/debian/kweather-trinity.lintian b/debian/squeeze/tdetoys/debian/kweather-trinity.lintian
index e6fb3080a..b6c7e13d9 100644
--- a/debian/squeeze/tdetoys/debian/kweather-trinity.lintian
+++ b/debian/squeeze/tdetoys/debian/kweather-trinity.lintian
@@ -1,2 +1,2 @@
-kweather: no-shlibs-control-file usr/lib/trinity/libkdeinit_kweatherreport.so
-kweather: package-name-doesnt-match-sonames libkdeinit-kweatherreport
+kweather: no-shlibs-control-file usr/lib/trinity/libtdeinit_kweatherreport.so
+kweather: package-name-doesnt-match-sonames libtdeinit-kweatherreport
diff --git a/debian/squeeze/tdeutils/debian/ark-trinity-trinity.lintian b/debian/squeeze/tdeutils/debian/ark-trinity-trinity.lintian
index 7c958e5e4..2b8d3a553 100644
--- a/debian/squeeze/tdeutils/debian/ark-trinity-trinity.lintian
+++ b/debian/squeeze/tdeutils/debian/ark-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-ark: no-shlibs-control-file opt/trinity/lib/libkdeinit_ark.so
-ark: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
-ark: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
+ark: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
+ark: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
diff --git a/debian/squeeze/tdeutils/debian/ark-trinity.install b/debian/squeeze/tdeutils/debian/ark-trinity.install
index bb908c9c3..fd8123f1a 100644
--- a/debian/squeeze/tdeutils/debian/ark-trinity.install
+++ b/debian/squeeze/tdeutils/debian/ark-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/ark.la
 debian/tmp/opt/trinity/lib/trinity/ark.so
 debian/tmp/opt/trinity/lib/trinity/libarkpart.la
 debian/tmp/opt/trinity/lib/trinity/libarkpart.so
-debian/tmp/opt/trinity/lib/libkdeinit_ark.so
+debian/tmp/opt/trinity/lib/libtdeinit_ark.so
 debian/tmp/opt/trinity/share/applications/kde/ark.desktop
 debian/tmp/opt/trinity/share/apps/ark/ark_part.rc
 debian/tmp/opt/trinity/share/apps/ark/ark_part_readonly.rc
diff --git a/debian/squeeze/tdeutils/debian/kcalc-trinity-trinity.lintian b/debian/squeeze/tdeutils/debian/kcalc-trinity-trinity.lintian
index d05acaa86..075ce6c50 100644
--- a/debian/squeeze/tdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/debian/squeeze/tdeutils/debian/kcalc-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-kcalc: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcalc.so
-kcalc: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
-kcalc: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
+kcalc: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
+kcalc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
diff --git a/debian/squeeze/tdeutils/debian/kcalc-trinity.install b/debian/squeeze/tdeutils/debian/kcalc-trinity.install
index bf44a2749..b4806f5f0 100644
--- a/debian/squeeze/tdeutils/debian/kcalc-trinity.install
+++ b/debian/squeeze/tdeutils/debian/kcalc-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kcalc
 debian/tmp/opt/trinity/lib/trinity/kcalc.la
 debian/tmp/opt/trinity/lib/trinity/kcalc.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcalc.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcalc.so
 debian/tmp/opt/trinity/share/applications/kde/kcalc.desktop
 debian/tmp/opt/trinity/share/apps/kcalc/kcalcui.rc
 debian/tmp/opt/trinity/share/apps/kconf_update/kcalcrc.upd
diff --git a/debian/squeeze/tdeutils/debian/kdelirc-trinity.install b/debian/squeeze/tdeutils/debian/kdelirc-trinity.install
index 7753037cb..cf0ff5438 100644
--- a/debian/squeeze/tdeutils/debian/kdelirc-trinity.install
+++ b/debian/squeeze/tdeutils/debian/kdelirc-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/irkick.la
 debian/tmp/opt/trinity/lib/trinity/irkick.so
 debian/tmp/opt/trinity/lib/trinity/kcm_kcmlirc.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kcmlirc.so
-debian/tmp/opt/trinity/lib/libkdeinit_irkick.so
+debian/tmp/opt/trinity/lib/libtdeinit_irkick.so
 debian/tmp/opt/trinity/share/applications/kde/irkick.desktop
 debian/tmp/opt/trinity/share/applications/kde/kcmlirc.desktop
 debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/irkick.png
diff --git a/debian/squeeze/tdeutils/debian/kdelirc-trinity.lintian b/debian/squeeze/tdeutils/debian/kdelirc-trinity.lintian
index 51b260d6a..986b7f7d4 100644
--- a/debian/squeeze/tdeutils/debian/kdelirc-trinity.lintian
+++ b/debian/squeeze/tdeutils/debian/kdelirc-trinity.lintian
@@ -1,3 +1,3 @@
-kdelirc: no-shlibs-control-file opt/trinity/lib/libkdeinit_irkick.so
-kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_irkick.so
-kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_irkick.so
+kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
+kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
+kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/debian/squeeze/tdeutils/debian/kedit-trinity.install b/debian/squeeze/tdeutils/debian/kedit-trinity.install
index 0ecca6f75..9e70f971b 100644
--- a/debian/squeeze/tdeutils/debian/kedit-trinity.install
+++ b/debian/squeeze/tdeutils/debian/kedit-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kedit
 debian/tmp/opt/trinity/lib/trinity/kedit.la
 debian/tmp/opt/trinity/lib/trinity/kedit.so
-debian/tmp/opt/trinity/lib/libkdeinit_kedit.so
+debian/tmp/opt/trinity/lib/libtdeinit_kedit.so
 debian/tmp/opt/trinity/share/applications/kde/KEdit.desktop
 debian/tmp/opt/trinity/share/apps/kedit/keditui.rc
 debian/tmp/opt/trinity/share/config.kcfg/kedit.kcfg
diff --git a/debian/squeeze/tdeutils/debian/kedit-trinity.lintian b/debian/squeeze/tdeutils/debian/kedit-trinity.lintian
index 864682bca..a2a63b3ba 100644
--- a/debian/squeeze/tdeutils/debian/kedit-trinity.lintian
+++ b/debian/squeeze/tdeutils/debian/kedit-trinity.lintian
@@ -1,3 +1,3 @@
-kedit: no-shlibs-control-file opt/trinity/lib/libkdeinit_kedit.so
-kedit: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
-kedit: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
+kedit: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
+kedit: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
diff --git a/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install b/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install
index e6ba996f4..a3c425a38 100644
--- a/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install
+++ b/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install
@@ -15,10 +15,10 @@ debian/tmp/opt/trinity/include/kde/ksim/themetypes.h
 debian/tmp/opt/trinity/include/kde/kwidgetstreamer.h
 debian/tmp/opt/trinity/lib/libkcmlaptop.la
 debian/tmp/opt/trinity/lib/libkcmlaptop.so
-debian/tmp/opt/trinity/lib/libkdeinit_ark.la
-debian/tmp/opt/trinity/lib/libkdeinit_irkick.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcalc.la
-debian/tmp/opt/trinity/lib/libkdeinit_kedit.la
+debian/tmp/opt/trinity/lib/libtdeinit_ark.la
+debian/tmp/opt/trinity/lib/libtdeinit_irkick.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcalc.la
+debian/tmp/opt/trinity/lib/libtdeinit_kedit.la
 debian/tmp/opt/trinity/lib/libkmilo.la
 debian/tmp/opt/trinity/lib/libkmilo.so
 debian/tmp/opt/trinity/lib/libkregexpeditorcommon.la
diff --git a/ubuntu/maverick/applications/adept/debian/changelog b/ubuntu/maverick/applications/adept/debian/changelog
index ec12c0119..332ec5674 100644
--- a/ubuntu/maverick/applications/adept/debian/changelog
+++ b/ubuntu/maverick/applications/adept/debian/changelog
@@ -378,7 +378,7 @@ adept (2.1.2ubuntu13) feisty; urgency=low
 
   * Add kubuntu_08_no_unique_application.diff don't use a unique application,
     stops it forking which broke xauthority and means debconf can't work in X mode
-  * Add kubuntu_09_no_double_kdesu.diff stop using kdesu twice
+  * Add kubuntu_09_no_double_tdesu.diff stop using tdesu twice
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Feb 2007 12:38:42 +0000
 
@@ -674,7 +674,7 @@ ept (0.4) experimental; urgency=low
   * Easy Tag filter.
   * Ship own copies of nuvola icons.
   * Fix segfaulting extenders.
-  * Use kdesu for .desktop entries.
+  * Use tdesu for .desktop entries.
   * Fix crasher on cache reload with active tag filter.
   * Major speedup of the tag menu.
   * Improve handling of comments in sources.list editor.
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/changelog b/ubuntu/maverick/applications/amarok.cmake/debian/changelog
index e72612a70..c2bf1ae55 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/changelog
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/changelog
@@ -284,7 +284,7 @@ amarok (2:1.4.8-0ubuntu3) hardy; urgency=low
 
   [ Sarah Hobbs ]
   * Sponsored upload.  (Closes LP: #187406)
-  * Reworked patch to avoid setting absolute paths (eg /usr/bin/kdesu) 
+  * Reworked patch to avoid setting absolute paths (eg /usr/bin/tdesu) 
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 12 Mar 2008 00:50:22 +1100
 
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/install-mp3 b/ubuntu/maverick/applications/amarok.cmake/debian/install-mp3
index 7b06cbd2f..ae0663182 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/install-mp3
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/install-mp3
@@ -27,8 +27,8 @@ INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install`
 
 #is available, not installed
 if [ -z "$INSTALLED" ]; then
-  if [ -x /opt/trinity/bin/kdesu ] && [ -x /usr/bin/install-package ]; then
-    /opt/trinity/bin/kdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
+  if [ -x /opt/trinity/bin/tdesu ] && [ -x /usr/bin/install-package ]; then
+    /opt/trinity/bin/tdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
   elif [ -x /usr/bin/gksudo ] && [ -x /usr/sbin/synaptic ]; then
     gksudo "sh -c 'echo \"libxine1-ffmpeg i\"|synaptic --non-interactive --set-selections'"
   else
diff --git a/ubuntu/maverick/applications/amarok/debian/changelog b/ubuntu/maverick/applications/amarok/debian/changelog
index e72612a70..c2bf1ae55 100644
--- a/ubuntu/maverick/applications/amarok/debian/changelog
+++ b/ubuntu/maverick/applications/amarok/debian/changelog
@@ -284,7 +284,7 @@ amarok (2:1.4.8-0ubuntu3) hardy; urgency=low
 
   [ Sarah Hobbs ]
   * Sponsored upload.  (Closes LP: #187406)
-  * Reworked patch to avoid setting absolute paths (eg /usr/bin/kdesu) 
+  * Reworked patch to avoid setting absolute paths (eg /usr/bin/tdesu) 
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 12 Mar 2008 00:50:22 +1100
 
diff --git a/ubuntu/maverick/applications/amarok/debian/install-mp3 b/ubuntu/maverick/applications/amarok/debian/install-mp3
index 7b06cbd2f..ae0663182 100644
--- a/ubuntu/maverick/applications/amarok/debian/install-mp3
+++ b/ubuntu/maverick/applications/amarok/debian/install-mp3
@@ -27,8 +27,8 @@ INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install`
 
 #is available, not installed
 if [ -z "$INSTALLED" ]; then
-  if [ -x /opt/trinity/bin/kdesu ] && [ -x /usr/bin/install-package ]; then
-    /opt/trinity/bin/kdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
+  if [ -x /opt/trinity/bin/tdesu ] && [ -x /usr/bin/install-package ]; then
+    /opt/trinity/bin/tdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
   elif [ -x /usr/bin/gksudo ] && [ -x /usr/sbin/synaptic ]; then
     gksudo "sh -c 'echo \"libxine1-ffmpeg i\"|synaptic --non-interactive --set-selections'"
   else
diff --git a/ubuntu/maverick/applications/digikam/debian/changelog b/ubuntu/maverick/applications/digikam/debian/changelog
index 86611e634..4e7505827 100644
--- a/ubuntu/maverick/applications/digikam/debian/changelog
+++ b/ubuntu/maverick/applications/digikam/debian/changelog
@@ -772,7 +772,7 @@ digikam (0.7.4-5) unstable; urgency=low
     (Closes: #326786)
   * debian/rules enable DEB_CONFIGURE_USER_FLAGS
   * Renable debian/patches/visibility.diff for 0.7.4
-  * Recommends: kdeprint, konqueror
+  * Recommends: tdeprint, konqueror
 
  -- Mark Purcell <msp@debian.org>  Sat, 17 Sep 2005 22:09:19 +0100
 
diff --git a/ubuntu/maverick/applications/digikam/debian/control b/ubuntu/maverick/applications/digikam/debian/control
index a6e1f9889..c62380338 100644
--- a/ubuntu/maverick/applications/digikam/debian/control
+++ b/ubuntu/maverick/applications/digikam/debian/control
@@ -18,7 +18,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: digikam-kde3 (<< 4:3.5.13)
 Breaks: digikam-kde3 (<< 4:3.5.13)
-Recommends: kipi-plugins-trinity, kdeprint-trinity, konqueror-trinity
+Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Suggests: digikam-trinity-doc
 Description: digital photo management application for KDE [Trinity]
  An easy to use and powerful digital photo management
@@ -46,7 +46,7 @@ Section: graphics
 Replaces: showfoto-kde3 (<< 4:3.5.13)
 Breaks: showfoto-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, digikam-trinity
-Recommends: kipi-plugins-trinity, kdeprint-trinity, konqueror-trinity
+Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Description: image viewer/editor for KDE [Trinity]
  Showphoto is part of the Digikam project.
  It allows to browse your photo collection and edit them with ease.
diff --git a/ubuntu/maverick/applications/digikam/debian/control.in b/ubuntu/maverick/applications/digikam/debian/control.in
index f0c7fd2cb..6905744a8 100644
--- a/ubuntu/maverick/applications/digikam/debian/control.in
+++ b/ubuntu/maverick/applications/digikam/debian/control.in
@@ -16,7 +16,7 @@ Homepage: http://www.digikam.org
 Package: digikam-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: kipi-plugins-trinity, kdeprint-trinity, konqueror-trinity
+Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Suggests: digikam-trinity-doc
 Description: digital photo management application for KDE [Trinity]
  An easy to use and powerful digital photo management
@@ -42,7 +42,7 @@ Package: showfoto-trinity
 Architecture: any
 Section: graphics
 Depends: ${shlibs:Depends}, digikam-trinity
-Recommends: kipi-plugins-trinity, kdeprint-trinity, konqueror-trinity
+Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Description: image viewer/editor for KDE [Trinity]
  Showphoto is part of the Digikam project.
  It allows to browse your photo collection and edit them with ease.
diff --git a/ubuntu/maverick/applications/gwenview/debian/changelog b/ubuntu/maverick/applications/gwenview/debian/changelog
index 0ebf36378..25741414f 100644
--- a/ubuntu/maverick/applications/gwenview/debian/changelog
+++ b/ubuntu/maverick/applications/gwenview/debian/changelog
@@ -157,7 +157,7 @@ gwenview (1.1.8+1.2.0pre1-1) unstable; urgency=low
   * New upstream release.
     + Fixes crash when double-clicking on an image using the konqueror kpart.
       (Closes: #290097)
-    + Gwenview is now a kdeinit module - added appropriate lintian override.
+    + Gwenview is now a tdeinit module - added appropriate lintian override.
 
  -- Christopher Martin <chrsmrtn@freeshell.org>  Wed, 26 Jan 2005 09:45:17 -0500
 
diff --git a/ubuntu/maverick/applications/gwenview/debian/gwenview.lintian b/ubuntu/maverick/applications/gwenview/debian/gwenview.lintian
index 91d566d75..6fdaead63 100644
--- a/ubuntu/maverick/applications/gwenview/debian/gwenview.lintian
+++ b/ubuntu/maverick/applications/gwenview/debian/gwenview.lintian
@@ -1,3 +1,3 @@
 gwenview binary: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libgwenviewcore.so.1.0.0 opt/trinity/lib/libgwenviewcore.so
-gwenview binary: shlib-missing-in-control-file libkdeinit_gwenview.so for opt/trinity/lib/libkdeinit_gwenview.so
-gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libkdeinit-gwenview
+gwenview binary: shlib-missing-in-control-file libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
+gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-gwenview
diff --git a/ubuntu/maverick/applications/kaffeine/debian/install-codecs b/ubuntu/maverick/applications/kaffeine/debian/install-codecs
index 271285c4e..720dfcd4c 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/install-codecs
+++ b/ubuntu/maverick/applications/kaffeine/debian/install-codecs
@@ -102,7 +102,7 @@ class CodecInstallerWidget(QDialog, apt.OpProgress):
         return True
 
     def install_cache_package(self, pkg):
-        if os.system('kdesu -d \'adept_batch install ' + pkg.name + '\'') != 0:
+        if os.system('tdesu -d \'adept_batch install ' + pkg.name + '\'') != 0:
             QApplication.exit(1)
             return
 
diff --git a/ubuntu/maverick/applications/kdiff3/debian/rules b/ubuntu/maverick/applications/kdiff3/debian/rules
index 09511bd51..90b33c108 100755
--- a/ubuntu/maverick/applications/kdiff3/debian/rules
+++ b/ubuntu/maverick/applications/kdiff3/debian/rules
@@ -45,7 +45,7 @@ build: build-stamp
 build-stamp:  config.status
 	dh_testdir
 
-	$(MAKE) LDFLAGS="-lkdecore -lkdeui" LIBS=""
+	$(MAKE) LDFLAGS="-ltdecore -ltdeui" LIBS=""
 	/usr/bin/docbook-to-man debian/kdiff3.sgml > doc/en/kdiff3.1
 	touch build-stamp
 
diff --git a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch b/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
index cbd096957..2dc15fe7f 100644
--- a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
+++ b/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
@@ -2,7 +2,7 @@ diff -Nur kerry-0.2.1/kerry/src/Makefile.am kerry-0.2.1.new/kerry/src/Makefile.a
 --- kerry-0.2.1/kerry/src/Makefile.am	2006-12-05 18:28:31.000000000 +0100
 +++ kerry-0.2.1.new/kerry/src/Makefile.am	2006-12-05 18:28:53.000000000 +0100
 @@ -31,7 +31,7 @@
- kerry_la_LIBADD = -lkio -lkonq $(LIB_KDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_KABC) 
+ kerry_la_LIBADD = -lkio -lkonq $(LIB_TDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_KABC) 
  
  autostartdir = $(datadir)/autostart
 -autostart_DATA = kerry.autostart.desktop beagled.desktop
diff --git a/ubuntu/maverick/applications/kerry/debian/rules b/ubuntu/maverick/applications/kerry/debian/rules
index e3861ca8d..0d08e83f9 100755
--- a/ubuntu/maverick/applications/kerry/debian/rules
+++ b/ubuntu/maverick/applications/kerry/debian/rules
@@ -23,7 +23,7 @@ clean::
 	rm -f kerry.1
 
 binary-post-install/kerry-trinity::
-	chrpath -d debian/kerry-trinity/opt/trinity/lib/libkdeinit_kerry.so
+	chrpath -d debian/kerry-trinity/opt/trinity/lib/libtdeinit_kerry.so
 	chrpath -d debian/kerry-trinity/opt/trinity/bin/kerry
 	chrpath -d debian/kerry-trinity/opt/trinity/lib/trinity/kerry.so
 	chrpath -d debian/kerry-trinity/opt/trinity/lib/trinity/kcm_beagle.so
diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
index 5488388ad..eb8ca9a1b 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
+++ b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
@@ -34,7 +34,7 @@
  
  #include <kio/netaccess.h>
 -#define NETACCESS	KIO::NetAccess
-+// Kiosktool wants to use fish://root@localhost/... which won't work on Kubuntu because we don't run ssh by default, we don't allow ssh to do root logins and root doesn't even have a password, so implement the functions here for local copies using kdesu instead
++// Kiosktool wants to use fish://root@localhost/... which won't work on Kubuntu because we don't run ssh by default, we don't allow ssh to do root logins and root doesn't even have a password, so implement the functions here for local copies using tdesu instead
 +// #define NETACCESS	KIO::NetAccess
  
  #undef DEBUG_ENTRIES
diff --git a/ubuntu/maverick/applications/kmplayer/debian/kmplayer-trinity.install b/ubuntu/maverick/applications/kmplayer/debian/kmplayer-trinity.install
index 3c2a5f5ff..f25460f29 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/kmplayer-trinity.install
+++ b/ubuntu/maverick/applications/kmplayer/debian/kmplayer-trinity.install
@@ -1,4 +1,4 @@
-opt/trinity/lib/libkdeinit_kmplayer.so
+opt/trinity/lib/libtdeinit_kmplayer.so
 opt/trinity/lib/trinity/kmplayer.so
 opt/trinity/bin/kmplayer
 opt/trinity/bin/kxvplayer
diff --git a/ubuntu/maverick/applications/kmymoney/debian/changelog b/ubuntu/maverick/applications/kmymoney/debian/changelog
index 36986fd74..a7240314d 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/changelog
+++ b/ubuntu/maverick/applications/kmymoney/debian/changelog
@@ -246,7 +246,7 @@ kmymoney2 (0.8.4-4) unstable; urgency=low
 
 kmymoney2 (0.8.4-3) unstable; urgency=low
 
-  * export LDFLAGS=-lgwenhywfar -laqbanking -lqbanking -lkdeui
+  * export LDFLAGS=-lgwenhywfar -laqbanking -lqbanking -ltdeui
    -- Fixes: FTBFS in sid (problem with kbanking) (Closes: #373707)
 
  -- Mark Purcell <msp@debian.org>  Wed, 21 Jun 2006 16:34:03 +0100
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
index 9ae01a92b..b5316fc73 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
+++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
@@ -1,2 +1,2 @@
-network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager
-network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so
+network-manager-kde: package-name-doesnt-match-sonames libtdeinit-knetworkmanager
+network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libtdeinit_knetworkmanager.so libtdeinit_knetworkmanager.so
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides b/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
index 9ae01a92b..b5316fc73 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
@@ -1,2 +1,2 @@
-network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager
-network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so
+network-manager-kde: package-name-doesnt-match-sonames libtdeinit-knetworkmanager
+network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libtdeinit_knetworkmanager.so libtdeinit_knetworkmanager.so
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install
index a36c77eb8..4df24b77e 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install
@@ -142,7 +142,7 @@ debian/tmp/opt/trinity/lib/trinity/libchalktiffexport.la
 debian/tmp/opt/trinity/lib/trinity/libchalktiffexport.so
 debian/tmp/opt/trinity/lib/trinity/libchalktiffimport.la
 debian/tmp/opt/trinity/lib/trinity/libchalktiffimport.so
-debian/tmp/opt/trinity/lib/libkdeinit_chalk.so
+debian/tmp/opt/trinity/lib/libtdeinit_chalk.so
 debian/tmp/opt/trinity/lib/libchalk_cmyk_*.so.*
 debian/tmp/opt/trinity/lib/libchalkcolor.so.*
 debian/tmp/opt/trinity/lib/libchalkcommon.so.*
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian
index 40bb7a6ee..08adc5291 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian
@@ -1,4 +1,4 @@
-chalk: shlib-missing-in-control-file libkdeinit_chalk.so for usr/lib/libkdeinit_chalk.so
+chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so
 chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libkdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
+chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
 
diff --git a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install b/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install
index 363bf04dc..653f730e0 100644
--- a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install
@@ -45,7 +45,7 @@ debian/tmp/opt/trinity/lib/trinity/libwmfexport.so
 debian/tmp/opt/trinity/lib/trinity/libwmfimport.la
 debian/tmp/opt/trinity/lib/trinity/libwmfimport.so
 debian/tmp/opt/trinity/lib/libkarboncommon.so.*
-debian/tmp/opt/trinity/lib/libkdeinit_karbon.so
+debian/tmp/opt/trinity/lib/libtdeinit_karbon.so
 debian/tmp/opt/trinity/share/applications/kde/karbon.desktop
 debian/tmp/opt/trinity/share/apps/karbon
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/karbon_konqi.desktop
diff --git a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/karbon-trinity.lintian
index e8e11eff0..9733b0a93 100644
--- a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/karbon-trinity.lintian
@@ -1,2 +1,2 @@
-karbon: shlib-missing-in-control-file libkdeinit_karbon.so for usr/lib/libkdeinit_karbon.so
-karbon: package-name-doesnt-match-sonames libkarboncommon0 libkdeinit-karbon
+karbon: shlib-missing-in-control-file libtdeinit_karbon.so for usr/lib/libtdeinit_karbon.so
+karbon: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install b/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install
index 095261d9f..443a6acbf 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install
@@ -21,7 +21,7 @@ debian/tmp/opt/trinity/lib/trinity/libkchartxpmexport.so
 debian/tmp/opt/trinity/lib/libkchartcommon.so.*
 debian/tmp/opt/trinity/lib/libkchartimageexport.so.*
 debian/tmp/opt/trinity/lib/libkdchart.*
-debian/tmp/opt/trinity/lib/libkdeinit_kchart.so
+debian/tmp/opt/trinity/lib/libtdeinit_kchart.so
 debian/tmp/opt/trinity/share/applications/kde/kchart.desktop
 debian/tmp/opt/trinity/share/apps/kchart
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kchart_konqi.desktop
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian
index 1c399d1f3..4a9df9c9e 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian
@@ -1,5 +1,5 @@
 # There is no -dev package.
 kchart: non-dev-pkg-with-shlib-symlink usr/lib/libkdchart.so.0.0.0 usr/lib/libkdchart.so
-kchart: shlib-missing-in-control-file libkdeinit_kchart.so for usr/lib/libkdeinit_kchart.so
-kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libkdeinit-kchart
+kchart: shlib-missing-in-control-file libtdeinit_kchart.so for usr/lib/libtdeinit_kchart.so
+kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-kchart
 
diff --git a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install b/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install
index fc645134d..a0b259950 100644
--- a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install
@@ -46,7 +46,7 @@ debian/tmp/opt/trinity/lib/trinity/krosskexiapp.la
 debian/tmp/opt/trinity/lib/trinity/krosskexiapp.so
 debian/tmp/opt/trinity/lib/trinity/krosskexidb.la
 debian/tmp/opt/trinity/lib/trinity/krosskexidb.so
-debian/tmp/opt/trinity/lib/libkdeinit_kexi.so
+debian/tmp/opt/trinity/lib/libtdeinit_kexi.so
 debian/tmp/opt/trinity/lib/libkexicore.so.*
 debian/tmp/opt/trinity/lib/libkexidatatable.so.*
 debian/tmp/opt/trinity/lib/libkexidbparser.so.*
diff --git a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kexi-trinity.lintian
index d1dfd14c2..5288fb87d 100644
--- a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kexi-trinity.lintian
@@ -1,4 +1,4 @@
-kexi: shlib-missing-in-control-file libkdeinit_kexi.so for usr/lib/libkdeinit_kexi.so
+kexi: shlib-missing-in-control-file libtdeinit_kexi.so for usr/lib/libtdeinit_kexi.so
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/importxhtml/ImportXHTML.py
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/readme.html
@@ -11,4 +11,4 @@ kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/Copy
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/kross/python/kexiapp/__init__.py
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/exportxhtml/ExportXHTML.rc
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenter.py
-kexi: package-name-doesnt-match-sonames libkdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
+kexi: package-name-doesnt-match-sonames libtdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install b/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install
index d9ba60a08..7c09d82a4 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/lib/trinity/libkformulapart.la
 debian/tmp/opt/trinity/lib/trinity/libkformulapart.so
 debian/tmp/opt/trinity/lib/trinity/libkfosvgexport.la
 debian/tmp/opt/trinity/lib/trinity/libkfosvgexport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kformula.so
+debian/tmp/opt/trinity/lib/libtdeinit_kformula.so
 debian/tmp/opt/trinity/share/applications/kde/kformula.desktop
 debian/tmp/opt/trinity/share/apps/kformula
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kformula_konqi.desktop
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kformula-trinity.lintian
index 1224a3094..1062b39db 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kformula-trinity.lintian
@@ -1,4 +1,4 @@
-kformula: no-shlibs-control-file usr/lib/libkdeinit_kformula.so
-kformula: postinst-must-call-ldconfig usr/lib/libkdeinit_kformula.so
-kformula: postrm-should-call-ldconfig usr/lib/libkdeinit_kformula.so
-kformula: package-name-doesnt-match-sonames libkdeinit-kformula
+kformula: no-shlibs-control-file usr/lib/libtdeinit_kformula.so
+kformula: postinst-must-call-ldconfig usr/lib/libtdeinit_kformula.so
+kformula: postrm-should-call-ldconfig usr/lib/libtdeinit_kformula.so
+kformula: package-name-doesnt-match-sonames libtdeinit-kformula
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.install b/ubuntu/maverick/applications/koffice/debian/kivio-trinity.install
index 510c85320..289580d09 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kivio-trinity.install
@@ -17,5 +17,5 @@ debian/tmp/opt/trinity/lib/trinity/libkiviozoomtool.la
 debian/tmp/opt/trinity/lib/trinity/libkiviozoomtool.so
 debian/tmp/opt/trinity/lib/trinity/straight_connector.la
 debian/tmp/opt/trinity/lib/trinity/straight_connector.so
-debian/tmp/opt/trinity/lib/libkdeinit_kivio.so
+debian/tmp/opt/trinity/lib/libtdeinit_kivio.so
 debian/tmp/opt/trinity/lib/libkiviocommon.so.*
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kivio-trinity.lintian
index 2d8cfc583..02a07173b 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kivio-trinity.lintian
@@ -1,4 +1,4 @@
-kivio: shlib-missing-in-control-file libkdeinit_kivio.so for usr/lib/libkdeinit_kivio.so
+kivio: shlib-missing-in-control-file libtdeinit_kivio.so for usr/lib/libtdeinit_kivio.so
 kivio: menu-icon-missing /usr/share/pixmaps/kivio.xpm
-kivio: package-name-doesnt-match-sonames libkdeinit-kivio libkiviocommon0
+kivio: package-name-doesnt-match-sonames libtdeinit-kivio libkiviocommon0
 
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install b/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install
index c65cbd3d3..936153c99 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install
@@ -5,20 +5,20 @@ debian/tmp/opt/trinity/lib/libkchartcommon.la
 debian/tmp/opt/trinity/lib/libkchartcommon.so
 debian/tmp/opt/trinity/lib/libkchartimageexport.la
 debian/tmp/opt/trinity/lib/libkchartimageexport.so
-debian/tmp/opt/trinity/lib/libkdeinit_karbon.la
-debian/tmp/opt/trinity/lib/libkdeinit_kchart.la
-debian/tmp/opt/trinity/lib/libkdeinit_kexi.la
-debian/tmp/opt/trinity/lib/libkdeinit_kformula.la
-debian/tmp/opt/trinity/lib/libkdeinit_kivio.la
-debian/tmp/opt/trinity/lib/libkdeinit_koshell.la
-debian/tmp/opt/trinity/lib/libkdeinit_kplato.la
-debian/tmp/opt/trinity/lib/libkdeinit_kpresenter.la
-debian/tmp/opt/trinity/lib/libkdeinit_chalk.la
-debian/tmp/opt/trinity/lib/libkdeinit_kspread.la
-debian/tmp/opt/trinity/lib/libkdeinit_kthesaurus.la
-debian/tmp/opt/trinity/lib/libkdeinit_kudesigner.la
-debian/tmp/opt/trinity/lib/libkdeinit_kugar.la
-debian/tmp/opt/trinity/lib/libkdeinit_kword.la
+debian/tmp/opt/trinity/lib/libtdeinit_karbon.la
+debian/tmp/opt/trinity/lib/libtdeinit_kchart.la
+debian/tmp/opt/trinity/lib/libtdeinit_kexi.la
+debian/tmp/opt/trinity/lib/libtdeinit_kformula.la
+debian/tmp/opt/trinity/lib/libtdeinit_kivio.la
+debian/tmp/opt/trinity/lib/libtdeinit_koshell.la
+debian/tmp/opt/trinity/lib/libtdeinit_kplato.la
+debian/tmp/opt/trinity/lib/libtdeinit_kpresenter.la
+debian/tmp/opt/trinity/lib/libtdeinit_chalk.la
+debian/tmp/opt/trinity/lib/libtdeinit_kspread.la
+debian/tmp/opt/trinity/lib/libtdeinit_kthesaurus.la
+debian/tmp/opt/trinity/lib/libtdeinit_kudesigner.la
+debian/tmp/opt/trinity/lib/libtdeinit_kugar.la
+debian/tmp/opt/trinity/lib/libtdeinit_kword.la
 debian/tmp/opt/trinity/lib/libkexicore.la
 debian/tmp/opt/trinity/lib/libkexicore.so
 debian/tmp/opt/trinity/lib/libkexidatatable.la
diff --git a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install b/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install
index fc8fbb841..c0399020b 100644
--- a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install
@@ -2,7 +2,7 @@ debian/koshell.xpm opt/trinity/share/pixmaps
 debian/tmp/opt/trinity/bin/koshell
 debian/tmp/opt/trinity/lib/trinity/koshell.la
 debian/tmp/opt/trinity/lib/trinity/koshell.so
-debian/tmp/opt/trinity/lib/libkdeinit_koshell.so
+debian/tmp/opt/trinity/lib/libtdeinit_koshell.so
 debian/tmp/opt/trinity/share/applications/kde/koshell.desktop
 debian/tmp/opt/trinity/share/apps/koshell/koshellui.rc
 debian/tmp/opt/trinity/share/config.kcfg/koshell.kcfg
diff --git a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/koshell-trinity.lintian
index e410a8d00..45d130a4e 100644
--- a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/koshell-trinity.lintian
@@ -1,4 +1,4 @@
-koshell: no-shlibs-control-file usr/lib/libkdeinit_koshell.so
-koshell: postinst-must-call-ldconfig usr/lib/libkdeinit_koshell.so
-koshell: postrm-should-call-ldconfig usr/lib/libkdeinit_koshell.so
-koshell: package-name-doesnt-match-sonames libkdeinit-koshell
+koshell: no-shlibs-control-file usr/lib/libtdeinit_koshell.so
+koshell: postinst-must-call-ldconfig usr/lib/libtdeinit_koshell.so
+koshell: postrm-should-call-ldconfig usr/lib/libtdeinit_koshell.so
+koshell: package-name-doesnt-match-sonames libtdeinit-koshell
diff --git a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
index df01154f4..d9667f9c6 100644
--- a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/kplato.la
 debian/tmp/opt/trinity/lib/trinity/kplato.so
 debian/tmp/opt/trinity/lib/trinity/libkplatopart.la
 debian/tmp/opt/trinity/lib/trinity/libkplatopart.so
-debian/tmp/opt/trinity/lib/libkdeinit_kplato.so
+debian/tmp/opt/trinity/lib/libtdeinit_kplato.so
 debian/tmp/opt/trinity/share/applications/kde/kplato.desktop
 debian/tmp/opt/trinity/share/apps/kplato/icons/crystalsvg/22x22/actions/accounts.png
 debian/tmp/opt/trinity/share/apps/kplato/icons/crystalsvg/22x22/actions/add_milestone.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.lintian
index 62e4d82ea..f08eafe73 100644
--- a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.lintian
@@ -1,4 +1,4 @@
-kplato: no-shlibs-control-file usr/lib/libkdeinit_kplato.so
-kplato: postinst-must-call-ldconfig usr/lib/libkdeinit_kplato.so
-kplato: postrm-should-call-ldconfig usr/lib/libkdeinit_kplato.so
-kplato: package-name-doesnt-match-sonames libkdeinit-kplato
+kplato: no-shlibs-control-file usr/lib/libtdeinit_kplato.so
+kplato: postinst-must-call-ldconfig usr/lib/libtdeinit_kplato.so
+kplato: postrm-should-call-ldconfig usr/lib/libtdeinit_kplato.so
+kplato: package-name-doesnt-match-sonames libtdeinit-kplato
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.install b/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.install
index fc90edce6..5aada1cab 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.install
@@ -24,6 +24,6 @@ debian/tmp/opt/trinity/lib/trinity/libooimpressexport.la
 debian/tmp/opt/trinity/lib/trinity/libooimpressexport.so
 debian/tmp/opt/trinity/lib/trinity/libooimpressimport.la
 debian/tmp/opt/trinity/lib/trinity/libooimpressimport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kpresenter.so
+debian/tmp/opt/trinity/lib/libtdeinit_kpresenter.so
 debian/tmp/opt/trinity/lib/libkpresenterimageexport.so.*
 debian/tmp/opt/trinity/lib/libkpresenterprivate.so.*
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.lintian
index d038ca914..6e7af5591 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.lintian
@@ -1,4 +1,4 @@
 kpresenter: script-with-language-extension usr/bin/kprconverter.pl
-kpresenter: shlib-missing-in-control-file libkdeinit_kpresenter.so for usr/lib/libkdeinit_kpresenter.so
+kpresenter: shlib-missing-in-control-file libtdeinit_kpresenter.so for usr/lib/libtdeinit_kpresenter.so
 kpresenter: menu-icon-missing /usr/share/pixmaps/kpresenter.xpm
-kpresenter: package-name-doesnt-match-sonames libkdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
+kpresenter: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install b/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install
index 9b1251bf2..6a7228fd3 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install
@@ -36,7 +36,7 @@ debian/tmp/opt/trinity/lib/trinity/libopencalcimport.la
 debian/tmp/opt/trinity/lib/trinity/libopencalcimport.so
 debian/tmp/opt/trinity/lib/trinity/libqproimport.la
 debian/tmp/opt/trinity/lib/trinity/libqproimport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kspread.so
+debian/tmp/opt/trinity/lib/libtdeinit_kspread.so
 debian/tmp/opt/trinity/lib/libkspreadcommon.so.*
 debian/tmp/opt/trinity/share/applications/kde/kspread.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kspread_konqi.desktop
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian
index 6c23d706d..b47c3a364 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian
@@ -1,7 +1,7 @@
-kspread: shlib-missing-in-control-file libkdeinit_kspread.so for usr/lib/libkdeinit_kspread.so
+kspread: shlib-missing-in-control-file libtdeinit_kspread.so for usr/lib/libtdeinit_kspread.so
 kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/scripteditor/ScriptEditor.rc
 kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/exporthtml/ExportHtml.rc
 kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/exporthtml/ExportHtml.py
 kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/scripteditor/ScriptEditor.py
-kspread: package-name-doesnt-match-sonames libkdeinit-kspread libkspreadcommon0
+kspread: package-name-doesnt-match-sonames libtdeinit-kspread libkspreadcommon0
 
diff --git a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install b/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install
index d115bcf4b..d0e29dd5c 100644
--- a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/kthesaurus
 debian/tmp/opt/trinity/lib/trinity/kthesaurus.*
 debian/tmp/opt/trinity/lib/trinity/libthesaurustool.la
 debian/tmp/opt/trinity/lib/trinity/libthesaurustool.so
-debian/tmp/opt/trinity/lib/libkdeinit_kthesaurus.so
+debian/tmp/opt/trinity/lib/libtdeinit_kthesaurus.so
 debian/tmp/opt/trinity/share/applnk/Office/KThesaurus.desktop
 debian/tmp/opt/trinity/share/apps/thesaurus
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/thesaurus/*.bz2
diff --git a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.lintian
index b32d255df..7d7018a77 100644
--- a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.lintian
@@ -1,5 +1,5 @@
-kthesaurus: no-shlibs-control-file usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: postinst-must-call-ldconfig usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: postrm-should-call-ldconfig usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: package-name-doesnt-match-sonames libkdeinit-kthesaurus
+kthesaurus: no-shlibs-control-file usr/lib/libtdeinit_kthesaurus.so
+kthesaurus: postinst-must-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
+kthesaurus: postrm-should-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
+kthesaurus: package-name-doesnt-match-sonames libtdeinit-kthesaurus
 
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install b/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install
index 62c8c369f..c12230725 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install
@@ -11,8 +11,8 @@ debian/tmp/opt/trinity/lib/trinity/libkugarnopimport.la
 debian/tmp/opt/trinity/lib/trinity/libkugarnopimport.so
 debian/tmp/opt/trinity/lib/trinity/libkugarpart.la
 debian/tmp/opt/trinity/lib/trinity/libkugarpart.so
-debian/tmp/opt/trinity/lib/libkdeinit_kudesigner.so
-debian/tmp/opt/trinity/lib/libkdeinit_kugar.so
+debian/tmp/opt/trinity/lib/libtdeinit_kudesigner.so
+debian/tmp/opt/trinity/lib/libtdeinit_kugar.so
 debian/tmp/opt/trinity/lib/libkudesignercore.la
 debian/tmp/opt/trinity/lib/libkudesignercore.so
 debian/tmp/opt/trinity/lib/libkugarlib.so.*
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kugar-trinity.lintian
index e06755739..5b8ec0d77 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kugar-trinity.lintian
@@ -1,4 +1,4 @@
-kugar: shlib-missing-in-control-file libkdeinit_kudesigner.so for usr/lib/libkdeinit_kudesigner.so
-kugar: shlib-missing-in-control-file libkdeinit_kugar.so for usr/lib/libkdeinit_kugar.so
+kugar: shlib-missing-in-control-file libtdeinit_kudesigner.so for usr/lib/libtdeinit_kudesigner.so
+kugar: shlib-missing-in-control-file libtdeinit_kugar.so for usr/lib/libtdeinit_kugar.so
 kugar: shlib-missing-in-control-file libkudesignercore.so for usr/lib/libkudesignercore.so
-kugar: package-name-doesnt-match-sonames libkdeinit-kudesigner libkdeinit-kugar libkudesignercore libkugarlib1
+kugar: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-kugar libkudesignercore libkugarlib1
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-trinity.install b/ubuntu/maverick/applications/koffice/debian/kword-trinity.install
index d003812cd..7f3f2f954 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kword-trinity.install
@@ -67,5 +67,5 @@ debian/tmp/opt/trinity/lib/trinity/libwpexport.la
 debian/tmp/opt/trinity/lib/trinity/libwpexport.so
 debian/tmp/opt/trinity/lib/trinity/libwpimport.la
 debian/tmp/opt/trinity/lib/trinity/libwpimport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kword.so
+debian/tmp/opt/trinity/lib/libtdeinit_kword.so
 debian/tmp/opt/trinity/lib/libkwordprivate.so.*
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kword-trinity.lintian
index e18dbe8b2..5d08d84ca 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kword-trinity.lintian
@@ -1,4 +1,4 @@
-kword: shlib-missing-in-control-file libkdeinit_kword.so for usr/lib/libkdeinit_kword.so
+kword: shlib-missing-in-control-file libtdeinit_kword.so for usr/lib/libtdeinit_kword.so
 kword: menu-icon-missing /usr/share/pixmaps/kword.xpm
-kword: package-name-doesnt-match-sonames libkdeinit-kword libkwordprivate4
+kword: package-name-doesnt-match-sonames libtdeinit-kword libkwordprivate4
 
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.linda b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
index 4d9818595..ff5153632 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
@@ -1,4 +1,4 @@
 Tag: lib-not-in-shlibs
 
 Tag: no-shlib-file
-Data: /usr/trinity/lib/libkdeinit_*.so
+Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
index 1f650ceb8..edff50852 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libkdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
 
diff --git a/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.linda b/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.linda
index 4d9818595..ff5153632 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.linda
+++ b/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.linda
@@ -1,4 +1,4 @@
 Tag: lib-not-in-shlibs
 
 Tag: no-shlib-file
-Data: /usr/trinity/lib/libkdeinit_*.so
+Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.lintian b/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.lintian
index 1f650ceb8..edff50852 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.lintian
+++ b/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libkdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
 
diff --git a/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides b/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides
index 74c03c669..62bf48233 100644
--- a/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides
+++ b/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides
@@ -1,2 +1,2 @@
-# package depends on tdebase-bin, which provides kdesu
-krusader-trinity: menu-command-not-in-package /usr/share/menu/krusader:17 kdesu
+# package depends on tdebase-bin, which provides tdesu
+krusader-trinity: menu-command-not-in-package /usr/share/menu/krusader:17 tdesu
diff --git a/ubuntu/maverick/applications/krusader/debian/menu b/ubuntu/maverick/applications/krusader/debian/menu
index 92d07892f..759ac536f 100644
--- a/ubuntu/maverick/applications/krusader/debian/menu
+++ b/ubuntu/maverick/applications/krusader/debian/menu
@@ -14,4 +14,4 @@
 	title="krusader - root-mode (File Manager)"\
 	icon32x32="/usr/share/pixmaps/krusader_root.xpm"\
 	icon16x16="/usr/share/pixmaps/krusader_root-16.xpm"\
-	command="kdesu -c /opt/trinity/bin/krusader"
+	command="tdesu -c /opt/trinity/bin/krusader"
diff --git a/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.lintian b/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.lintian
index dd274dba5..89f453cea 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.lintian
+++ b/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.lintian
@@ -1,4 +1,4 @@
-kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow-trinity: package-name-doesnt-match-sonames libkdeinit-kuickshow
+kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow
diff --git a/ubuntu/maverick/applications/tdesudo/debian/links b/ubuntu/maverick/applications/tdesudo/debian/links
index 0482e1e4f..faf8013c3 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/links
+++ b/ubuntu/maverick/applications/tdesudo/debian/links
@@ -1 +1 @@
-opt/trinity/bin/tdesudo opt/trinity/bin/kdesu 
+opt/trinity/bin/tdesudo opt/trinity/bin/tdesu 
diff --git a/ubuntu/maverick/applications/tdesudo/debian/postinst b/ubuntu/maverick/applications/tdesudo/debian/postinst
index b0100d96c..9164f9d4a 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/postinst
+++ b/ubuntu/maverick/applications/tdesudo/debian/postinst
@@ -12,7 +12,7 @@ fi
 case "$1" in
   configure)
 	dpkg-divert --package $package_name --rename --remove \
-                /usr/trinity/bin/kdesu || true
+                /usr/trinity/bin/tdesu || true
     ;;
   abort-upgrade)
     ;;
diff --git a/ubuntu/maverick/applications/tdesudo/debian/postrm b/ubuntu/maverick/applications/tdesudo/debian/postrm
index a5b54ebf1..dfab37030 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/postrm
+++ b/ubuntu/maverick/applications/tdesudo/debian/postrm
@@ -12,7 +12,7 @@ fi
 case "$1" in
   remove)
     dpkg-divert --package $package_name --rename --remove \
-                /opt/trinity/bin/kdesu
+                /opt/trinity/bin/tdesu
     ;;
   purge)
     ;;
diff --git a/ubuntu/maverick/applications/tdesudo/debian/preinst b/ubuntu/maverick/applications/tdesudo/debian/preinst
index fe6a85b58..a13492559 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/preinst
+++ b/ubuntu/maverick/applications/tdesudo/debian/preinst
@@ -12,13 +12,13 @@ fi
 case "$1" in
   install)
     dpkg-divert --package $package_name \
-    --divert /opt/trinity/bin/kdesu.distrib \
-    --rename /opt/trinity/bin/kdesu
+    --divert /opt/trinity/bin/tdesu.distrib \
+    --rename /opt/trinity/bin/tdesu
     ;;
   upgrade)
     dpkg-divert --package $package_name \
-    --divert /opt/trinity/bin/kdesu.distrib \
-    --rename /opt/trinity/bin/kdesu
+    --divert /opt/trinity/bin/tdesu.distrib \
+    --rename /opt/trinity/bin/tdesu
     ;;
   abort-upgrade)
     ;;
diff --git a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu b/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu
index dc43a7b0f..e30b43ad8 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu
@@ -5,6 +5,6 @@
         icon32x32="/usr/share/pixmaps/wlassistant.xpm"\
         icon16x16="/usr/share/pixmaps/wlassistant-16.xpm"\
         title="wlassistant"\
-        command="/opt/trinity/bin/kdesu -X -c /opt/trinity/bin/wlassistant"
+        command="/opt/trinity/bin/tdesu -X -c /opt/trinity/bin/wlassistant"
 
 
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install
index 3c15273ee..608149acc 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install
@@ -179,8 +179,8 @@ debian/tmp/opt/trinity/include/kde/kviewshell/zoomlimits.h
 debian/tmp/opt/trinity/include/kde/libtext2path-0.1/BezierPath.h
 debian/tmp/opt/trinity/include/kde/libtext2path-0.1/Glyph.h
 debian/tmp/opt/trinity/include/kde/libtext2path-0.1/GlyphTracer.h
-debian/tmp/opt/trinity/lib/libkdeinit_kview.la
-debian/tmp/opt/trinity/lib/libkdeinit_mrmlsearch.la
+debian/tmp/opt/trinity/lib/libtdeinit_kview.la
+debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.la
 debian/tmp/opt/trinity/lib/libkghostviewlib.la
 debian/tmp/opt/trinity/lib/libkghostviewlib.so
 debian/tmp/opt/trinity/lib/libkimageviewer.la
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.install
index 99491c4e7..bdbbef7c6 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.install
@@ -9,7 +9,7 @@ debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.la
 debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.so
 debian/tmp/opt/trinity/lib/trinity/mrmlsearch.la
 debian/tmp/opt/trinity/lib/trinity/mrmlsearch.so
-debian/tmp/opt/trinity/lib/libkdeinit_mrmlsearch.so
+debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.so
 debian/tmp/opt/trinity/share/applications/kde/kcmkmrml.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/mrml-servicemenu.desktop
 debian/tmp/opt/trinity/share/mimelnk/text/mrml.desktop
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.lintian b/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.lintian
index 5c83f447b..e3a5ddb8a 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.lintian
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.lintian
@@ -1,4 +1,4 @@
-kmrml: no-shlibs-control-file opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: package-name-doesnt-match-sonames libkdeinit-mrmlsearch
+kmrml: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml: package-name-doesnt-match-sonames libtdeinit-mrmlsearch
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.install
index 07929cfa2..d9ef57977 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kuickshow
 debian/tmp/opt/trinity/lib/trinity/kuickshow.la
 debian/tmp/opt/trinity/lib/trinity/kuickshow.so
-debian/tmp/opt/trinity/lib/libkdeinit_kuickshow.so
+debian/tmp/opt/trinity/lib/libtdeinit_kuickshow.so
 debian/tmp/opt/trinity/share/applications/kde/kuickshow.desktop
 debian/tmp/opt/trinity/share/apps/kuickshow/im_palette.pal
 debian/tmp/opt/trinity/share/apps/kuickshow/pics/about.png
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.lintian b/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.lintian
index 61cb450ac..4551b5f0c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.lintian
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.lintian
@@ -1,4 +1,4 @@
-kuickshow: no-shlibs-control-file opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: package-name-doesnt-match-sonames libkdeinit-kuickshow
+kuickshow: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow: package-name-doesnt-match-sonames libtdeinit-kuickshow
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.install
index 0efbbd7b5..ca570ad61 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.install
@@ -21,7 +21,7 @@ debian/tmp/opt/trinity/lib/trinity/libkviewcanvas.la
 debian/tmp/opt/trinity/lib/trinity/libkviewcanvas.so
 debian/tmp/opt/trinity/lib/trinity/libkviewviewer.la
 debian/tmp/opt/trinity/lib/trinity/libkviewviewer.so
-debian/tmp/opt/trinity/lib/libkdeinit_kview.so
+debian/tmp/opt/trinity/lib/libtdeinit_kview.so
 debian/tmp/opt/trinity/lib/libkimageviewer.so.0
 debian/tmp/opt/trinity/lib/libkimageviewer.so.0.0.0
 debian/tmp/opt/trinity/lib/trinity/libphotobook.la
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.lintian b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.lintian
index 8314a8155..b81a18ccc 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.lintian
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.lintian
@@ -1,3 +1,3 @@
 kview: shlib-missing-in-control-file libphotobook.so opt/trinity/lib/libphotobook.so
-kview: shlib-missing-in-control-file libkdeinit_kview.so opt/trinity/lib/libkdeinit_kview.so
-kview: package-name-doesnt-match-sonames libkdeinit-kview libkimageviewer0
+kview: shlib-missing-in-control-file libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so
+kview: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/rules b/ubuntu/maverick/kdegraphics.automake/debian/rules
index dc67d38f0..75fb0ff6e 100755
--- a/ubuntu/maverick/kdegraphics.automake/debian/rules
+++ b/ubuntu/maverick/kdegraphics.automake/debian/rules
@@ -28,7 +28,7 @@ DEB_DH_MAKESHLIBS_ARGS_libkscan1-trinity	:= -V'libkscan1-trinity (>= 4:3.5.5-1)'
 
 binary-post-install/kuickshow-trinity::
 ifeq ($(DEB_HOST_ARCH), powerpc)
-	chrpath -d -k debian/kuickshow-trinity/opt/trinity/lib/libkdeinit_kuickshow.so
+	chrpath -d -k debian/kuickshow-trinity/opt/trinity/lib/libtdeinit_kuickshow.so
 endif
 
 #shlibs_ver = 4:3.5.0-1
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/man/kdeopt.part b/ubuntu/maverick/kdevelop.cmake/debian/man/kdeopt.part
index d258f0ad1..e8fd346a6 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/man/kdeopt.part
+++ b/ubuntu/maverick/kdevelop.cmake/debian/man/kdeopt.part
@@ -1,5 +1,5 @@
 .\" This portion of the manual page is from kdeopt.man, from the
-.\" kdepim Debian package.
+.\" tdepim Debian package.
 .SH GENERIC OPTIONS
 .TP
 .B \-\-help
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/changelog b/ubuntu/maverick/libraries/kipi-plugins/debian/changelog
index d9e80a9a4..0ba259e3b 100755
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/changelog
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/changelog
@@ -297,7 +297,7 @@ kipi-plugins (0.1.1-1) unstable; urgency=low
   * New upstream release
     - Delete: debian/patches/13_10_pull_from_upstreamsvn_from_r460242.diff
   * Add debian/rules print-version & get-orig-source targets
-  * Recommends: kdeprint
+  * Recommends: tdeprint
   * Build-Depends: libmagick9++-dev | libmagick++-dev
   * Relibtoolize from /pkg-kde/trunk/common-patches/ for 3.5.2
       + patches/02_autotools_update.diff
@@ -375,7 +375,7 @@ kipi-plugins (0.1+rc1-1) unstable; urgency=low
   [ Mark Purcell ]
   * Bump Suggests: to Recommends: these would be found together in all but
   unusual situations
-    - kdeprinter - PrintWizard
+    - tdeprinter - PrintWizard
     - kmail - SendImages
     - sane-utils - AcquireImages
     - k3b - CdArchiving
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/control b/ubuntu/maverick/libraries/kipi-plugins/debian/control
index 7a396b78c..b80e27503 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/control
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/control
@@ -16,7 +16,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: kipi-plugins-kde3 (<< 4:3.5.13)
 Breaks: kipi-plugins-kde3 (<< 4:3.5.13)
-Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kmail-trinity, kdeprint-trinity, sane-utils, kooka-trinity, konqueror-trinity, mpg123
+Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kmail-trinity, tdeprint-trinity, sane-utils, kooka-trinity, konqueror-trinity, mpg123
 Suggests: gimp, gallery, kipi-plugins-trinity-doc
 Enhances: digikam-trinity, kphotoalbum-trinity, showimg, gwenview-trinity
 Description: image manipulation/handling plugins for KIPI aware programs [Trinity]
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/control.in b/ubuntu/maverick/libraries/kipi-plugins/debian/control.in
index 0d68a8196..94cbc99da 100755
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/control.in
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/control.in
@@ -16,7 +16,7 @@ Package: kipi-plugins-trinity
 Replaces: digikamplugins-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kmail-trinity, kdeprint-trinity, sane-utils, kooka-trinity, konqueror-trinity, mpg123
+Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kmail-trinity, tdeprint-trinity, sane-utils, kooka-trinity, konqueror-trinity, mpg123
 Suggests: gimp, gallery, kipi-plugins-trinity-doc
 Enhances: digikam-trinity, kphotoalbum-trinity, showimg, gwenview-trinity
 Description: image manipulation/handling plugins for KIPI aware programs [Trinity]
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/changelog b/ubuntu/maverick/libraries/libkdcraw/debian/changelog
index 4458e7b08..3cc18c357 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/changelog
+++ b/ubuntu/maverick/libraries/libkdcraw/debian/changelog
@@ -90,8 +90,8 @@ libkdcraw (0.1.1-2) unstable; urgency=low
       patches/04_am_maintainer_mode.diff
       patches/05_pedantic-errors.diff
       patches/98_buildprep.diff
-      patches/98_configure.diff: makes $LIB_QT only -lqt-mt and LIB_KDECORE
-      only -lkdecore
+      patches/98_configure.diff: makes $LIB_QT only -lqt-mt and LIB_TDECORE
+      only -ltdecore
   * Add utils.mk to debian/rules to have list-missing target
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Tue, 26 Jun 2007 07:31:15 +0100
diff --git a/ubuntu/maverick/libraries/libkipi/debian/changelog b/ubuntu/maverick/libraries/libkipi/debian/changelog
index eaec4a227..af82417d7 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/changelog
+++ b/ubuntu/maverick/libraries/libkipi/debian/changelog
@@ -111,7 +111,7 @@ libkipi (0.1.2-3) unstable; urgency=low
       + debian/rules: add buildprep rule to recreate the buildpref diff
       + add 06_aclocal_update.diff: aclocal.m4 gets recreated after each
         new buildprep diff
-      + patches/10_link_to_right_libs.diff: add missing libraries -lkdecore
+      + patches/10_link_to_right_libs.diff: add missing libraries -ltdecore
         -lqt-mt
     Result: libkipi0 now depends on 5 instead of 25 packages
   * remove unnecessary build dependency on libimlib2-dev
diff --git a/ubuntu/maverick/tdeadmin/debian/changelog b/ubuntu/maverick/tdeadmin/debian/changelog
index 4c2296fcb..4fca9af79 100644
--- a/ubuntu/maverick/tdeadmin/debian/changelog
+++ b/ubuntu/maverick/tdeadmin/debian/changelog
@@ -531,7 +531,7 @@ tdeadmin (4:3.4.0-0pre2) alioth; urgency=low
 
   +++ Changes by Pierre Habouzit:
 
-  * Recommends tdebase-bin for lilo-config (kdesu in the menu command).
+  * Recommends tdebase-bin for lilo-config (tdesu in the menu command).
   * Remove kcmlinuz from Depends for tdeadmin meta package.
   * Wrote a man page for kdat.
 
diff --git a/ubuntu/maverick/tdeadmin/debian/control b/ubuntu/maverick/tdeadmin/debian/control
index d3165c338..c12e794f5 100644
--- a/ubuntu/maverick/tdeadmin/debian/control
+++ b/ubuntu/maverick/tdeadmin/debian/control
@@ -160,7 +160,7 @@ Description: Trinity frontend for lilo configuration
  It runs out of the KDE Control Center.
  .
  If you want to use the menu entry to launch lilo-config, you need to install
- tdebase-bin since it uses the kdesu command to gain root privileges.
+ tdebase-bin since it uses the tdesu command to gain root privileges.
  .
  This package is part of Trinity, as a component of the KDE administration module.
  See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
diff --git a/ubuntu/maverick/tdeadmin/debian/control.in b/ubuntu/maverick/tdeadmin/debian/control.in
index 8fd3732e5..5d67ada60 100644
--- a/ubuntu/maverick/tdeadmin/debian/control.in
+++ b/ubuntu/maverick/tdeadmin/debian/control.in
@@ -140,7 +140,7 @@ Description: KDE frontend for lilo configuration
  It runs out of the KDE Control Center.
  .
  If you want to use the menu entry to launch lilo-config, you need to install
- tdebase-bin since it uses the kdesu command to gain root privileges.
+ tdebase-bin since it uses the tdesu command to gain root privileges.
  .
  This package is part of KDE, as a component of the KDE administration module.
  See the 'kde' and 'tdeadmin' packages for more information.
diff --git a/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.lintian b/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.lintian
index 96c770df9..dc8ec46fb 100644
--- a/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.lintian
+++ b/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.lintian
@@ -1 +1 @@
-lilo-config: menu-command-not-in-package /usr/share/menu/lilo-config:6 /opt/trinity/bin/kdesu
+lilo-config: menu-command-not-in-package /usr/share/menu/lilo-config:6 /opt/trinity/bin/tdesu
diff --git a/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.menu b/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.menu
index 3f2bfca36..6efa201f0 100644
--- a/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.menu
+++ b/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.menu
@@ -3,4 +3,4 @@
 	section="Applications/System/Administration"\
 	hints="KDE"\
 	title="lilo-config"\
-	command="/opt/trinity/bin/kdesu kcmshell lilo"
+	command="/opt/trinity/bin/tdesu kcmshell lilo"
diff --git a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
index 2a94294ef..5d776fe2d 100644
--- a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
@@ -24,7 +24,7 @@ binary-install/tdebase-bin::
 	install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap
 	install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap
 
---with-sudo-kdesu-backend
+--with-sudo-tdesu-backend
 
 XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/tdebase/debian
 
diff --git a/ubuntu/maverick/tdebase/debian/changelog b/ubuntu/maverick/tdebase/debian/changelog
index 348bfd069..b991c3875 100644
--- a/ubuntu/maverick/tdebase/debian/changelog
+++ b/ubuntu/maverick/tdebase/debian/changelog
@@ -635,7 +635,7 @@ tdebase (4:3.5.7.dfsg.1-1) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
   
-  * Add smbclient to suggests of kdeprint to show that it is needed to make
+  * Add smbclient to suggests of tdeprint to show that it is needed to make
     smb printers work. Also adapt the description. (Closes: #445182)
   * Lower gdb recommends to a suggests now that recommends get installed by
     default. (Closes: 442432)
@@ -866,7 +866,7 @@ tdebase (4:3.5.7-1ubuntu10) gutsy; urgency=low
 
   * Added kubuntu_99_kate_crashfix_from_svn.diff.  (LP: #122296)
   * Committed into Bzr.
-  * Added gs-esp-x to kdeprint depends and konqueror depends. (LP: #83597)
+  * Added gs-esp-x to tdeprint depends and konqueror depends. (LP: #83597)
   * Added konqueror Recommends: libxine1-ffmpeg, so that the thumbnail
     generation no longer fails on video files. (LP: #51024)
   * Added konqueror Recommends: libarts1-mpeglib, so that the thumbnail
@@ -1050,7 +1050,7 @@ tdebase (4:3.5.6.dfsg.2-1) unstable; urgency=low
       - Simplified chinese thanks to Ming Hua. (Closes: #418486)
       - Malayam thanks to Praveen A. (Closes: #418495)
       - Greek (still has a couple of fuzzy strings).
-  * Add a patch to put some quotes in kdeprintgfax to have spaces in
+  * Add a patch to put some quotes in tdeprintgfax to have spaces in
     names/numbers. Thanks to Robert Cheramy. (Closes: #247396)
   * Fix minor issues in manpage. Thanks JS Bygott. (Closes: #414270)
   * Enable kerberos in kio slaves. It seems do not break anything. 
@@ -1347,7 +1347,7 @@ tdebase (4:3.5.5a.dfsg.1-1ubuntu7) feisty; urgency=low
 
 tdebase (4:3.5.5a.dfsg.1-1ubuntu6) feisty; urgency=low
 
-  * Compile with --with-sudo-kdesu-backend
+  * Compile with --with-sudo-tdesu-backend
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Nov 2006 10:18:52 +0000
 
@@ -1425,7 +1425,7 @@ tdebase (4:3.5.5a.dfsg.1-5) unstable; urgency=high
 tdebase (4:3.5.5a.dfsg.1-4) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
-  * Add a section to man page about how to use sudo as kdesu backend 
+  * Add a section to man page about how to use sudo as tdesu backend 
     (Closes: #399823, #384416)
  
   +++ Changes by Ana Guerrero:
@@ -1713,13 +1713,13 @@ tdebase (4:3.5.5-0ubuntu1) edgy; urgency=low
   * 28_tdebase_rubberband.diff now kubuntu_28_tdebase_rubberband.diff and hunk
     removed to apply
   * kubuntu_14_hide_konquerorsu_menu_entry.diff updated
-  * kubuntu_20_kdesu_sudo.diff updated, merged upstream
+  * kubuntu_20_tdesu_sudo.diff updated, merged upstream
   * kubuntu_35_hide_klipper_menu_entry.diff updated
   * kubuntu_73_nomediaioslave_mounthelper.diff  updated
   * kubuntu_75_kicker_taskbar_resize.diff removed, fixed upstream
   * kubuntu_76_kickermedia.diff updated
   * kubuntu_83_media_desktop.diff updated
-  * Use --with-sudo-kdesu-backend and build-dep on sudo
+  * Use --with-sudo-tdesu-backend and build-dep on sudo
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:06 +0000
 
@@ -2232,7 +2232,7 @@ tdebase (4:3.5.2-0ubuntu23) dapper; urgency=low
 
 tdebase (4:3.5.2-0ubuntu22) dapper; urgency=low
 
-  * Update kubuntu_20_kdesu_sudo.diff to fix run as foo message in kdesu
+  * Update kubuntu_20_tdesu_sudo.diff to fix run as foo message in tdesu
     with -u switch (Closes: Malone #41184)
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Thu, 11 May 2006 12:12:44 +0200
@@ -2294,7 +2294,7 @@ tdebase (4:3.5.2-0ubuntu14) dapper; urgency=low
   * Removed system tab from konqueror's sidebar
   * Alter kubuntu_52_gtk_qt_engine_config.diff, don't make use of
     gtk_qt_engine if gnome or xfce are already installed (Malone #36256)
-  * Added kubuntu_61_kdeprint_admin.diff, makes kdeprint admin mode work
+  * Added kubuntu_61_tdeprint_admin.diff, makes tdeprint admin mode work
     (Malone #39867)
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 24 Apr 2006 21:16:19 +0200
@@ -2503,7 +2503,7 @@ tdebase (4:3.5.1-0ubuntu1) dapper; urgency=low
 
 tdebase (4:3.5.0-0ubuntu16) dapper; urgency=low
 
-  * Add kubuntu_43_kdesu_terminal_output.diff to make kdesu
+  * Add kubuntu_43_tdesu_terminal_output.diff to make tdesu
     have terminal output
   * Remove xlibs-static-pic from build-deps
 
@@ -2605,7 +2605,7 @@ tdebase (4:3.5.0-0ubuntu2) dapper; urgency=low
     duplicate printer .desktop files
   * Add kubuntu_35_hide_klipper_menu_entry.diff autostarts by default
   * Add kubuntu_36_hide_kjobviewer_menu_entry.diff starts when printing
-  * Add kubuntu_37_hide_kdeprintfax_menu_entry.diff kdeprintfax 
+  * Add kubuntu_37_hide_tdeprintfax_menu_entry.diff tdeprintfax 
     is available when printing with Print to Fax
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Dec 2005 21:51:29 +0000
@@ -2848,7 +2848,7 @@ tdebase (4:3.4.1-1) experimental; urgency=low
 
 tdebase (4:3.4.3-0ubuntu6) breezy-updates; urgency=low
 
-  * Add kubuntu_34_kdesu_sycoca_cache_path.diff fix administrator
+  * Add kubuntu_34_tdesu_sycoca_cache_path.diff fix administrator
     kcontrol module bug http://bugzilla.ubuntu.com/8681
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  2 Nov 2005 02:37:11 +0000
@@ -3069,7 +3069,7 @@ tdebase (4:3.4.0-0pre4) alioth; urgency=low
     fail when kpersonalizer is not present. (Closes: #309803)
 
   * Add manpages for kdialog (thanks to Bastian Kleineidam for tracking it
-    down) and my own manpage for kdesu/kdesud. (Closes: #239945)
+    down) and my own manpage for tdesu/tdesud. (Closes: #239945)
 
   +++ Changes by Adeodato Simó:
 
@@ -3090,7 +3090,7 @@ tdebase (4:3.3.2-1) unstable; urgency=low
 
   * Fix typo in tdebase-bin description. (Closes: #286587)
 
-  * Update kdeprint documentation to sync with tdelibs patches.
+  * Update tdeprint documentation to sync with tdelibs patches.
 
   * Add NEWS.Debian for kdm, explaining the "keyboard doesn't work"
     problem when upgrading to KDE 3.3, and how to deal with it.
@@ -3107,8 +3107,8 @@ tdebase (4:3.3.2-1) unstable; urgency=low
   +++ Changes by Adeodato Simó:
 
   * debian/control:
-    - make tdebase-dev depend on kwin for the libkdecorations.so ->
-      libkdecorations.so.1.0.0 symlink. (Closes: #289544)
+    - make tdebase-dev depend on kwin for the libtdecorations.so ->
+      libtdecorations.so.1.0.0 symlink. (Closes: #289544)
 
   * Included Czech po-debconf translation by Miroslav Kure.
     (Closes: #289454)
@@ -3153,7 +3153,7 @@ tdebase (4:3.4.0-0ubuntu17) hoary; urgency=low
 
 tdebase (4:3.4.0-0ubuntu16) hoary; urgency=low
 
-  * Add kubuntu_20_kdesu_sudo.diff to fix string on kdesu for sudo.
+  * Add kubuntu_20_tdesu_sudo.diff to fix string on tdesu for sudo.
     Fixes http://bugzilla.ubuntu.com/7327
 
  -- Jonathan Riddell <jr@jriddell.org>  Sat,  2 Apr 2005 17:01:37 +0100
@@ -3311,7 +3311,7 @@ tdebase (4:3.3.2-0pre1) experimental; urgency=low
   * New upstream release.
   * KDE_3_3_BRANCH update. Includes the tdebase part of the fix
     for CAN-2004-1158.
-  * Lower kdeprint's dependency on gv to a Suggests. (Closes: #269590)
+  * Lower tdeprint's dependency on gv to a Suggests. (Closes: #269590)
   * kwin is now registered as an x-window-manager. (Closes: #249162)
   * Added /usr/share/xsessions to KDM's default session path, so
     .desktop files installed there are found.
@@ -3498,7 +3498,7 @@ tdebase (4:3.1.4-1) unstable; urgency=low
   * Added patch to update autotools files.
   * Added patch to remove pedantic-errors from KDE_CHECK_FUNC_EXT since it
     causes configure checks to fail due to #line numbers being > 32767.
-  * Demote kdeprint Depends 'efax | hylafax-client | mgetty-fax' to Suggests.
+  * Demote tdeprint Depends 'efax | hylafax-client | mgetty-fax' to Suggests.
     (Closes: #142489)
   * Change kicker.menu-method to not display the empty_mime icon if a menu file
     doesn't provide an icon. (Closes: #154065)
@@ -3540,7 +3540,7 @@ tdebase (4:3.1.2-1) unstable; urgency=low
   * New upstream release.
   * Remove Build-Depends on libsasl-dev. (Closes: #189949, #193866)
   * Add libkregexpeditor to kate Recommends. (Closes: #183280)
-  * Add efax | hylafax | mgetty-fax to kdeprint Depends. (Closes: #142489)
+  * Add efax | hylafax | mgetty-fax to tdeprint Depends. (Closes: #142489)
   * Add kfind to konqueror Depends. (Closes: #192859)
   * Fix KDE GDM Session file. (Closes: #144206, #154519, #188560, #189438,
     #193274)
@@ -4289,7 +4289,7 @@ tdebase (4:2.1-beta2-0128-1) unstable; urgency=low
 tdebase (4:2.1-beta2-3) unstable; urgency=low
  
   * Don't crash when trying to load/read faulty plugins (Closes: #82983)
-  * Moving kdesu to tdebase-libs so that we can use it without needing
+  * Moving tdesu to tdebase-libs so that we can use it without needing
     tdebase installed
   * Adding autoconf and gettext to build-deps
   * Several small bug fixes from upstream
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control
index 5718cf914..13b0f584b 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/tdebase/debian/control
@@ -14,7 +14,7 @@ Section: kde
 Architecture: all
 Replaces: tdebase-kde3 (<< 4:3.5.13)
 Breaks: tdebase-kde3 (<< 4:3.5.13)
-Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), kdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), kwin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
+Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), kwin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
 Recommends: kdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -140,7 +140,7 @@ Section: devel
 Architecture: any
 Replaces: tdebase-kde3-dev (<< 4:3.5.13)
 Breaks: tdebase-kde3-dev (<< 4:3.5.13)
-Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), kdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), kwin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), kwin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
 Description: development files for the KDE base module
  This package contains headers and other development files needed to
  compile software based on the KDE base module.
@@ -215,11 +215,11 @@ Description: password changer for KDE
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
 
-Package: kdeprint-trinity
+Package: tdeprint-trinity
 Section: utils
 Architecture: any
-Replaces: kdeprint-kde3 (<< 4:3.5.13)
-Breaks: kdeprint-kde3 (<< 4:3.5.13)
+Replaces: tdeprint-kde3 (<< 4:3.5.13)
+Breaks: tdeprint-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, enscript, poster, psutils
 Recommends: kghostview-trinity | postscript-viewer
 Suggests: khelpcenter-trinity, efax | hylafax-client | mgetty-fax, smbclient
diff --git a/ubuntu/maverick/tdebase/debian/control.in b/ubuntu/maverick/tdebase/debian/control.in
index c23253584..107c75b66 100644
--- a/ubuntu/maverick/tdebase/debian/control.in
+++ b/ubuntu/maverick/tdebase/debian/control.in
@@ -13,7 +13,7 @@ XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/tdebase/debian
 Package: tdebase
 Section: kde
 Architecture: all
-Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), kdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
+Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
 Recommends: kdm (>= ${Source-Version})
 Suggests: tdebase-doc-html (>= ${Source-Version})
 Description: base components from the official KDE release
@@ -121,7 +121,7 @@ Description: shared data files for the KDE base module
 Package: tdebase-dev
 Section: devel
 Architecture: any
-Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), kdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), tdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
 Replaces: kate (<< 4:3.0.0), tdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
 Description: development files for the KDE base module
  This package contains headers and other development files needed to
@@ -191,7 +191,7 @@ Description: password changer for KDE
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde' and 'tdebase' packages for more information.
 
-Package: kdeprint
+Package: tdeprint
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}, enscript, poster, psutils
diff --git a/ubuntu/maverick/tdebase/debian/copyright b/ubuntu/maverick/tdebase/debian/copyright
index 8e0933735..a17edd5c2 100644
--- a/ubuntu/maverick/tdebase/debian/copyright
+++ b/ubuntu/maverick/tdebase/debian/copyright
@@ -16,7 +16,7 @@ headings and other identifying marks.
 
 Artistic
 --------
-kdcop, kdesu, klipper
+kdcop, tdesu, klipper
 
 BSD
 ---
@@ -24,7 +24,7 @@ drkonqi, kaddressbook, kicker, ksmserver, ksplash, kwin, legacyimport
 
 GPL
 ---
-kappfinder, kate, kcheckpass, kdeprint, kdm, kfind, khelpcenter, kmenuedit,
+kappfinder, kate, kcheckpass, tdeprint, kdm, kfind, khelpcenter, kmenuedit,
 konqueror, konsole, kpager, kpersonalizer, kreadconfig, kstart, ksysguard, ktip
 
 LGPL
diff --git a/ubuntu/maverick/tdebase/debian/edit-as-root.desktop b/ubuntu/maverick/tdebase/debian/edit-as-root.desktop
index 049454ea0..e3df17006 100644
--- a/ubuntu/maverick/tdebase/debian/edit-as-root.desktop
+++ b/ubuntu/maverick/tdebase/debian/edit-as-root.desktop
@@ -9,4 +9,4 @@ Name[fr]=Editer en tant que Root
 Name[es]=Editar como Root
 Name[de]=Als root bearbeiten
 Icon=kfm
-Exec=kdesu "kwrite" "%U"
+Exec=tdesu "kwrite" "%U"
diff --git a/ubuntu/maverick/tdebase/debian/icons/kdeprint-16.xpm b/ubuntu/maverick/tdebase/debian/icons/kdeprint-16.xpm
index 4f03a0b06..58b87a90d 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kdeprint-16.xpm
+++ b/ubuntu/maverick/tdebase/debian/icons/kdeprint-16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kdeprint-16[] = {
+static char *tdeprint-16[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 137 2",
 "   c black",
diff --git a/ubuntu/maverick/tdebase/debian/icons/kdeprint.xpm b/ubuntu/maverick/tdebase/debian/icons/kdeprint.xpm
index f11005860..c10da523c 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kdeprint.xpm
+++ b/ubuntu/maverick/tdebase/debian/icons/kdeprint.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kdeprint[] = {
+static char *tdeprint[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 130 2",
 "   c black",
diff --git a/ubuntu/maverick/tdebase/debian/icons/kdeprintfax-16.xpm b/ubuntu/maverick/tdebase/debian/icons/kdeprintfax-16.xpm
index debb554b6..3e07385e5 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kdeprintfax-16.xpm
+++ b/ubuntu/maverick/tdebase/debian/icons/kdeprintfax-16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kdeprintfax-16[] = {
+static char *tdeprintfax-16[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 168 2",
 "   c black",
diff --git a/ubuntu/maverick/tdebase/debian/icons/kdeprintfax.xpm b/ubuntu/maverick/tdebase/debian/icons/kdeprintfax.xpm
index 6af142f57..9f5d6a2e7 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kdeprintfax.xpm
+++ b/ubuntu/maverick/tdebase/debian/icons/kdeprintfax.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kdeprintfax[] = {
+static char *tdeprintfax[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 94 2",
 "   c #000000",
diff --git a/ubuntu/maverick/tdebase/debian/kate-trinity.install b/ubuntu/maverick/tdebase/debian/kate-trinity.install
index bc586a595..3b65dfabc 100644
--- a/ubuntu/maverick/tdebase/debian/kate-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kate-trinity.install
@@ -9,8 +9,8 @@ debian/tmp/opt/trinity/lib/libkateinterfaces.so.0
 debian/tmp/opt/trinity/lib/libkateinterfaces.so.0.0.0
 debian/tmp/opt/trinity/lib/libkateutils.so.0
 debian/tmp/opt/trinity/lib/libkateutils.so.0.0.0
-debian/tmp/opt/trinity/lib/libkdeinit_kate.so
-debian/tmp/opt/trinity/lib/libkdeinit_kwrite.so
+debian/tmp/opt/trinity/lib/libtdeinit_kate.so
+debian/tmp/opt/trinity/lib/libtdeinit_kwrite.so
 debian/tmp/opt/trinity/share/applications/kde/kate.desktop
 debian/tmp/opt/trinity/share/applications/kde/kwrite.desktop
 debian/tmp/opt/trinity/share/apps/kate/externaltools
diff --git a/ubuntu/maverick/tdebase/debian/kate-trinity.lintian b/ubuntu/maverick/tdebase/debian/kate-trinity.lintian
index fcc9b79aa..0ad1f24b6 100644
--- a/ubuntu/maverick/tdebase/debian/kate-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kate-trinity.lintian
@@ -1,2 +1,2 @@
-kate: shlib-missing-in-control-file libkdeinit_kwrite.so usr/lib/libkdeinit_kwrite.so
-kate: shlib-missing-in-control-file libkdeinit_kate.so usr/lib/libkdeinit_kate.so
+kate: shlib-missing-in-control-file libtdeinit_kwrite.so usr/lib/libtdeinit_kwrite.so
+kate: shlib-missing-in-control-file libtdeinit_kate.so usr/lib/libtdeinit_kate.so
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
index f337002f6..71527a0c5 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
@@ -124,8 +124,8 @@ debian/tmp/opt/trinity/lib/trinity/libkurisearchfilter.la
 debian/tmp/opt/trinity/lib/trinity/libkurisearchfilter.so
 debian/tmp/opt/trinity/lib/trinity/liblocaldomainurifilter.la
 debian/tmp/opt/trinity/lib/trinity/liblocaldomainurifilter.so
-debian/tmp/opt/trinity/lib/libkdeinit_kaccess.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcontrol.so
+debian/tmp/opt/trinity/lib/libtdeinit_kaccess.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcontrol.so
 debian/tmp/opt/trinity/lib/libkfontinst.so.0
 debian/tmp/opt/trinity/lib/libkfontinst.so.0.0.0
 debian/tmp/opt/trinity/share/applications/kde/arts.desktop
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian
index 3c7f407c6..d18964b2d 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian
@@ -1,3 +1,3 @@
-kcontrol: shlib-missing-in-control-file libkdeinit_kaccess.so usr/lib/libkdeinit_kaccess.so
-kcontrol: shlib-missing-in-control-file libkdeinit_kcontrol.so usr/lib/libkdeinit_kcontrol.so
-kcontrol: shlib-missing-in-control-file libkdeinit_krandrinithack.so usr/lib/libkdeinit_krandrinithack.so
+kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so
+kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so
+kcontrol: shlib-missing-in-control-file libtdeinit_krandrinithack.so usr/lib/libtdeinit_krandrinithack.so
diff --git a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.install b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.install
index bd25acf54..69f67a958 100644
--- a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/bin/kdeprintfax
+debian/tmp/opt/trinity/bin/tdeprintfax
 debian/tmp/opt/trinity/bin/kjobviewer
 debian/tmp/opt/trinity/bin/kprinter
 debian/tmp/opt/trinity/lib/trinity/kcm_printmgr.la
@@ -9,126 +9,126 @@ debian/tmp/opt/trinity/lib/trinity/kjobviewer.la
 debian/tmp/opt/trinity/lib/trinity/kjobviewer.so
 debian/tmp/opt/trinity/lib/trinity/kprinter.la
 debian/tmp/opt/trinity/lib/trinity/kprinter.so
-debian/tmp/opt/trinity/lib/trinity/libkdeprint_part.la
-debian/tmp/opt/trinity/lib/trinity/libkdeprint_part.so
-debian/tmp/opt/trinity/lib/libkdeinit_kjobviewer.so
-debian/tmp/opt/trinity/lib/libkdeinit_kprinter.so
-debian/tmp/opt/trinity/share/applications/kde/kdeprintfax.desktop
+debian/tmp/opt/trinity/lib/trinity/libtdeprint_part.la
+debian/tmp/opt/trinity/lib/trinity/libtdeprint_part.so
+debian/tmp/opt/trinity/lib/libtdeinit_kjobviewer.so
+debian/tmp/opt/trinity/lib/libtdeinit_kprinter.so
+debian/tmp/opt/trinity/share/applications/kde/tdeprintfax.desktop
 debian/tmp/opt/trinity/share/applications/kde/kjobviewer.desktop
 debian/tmp/opt/trinity/share/applications/kde/printers.desktop
-debian/tmp/opt/trinity/share/apps/kdeprintfax/anytops
-debian/tmp/opt/trinity/share/apps/kdeprintfax/faxfilters
-debian/tmp/opt/trinity/share/apps/kdeprintfax/icons/crystalsvg/16x16/actions/abentry.png
-debian/tmp/opt/trinity/share/apps/kdeprintfax/kdeprintfaxui.rc
-debian/tmp/opt/trinity/share/apps/kdeprint_part/kdeprint_part.rc
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-middle-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-middle-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-top-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-top-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-centre-kdeprint.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-middle-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-middle-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-top-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-top-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/class.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/driver.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/htmlstyles.css
-debian/tmp/opt/trinity/share/apps/kdeprint/template/jobs.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/printer.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/pseudo.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/top-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/top-right-kdeprint.png
+debian/tmp/opt/trinity/share/apps/tdeprintfax/anytops
+debian/tmp/opt/trinity/share/apps/tdeprintfax/faxfilters
+debian/tmp/opt/trinity/share/apps/tdeprintfax/icons/crystalsvg/16x16/actions/abentry.png
+debian/tmp/opt/trinity/share/apps/tdeprintfax/tdeprintfaxui.rc
+debian/tmp/opt/trinity/share/apps/tdeprint_part/tdeprint_part.rc
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-middle-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-middle-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-top-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-top-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-centre-tdeprint.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-middle-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-middle-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-top-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-top-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/class.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/driver.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/htmlstyles.css
+debian/tmp/opt/trinity/share/apps/tdeprint/template/jobs.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/printer.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/pseudo.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/top-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/top-right-tdeprint.png
 debian/tmp/opt/trinity/share/apps/kjobviewer/kjobviewerui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/add-printer-wiz.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cr32-action-wizard.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard2_backendselection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan_results.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard4_networkscan_config.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cups-config.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsoptions.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browse_relay_add_button.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsingmasks_add_button.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration10_browsinggeneral.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration11_browsingconnections.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration11_browsingmasks.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration12_browsingtimeouts.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration14_browsingrelay.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration1_welcome.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration2_general.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration3_logging.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration4_directories.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration5_HTTP.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration6_encryption.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration7_miscellanious.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration8_networkgeneral.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration9_networkclients.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminauthorization.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_securityoverview.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/extensions.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/external-command.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/final-word.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/getting-started.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/highlights.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kcontrol-icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kcron_to_be_printed.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kdeprint-jobviewer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter-as-netscape-printcommand.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter_called_from_run_command.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter-kivio.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter_with_kcron_developer_special.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/lpd.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/lpr-bsd.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/lprng.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/ps-boxes.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/rlpr.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/steinbruch_scaled.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/tech-overview.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/theory.docbook
-debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/add-printer-wiz.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/common
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cr32-action-wizard.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard1.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard2_backendselection.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard3_networkscan.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard3_networkscan_results.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard4_networkscan_config.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cups-config.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsoptions.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfig_browse_relay_add_button.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfig_browsingmasks_add_button.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration10_browsinggeneral.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration11_browsingconnections.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration11_browsingmasks.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration12_browsingtimeouts.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration14_browsingrelay.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration1_welcome.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration2_general.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration3_logging.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration4_directories.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration5_HTTP.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration6_encryption.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration7_miscellanious.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration8_networkgeneral.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration9_networkclients.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaddprinters.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminauthorization.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_securityoverview.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/extensions.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/external-command.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/final-word.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/getting-started.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/highlights.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/index.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kcontrol-icon.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kcron_to_be_printed.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/tdeprint-jobviewer.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter-as-netscape-printcommand.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter_called_from_run_command.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter-kivio.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter_with_kcron_developer_special.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/lpd.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/lpr-bsd.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/lprng.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/ps-boxes.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/rlpr.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/steinbruch_scaled.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/tech-overview.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/theory.docbook
+debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kdeprintfax.svgz
+debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/tdeprintfax.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kjobviewer.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/printmgr.svgz
 debian/tmp/opt/trinity/share/mimelnk/print/class.desktop
@@ -138,13 +138,13 @@ debian/tmp/opt/trinity/share/mimelnk/print/jobs.desktop
 debian/tmp/opt/trinity/share/mimelnk/print/manager.desktop
 debian/tmp/opt/trinity/share/mimelnk/print/printer.desktop
 debian/tmp/opt/trinity/share/mimelnk/print/printermodel.desktop
-debian/tmp/opt/trinity/share/services/kdeprint_part.desktop
+debian/tmp/opt/trinity/share/services/tdeprint_part.desktop
 debian/tmp/opt/trinity/share/services/printdb.protocol
 debian/tmp/opt/trinity/share/services/print.protocol
 
 debian/icons/kjobviewer.xpm		/opt/trinity/share/pixmaps
 debian/icons/kjobviewer-16.xpm		/opt/trinity/share/pixmaps
-debian/icons/kdeprint.xpm		/opt/trinity/share/pixmaps
-debian/icons/kdeprint-16.xpm		/opt/trinity/share/pixmaps
-debian/icons/kdeprintfax.xpm		/opt/trinity/share/pixmaps
-debian/icons/kdeprintfax-16.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeprint.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeprint-16.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeprintfax.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeprintfax-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.lintian b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.lintian
index 6cac09d35..9da8261d7 100644
--- a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.lintian
@@ -1,4 +1,4 @@
-kdeprint: no-shlibs-control-file usr/lib/libkdeinit_kjobviewer.so
-kdeprint: no-shlibs-control-file usr/lib/libkdeinit_kprinter.so
-kdeprint: postinst-must-call-ldconfig usr/lib/libkdeinit_kjobviewer.so
-kdeprint: postrm-should-call-ldconfig usr/lib/libkdeinit_kjobviewer.so
+tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kjobviewer.so
+tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kprinter.so
+tdeprint: postinst-must-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
+tdeprint: postrm-should-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
diff --git a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.manpages b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.manpages
index 6d4136bf9..55b9bfae7 100644
--- a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.manpages
+++ b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.manpages
@@ -1,3 +1,3 @@
-debian/man/kdeprintfax-trinity.1
+debian/man/tdeprintfax-trinity.1
 debian/man/kjobviewer-trinity.1
 debian/man/kprinter-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.menu b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.menu
index 3140de34c..1268aa55c 100644
--- a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.menu
+++ b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.menu
@@ -1,4 +1,4 @@
-?package(kdeprint):\
+?package(tdeprint):\
 	needs="X11"\
 	section="Applications/System/Monitoring"\
 	hints="KDE"\
@@ -7,29 +7,29 @@
 	icon16x16="/opt/trinity/share/pixmaps/kjobviewer-16.xpm"\
 	command="/opt/trinity/bin/kjobviewer --show --all"
 
-?package(kdeprint):\
+?package(tdeprint):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="KDE"\
 	title="KPrinter"\
-	icon32x32="/opt/trinity/share/pixmaps/kdeprint.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kdeprint-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeprint.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeprint-16.xpm"\
 	command="/opt/trinity/bin/kprinter"
 
-?package(kdeprint):\
+?package(tdeprint):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="KDE"\
 	title="KDEPrintFax"\
-	icon32x32="/opt/trinity/share/pixmaps/kdeprintfax.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kdeprintfax-16.xpm"\
-	command="/opt/trinity/bin/kdeprintfax"
+	icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\
+	command="/opt/trinity/bin/tdeprintfax"
 
-# Icon 32x32 kdeprint/kjobviewer/cr32-app-kjobviewer.png kjobviewer.xpm
-# Icon 16x16 kdeprint/kjobviewer/cr16-app-kjobviewer.png kjobviewer-16.xpm
+# Icon 32x32 tdeprint/kjobviewer/cr32-app-kjobviewer.png kjobviewer.xpm
+# Icon 16x16 tdeprint/kjobviewer/cr16-app-kjobviewer.png kjobviewer-16.xpm
 
-# Icon 32x32 kdeprint/printmgr/cr32-app-printmgr.png kdeprint.xpm
-# Icon 16x16 kdeprint/printmgr/cr16-app-printmgr.png kdeprint-16.xpm
+# Icon 32x32 tdeprint/printmgr/cr32-app-printmgr.png tdeprint.xpm
+# Icon 16x16 tdeprint/printmgr/cr16-app-printmgr.png tdeprint-16.xpm
 
-# Icon 32x32 kdeprint/kdeprintfax/cr32-app-kdeprintfax.png kdeprintfax.xpm
-# Icon 16x16 kdeprint/kdeprintfax/cr16-app-kdeprintfax.png kdeprintfax-16.xpm
+# Icon 32x32 tdeprint/tdeprintfax/cr32-app-tdeprintfax.png tdeprintfax.xpm
+# Icon 16x16 tdeprint/tdeprintfax/cr16-app-tdeprintfax.png tdeprintfax-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install b/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install
index aa950c6d5..8ee3c9256 100644
--- a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install
@@ -8,7 +8,7 @@ debian/tmp/opt/trinity/bin/kdesktop_lock
 debian/tmp/opt/trinity/bin/kwebdesktop
 debian/tmp/opt/trinity/lib/trinity/kdesktop.la
 debian/tmp/opt/trinity/lib/trinity/kdesktop.so
-debian/tmp/opt/trinity/lib/libkdeinit_kdesktop.so
+debian/tmp/opt/trinity/lib/libtdeinit_kdesktop.so
 debian/tmp/opt/trinity/share/apps/kdesktop/DesktopLinks/Home.desktop usr/share/apps/kdesktop/unused/
 debian/tmp/opt/trinity/share/apps/kdesktop/DesktopLinks/System.desktop usr/share/apps/kdesktop/unused/
 debian/tmp/opt/trinity/share/apps/kdesktop/directory.autostart
diff --git a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.lintian b/ubuntu/maverick/tdebase/debian/kdesktop-trinity.lintian
index b652ef1a3..478f4fbc8 100644
--- a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kdesktop-trinity.lintian
@@ -1 +1 @@
-kdesktop: no-shlibs-control-file usr/lib/libkdeinit_kdesktop.so
+kdesktop: no-shlibs-control-file usr/lib/libtdeinit_kdesktop.so
diff --git a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
index 8e219a21f..eff975b5d 100644
--- a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/bin/khc_mansearch.pl
 debian/tmp/opt/trinity/bin/khelpcenter
 debian/tmp/opt/trinity/lib/trinity/khelpcenter.la
 debian/tmp/opt/trinity/lib/trinity/khelpcenter.so
-debian/tmp/opt/trinity/lib/libkdeinit_khelpcenter.so
+debian/tmp/opt/trinity/lib/libtdeinit_khelpcenter.so
 debian/tmp/opt/trinity/share/applications/kde/Help.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/glossary.html.in
 debian/tmp/opt/trinity/share/apps/khelpcenter/glossary.xslt
@@ -79,7 +79,7 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/checkxrefs
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/common
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/kdeprintingglossary.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/tdeprintingglossary.docbook
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/help.docbook
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/index.docbook
diff --git a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.lintian b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.lintian
index db8286ac4..44eb5fc11 100644
--- a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.lintian
@@ -1,3 +1,3 @@
-khelpcenter: no-shlibs-control-file usr/lib/libkdeinit_khelpcenter.so
-khelpcenter: postinst-must-call-ldconfig usr/lib/libkdeinit_khelpcenter.so
-khelpcenter: postrm-should-call-ldconfig usr/lib/libkdeinit_khelpcenter.so
+khelpcenter: no-shlibs-control-file usr/lib/libtdeinit_khelpcenter.so
+khelpcenter: postinst-must-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
+khelpcenter: postrm-should-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
diff --git a/ubuntu/maverick/tdebase/debian/kicker-trinity.install b/ubuntu/maverick/tdebase/debian/kicker-trinity.install
index bdd7a8a8b..c99afee75 100644
--- a/ubuntu/maverick/tdebase/debian/kicker-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kicker-trinity.install
@@ -18,8 +18,8 @@ debian/tmp/opt/trinity/lib/trinity/kickermenu_find.la
 debian/tmp/opt/trinity/lib/trinity/kickermenu_find.so
 debian/tmp/opt/trinity/lib/trinity/kickermenu_kate.so
 debian/tmp/opt/trinity/lib/trinity/kickermenu_kate.la
-debian/tmp/opt/trinity/lib/trinity/kickermenu_kdeprint.la
-debian/tmp/opt/trinity/lib/trinity/kickermenu_kdeprint.so
+debian/tmp/opt/trinity/lib/trinity/kickermenu_tdeprint.la
+debian/tmp/opt/trinity/lib/trinity/kickermenu_tdeprint.so
 debian/tmp/opt/trinity/lib/trinity/kickermenu_konqueror.la
 debian/tmp/opt/trinity/lib/trinity/kickermenu_konqueror.so
 debian/tmp/opt/trinity/lib/trinity/kickermenu_konsole.la
@@ -59,9 +59,9 @@ debian/tmp/opt/trinity/lib/trinity/trash_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/trash_panelapplet.so
 debian/tmp/opt/trinity/lib/libkasbar.so.1
 debian/tmp/opt/trinity/lib/libkasbar.so.1.0.0
-debian/tmp/opt/trinity/lib/libkdeinit_appletproxy.so
-debian/tmp/opt/trinity/lib/libkdeinit_extensionproxy.so
-debian/tmp/opt/trinity/lib/libkdeinit_kicker.so
+debian/tmp/opt/trinity/lib/libtdeinit_appletproxy.so
+debian/tmp/opt/trinity/lib/libtdeinit_extensionproxy.so
+debian/tmp/opt/trinity/lib/libtdeinit_kicker.so
 debian/tmp/opt/trinity/lib/libkickermain.so.1
 debian/tmp/opt/trinity/lib/libkickermain.so.1.0.0
 debian/tmp/opt/trinity/lib/libtaskbar.so.1
diff --git a/ubuntu/maverick/tdebase/debian/kicker-trinity.lintian b/ubuntu/maverick/tdebase/debian/kicker-trinity.lintian
index 41de1be8e..f600f5d82 100644
--- a/ubuntu/maverick/tdebase/debian/kicker-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kicker-trinity.lintian
@@ -1,3 +1,3 @@
-kicker: shlib-missing-in-control-file libkdeinit_extensionproxy.so usr/lib/libkdeinit_extensionproxy.so
-kicker: shlib-missing-in-control-file libkdeinit_kicker.so usr/lib/libkdeinit_kicker.so
-kicker: shlib-missing-in-control-file libkdeinit_appletproxy.so usr/lib/libkdeinit_appletproxy.so
+kicker: shlib-missing-in-control-file libtdeinit_extensionproxy.so usr/lib/libtdeinit_extensionproxy.so
+kicker: shlib-missing-in-control-file libtdeinit_kicker.so usr/lib/libtdeinit_kicker.so
+kicker: shlib-missing-in-control-file libtdeinit_appletproxy.so usr/lib/libtdeinit_appletproxy.so
diff --git a/ubuntu/maverick/tdebase/debian/klipper-trinity.install b/ubuntu/maverick/tdebase/debian/klipper-trinity.install
index e84bf502b..467dd6710 100644
--- a/ubuntu/maverick/tdebase/debian/klipper-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/klipper-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/lib/trinity/klipper.la
 debian/tmp/opt/trinity/lib/trinity/klipper_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/klipper_panelapplet.so
 debian/tmp/opt/trinity/lib/trinity/klipper.so
-debian/tmp/opt/trinity/lib/libkdeinit_klipper.so
+debian/tmp/opt/trinity/lib/libtdeinit_klipper.so
 debian/tmp/opt/trinity/share/applications/kde/klipper.desktop
 debian/tmp/opt/trinity/share/apps/kconf_update/klipper-1-2.pl
 debian/tmp/opt/trinity/share/apps/kconf_update/klipper-trinity1.sh
diff --git a/ubuntu/maverick/tdebase/debian/klipper-trinity.lintian b/ubuntu/maverick/tdebase/debian/klipper-trinity.lintian
index 710a50459..f7bcf9946 100644
--- a/ubuntu/maverick/tdebase/debian/klipper-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/klipper-trinity.lintian
@@ -1,3 +1,3 @@
-klipper: no-shlibs-control-file usr/lib/libkdeinit_klipper.so
-klipper: postinst-must-call-ldconfig usr/lib/libkdeinit_klipper.so
-klipper: postrm-should-call-ldconfig usr/lib/libkdeinit_klipper.so
+klipper: no-shlibs-control-file usr/lib/libtdeinit_klipper.so
+klipper: postinst-must-call-ldconfig usr/lib/libtdeinit_klipper.so
+klipper: postrm-should-call-ldconfig usr/lib/libtdeinit_klipper.so
diff --git a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.install b/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.install
index 140ea409b..49711b6e4 100644
--- a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.install
@@ -4,8 +4,8 @@ debian/tmp/opt/trinity/lib/trinity/kcontroledit.la
 debian/tmp/opt/trinity/lib/trinity/kcontroledit.so
 debian/tmp/opt/trinity/lib/trinity/kmenuedit.la
 debian/tmp/opt/trinity/lib/trinity/kmenuedit.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcontroledit.so
-debian/tmp/opt/trinity/lib/libkdeinit_kmenuedit.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcontroledit.so
+debian/tmp/opt/trinity/lib/libtdeinit_kmenuedit.so
 debian/tmp/opt/trinity/share/applications/kde/kmenuedit.desktop
 debian/tmp/opt/trinity/share/applnk/System/kmenuedit.desktop
 debian/tmp/opt/trinity/share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png
diff --git a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.lintian b/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.lintian
index 075ffc823..154077ad9 100644
--- a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.lintian
@@ -1,4 +1,4 @@
-kmenuedit: no-shlibs-control-file usr/lib/libkdeinit_kcontroledit.so
-kmenuedit: no-shlibs-control-file usr/lib/libkdeinit_kmenuedit.so
-kmenuedit: postinst-must-call-ldconfig usr/lib/libkdeinit_kcontroledit.so
-kmenuedit: postrm-should-call-ldconfig usr/lib/libkdeinit_kcontroledit.so
+kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kcontroledit.so
+kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kmenuedit.so
+kmenuedit: postinst-must-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
+kmenuedit: postrm-should-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.install b/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
index 11d8a57c1..ece23b00f 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
@@ -37,9 +37,9 @@ debian/tmp/opt/trinity/lib/trinity/konqueror.la
 debian/tmp/opt/trinity/lib/trinity/konqueror.so
 debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.la
 debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.so
-debian/tmp/opt/trinity/lib/libkdeinit_keditbookmarks.so
-debian/tmp/opt/trinity/lib/libkdeinit_kfmclient.so
-debian/tmp/opt/trinity/lib/libkdeinit_konqueror.so
+debian/tmp/opt/trinity/lib/libtdeinit_keditbookmarks.so
+debian/tmp/opt/trinity/lib/libtdeinit_kfmclient.so
+debian/tmp/opt/trinity/lib/libtdeinit_konqueror.so
 debian/tmp/opt/trinity/lib/libkonqsidebarplugin.so.1
 debian/tmp/opt/trinity/lib/libkonqsidebarplugin.so.1.2.0
 debian/tmp/opt/trinity/share/applications/kde/Home.desktop
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.lintian b/ubuntu/maverick/tdebase/debian/konqueror-trinity.lintian
index 27e528d84..243cafb9f 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/konqueror-trinity.lintian
@@ -1,3 +1,3 @@
-konqueror: shlib-missing-in-control-file libkdeinit_keditbookmarks.so usr/lib/libkdeinit_keditbookmarks.so
-konqueror: shlib-missing-in-control-file libkdeinit_kfmclient.so usr/lib/libkdeinit_kfmclient.so
-konqueror: shlib-missing-in-control-file libkdeinit_konqueror.so usr/lib/libkdeinit_konqueror.so
+konqueror: shlib-missing-in-control-file libtdeinit_keditbookmarks.so usr/lib/libtdeinit_keditbookmarks.so
+konqueror: shlib-missing-in-control-file libtdeinit_kfmclient.so usr/lib/libtdeinit_kfmclient.so
+konqueror: shlib-missing-in-control-file libtdeinit_konqueror.so usr/lib/libtdeinit_konqueror.so
diff --git a/ubuntu/maverick/tdebase/debian/konsole-trinity.install b/ubuntu/maverick/tdebase/debian/konsole-trinity.install
index 0fb1e3a22..69e1c7699 100644
--- a/ubuntu/maverick/tdebase/debian/konsole-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/konsole-trinity.install
@@ -7,7 +7,7 @@ debian/tmp/opt/trinity/lib/trinity/konsole.la
 debian/tmp/opt/trinity/lib/trinity/konsole.so
 debian/tmp/opt/trinity/lib/trinity/libkonsolepart.la
 debian/tmp/opt/trinity/lib/trinity/libkonsolepart.so
-debian/tmp/opt/trinity/lib/libkdeinit_konsole.so
+debian/tmp/opt/trinity/lib/libtdeinit_konsole.so
 debian/tmp/opt/trinity/share/applications/kde/konsole.desktop
 debian/tmp/opt/trinity/share/applications/kde/konsolesu.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kcmkonsole.desktop
diff --git a/ubuntu/maverick/tdebase/debian/konsole-trinity.lintian b/ubuntu/maverick/tdebase/debian/konsole-trinity.lintian
index 95c2d012e..765754c3e 100644
--- a/ubuntu/maverick/tdebase/debian/konsole-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/konsole-trinity.lintian
@@ -1,3 +1,3 @@
-konsole: no-shlibs-control-file usr/lib/libkdeinit_konsole.so
-konsole: postinst-must-call-ldconfig usr/lib/libkdeinit_konsole.so
-konsole: postrm-should-call-ldconfig usr/lib/libkdeinit_konsole.so
+konsole: no-shlibs-control-file usr/lib/libtdeinit_konsole.so
+konsole: postinst-must-call-ldconfig usr/lib/libtdeinit_konsole.so
+konsole: postrm-should-call-ldconfig usr/lib/libtdeinit_konsole.so
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install
index f5200691f..0946d8a57 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/ksmserver
 debian/tmp/opt/trinity/bin/startkde
 debian/tmp/opt/trinity/lib/trinity/ksmserver.la
 debian/tmp/opt/trinity/lib/trinity/ksmserver.so
-debian/tmp/opt/trinity/lib/libkdeinit_ksmserver.so
+debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.so
 debian/tmp/opt/trinity/share/apps/kconf_update/ksmserver.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/move_session_config.sh
 debian/tmp/opt/trinity/share/apps/ksmserver/pics/shutdownkonq.png
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.lintian b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.lintian
index 669919e49..20f94f8ee 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.lintian
@@ -1,2 +1,2 @@
-ksmserver: no-shlibs-control-file usr/lib/libkdeinit_ksmserver.so
-ksmserver: postinst-must-call-ldconfig usr/lib/libkdeinit_ksmserver.so
+ksmserver: no-shlibs-control-file usr/lib/libtdeinit_ksmserver.so
+ksmserver: postinst-must-call-ldconfig usr/lib/libtdeinit_ksmserver.so
diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.install b/ubuntu/maverick/tdebase/debian/kwin-trinity.install
index 6ebdc3c30..a6fde0638 100644
--- a/ubuntu/maverick/tdebase/debian/kwin-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kwin-trinity.install
@@ -44,10 +44,10 @@ debian/tmp/opt/trinity/lib/trinity/kwin_quartz_config.so
 debian/tmp/opt/trinity/lib/trinity/kwin_rules_dialog.la
 debian/tmp/opt/trinity/lib/trinity/kwin_rules_dialog.so
 debian/tmp/opt/trinity/lib/trinity/kwin.so
-debian/tmp/opt/trinity/lib/libkdecorations.so.1
-debian/tmp/opt/trinity/lib/libkdecorations.so.1.0.0
-debian/tmp/opt/trinity/lib/libkdeinit_kwin_rules_dialog.so
-debian/tmp/opt/trinity/lib/libkdeinit_kwin.so
+debian/tmp/opt/trinity/lib/libtdecorations.so.1
+debian/tmp/opt/trinity/lib/libtdecorations.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdeinit_kwin_rules_dialog.so
+debian/tmp/opt/trinity/lib/libtdeinit_kwin.so
 debian/tmp/opt/trinity/share/applications/kde/showdesktop.desktop
 debian/tmp/opt/trinity/share/applications/kde/kwindecoration.desktop
 debian/tmp/opt/trinity/share/applications/kde/kwinoptions.desktop
diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian b/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian
index 1bf281c8a..ab81fccc0 100644
--- a/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian
@@ -1,2 +1,2 @@
-kwin: shlib-missing-in-control-file libkdeinit_kwin.so usr/lib/libkdeinit_kwin.so
-kwin: shlib-missing-in-control-file libkdeinit_kwin_rules_dialog.so usr/lib/libkdeinit_kwin_rules_dialog.so
+kwin: shlib-missing-in-control-file libtdeinit_kwin.so usr/lib/libtdeinit_kwin.so
+kwin: shlib-missing-in-control-file libtdeinit_kwin_rules_dialog.so usr/lib/libtdeinit_kwin_rules_dialog.so
diff --git a/ubuntu/maverick/tdebase/debian/man/drkonqi-trinity.1 b/ubuntu/maverick/tdebase/debian/man/drkonqi-trinity.1
index c1a7a8936..9371c2d9f 100644
--- a/ubuntu/maverick/tdebase/debian/man/drkonqi-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/drkonqi-trinity.1
@@ -34,8 +34,8 @@ The PID of the program
 .B  \-\-startupid  <id>
 Startup ID of the program
 .TP
-.B  \-\-kdeinit  
-The program was started by kdeinit
+.B  \-\-tdeinit  
+The program was started by tdeinit
 .TP
 .B  \-\-safer  
 Disable arbitrary disk access
diff --git a/ubuntu/maverick/tdebase/debian/man/kdeprintfax-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kdeprintfax-trinity.1
index 0308ac1d8..353fb6529 100644
--- a/ubuntu/maverick/tdebase/debian/man/kdeprintfax-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/kdeprintfax-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDEPRINTFAX 1 "June 2006" "K Desktop Environment" "A fax utility"
+.TH TDEPRINTFAX 1 "June 2006" "K Desktop Environment" "A fax utility"
 .SH NAME
-kdeprintfax
+tdeprintfax
 \- a interface to fax-packages
 .SH SYNOPSIS
-\fBkdeprintfax\fP [Qt\-options] [KDE\-options] [options] [file] 
+\fBtdeprintfax\fP [Qt\-options] [KDE\-options] [options] [file] 
 .SH DESCRIPTION
-\fBkdeprintfax\fP is a small fax utility to be used with kdeprint.
+\fBtdeprintfax\fP is a small fax utility to be used with tdeprint.
 .SH OPTIONS
 .SS
 .SS Arguments:
@@ -148,7 +148,7 @@ sets the client geometry of the main widget \- see man X for the argument format
 
 .SH AUTHORS
 .nf
-Michael Goffioul <kdeprint@swing.be>
+Michael Goffioul <tdeprint@swing.be>
 .br
 
 .br
diff --git a/ubuntu/maverick/tdebase/debian/man/kdesu-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kdesu-trinity.1
index e552d288c..8befa3c39 100644
--- a/ubuntu/maverick/tdebase/debian/man/kdesu-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/kdesu-trinity.1
@@ -1,16 +1,16 @@
-.TH KDESU 1 "May 2005" "K Desktop Environment" "Runs a program with elevated privileges."
+.TH TDESU 1 "May 2005" "K Desktop Environment" "Runs a program with elevated privileges."
 .SH NAME
-kdesu \- Runs a program with elevated privileges.
+tdesu \- Runs a program with elevated privileges.
 .SH SYNOPSIS
-\fBkdesu\fR [Qt\-options] [KDE\-options] [kdesu options] command 
+\fBtdesu\fR [Qt\-options] [KDE\-options] [tdesu options] command 
 .SH DESCRIPTION
 Runs a program with elevated privileges.
 .PP
 KDE su is a graphical front end to the Unix \fBsu\fR utility. It allows you to run programs as another user by entering their password. It is not a SUID root program, but runs unprivileged. The system program \fBsu\fR is used for acquiring special privileges.
 .PP
-\fBkdesu\fR has the ability to store passwords for the convenience of users. The passwords are NOT written to disk, but stored in memory using a special program, \fBkdesud\fR. This is only done if the user specifies that the password be remembered. In this case, passwords are stored in memory for a certain period of time before being removed. \fBkdesud\fR runs in such a way that only the user who entered the password originally can use it, though no one, not even the user who originally entered the password, can retrieve the password that is stored by \fBkdesud\fR. Through these measures, users can avoid having to repeatedly enter root passwords or other passwords, without a significant risk to overall system security.
+\fBtdesu\fR has the ability to store passwords for the convenience of users. The passwords are NOT written to disk, but stored in memory using a special program, \fBtdesud\fR. This is only done if the user specifies that the password be remembered. In this case, passwords are stored in memory for a certain period of time before being removed. \fBtdesud\fR runs in such a way that only the user who entered the password originally can use it, though no one, not even the user who originally entered the password, can retrieve the password that is stored by \fBtdesud\fR. Through these measures, users can avoid having to repeatedly enter root passwords or other passwords, without a significant risk to overall system security.
 .PP
-\fBkdesu\fR uses normally \fBsu\fR to gain root by using the root password. \fBkdesu\fR can also be configured to use other commands to gain root like sudo to use users password.
+\fBtdesu\fR uses normally \fBsu\fR to gain root by using the root password. \fBtdesu\fR can also be configured to use other commands to gain root like sudo to use users password.
 .SH OPTIONS
 .SS Generic options:
 .TP
@@ -35,7 +35,7 @@ Show version information
 .B  --license
 Show license information
 .SS
-.SS kdesu Options:
+.SS tdesu Options:
 .TP
 .TP
 .B -c <command>
@@ -78,7 +78,7 @@ Specifies the command to run
 
 .SH CONFIGURATION FILES
 .PP
-\fBkdesu\fR can be configured with a default configuration file /etc/trinity/kdesurc and with a per user configuration file in .kde/share/config/kdesurc. Alternative a section could be added to kdeglobals.
+\fBtdesu\fR can be configured with a default configuration file /etc/trinity/tdesurc and with a per user configuration file in .kde/share/config/tdesurc. Alternative a section could be added to kdeglobals.
 .SH EXAMPLE
 The configuration item for the configuration files is the following:
 .br
@@ -88,9 +88,9 @@ super-user-command=sudo
 
 .SH SEE ALSO
 Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kdesu/
+.BR help:/tdesu/
 directly into konqueror or you can run 
-.BR "`khelpcenter help:/kdesu/'"
+.BR "`khelpcenter help:/tdesu/'"
 from the command-line.
 .br
 .SH AUTHORS
diff --git a/ubuntu/maverick/tdebase/debian/man/kjobviewer-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kjobviewer-trinity.1
index 767d4ab1f..04ebe8a44 100644
--- a/ubuntu/maverick/tdebase/debian/man/kjobviewer-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/kjobviewer-trinity.1
@@ -190,7 +190,7 @@ from the command\-line.
 .br
 .SH AUTHORS
 .nf
-Michael Goffioul <kdeprint@swing.be>
+Michael Goffioul <tdeprint@swing.be>
 .br
 
 .br
diff --git a/ubuntu/maverick/tdebase/debian/man/kprinter-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kprinter-trinity.1
index 340bd84d1..8eaf6c4fb 100644
--- a/ubuntu/maverick/tdebase/debian/man/kprinter-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/kprinter-trinity.1
@@ -198,7 +198,7 @@ from the command\-line.
 .br
 .SH AUTHORS
 .nf
-Michael Goffioul <kdeprint@swing.be>
+Michael Goffioul <tdeprint@swing.be>
 
 .br
 .fi
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff
index b647fd41d..620302912 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff
@@ -1,5 +1,5 @@
---- tdebase/kdeprint/kdeprintfax/kdeprintfax.desktop
-+++ tdebase/kdeprint/kdeprintfax/kdeprintfax.desktop
+--- tdebase/tdeprint/tdeprintfax/tdeprintfax.desktop
++++ tdebase/tdeprint/tdeprintfax/tdeprintfax.desktop
 @@ -90,3 +90,4 @@
  Terminal=false
  X-DCOP-ServiceType=Multi
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
index c2e139f99..df2cf8cac 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
@@ -1,6 +1,6 @@
-diff -Nur tdebase-3.5.4/kdeprint/printmgr/printers.desktop tdebase-3.5.4.new/kdeprint/printmgr/printers.desktop
---- tdebase-3.5.4/kdeprint/printmgr/printers.desktop	2006-07-22 10:15:47.000000000 +0200
-+++ tdebase-3.5.4.new/kdeprint/printmgr/printers.desktop	2006-08-21 22:20:40.000000000 +0200
+diff -Nur tdebase-3.5.4/tdeprint/printmgr/printers.desktop tdebase-3.5.4.new/tdeprint/printmgr/printers.desktop
+--- tdebase-3.5.4/tdeprint/printmgr/printers.desktop	2006-07-22 10:15:47.000000000 +0200
++++ tdebase-3.5.4.new/tdeprint/printmgr/printers.desktop	2006-08-21 22:20:40.000000000 +0200
 @@ -219,4 +219,4 @@
  Keywords[zh_TW]=print,printer,printing management,列印,印表機,列印管理
  Keywords[zu]=shicilela,umshicileli,abaphathi boshicilelo
diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules
index 036d8f469..da70cfb66 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/maverick/tdebase/debian/rules
@@ -21,19 +21,19 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -
 
 DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
 -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DKDM_PAM_SERVICE="kdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
--DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_KDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON"
+-DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
 DEB_BUILD_PARALLEL = true
 
 DEB_FIXPERMS_EXCLUDE := \
-	opt/trinity/bin/kdesud    \
+	opt/trinity/bin/tdesud    \
 	opt/trinity/bin/kdmtsak
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdebase-trinity-dbg
 
-DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter kdesu knetattach kioslave kxkb kdebugdialog kdcop
+DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach kioslave kxkb kdebugdialog kdcop
 
 PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
 			ksysguard-trinity kwin-trinity libkonq4-trinity
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdeprint b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
index f43d9196b..7610a4313 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
@@ -1,10 +1,10 @@
-Document: tdebase-doc-html-kdeprint
+Document: tdebase-doc-html-tdeprint
 Title: KDEPrint Handbook
 Author: Kurt Pfeifle
 Abstract: KDEPrint is the official printing system of KDE. 
 Section: Apps/Tools 
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kdeprint/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kdeprint/*.html
+Index: /opt/trinity/share/doc/kde/HTML/en/tdeprint/index.html
+Files: /opt/trinity/share/doc/kde/HTML/en/tdeprint/*.html
 
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
index 2322b0008..fd0d3ac41 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
@@ -13,8 +13,8 @@ debian/tmp/opt/trinity/bin/kcheckpass
 debian/tmp/opt/trinity/bin/kcminit
 debian/tmp/opt/trinity/bin/kcminit_startup
 debian/tmp/opt/trinity/bin/kdcop
-debian/tmp/opt/trinity/bin/kdesu
-debian/tmp/opt/trinity/bin/kdesud
+debian/tmp/opt/trinity/bin/tdesu
+debian/tmp/opt/trinity/bin/tdesud
 debian/tmp/opt/trinity/bin/kdialog
 debian/tmp/opt/trinity/bin/khotkeys
 debian/tmp/opt/trinity/bin/knetattach
@@ -44,11 +44,11 @@ debian/tmp/opt/trinity/lib/trinity/khotkeys_arts.la
 debian/tmp/opt/trinity/lib/trinity/khotkeys_arts.so
 debian/tmp/opt/trinity/lib/trinity/kxkb.la
 debian/tmp/opt/trinity/lib/trinity/kxkb.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcminit.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcminit_startup.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcminit_startup.so
-debian/tmp/opt/trinity/lib/libkdeinit_khotkeys.so
-debian/tmp/opt/trinity/lib/libkdeinit_kxkb.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcminit.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcminit_startup.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcminit_startup.so
+debian/tmp/opt/trinity/lib/libtdeinit_khotkeys.so
+debian/tmp/opt/trinity/lib/libtdeinit_kxkb.so
 debian/tmp/opt/trinity/lib/libkhotkeys_shared.so.1
 debian/tmp/opt/trinity/lib/libkhotkeys_shared.so.1.0.0
 debian/tmp/opt/trinity/share/applications/kde/keyboard.desktop
@@ -74,9 +74,9 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdcop/index.docbook
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebugdialog/common
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebugdialog/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebugdialog/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesu/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesu/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesu/index.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesu/common
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesu/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesu/index.docbook
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/common
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/index.docbook
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.links b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.links
index ae21842e4..2c6c3384a 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.links
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.links
@@ -1 +1 @@
-opt/trinity/share/man/man1/kdesu.1.gz opt/trinity/share/man/man1/kdesud.1.gz
+opt/trinity/share/man/man1/tdesu.1.gz opt/trinity/share/man/man1/tdesud.1.gz
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian
index 1b1985b6d..3f56c6d4a 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian
@@ -1,6 +1,6 @@
-tdebase-bin: setgid-binary usr/bin/kdesud 2755 root/nogroup
-tdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kcminit.so
-tdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_khotkeys.so
-tdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kxkb.so
-tdebase-bin: postinst-must-call-ldconfig usr/lib/libkdeinit_khotkeys.so
-tdebase-bin: postrm-should-call-ldconfig usr/lib/libkdeinit_khotkeys.so
+tdebase-bin: setgid-binary usr/bin/tdesud 2755 root/nogroup
+tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kcminit.so
+tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_khotkeys.so
+tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kxkb.so
+tdebase-bin: postinst-must-call-ldconfig usr/lib/libtdeinit_khotkeys.so
+tdebase-bin: postrm-should-call-ldconfig usr/lib/libtdeinit_khotkeys.so
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages
index b801c202a..ebb07daf7 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages
@@ -4,7 +4,7 @@ debian/man/kcheckpass-trinity.1
 debian/man/kcminit-trinity.1
 debian/man/kdcop-trinity.1
 debian/man/kdebugdialog-trinity.1
-debian/man/kdesu-trinity.1
+debian/man/tdesu-trinity.1
 debian/man/kdialog-trinity.1
 debian/man/khotkeys-trinity.1
 debian/man/kio_system_documenthelper-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install
index d9759729d..4328f203e 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install
@@ -43,32 +43,32 @@ debian/tmp/opt/trinity/lib/libkateinterfaces.la
 debian/tmp/opt/trinity/lib/libkateinterfaces.so
 debian/tmp/opt/trinity/lib/libkateutils.la
 debian/tmp/opt/trinity/lib/libkateutils.so
-debian/tmp/opt/trinity/lib/libkdecorations.la
-debian/tmp/opt/trinity/lib/libkdecorations.so
-debian/tmp/opt/trinity/lib/libkdeinit_appletproxy.la
-debian/tmp/opt/trinity/lib/libkdeinit_extensionproxy.la
-debian/tmp/opt/trinity/lib/libkdeinit_kaccess.la
-debian/tmp/opt/trinity/lib/libkdeinit_kate.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcminit.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcontroledit.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcontrol.la
-debian/tmp/opt/trinity/lib/libkdeinit_kdesktop.la
-debian/tmp/opt/trinity/lib/libkdeinit_keditbookmarks.la
-debian/tmp/opt/trinity/lib/libkdeinit_kfmclient.la
-debian/tmp/opt/trinity/lib/libkdeinit_khelpcenter.la
-debian/tmp/opt/trinity/lib/libkdeinit_khotkeys.la
-debian/tmp/opt/trinity/lib/libkdeinit_kicker.la
-debian/tmp/opt/trinity/lib/libkdeinit_kjobviewer.la
-debian/tmp/opt/trinity/lib/libkdeinit_klipper.la
-debian/tmp/opt/trinity/lib/libkdeinit_kmenuedit.la
-debian/tmp/opt/trinity/lib/libkdeinit_konqueror.la
-debian/tmp/opt/trinity/lib/libkdeinit_konsole.la
-debian/tmp/opt/trinity/lib/libkdeinit_kprinter.la
-debian/tmp/opt/trinity/lib/libkdeinit_ksmserver.la
-debian/tmp/opt/trinity/lib/libkdeinit_kwin.la
-debian/tmp/opt/trinity/lib/libkdeinit_kwin_rules_dialog.la
-debian/tmp/opt/trinity/lib/libkdeinit_kwrite.la
-debian/tmp/opt/trinity/lib/libkdeinit_kxkb.la
+debian/tmp/opt/trinity/lib/libtdecorations.la
+debian/tmp/opt/trinity/lib/libtdecorations.so
+debian/tmp/opt/trinity/lib/libtdeinit_appletproxy.la
+debian/tmp/opt/trinity/lib/libtdeinit_extensionproxy.la
+debian/tmp/opt/trinity/lib/libtdeinit_kaccess.la
+debian/tmp/opt/trinity/lib/libtdeinit_kate.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcminit.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcontroledit.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcontrol.la
+debian/tmp/opt/trinity/lib/libtdeinit_kdesktop.la
+debian/tmp/opt/trinity/lib/libtdeinit_keditbookmarks.la
+debian/tmp/opt/trinity/lib/libtdeinit_kfmclient.la
+debian/tmp/opt/trinity/lib/libtdeinit_khelpcenter.la
+debian/tmp/opt/trinity/lib/libtdeinit_khotkeys.la
+debian/tmp/opt/trinity/lib/libtdeinit_kicker.la
+debian/tmp/opt/trinity/lib/libtdeinit_kjobviewer.la
+debian/tmp/opt/trinity/lib/libtdeinit_klipper.la
+debian/tmp/opt/trinity/lib/libtdeinit_kmenuedit.la
+debian/tmp/opt/trinity/lib/libtdeinit_konqueror.la
+debian/tmp/opt/trinity/lib/libtdeinit_konsole.la
+debian/tmp/opt/trinity/lib/libtdeinit_kprinter.la
+debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.la
+debian/tmp/opt/trinity/lib/libtdeinit_kwin.la
+debian/tmp/opt/trinity/lib/libtdeinit_kwin_rules_dialog.la
+debian/tmp/opt/trinity/lib/libtdeinit_kwrite.la
+debian/tmp/opt/trinity/lib/libtdeinit_kxkb.la
 debian/tmp/opt/trinity/lib/libkfontinst.la
 debian/tmp/opt/trinity/lib/libkfontinst.so
 debian/tmp/opt/trinity/lib/libkhotkeys_shared.la
diff --git a/ubuntu/maverick/tdebindings/debian/local/krubyinit.1 b/ubuntu/maverick/tdebindings/debian/local/krubyinit.1
index 21cd93112..cca53af30 100644
--- a/ubuntu/maverick/tdebindings/debian/local/krubyinit.1
+++ b/ubuntu/maverick/tdebindings/debian/local/krubyinit.1
@@ -7,7 +7,7 @@ krubyinit \- Start Korundum Ruby Scripts Faster
 .SH DESCRIPTION
 Krubyinit is a wrapper around the ruby interpreter for executing Ruby
 scripts using the Korundum library ( the Ruby KDE bindings ).  It uses
-the kdeinit system to start the app so that they start a little bit
+the tdeinit system to start the app so that they start a little bit
 faster when started in a running KDE session.
 
 The script takes exactly the same options as the ruby(1) program.
diff --git a/ubuntu/maverick/tdebindings/debian/local/qtrubyinit.1 b/ubuntu/maverick/tdebindings/debian/local/qtrubyinit.1
index 61a505863..52b099b0e 100644
--- a/ubuntu/maverick/tdebindings/debian/local/qtrubyinit.1
+++ b/ubuntu/maverick/tdebindings/debian/local/qtrubyinit.1
@@ -6,7 +6,7 @@ qtrubyinit \- Start Qt Ruby Scripts Faster
 [switches] [--] [programfile] [arguments]
 .SH DESCRIPTION
 Qtrubyinit is a wrapper around the ruby interpreter for executing Ruby
-scripts using the QtRuby library.  It uses the kdeinit system to start
+scripts using the QtRuby library.  It uses the tdeinit system to start
 the app so that they start a little bit faster when started in a
 running KDE session.
 
diff --git a/ubuntu/maverick/tdegames/debian/kolf-trinity.install b/ubuntu/maverick/tdegames/debian/kolf-trinity.install
index 7ca84b810..beb920191 100644
--- a/ubuntu/maverick/tdegames/debian/kolf-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kolf-trinity.install
@@ -11,8 +11,8 @@
 /opt/trinity/share/icons/hicolor/128x128/apps/kolf.png
 /opt/trinity/share/mimelnk/application/x-kolf.desktop
 /opt/trinity/share/mimelnk/application/x-kourse.desktop
-/opt/trinity/lib/libkdeinit_kolf.so
-/opt/trinity/lib/libkdeinit_kolf.la
+/opt/trinity/lib/libtdeinit_kolf.so
+/opt/trinity/lib/libtdeinit_kolf.la
 /opt/trinity/lib/trinity/kolf.la
 /opt/trinity/lib/trinity/kolf.so
 /opt/trinity/lib/libkolf.la
diff --git a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install b/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install
index 99491c4e7..bdbbef7c6 100644
--- a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install
@@ -9,7 +9,7 @@ debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.la
 debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.so
 debian/tmp/opt/trinity/lib/trinity/mrmlsearch.la
 debian/tmp/opt/trinity/lib/trinity/mrmlsearch.so
-debian/tmp/opt/trinity/lib/libkdeinit_mrmlsearch.so
+debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.so
 debian/tmp/opt/trinity/share/applications/kde/kcmkmrml.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/mrml-servicemenu.desktop
 debian/tmp/opt/trinity/share/mimelnk/text/mrml.desktop
diff --git a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian b/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian
index 5c83f447b..e3a5ddb8a 100644
--- a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian
+++ b/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian
@@ -1,4 +1,4 @@
-kmrml: no-shlibs-control-file opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: package-name-doesnt-match-sonames libkdeinit-mrmlsearch
+kmrml: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml: package-name-doesnt-match-sonames libtdeinit-mrmlsearch
diff --git a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install b/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install
index 07929cfa2..d9ef57977 100644
--- a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kuickshow
 debian/tmp/opt/trinity/lib/trinity/kuickshow.la
 debian/tmp/opt/trinity/lib/trinity/kuickshow.so
-debian/tmp/opt/trinity/lib/libkdeinit_kuickshow.so
+debian/tmp/opt/trinity/lib/libtdeinit_kuickshow.so
 debian/tmp/opt/trinity/share/applications/kde/kuickshow.desktop
 debian/tmp/opt/trinity/share/apps/kuickshow/im_palette.pal
 debian/tmp/opt/trinity/share/apps/kuickshow/pics/about.png
diff --git a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.lintian b/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.lintian
index 61cb450ac..4551b5f0c 100644
--- a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.lintian
+++ b/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.lintian
@@ -1,4 +1,4 @@
-kuickshow: no-shlibs-control-file opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: package-name-doesnt-match-sonames libkdeinit-kuickshow
+kuickshow: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow: package-name-doesnt-match-sonames libtdeinit-kuickshow
diff --git a/ubuntu/maverick/tdegraphics/debian/kview-trinity.install b/ubuntu/maverick/tdegraphics/debian/kview-trinity.install
index 0efbbd7b5..ca570ad61 100644
--- a/ubuntu/maverick/tdegraphics/debian/kview-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kview-trinity.install
@@ -21,7 +21,7 @@ debian/tmp/opt/trinity/lib/trinity/libkviewcanvas.la
 debian/tmp/opt/trinity/lib/trinity/libkviewcanvas.so
 debian/tmp/opt/trinity/lib/trinity/libkviewviewer.la
 debian/tmp/opt/trinity/lib/trinity/libkviewviewer.so
-debian/tmp/opt/trinity/lib/libkdeinit_kview.so
+debian/tmp/opt/trinity/lib/libtdeinit_kview.so
 debian/tmp/opt/trinity/lib/libkimageviewer.so.0
 debian/tmp/opt/trinity/lib/libkimageviewer.so.0.0.0
 debian/tmp/opt/trinity/lib/trinity/libphotobook.la
diff --git a/ubuntu/maverick/tdegraphics/debian/kview-trinity.lintian b/ubuntu/maverick/tdegraphics/debian/kview-trinity.lintian
index 8314a8155..b81a18ccc 100644
--- a/ubuntu/maverick/tdegraphics/debian/kview-trinity.lintian
+++ b/ubuntu/maverick/tdegraphics/debian/kview-trinity.lintian
@@ -1,3 +1,3 @@
 kview: shlib-missing-in-control-file libphotobook.so opt/trinity/lib/libphotobook.so
-kview: shlib-missing-in-control-file libkdeinit_kview.so opt/trinity/lib/libkdeinit_kview.so
-kview: package-name-doesnt-match-sonames libkdeinit-kview libkimageviewer0
+kview: shlib-missing-in-control-file libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so
+kview: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0
diff --git a/ubuntu/maverick/tdegraphics/debian/rules b/ubuntu/maverick/tdegraphics/debian/rules
index 42330d01a..caff9212a 100755
--- a/ubuntu/maverick/tdegraphics/debian/rules
+++ b/ubuntu/maverick/tdegraphics/debian/rules
@@ -35,7 +35,7 @@ DEB_DH_MAKESHLIBS_ARGS_libkscan1-trinity	:= -V'libkscan1-trinity (>= 4:3.5.5-1)'
 
 binary-post-install/kuickshow-trinity::
 ifeq ($(DEB_HOST_ARCH), powerpc)
-	chrpath -d -k debian/kuickshow-trinity/opt/trinity/lib/libkdeinit_kuickshow.so
+	chrpath -d -k debian/kuickshow-trinity/opt/trinity/lib/libtdeinit_kuickshow.so
 endif
 
 #shlibs_ver = 4:3.5.0-1
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install b/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install
index 3c15273ee..608149acc 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install
@@ -179,8 +179,8 @@ debian/tmp/opt/trinity/include/kde/kviewshell/zoomlimits.h
 debian/tmp/opt/trinity/include/kde/libtext2path-0.1/BezierPath.h
 debian/tmp/opt/trinity/include/kde/libtext2path-0.1/Glyph.h
 debian/tmp/opt/trinity/include/kde/libtext2path-0.1/GlyphTracer.h
-debian/tmp/opt/trinity/lib/libkdeinit_kview.la
-debian/tmp/opt/trinity/lib/libkdeinit_mrmlsearch.la
+debian/tmp/opt/trinity/lib/libtdeinit_kview.la
+debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.la
 debian/tmp/opt/trinity/lib/libkghostviewlib.la
 debian/tmp/opt/trinity/lib/libkghostviewlib.so
 debian/tmp/opt/trinity/lib/libkimageviewer.la
diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog
index ff494b112..936097e90 100644
--- a/ubuntu/maverick/tdelibs/debian/changelog
+++ b/ubuntu/maverick/tdelibs/debian/changelog
@@ -136,12 +136,12 @@ tdelibs (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
 tdelibs (4:3.5.9-0ubuntu7.1) hardy-security; urgency=low
 
-  * SECURITY UPDATE: integer overflow in start_kdeinit. The start_kdeinit
+  * SECURITY UPDATE: integer overflow in start_tdeinit. The start_tdeinit
     processing of user-influenceable input is faulty.  A local user
     might be able to send unix signals to other processes, cause
     a denial of service or even possibly execute arbitrary code.
   * Add kubuntu_9903_kinit_integer_overflow.diff, edits
-    kinit/start_kdeinit.c, patch from upstream KDE
+    kinit/start_tdeinit.c, patch from upstream KDE
   * References
     http://www.kde.org/info/security/advisory-20080426-2.txt
     CVE-2008-1671
@@ -321,7 +321,7 @@ tdelibs (4:3.5.8-3ubuntu1) hardy; urgency=low
    - remove tdelibs4c2a depends on menu-xdg
    - include kubuntu_01_kdepot.diff and kde.pot in debian/patches/common
    - use a local copy of kde.mk without the common-install-prehook-impl:: rule; edit debian-qt-kde.mk to include debian/cdbs/kde.mk
-   - build with --with-sudo-kdesu-backend and build-dep on sudo and make tdelibs4c2a depend on sudo
+   - build with --with-sudo-tdesu-backend and build-dep on sudo and make tdelibs4c2a depend on sudo
    - tdelibs-data.install : Add nzb mimetype
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 13 Nov 2007 18:18:05 +0000
@@ -348,8 +348,8 @@ tdelibs (4:3.5.8.dfsg.1-1) unstable; urgency=low
   * New upstream release (Closes: #444383, #328479, #425741)
   * Resync patches:
     - Remove, applied upstream:
-      01_branch_kate_redo_save_fix, 01_branch_wait_for_kdeinit_to_finish,
-      48_cups13, 55_several-CVE-tdelibs-kdecore.
+      01_branch_kate_redo_save_fix, 01_branch_wait_for_tdeinit_to_finish,
+      48_cups13, 55_several-CVE-tdelibs-tdecore.
   * Update *.install files. 
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 13 Oct 2007 11:53:45 +0200
@@ -364,7 +364,7 @@ tdelibs (4:3.5.7.dfsg.1-7) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
-  * Add patch 55_several-CVE-tdelibs-kdecore.diff to make Konqueror address
+  * Add patch 55_several-CVE-tdelibs-tdecore.diff to make Konqueror address
     bar more robust against addressbar spoofing.
     Related CVEs: CVE-2007-4224, CVE-2007-4225, CVE-2007-3820.
 
@@ -420,7 +420,7 @@ tdelibs (4:3.5.7.dfsg.1-2) unstable; urgency=low
   * Better error messages when opening a tty fails. Thanks to Robert Millan.
     (Closes: #334974)
   * Don't refer to help:/kcmshell in kcmshell manpage. (Closes: #408470)
-  * Make sure kdeinit closes all files before terminating kde. (Closes: #425314)
+  * Make sure tdeinit closes all files before terminating kde. (Closes: #425314)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 19 Jul 2007 22:52:17 +0200
 
@@ -690,7 +690,7 @@ tdelibs (4:3.5.6-0ubuntu8) feisty; urgency=low
 
 tdelibs (4:3.5.6-0ubuntu7) feisty; urgency=low
 
-  * Add kubuntu_92_kdeprint_filter.diff, closes Malone
+  * Add kubuntu_92_tdeprint_filter.diff, closes Malone
     #51354. Patch from Marcus Trautwig
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 22 Feb 2007 17:27:47 +0100
@@ -739,11 +739,11 @@ tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low
 
 tdelibs (4:3.5.6-0ubuntu1) feisty; urgency=low
 
-  * Remove 02_kate_kdeprint_fixes_branch.diff
+  * Remove 02_kate_tdeprint_fixes_branch.diff
   * Update 27_kdnssd_avahi.dif
   * Remove 33_cups12_kprinter_fixes.diff
   * Remove 35_cups_unify_ipp_uri_assembling.diff
-  * Remove 36_kdeprintd_64bit_fix.diff
+  * Remove 36_tdeprintd_64bit_fix.diff
   * Remove 41_x_kde_getactionmenu_no_timeout.diff
   * Remove kubuntu_63_ark.diff
   * Remove kubuntu_65_kstyle_password_noasterisk
@@ -788,7 +788,7 @@ tdelibs (4:3.5.5a.dfsg.1-3ubuntu5) feisty; urgency=low
 
 tdelibs (4:3.5.5a.dfsg.1-3ubuntu4) feisty; urgency=low
 
-  * Compile with --with-sudo-kdesu-backend
+  * Compile with --with-sudo-tdesu-backend
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Nov 2006 10:16:08 +0000
 
@@ -924,8 +924,8 @@ tdelibs (4:3.5.5a.dfsg.1-3) unstable; urgency=medium
       when there are no printers.
     * 35_cups_unify_ipp_uri_assembling.diff - ensure proper IPP URI
       generation when CUPS is accessed via a UNIX socket. (Closes: #379216)
-  * Add 36_kdeprintd_64bit_fix.diff - fix a bug on 64bit arches when kdeprint
-    is not able to get a configuration file from CUPS server because kdeprintd
+  * Add 36_tdeprintd_64bit_fix.diff - fix a bug on 64bit arches when tdeprint
+    is not able to get a configuration file from CUPS server because tdeprintd
     fails to retreive the password from kpasswdserver.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  2 Nov 2006 17:54:30 -0500
@@ -953,7 +953,7 @@ tdelibs (4:3.5.5a-2) unstable; urgency=medium
 
   * Grab two more fixes from KDE_3_5_BRANCH.
     + Fix kate's indentation of C/C++ files.
-    + Fix kdeprint's timeout when trying to find cupsd.
+    + Fix tdeprint's timeout when trying to find cupsd.
       (Closes: #392052, #392052)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 13 Oct 2006 17:04:21 -0400
@@ -1026,7 +1026,7 @@ tdelibs (4:3.5.4-1) unstable; urgency=low
     tdelibs-data.
 
   * Add a number of patches, courtesy of Debian, which attempt to get
-    kdeprint working reasonably well with CUPS 1.2.x. These patches should
+    tdeprint working reasonably well with CUPS 1.2.x. These patches should
     resolve a number of user glitches, such as cryptic errors popping up when
     no printer has yet been added to CUPS.
     (Closes: #369140, #370403, #375477, #379216)
@@ -1050,7 +1050,7 @@ tdelibs (4:3.5.5-0ubuntu3) edgy; urgency=low
 
 tdelibs (4:3.5.5-0ubuntu2) edgy; urgency=low
 
-  * Revert kdeprint directory and patches to those from kde 3.5.4 packages
+  * Revert tdeprint directory and patches to those from kde 3.5.4 packages
     closes malone No 65665
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 14 Oct 2006 01:54:33 +0000
@@ -1065,8 +1065,8 @@ tdelibs (4:3.5.5-0ubuntu1) edgy; urgency=low
    - kubuntu_48_cups12_cupsdconf.diff
    - kubuntu_54_mouse_scroll_speed.diff
    - cups 1.2 domain socket fixed upstream
-  * Remove kubuntu_01_kdesu_sudo.diff, and kubuntu_50_kdesu_non_root.patch
-    patches gone upstream, use new --with-sudo-kdesu-backend
+  * Remove kubuntu_01_tdesu_sudo.diff, and kubuntu_50_tdesu_non_root.patch
+    patches gone upstream, use new --with-sudo-tdesu-backend
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 11:23:11 +0000
 
@@ -1469,8 +1469,8 @@ tdelibs (4:3.5.2-0ubuntu18) dapper; urgency=low
 
 tdelibs (4:3.5.2-0ubuntu17) dapper; urgency=low
 
-  * Add kubuntu_50_kdesu_non_root.patch to fix running commands as non-root
-    with kdesu with su instead of sudo (Malone #41184)
+  * Add kubuntu_50_tdesu_non_root.patch to fix running commands as non-root
+    with tdesu with su instead of sudo (Malone #41184)
 
  -- Luka Renko <lure.net@gmail.net>  Wed, 10 May 2006 22:45:27 +0200
 
@@ -1575,7 +1575,7 @@ tdelibs (4:3.5.2-0ubuntu4) dapper; urgency=low
 
 tdelibs (4:3.5.2-0ubuntu3) dapper; urgency=low
 
-  * Add kubuntu_35_kdeprint_branch.diff to fix compile error
+  * Add kubuntu_35_tdeprint_branch.diff to fix compile error
     with CUPS 1.2, remove my random hack from kubuntu_34_cups12.diff 
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Apr 2006 18:53:24 +0100
@@ -1781,20 +1781,20 @@ tdelibs (4:3.5-rc2-0ubuntu5) dapper; urgency=low
 
 tdelibs (4:3.5-rc2-0ubuntu4) dapper; urgency=low
 
-  * Add debian/patches/kubuntu_06_fix_kdeprint_cups12_fix.diff, fix kdeprint compile error properly
+  * Add debian/patches/kubuntu_06_fix_tdeprint_cups12_fix.diff, fix tdeprint compile error properly
   * Add common/kubuntu_01_kdepot.diff and common/kde.pot, fix .pot generation
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 25 Nov 2005 22:11:51 +0000
 
 tdelibs (4:3.5-rc2-0ubuntu3) dapper; urgency=low
 
-  * Fix broken kubuntu_06_fix_kdeprint_compile_hack.diff
+  * Fix broken kubuntu_06_fix_tdeprint_compile_hack.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 25 Nov 2005 18:44:54 +0000
 
 tdelibs (4:3.5-rc2-0ubuntu2) dapper; urgency=low
 
-  * Add kubuntu_06_fix_kdeprint_compile_hack.diff, quick patch until I
+  * Add kubuntu_06_fix_tdeprint_compile_hack.diff, quick patch until I
     work out how to fix it properly
   * Fix tdelibs4-doc.install for correct path of files
 
@@ -1831,8 +1831,8 @@ tdelibs (4:3.4.3-1) experimental; urgency=low
   * Tweak the rounded text selection patch to avoid it causing icon spacing
     issues in Konqueror. (Closes: #329404)
 
-  * Add a patch to generate a PIC static libkdefakes, libkdefakes_pic.a.
-    This will allow other libraries, such as mimelib, to use libkdefakes,
+  * Add a patch to generate a PIC static libtdefakes, libtdefakes_pic.a.
+    This will allow other libraries, such as mimelib, to use libtdefakes,
     without acquiring non-PIC code or a dependency upon the full tdelibs.
     (Closes: #326113)
 
@@ -2203,7 +2203,7 @@ tdelibs (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
 
 tdelibs (4:3.4.0~rc1-1ubuntu0.2) hoary; urgency=low
 
-  * Add sudo for kdesu patch kubuntu_01_kdesu_sudo.diff
+  * Add sudo for tdesu patch kubuntu_01_tdesu_sudo.diff
   * Add applications.menu move patch to stop collisions with Gnome kubuntu_02_applications_menu_rename.diff
 
  -- Jonathan Riddell <jr@jriddell.org>  Sat,  5 Mar 2005 21:00:03 +0000
@@ -2310,7 +2310,7 @@ tdelibs (4:3.3.2-2) unstable; urgency=high
 
   * Add patch from upstream that solves the problem wherein programs whose
     .desktop entry contained their full path, rather than just the binary
-    to be executed (mainly games), confused kdeinit.
+    to be executed (mainly games), confused tdeinit.
     (Closes: #270592, #290323)
 
   * debian/control: Add necessary tdelibs-data Replaces for old
@@ -2379,7 +2379,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low
 
   * New patches:
     - 06_automake-1.9.diff
-    - 12_cups_docroot.diff: changed the CUPS document path in kdeprint to
+    - 12_cups_docroot.diff: changed the CUPS document path in tdeprint to
       reflect the Debian default. [CM]
 
   * Updated dcop.1 manpage with patch by Helge Kreutzman. (Closes: #250631)
@@ -3323,7 +3323,7 @@ tdelibs (4:2.1-20010109-1) unstable; urgency=low
    * This was definatly built with the same dpkg that tdelibs-crypto was so
      I'm assuming this just squeaked by dinstall...so just to be sure...
    * Java should work again
-   * Fix kdesud security by
+   * Fix tdesud security by
      a) Not creating the socket under /tmp
      b) Verifying afterwards that it was our own socket
  
@@ -3332,7 +3332,7 @@ tdelibs (4:2.1-20010109-1) unstable; urgency=low
 tdelibs (4:2.1-20010106-1) unstable; urgency=low
  
    * more upstream bug fixes
-   * Contains both the symlink/sniff attack fix for kdesu
+   * Contains both the symlink/sniff attack fix for tdesu
    * Moving conflicts for task-* packages to tdebase
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 06 Jan 2001 15:00:00 -0700
diff --git a/ubuntu/maverick/tdelibs/debian/copyright b/ubuntu/maverick/tdelibs/debian/copyright
index c622c0cf8..7c67eaede 100644
--- a/ubuntu/maverick/tdelibs/debian/copyright
+++ b/ubuntu/maverick/tdelibs/debian/copyright
@@ -14,8 +14,8 @@ systems, the complete text of the BSD, GPL and LGPL licenses can be found
 in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and
 /usr/share/common-licenses/LGPL files.
 
-libartskde, interfaces, kabc, kate, kcert, kconf_update, kdecore, kded, kdefx,
-kdeprint, kdesu, kdeui, kdewidgets, khtml, kimgio, kinit, kio, kioslave, kjs,
+libartskde, interfaces, kabc, kate, kcert, kconf_update, tdecore, kded, tdefx,
+tdeprint, tdesu, tdeui, kdewidgets, khtml, kimgio, kinit, kio, kioslave, kjs,
 kparts, ksmartcard, kspell, kstyles, libkmid, libkscreensaver
 ------------------------------------------------------------------------------
 LGPL
diff --git a/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/findfiles b/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/findfiles
index 59a1d97a2..e53ad2bee 100644
--- a/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/findfiles
+++ b/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/findfiles
@@ -31,7 +31,7 @@ for file in `cat ./kolf/courses.list 2>/dev/null`; do
 	cat ./kolf/$file 2>/dev/null | grep -v debian >> $filelist
 done
 find ./amor/data -name \*rc -print 2>/dev/null | grep -v debian >> $filelist
-find ./kdeprint -name \*.print -print 2>/dev/null | grep -v debian >> $filelist 
+find ./tdeprint -name \*.print -print 2>/dev/null | grep -v debian >> $filelist 
 find . -name \*.kksrc -print 2>/dev/null | grep -v debian >> $filelist
 find ./kopete -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
 find . -name \*.kdevtemplate -print 2>/dev/null | grep -v debian >> $filelist
diff --git a/ubuntu/maverick/tdelibs/debian/man/cupsdoprint-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/cupsdoprint-trinity.1
index a79649057..52275e6f8 100644
--- a/ubuntu/maverick/tdelibs/debian/man/cupsdoprint-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/cupsdoprint-trinity.1
@@ -49,7 +49,7 @@ Information about printing under UNIX
 .BR lp (1),\  lpr (1),\  lpoptions (1)
 .SH AUTHORS
 .nf
-Michael Goffioul <kdeprint@swing.be>
+Michael Goffioul <tdeprint@swing.be>
 
 .br
 .fi
diff --git a/ubuntu/maverick/tdelibs/debian/man/kdeinit-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/kdeinit-trinity.1
index 1e1e10adf..1c3861783 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kdeinit-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/kdeinit-trinity.1
@@ -1,21 +1,21 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDEINIT 1 "Jun 2006" "K Desktop Environment" "process launcher"
+.TH TDEINIT 1 "Jun 2006" "K Desktop Environment" "process launcher"
 .SH NAME
-kdeinit
+tdeinit
 \- KDE process launcher
 .SH SYNOPSIS
-\fBkdeinit\fP [options]
+\fBtdeinit\fP [options]
 .SH DESCRIPTION
-\fBkdeinit\fP is a process launcher similar to \fBinit\fP used for booting UNIX.
+\fBtdeinit\fP is a process launcher similar to \fBinit\fP used for booting UNIX.
 .sp 1
-\fBkdeinit\fP is used to start all other KDE programs. It can start binary program files as well as kdeinit loadable modules (KLMs).
+\fBtdeinit\fP is used to start all other KDE programs. It can start binary program files as well as tdeinit loadable modules (KLMs).
 .sp 1
-When \fBkdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstartkde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
+When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstartkde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
 .sp 1
-The \fBkdeinit\fP master process can be used to start additional KDE programs via \fBkdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
+The \fBtdeinit\fP master process can be used to start additional KDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
 .sp 1
 KLMs are dynamic libraries that work like binary programs but can be started more efficiently.
-Starting KLMs via \fBkdeinit\fP is much faster and more memory efficient because \fBkdeinit\fP is linked against all libraries a standard KDE application needs. To start a KLM \fBkdeinit\fP forks and loads the dynamic library.
+Starting KLMs via \fBtdeinit\fP is much faster and more memory efficient because \fBtdeinit\fP is linked against all libraries a standard KDE application needs. To start a KLM \fBtdeinit\fP forks and loads the dynamic library.
 .SH OPTIONS
 .TP
 .B \-\-no\-kded
@@ -27,9 +27,9 @@ Terminate when no KDE applications are left running
 .SH FILES
 .TP
 .I /usr/lib/trinity
-directory with KLMs (kdeinit loadable modules)
+directory with KLMs (tdeinit loadable modules)
 .SH SEE ALSO
-.BR dcopserver (1),\  kded (1),\  kcminit (1),\  kdeinit_wrapper (1),\  klauncher (1),\  kshell (1),\  kwrapper (1),\  startkde (1)
+.BR dcopserver (1),\  kded (1),\  kcminit (1),\  tdeinit_wrapper (1),\  klauncher (1),\  kshell (1),\  kwrapper (1),\  startkde (1)
 .SH AUTHORS
 .nf
 Waldo Bastian <bastian@kde.org>
diff --git a/ubuntu/maverick/tdelibs/debian/man/kdeinit_shutdown-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/kdeinit_shutdown-trinity.1
index 11081656a..679666846 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kdeinit_shutdown-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/kdeinit_shutdown-trinity.1
@@ -1,14 +1,14 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDEINIT_SHUTDOWN 1 "Jun 2006" "K Desktop Environment" ""
+.TH TDEINIT_SHUTDOWN 1 "Jun 2006" "K Desktop Environment" ""
 .SH NAME
-kdeinit_shutdown
-\- shuts down kdeinit master process
+tdeinit_shutdown
+\- shuts down tdeinit master process
 .SH SYNOPSIS
-\fBkdeinit_shutdown
+\fBtdeinit_shutdown
 .SH DESCRIPTION
-\fBkdeinit_shutdown\fP shuts down kdeinit master process and terminates all processes spawned from it.
+\fBtdeinit_shutdown\fP shuts down tdeinit master process and terminates all processes spawned from it.
 .SH SEE ALSO
-.BR kdeinit (1)
+.BR tdeinit (1)
 .SH AUTHORS
 .nf
 The KDE project
diff --git a/ubuntu/maverick/tdelibs/debian/man/kdesu_stub-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/kdesu_stub-trinity.1
index 7a3800513..f21330cc4 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kdesu_stub-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/kdesu_stub-trinity.1
@@ -1,23 +1,23 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDESU_STUB 1 "Jun 2006" "K Desktop Environment" "KDE internal"
+.TH TDESU_STUB 1 "Jun 2006" "K Desktop Environment" "KDE internal"
 .SH NAME
-kdesu_stub
+tdesu_stub
 \- used by KDE su
 .SH DESCRIPTION
-!!! \fBkdesu_stub\fP is for KDE internal use only !!!
+!!! \fBtdesu_stub\fP is for KDE internal use only !!!
 .sp 1
-KDE su executes \fBkdesu_stub\fP through su or ssh. The stub is running as the target user. After some information is sent via stdin and stdout the stub executes the target program.
+KDE su executes \fBtdesu_stub\fP through su or ssh. The stub is running as the target user. After some information is sent via stdin and stdout the stub executes the target program.
 .br
 The information passed over are the X display, a X authentication cookie (if available), the PATH and the command to run.
 .sp 1
 KDE su uses a stub program because the X cookie is private information and therefore cannot be passed on the command line.
 .SH SEE ALSO
-.BR kdesu (1)
+.BR tdesu (1)
 .sp 1
 Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kdesu/
+.BR help:/tdesu/
 directly into konqueror or you can run 
-.BR "`khelpcenter help:/kdesu/'"
+.BR "`khelpcenter help:/tdesu/'"
 from the command\-line.
 .br
 .SH AUTHORS
diff --git a/ubuntu/maverick/tdelibs/debian/man/klauncher-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/klauncher-trinity.1
index f8274aea6..240dab5e3 100644
--- a/ubuntu/maverick/tdelibs/debian/man/klauncher-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/klauncher-trinity.1
@@ -4,15 +4,15 @@
 klauncher
 \- daemon for service activation in KDE
 .SH DESCRIPTION
-!!! \fBklauncher\fP is started automatically by kdeinit. It is not supposed to be started manually. !!!
+!!! \fBklauncher\fP is started automatically by tdeinit. It is not supposed to be started manually. !!!
 .sp 1
-\fBklauncher\fP is a daemon responsible for service activation in KDE. It operates closely together with the kdeinit master process to start new processes. KDE applications communicate with \fBklauncher\fP via DCOP to start new applications or services.
+\fBklauncher\fP is a daemon responsible for service activation in KDE. It operates closely together with the tdeinit master process to start new processes. KDE applications communicate with \fBklauncher\fP via DCOP to start new applications or services.
 .sp 1
 The error message "KLauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBklauncher\fP crashed.
 .sp 1
 Note: \fBklauncher\fP is not the "run command" dialog (Alt+F2)!
 .SH SEE ALSO
-.BR dcopserver (1),\  kdeinit (1)
+.BR dcopserver (1),\  tdeinit (1)
 .SH AUTHORS
 .nf
 Waldo Bastian <bastian@kde.org>
diff --git a/ubuntu/maverick/tdelibs/debian/man/kshell-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/kshell-trinity.1
index acbe215c8..5afbc3048 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kshell-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/kshell-trinity.1
@@ -1,21 +1,21 @@
 .TH KSHELL 1 "Jun 2006" "K Desktop Environment" ""
 .SH NAME
-kdeinit_wrapper, kshell, kwrapper
-\- start applications via kdeinit
+tdeinit_wrapper, kshell, kwrapper
+\- start applications via tdeinit
 .SH SYNOPSIS
-\fBkdeinit_wrapper\fP application [arguments]
+\fBtdeinit_wrapper\fP application [arguments]
 .sp 1
 \fBkshell\fP application [arguments]
 .sp 1
 \fBkwrapper\fP application [arguments]
 .SH DESCRIPTION
-\fBkdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP start applications via \fBkdeinit\fP.
+\fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP start applications via \fBtdeinit\fP.
 .sp 1
-\fBkdeinit_wrapper\fP simply passes application name and arguments to \fBkdeinit\fP.
+\fBtdeinit_wrapper\fP simply passes application name and arguments to \fBtdeinit\fP.
 .sp 1
-\fBkshell\fP passes application name, arguments, complete environment and current working directory to \fBkdeinit\fP.
+\fBkshell\fP passes application name, arguments, complete environment and current working directory to \fBtdeinit\fP.
 .sp 1
-\fBkwrapper\fP tries to make the application look like it was actually started directly and not via \fBkdeinit\fP. Like \fBkshell\fP it passes application name, arguments, complete environment and current working directory to \fBkdeinit\fP.
+\fBkwrapper\fP tries to make the application look like it was actually started directly and not via \fBtdeinit\fP. Like \fBkshell\fP it passes application name, arguments, complete environment and current working directory to \fBtdeinit\fP.
 .br
 Additionally it
 .IP "    \-"
@@ -37,7 +37,7 @@ application to start
 arguments of application to start
 .SS 
 .SH SEE ALSO
-.BR kdeinit (1)
+.BR tdeinit (1)
 .br
 .SH AUTHORS
 .nf
@@ -45,7 +45,7 @@ arguments of application to start
 .br
 Oswald Buddenhagen <ossi@kde.org>
 
-\fBkwrapper\fP and \fBkdeinit_wrapper\fP:
+\fBkwrapper\fP and \fBtdeinit_wrapper\fP:
 .br
 Waldo Bastian <bastian@kde.org>
 Mario Weilguni <mweilguni@sime.org>
diff --git a/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1
index e4eb8251f..0201523ce 100644
--- a/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1
@@ -25,7 +25,7 @@ directory with ppd files
 write printer database into this file
 .SH FILES
 .TP
-.I $KDEHOME/share/apps/kdeprint/printerdb_cups.txt
+.I $KDEHOME/share/apps/tdeprint/printerdb_cups.txt
 KDE printer database
 .br
 (if $KDEHOME is not set ~/.kde is used)
diff --git a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff
index 3a40b1045..06bd685ca 100644
--- a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff
+++ b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff
@@ -3,7 +3,7 @@
 @@ -54,10 +54,8 @@
  	find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
  	find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
- 	echo ./kdecore/kde-config.cpp.in >> files ;\
+ 	echo ./tdecore/kde-config.cpp.in >> files ;\
 -	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
 -	: > kde.pot ;\
 +	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp;
diff --git a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
index 0671ce20e..a0db3e5c7 100644
--- a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
+++ b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
@@ -1,5 +1,5 @@
---- tdelibs/kdecore/kaboutdata.cpp	2006-03-17 10:19:05.000000000 +0000
-+++ tdelibs/kdecore/kaboutdata.cpp	2006-12-05 19:46:12.000000000 +0000
+--- tdelibs/tdecore/kaboutdata.cpp	2006-03-17 10:19:05.000000000 +0000
++++ tdelibs/tdecore/kaboutdata.cpp	2006-12-05 19:46:12.000000000 +0000
 @@ -389,7 +389,7 @@
              "of the translation teams all over the world.</p>"
              "<p>For more information on KDE internationalization "
diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules
index 4cdb2747a..119f2a4fe 100755
--- a/ubuntu/maverick/tdelibs/debian/rules
+++ b/ubuntu/maverick/tdelibs/debian/rules
@@ -31,7 +31,7 @@ DEB_FIXPERMS_EXCLUDE := \
 	opt/trinity/bin/fileshareset	\
 	opt/trinity/bin/kgrantpty	\
 	opt/trinity/bin/kpac_dhcp_helper \
-	opt/trinity/bin/start_kdeinit
+	opt/trinity/bin/start_tdeinit
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdelibs-trinity-dbg
 
@@ -40,7 +40,7 @@ DEB_DH_MAKESHLIBS_ARGS_tdelibs4c2a-trinity := -V'tdelibs4c2a-trinity (>= 4:3.5.8
 binary-install/tdelibs-data-trinity::
 	install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu
 	install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf
-	uudecode debian/icons/aboutkde-kubuntu.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/apps/kdeui/pics/aboutkde.png
+	uudecode debian/icons/aboutkde-kubuntu.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/apps/tdeui/pics/aboutkde.png
 
 	uudecode debian/icons/cr16-device-system.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/16x16/devices/system.png
 	uudecode debian/icons/cr22-device-system.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/22x22/devices/system.png
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index 22d939e81..6cd2a864c 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
@@ -8,7 +8,7 @@ debian/tmp/etc/trinity/katefiletyperc
 debian/tmp/etc/trinity/katesyntaxhighlightingrc
 debian/tmp/etc/trinity/kdebug.areas
 debian/tmp/etc/trinity/kdebugrc
-debian/tmp/etc/trinity/kdeprintrc
+debian/tmp/etc/trinity/tdeprintrc
 debian/tmp/etc/trinity/kio_isorc
 debian/tmp/etc/trinity/ksslcalist
 debian/tmp/etc/trinity/kthemestylerc
@@ -40,152 +40,152 @@ debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_instantmessenger.desk
 debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_ktexteditor.desktop
 debian/tmp/opt/trinity/share/apps/kconf_update/kcookiescfg.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/kded.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kdeprintrc.upd
+debian/tmp/opt/trinity/share/apps/kconf_update/tdeprintrc.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/kio_help.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/kioslave.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/move_kio_help_cache.sh
 debian/tmp/opt/trinity/share/apps/kconf_update/proxytype.pl
 debian/tmp/opt/trinity/share/apps/kconf_update/useragent.pl
-debian/tmp/opt/trinity/share/apps/kdeprint/apsdriver1
-debian/tmp/opt/trinity/share/apps/kdeprint/apsdriver2
-debian/tmp/opt/trinity/share/apps/kdeprint/cupsd.conf.template
-debian/tmp/opt/trinity/share/apps/kdeprint/cups_logo.png
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/enscript.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/enscript.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/imagetops.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/imagetops.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/pdf2ps.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/pdf2ps.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/pdfwrite.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/pdfwrite.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/poster.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/poster.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/ps2pdf.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/ps2pdf.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook1.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook1.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook2.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook2.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psbook.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psnup.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psnup.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psselect.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/filters/psselect.xml
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/actions/filterstop.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/actions/kdeprint_restartsrv.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/actions/kdeprint_uploadsmb.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_computer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_cancelled.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_completed.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_error.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_job_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_class.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_class_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_class_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_defect.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_remote.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_remote_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_remote_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/16x16/apps/kdeprint_printer_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/history.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_addprinter.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_addpseudo.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_configmgr.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_configsrv.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_defaulthard.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_defaultsoft.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_enableprinter.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_printer_infos.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_printstate.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_queuestate.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_report.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_restartsrv.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_stopprinter.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_testprinter.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_uploadsmb.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/actions/package_utilities.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/22x22/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/actions/kdeprint_inklevel.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_defect.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote_process.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_stopped.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_users.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/48x48/apps/kdeprint_printer_class.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/48x48/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer_class.png
-debian/tmp/opt/trinity/share/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer.png
-debian/tmp/opt/trinity/share/apps/kdeprint/kde_logo.png
-debian/tmp/opt/trinity/share/apps/kdeprint/lprngtooldriver1
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_collate.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_collate_reverse.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_color.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_duplex_long.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_duplex_none.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_duplex_short.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_grayscale.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_landscape.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_nup1.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_nup2.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_nup4.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_nupother.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_portrait.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_prettyprint.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_revlandscape.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_revportrait.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_uncollate.png
-debian/tmp/opt/trinity/share/apps/kdeprint/pics/kdeprint_uncollate_reverse.png
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/cups.print
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/ext.print
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/lpdunix.print
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/lpr.print
-debian/tmp/opt/trinity/share/apps/kdeprint/plugins/rlpr.print
-debian/tmp/opt/trinity/share/apps/kdeprint/preview-mini.png
-debian/tmp/opt/trinity/share/apps/kdeprint/preview.png
-debian/tmp/opt/trinity/share/apps/kdeprint/side.png
-debian/tmp/opt/trinity/share/apps/kdeprint/specials.desktop
-debian/tmp/opt/trinity/share/apps/kdeprint/testprint.ps
-debian/tmp/opt/trinity/share/apps/kdeprint/tiledown.png
-debian/tmp/opt/trinity/share/apps/kdeprint/tileup.png
-debian/tmp/opt/trinity/share/apps/kdeprint/tools/escputil.desktop
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-middle-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-middle-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-top-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bar-top-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-middle-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-middle-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-top-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/box-top-right.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/kde_infopage.css
-debian/tmp/opt/trinity/share/apps/kdeui/about/kde_infopage_rtl.css
-debian/tmp/opt/trinity/share/apps/kdeui/about/top-left.png
-debian/tmp/opt/trinity/share/apps/kdeui/about/top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeui/pics/aboutkde.png
-debian/tmp/opt/trinity/share/apps/kdeui/pics/ktip-background.png
-debian/tmp/opt/trinity/share/apps/kdeui/pics/ktip-bulb.png
+debian/tmp/opt/trinity/share/apps/tdeprint/apsdriver1
+debian/tmp/opt/trinity/share/apps/tdeprint/apsdriver2
+debian/tmp/opt/trinity/share/apps/tdeprint/cupsd.conf.template
+debian/tmp/opt/trinity/share/apps/tdeprint/cups_logo.png
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/enscript.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/enscript.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/imagetops.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/imagetops.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/pdf2ps.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/pdf2ps.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/pdfwrite.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/pdfwrite.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/poster.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/poster.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/ps2pdf.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/ps2pdf.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook1.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook1.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook2.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook2.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psbook.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psnup.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psnup.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psselect.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/filters/psselect.xml
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/actions/filterstop.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/actions/tdeprint_restartsrv.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/actions/tdeprint_uploadsmb.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_computer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_cancelled.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_completed.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_error.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_job_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_class.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_class_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_class_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_defect.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_remote.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_remote_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_remote_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/16x16/apps/tdeprint_printer_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/history.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_addprinter.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_addpseudo.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_configmgr.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_configsrv.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_defaulthard.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_defaultsoft.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_enableprinter.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_printer_infos.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_printstate.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_queuestate.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_report.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_restartsrv.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_stopprinter.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_testprinter.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/tdeprint_uploadsmb.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/actions/package_utilities.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/22x22/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/actions/tdeprint_inklevel.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_class.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_class_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_class_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_defect.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_remote.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_remote_process.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_remote_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_stopped.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/32x32/apps/tdeprint_printer_users.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/48x48/apps/tdeprint_printer_class.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/48x48/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/64x64/apps/tdeprint_printer_class.png
+debian/tmp/opt/trinity/share/apps/tdeprint/icons/crystalsvg/64x64/apps/tdeprint_printer.png
+debian/tmp/opt/trinity/share/apps/tdeprint/kde_logo.png
+debian/tmp/opt/trinity/share/apps/tdeprint/lprngtooldriver1
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_collate.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_collate_reverse.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_color.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_duplex_long.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_duplex_none.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_duplex_short.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_grayscale.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_landscape.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_nup1.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_nup2.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_nup4.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_nupother.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_portrait.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_prettyprint.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_revlandscape.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_revportrait.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_uncollate.png
+debian/tmp/opt/trinity/share/apps/tdeprint/pics/tdeprint_uncollate_reverse.png
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/cups.print
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/ext.print
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/lpdunix.print
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/lpr.print
+debian/tmp/opt/trinity/share/apps/tdeprint/plugins/rlpr.print
+debian/tmp/opt/trinity/share/apps/tdeprint/preview-mini.png
+debian/tmp/opt/trinity/share/apps/tdeprint/preview.png
+debian/tmp/opt/trinity/share/apps/tdeprint/side.png
+debian/tmp/opt/trinity/share/apps/tdeprint/specials.desktop
+debian/tmp/opt/trinity/share/apps/tdeprint/testprint.ps
+debian/tmp/opt/trinity/share/apps/tdeprint/tiledown.png
+debian/tmp/opt/trinity/share/apps/tdeprint/tileup.png
+debian/tmp/opt/trinity/share/apps/tdeprint/tools/escputil.desktop
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-middle-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-middle-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-middle-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-middle-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-right.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage.css
+debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage_rtl.css
+debian/tmp/opt/trinity/share/apps/tdeui/about/top-left.png
+debian/tmp/opt/trinity/share/apps/tdeui/about/top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeui/pics/aboutkde.png
+debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-background.png
+debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-bulb.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kactionselector.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kactivelabel.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kcharselect.png
@@ -3572,7 +3572,7 @@ debian/tmp/opt/trinity/share/services/katepart.desktop
 debian/tmp/opt/trinity/share/services/kbzip2filter.desktop
 debian/tmp/opt/trinity/share/services/kcertpart.desktop
 debian/tmp/opt/trinity/share/services/kded/kcookiejar.desktop
-debian/tmp/opt/trinity/share/services/kded/kdeprintd.desktop
+debian/tmp/opt/trinity/share/services/kded/tdeprintd.desktop
 debian/tmp/opt/trinity/share/services/kded/kdetrayproxy.desktop
 debian/tmp/opt/trinity/share/services/kded/kpasswdserver.desktop
 debian/tmp/opt/trinity/share/services/kded/kssld.desktop
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
index b065921dd..8f84589d6 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -204,33 +204,33 @@ debian/tmp/opt/trinity/include/kde_file.h
 debian/tmp/opt/trinity/include/tdelibs_export.h
 debian/tmp/opt/trinity/include/kdemacros.h
 debian/tmp/opt/trinity/include/kde.pot
-debian/tmp/opt/trinity/include/kdeprint/driver.h
-debian/tmp/opt/trinity/include/kdeprint/kiconselectaction.h
-debian/tmp/opt/trinity/include/kdeprint/kmjob.h
-debian/tmp/opt/trinity/include/kdeprint/kmjobmanager.h
-debian/tmp/opt/trinity/include/kdeprint/kmjobviewer.h
-debian/tmp/opt/trinity/include/kdeprint/kmmainview.h
-debian/tmp/opt/trinity/include/kdeprint/kmmanager.h
-debian/tmp/opt/trinity/include/kdeprint/kmobject.h
-debian/tmp/opt/trinity/include/kdeprint/kmprinter.h
-debian/tmp/opt/trinity/include/kdeprint/kmprinterpage.h
-debian/tmp/opt/trinity/include/kdeprint/kmtimer.h
-debian/tmp/opt/trinity/include/kdeprint/kpreloadobject.h
-debian/tmp/opt/trinity/include/kdeprint/kprintdialog.h
-debian/tmp/opt/trinity/include/kdeprint/kprintdialogpage.h
-debian/tmp/opt/trinity/include/kdeprint/lpr/lprhandler.h
-debian/tmp/opt/trinity/include/kdeprint/lpr/lprsettings.h
-debian/tmp/opt/trinity/include/kdeprint/lpr/printcapentry.h
+debian/tmp/opt/trinity/include/tdeprint/driver.h
+debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h
+debian/tmp/opt/trinity/include/tdeprint/kmjob.h
+debian/tmp/opt/trinity/include/tdeprint/kmjobmanager.h
+debian/tmp/opt/trinity/include/tdeprint/kmjobviewer.h
+debian/tmp/opt/trinity/include/tdeprint/kmmainview.h
+debian/tmp/opt/trinity/include/tdeprint/kmmanager.h
+debian/tmp/opt/trinity/include/tdeprint/kmobject.h
+debian/tmp/opt/trinity/include/tdeprint/kmprinter.h
+debian/tmp/opt/trinity/include/tdeprint/kmprinterpage.h
+debian/tmp/opt/trinity/include/tdeprint/kmtimer.h
+debian/tmp/opt/trinity/include/tdeprint/kpreloadobject.h
+debian/tmp/opt/trinity/include/tdeprint/kprintdialog.h
+debian/tmp/opt/trinity/include/tdeprint/kprintdialogpage.h
+debian/tmp/opt/trinity/include/tdeprint/lpr/lprhandler.h
+debian/tmp/opt/trinity/include/tdeprint/lpr/lprsettings.h
+debian/tmp/opt/trinity/include/tdeprint/lpr/printcapentry.h
 debian/tmp/opt/trinity/include/kdesktopfile.h
-debian/tmp/opt/trinity/include/kdesu/client.h
-debian/tmp/opt/trinity/include/kdesu/defaults.h
-debian/tmp/opt/trinity/include/kdesu/kcookie.h
-debian/tmp/opt/trinity/include/kdesu/kdesu_pty.h
-debian/tmp/opt/trinity/include/kdesu/process.h
-debian/tmp/opt/trinity/include/kdesu/pty.h
-debian/tmp/opt/trinity/include/kdesu/ssh.h
-debian/tmp/opt/trinity/include/kdesu/stub.h
-debian/tmp/opt/trinity/include/kdesu/su.h
+debian/tmp/opt/trinity/include/tdesu/client.h
+debian/tmp/opt/trinity/include/tdesu/defaults.h
+debian/tmp/opt/trinity/include/tdesu/kcookie.h
+debian/tmp/opt/trinity/include/tdesu/tdesu_pty.h
+debian/tmp/opt/trinity/include/tdesu/process.h
+debian/tmp/opt/trinity/include/tdesu/pty.h
+debian/tmp/opt/trinity/include/tdesu/ssh.h
+debian/tmp/opt/trinity/include/tdesu/stub.h
+debian/tmp/opt/trinity/include/tdesu/su.h
 debian/tmp/opt/trinity/include/kde_terminal_interface.h
 debian/tmp/opt/trinity/include/kdeversion.h
 debian/tmp/opt/trinity/include/kdialogbase.h
@@ -324,7 +324,7 @@ debian/tmp/opt/trinity/include/kio/http_slave_defaults.h
 debian/tmp/opt/trinity/include/kio/ioslave_defaults.h
 debian/tmp/opt/trinity/include/kio/jobclasses.h
 debian/tmp/opt/trinity/include/kio/job.h
-debian/tmp/opt/trinity/include/kio/kdesasl.h
+debian/tmp/opt/trinity/include/kio/tdesasl.h
 debian/tmp/opt/trinity/include/kio/kmdbase.h
 debian/tmp/opt/trinity/include/kio/kmdcodec.h
 debian/tmp/opt/trinity/include/kio/kntlm.h
@@ -743,35 +743,35 @@ debian/tmp/opt/trinity/lib/libkabc_ldapkio.so
 debian/tmp/opt/trinity/lib/libkabc.so
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.la
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so
-debian/tmp/opt/trinity/lib/libkdecore.la
-debian/tmp/opt/trinity/lib/libkdecore.so
-debian/tmp/opt/trinity/lib/libkdefakes.la
-debian/tmp/opt/trinity/lib/libkdefakes_nonpic.a
-debian/tmp/opt/trinity/lib/libkdefakes_pic.a
-debian/tmp/opt/trinity/lib/libkdefakes.so
-debian/tmp/opt/trinity/lib/libkdefx.la
-debian/tmp/opt/trinity/lib/libkdefx.so
-debian/tmp/opt/trinity/lib/libkdeinit_cupsdconf.la
-debian/tmp/opt/trinity/lib/libkdeinit_dcopserver.la
-debian/tmp/opt/trinity/lib/libkdeinit_kaddprinterwizard.la
-debian/tmp/opt/trinity/lib/libkdeinit_kbuildsycoca.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcmshell.la
-debian/tmp/opt/trinity/lib/libkdeinit_kconf_update.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcookiejar.la
-debian/tmp/opt/trinity/lib/libkdeinit_kded.la
-debian/tmp/opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.la
-debian/tmp/opt/trinity/lib/libkdeinit_kio_uiserver.la
-debian/tmp/opt/trinity/lib/libkdeinit_klauncher.la
-debian/tmp/opt/trinity/lib/libkdeprint.la
-debian/tmp/opt/trinity/lib/libkdeprint_management.la
-debian/tmp/opt/trinity/lib/libkdeprint_management.so
-debian/tmp/opt/trinity/lib/libkdeprint.so
-debian/tmp/opt/trinity/lib/libkdesasl.la
-debian/tmp/opt/trinity/lib/libkdesasl.so
-debian/tmp/opt/trinity/lib/libkdesu.la
-debian/tmp/opt/trinity/lib/libkdesu.so
-debian/tmp/opt/trinity/lib/libkdeui.la
-debian/tmp/opt/trinity/lib/libkdeui.so
+debian/tmp/opt/trinity/lib/libtdecore.la
+debian/tmp/opt/trinity/lib/libtdecore.so
+debian/tmp/opt/trinity/lib/libtdefakes.la
+debian/tmp/opt/trinity/lib/libtdefakes_nonpic.a
+debian/tmp/opt/trinity/lib/libtdefakes_pic.a
+debian/tmp/opt/trinity/lib/libtdefakes.so
+debian/tmp/opt/trinity/lib/libtdefx.la
+debian/tmp/opt/trinity/lib/libtdefx.so
+debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.la
+debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.la
+debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.la
+debian/tmp/opt/trinity/lib/libtdeinit_kbuildsycoca.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcmshell.la
+debian/tmp/opt/trinity/lib/libtdeinit_kconf_update.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcookiejar.la
+debian/tmp/opt/trinity/lib/libtdeinit_kded.la
+debian/tmp/opt/trinity/lib/libtdeinit_kio_http_cache_cleaner.la
+debian/tmp/opt/trinity/lib/libtdeinit_kio_uiserver.la
+debian/tmp/opt/trinity/lib/libtdeinit_klauncher.la
+debian/tmp/opt/trinity/lib/libtdeprint.la
+debian/tmp/opt/trinity/lib/libtdeprint_management.la
+debian/tmp/opt/trinity/lib/libtdeprint_management.so
+debian/tmp/opt/trinity/lib/libtdeprint.so
+debian/tmp/opt/trinity/lib/libtdesasl.la
+debian/tmp/opt/trinity/lib/libtdesasl.so
+debian/tmp/opt/trinity/lib/libtdesu.la
+debian/tmp/opt/trinity/lib/libtdesu.so
+debian/tmp/opt/trinity/lib/libtdeui.la
+debian/tmp/opt/trinity/lib/libtdeui.so
 debian/tmp/opt/trinity/lib/libkdnssd.la
 debian/tmp/opt/trinity/lib/libkdnssd.so
 debian/tmp/opt/trinity/lib/libkhtml.la
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
index 6ee941938..91c12cb5b 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -20,12 +20,12 @@ debian/tmp/opt/trinity/bin/kconf_update
 debian/tmp/opt/trinity/bin/kcookiejar
 debian/tmp/opt/trinity/bin/kde-config
 debian/tmp/opt/trinity/bin/kded
-debian/tmp/opt/trinity/bin/kdeinit
-debian/tmp/opt/trinity/bin/kdeinit_shutdown
-debian/tmp/opt/trinity/bin/kdeinit_wrapper
+debian/tmp/opt/trinity/bin/tdeinit
+debian/tmp/opt/trinity/bin/tdeinit_shutdown
+debian/tmp/opt/trinity/bin/tdeinit_wrapper
 debian/tmp/opt/trinity/bin/kdetcompmgr
 debian/tmp/opt/trinity/bin/kde-menu
-debian/tmp/opt/trinity/bin/kdesu_stub
+debian/tmp/opt/trinity/bin/tdesu_stub
 debian/tmp/opt/trinity/bin/kdontchangethehostname
 debian/tmp/opt/trinity/bin/kdostartupconfig
 debian/tmp/opt/trinity/bin/kfile
@@ -50,8 +50,8 @@ debian/tmp/opt/trinity/bin/lnusertemp
 debian/tmp/opt/trinity/bin/make_driver_db_cups
 debian/tmp/opt/trinity/bin/make_driver_db_lpr
 debian/tmp/opt/trinity/bin/meinproc
-debian/tmp/opt/trinity/bin/start_kdeinit
-debian/tmp/opt/trinity/bin/start_kdeinit_wrapper
+debian/tmp/opt/trinity/bin/start_tdeinit
+debian/tmp/opt/trinity/bin/start_tdeinit_wrapper
 debian/tmp/opt/trinity/lib/trinity/cupsdconf.la
 debian/tmp/opt/trinity/lib/trinity/cupsdconf.so
 debian/tmp/opt/trinity/lib/trinity/dcopserver.la
@@ -83,8 +83,8 @@ debian/tmp/opt/trinity/lib/trinity/kcookiejar.la
 debian/tmp/opt/trinity/lib/trinity/kcookiejar.so
 debian/tmp/opt/trinity/lib/trinity/kded_kcookiejar.la
 debian/tmp/opt/trinity/lib/trinity/kded_kcookiejar.so
-debian/tmp/opt/trinity/lib/trinity/kded_kdeprintd.la
-debian/tmp/opt/trinity/lib/trinity/kded_kdeprintd.so
+debian/tmp/opt/trinity/lib/trinity/kded_tdeprintd.la
+debian/tmp/opt/trinity/lib/trinity/kded_tdeprintd.so
 debian/tmp/opt/trinity/lib/trinity/kded_kdetrayproxy.la
 debian/tmp/opt/trinity/lib/trinity/kded_kdetrayproxy.so
 debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.la
@@ -97,18 +97,18 @@ debian/tmp/opt/trinity/lib/trinity/kded.la
 debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.la
 debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.so
 debian/tmp/opt/trinity/lib/trinity/kded.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_cups.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_cups.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_ext.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_ext.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_lpdunix.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_lpdunix.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_lpr.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_lpr.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_rlpr.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_rlpr.so
-debian/tmp/opt/trinity/lib/trinity/kdeprint_tool_escputil.la
-debian/tmp/opt/trinity/lib/trinity/kdeprint_tool_escputil.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_cups.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_cups.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_ext.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_ext.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_lpdunix.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_lpdunix.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_lpr.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_lpr.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_rlpr.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_rlpr.so
+debian/tmp/opt/trinity/lib/trinity/tdeprint_tool_escputil.la
+debian/tmp/opt/trinity/lib/trinity/tdeprint_tool_escputil.so
 debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.la
 debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.so
 debian/tmp/opt/trinity/lib/trinity/kgzipfilter.la
@@ -187,8 +187,8 @@ debian/tmp/opt/trinity/lib/trinity/libkatepart.la
 debian/tmp/opt/trinity/lib/trinity/libkatepart.so
 debian/tmp/opt/trinity/lib/trinity/libkcertpart.la
 debian/tmp/opt/trinity/lib/trinity/libkcertpart.so
-debian/tmp/opt/trinity/lib/trinity/libkdeprint_management_module.la
-debian/tmp/opt/trinity/lib/trinity/libkdeprint_management_module.so
+debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.la
+debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.so
 debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.la
 debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.so
 debian/tmp/opt/trinity/lib/trinity/libkmultipart.la
@@ -235,33 +235,33 @@ debian/tmp/opt/trinity/lib/libkabc.so.1
 debian/tmp/opt/trinity/lib/libkabc.so.1.2.0
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0.0.0
-debian/tmp/opt/trinity/lib/libkdecore.so.4
-debian/tmp/opt/trinity/lib/libkdecore.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdefakes.so.4
-debian/tmp/opt/trinity/lib/libkdefakes.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdefx.so.4
-debian/tmp/opt/trinity/lib/libkdefx.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdeinit_cupsdconf.so
-debian/tmp/opt/trinity/lib/libkdeinit_dcopserver.so
-debian/tmp/opt/trinity/lib/libkdeinit_kaddprinterwizard.so
-debian/tmp/opt/trinity/lib/libkdeinit_kbuildsycoca.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcmshell.so
-debian/tmp/opt/trinity/lib/libkdeinit_kconf_update.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcookiejar.so
-debian/tmp/opt/trinity/lib/libkdeinit_kded.so
-debian/tmp/opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.so
-debian/tmp/opt/trinity/lib/libkdeinit_kio_uiserver.so
-debian/tmp/opt/trinity/lib/libkdeinit_klauncher.so
-debian/tmp/opt/trinity/lib/libkdeprint_management.so.4
-debian/tmp/opt/trinity/lib/libkdeprint_management.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdeprint.so.4
-debian/tmp/opt/trinity/lib/libkdeprint.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdesasl.so.1
-debian/tmp/opt/trinity/lib/libkdesasl.so.1.2.0
-debian/tmp/opt/trinity/lib/libkdesu.so.4
-debian/tmp/opt/trinity/lib/libkdesu.so.4.2.0
-debian/tmp/opt/trinity/lib/libkdeui.so.4
-debian/tmp/opt/trinity/lib/libkdeui.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdecore.so.4
+debian/tmp/opt/trinity/lib/libtdecore.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdefakes.so.4
+debian/tmp/opt/trinity/lib/libtdefakes.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdefx.so.4
+debian/tmp/opt/trinity/lib/libtdefx.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.so
+debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.so
+debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+debian/tmp/opt/trinity/lib/libtdeinit_kbuildsycoca.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcmshell.so
+debian/tmp/opt/trinity/lib/libtdeinit_kconf_update.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcookiejar.so
+debian/tmp/opt/trinity/lib/libtdeinit_kded.so
+debian/tmp/opt/trinity/lib/libtdeinit_kio_http_cache_cleaner.so
+debian/tmp/opt/trinity/lib/libtdeinit_kio_uiserver.so
+debian/tmp/opt/trinity/lib/libtdeinit_klauncher.so
+debian/tmp/opt/trinity/lib/libtdeprint_management.so.4
+debian/tmp/opt/trinity/lib/libtdeprint_management.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeprint.so.4
+debian/tmp/opt/trinity/lib/libtdeprint.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdesasl.so.1
+debian/tmp/opt/trinity/lib/libtdesasl.so.1.2.0
+debian/tmp/opt/trinity/lib/libtdesu.so.4
+debian/tmp/opt/trinity/lib/libtdesu.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeui.so.4
+debian/tmp/opt/trinity/lib/libtdeui.so.4.2.0
 debian/tmp/opt/trinity/lib/libkdnssd.so.1
 debian/tmp/opt/trinity/lib/libkdnssd.so.1.0.0
 debian/tmp/opt/trinity/lib/libkhtml.so.4
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian
index 68997d62e..593ec30ed 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian
@@ -1,15 +1,15 @@
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kaddprinterwizard.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_cupsdconf.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_dcopserver.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcmshell.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kbuildsycoca.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kded.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcookiejar.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_klauncher.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kconf_update.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_uiserver.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcmshell.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kio_http_cache_cleaner.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kbuildsycoca.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_klauncher.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kconf_update.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kio_uiserver.so
 tdelibs4c2a binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
 tdelibs4c2a binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
 tdelibs4c2a binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/start_kdeinit 4755 root/root
+tdelibs4c2a binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
index eba677adb..00ed3a04e 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
@@ -20,7 +20,7 @@ debian/man/out/ksendbugmail-trinity.1
 debian/man/out/ktelnetservice-trinity.1
 debian/man/out/lnusertemp-trinity.1
 debian/man/out/meinproc-trinity.1
-./debian/man/kdeinit-trinity.1
+./debian/man/tdeinit-trinity.1
 ./debian/man/cupsdoprint-trinity.1
 ./debian/man/dcopclient-trinity.1
 ./debian/man/dcopobject-trinity.1
@@ -31,9 +31,9 @@ debian/man/out/meinproc-trinity.1
 ./debian/man/imagetops-trinity.1
 ./debian/man/kab2kabc-trinity.1
 ./debian/man/kcmshell-trinity.1
-./debian/man/kdeinit_shutdown-trinity.1
+./debian/man/tdeinit_shutdown-trinity.1
 ./debian/man/kde-menu-trinity.1
-./debian/man/kdesu_stub-trinity.1
+./debian/man/tdesu_stub-trinity.1
 ./debian/man/kgrantpty-trinity.1
 ./debian/man/khotnewstuff-trinity.1
 ./debian/man/kioexec-trinity.1
diff --git a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.install b/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.install
index 742bd3f9c..79dfc1cef 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.install
@@ -6,8 +6,8 @@ debian/tmp/opt/trinity/lib/trinity/kmix_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/kmix_panelapplet.so
 debian/tmp/opt/trinity/lib/trinity/kmixctrl.la
 debian/tmp/opt/trinity/lib/trinity/kmixctrl.so
-debian/tmp/opt/trinity/lib/libkdeinit_kmix.so
-debian/tmp/opt/trinity/lib/libkdeinit_kmixctrl.so
+debian/tmp/opt/trinity/lib/libtdeinit_kmix.so
+debian/tmp/opt/trinity/lib/libtdeinit_kmixctrl.so
 debian/tmp/opt/trinity/share/applications/kde/kmix.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/kmixapplet.desktop
 debian/tmp/opt/trinity/share/apps/kmix/kmixui.rc
diff --git a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian b/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian
index 6f97d1c92..a2a96f9ee 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian
+++ b/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian
@@ -1,4 +1,4 @@
-kmix: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmixctrl.so
-kmix: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmix.so
-kmix: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
-kmix: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
+kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
+kmix: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
diff --git a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.install b/ubuntu/maverick/tdemultimedia/debian/krec-trinity.install
index 7446b200d..bbb4ed25f 100644
--- a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/krec-trinity.install
@@ -9,7 +9,7 @@ debian/tmp/opt/trinity/lib/trinity/libkrecexport_ogg.la
 debian/tmp/opt/trinity/lib/trinity/libkrecexport_ogg.so
 debian/tmp/opt/trinity/lib/trinity/libkrecexport_wave.la
 debian/tmp/opt/trinity/lib/trinity/libkrecexport_wave.so
-debian/tmp/opt/trinity/lib/libkdeinit_krec.so
+debian/tmp/opt/trinity/lib/libtdeinit_krec.so
 debian/tmp/opt/trinity/share/applications/kde/krec.desktop
 debian/tmp/opt/trinity/share/apps/krec/icons/crystalsvg/16x16/actions/krec_record.png
 debian/tmp/opt/trinity/share/apps/krec/icons/crystalsvg/22x22/actions/krec_record.png
diff --git a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian b/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian
index 4b6b929a1..b09b553d8 100644
--- a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian
+++ b/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian
@@ -1,3 +1,3 @@
-krec: no-shlibs-control-file opt/trinity/lib/libkdeinit_krec.so
-krec: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
-krec: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
+krec: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
+krec: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
diff --git a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install b/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install
index 21524ef0b..e7b22e4e0 100644
--- a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install
@@ -38,7 +38,7 @@ debian/tmp/opt/trinity/lib/trinity/noatunsimple.la
 debian/tmp/opt/trinity/lib/trinity/noatunsimple.so
 debian/tmp/opt/trinity/lib/libartseffects.la
 debian/tmp/opt/trinity/lib/libartseffects.so
-debian/tmp/opt/trinity/lib/libkdeinit_noatun.so
+debian/tmp/opt/trinity/lib/libtdeinit_noatun.so
 debian/tmp/opt/trinity/lib/libnoatun.so.1
 debian/tmp/opt/trinity/lib/libnoatun.so.1.2.0
 debian/tmp/opt/trinity/lib/libnoatunarts.la
diff --git a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian b/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian
index 2dba45ea5..89faa71aa 100644
--- a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian
+++ b/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian
@@ -1,4 +1,4 @@
 noatun: shlib-missing-in-control-file libwinskinvis.so opt/trinity/lib/libwinskinvis.so
 noatun: shlib-missing-in-control-file libartseffects.so opt/trinity/lib/libartseffects.so
 noatun: shlib-missing-in-control-file libnoatunarts.so opt/trinity/lib/libnoatunarts.so
-noatun: shlib-missing-in-control-file libkdeinit_noatun.so opt/trinity/lib/libkdeinit_noatun.so
+noatun: shlib-missing-in-control-file libtdeinit_noatun.so opt/trinity/lib/libtdeinit_noatun.so
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install
index 343efda6f..a6b4265bd 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install
@@ -151,10 +151,10 @@ debian/tmp/opt/trinity/lib/libaudiocdplugins.la
 debian/tmp/opt/trinity/lib/libaudiocdplugins.so
 debian/tmp/opt/trinity/lib/libkcddb.la
 debian/tmp/opt/trinity/lib/libkcddb.so
-debian/tmp/opt/trinity/lib/libkdeinit_kmix.la
-debian/tmp/opt/trinity/lib/libkdeinit_kmixctrl.la
-debian/tmp/opt/trinity/lib/libkdeinit_krec.la
-debian/tmp/opt/trinity/lib/libkdeinit_noatun.la
+debian/tmp/opt/trinity/lib/libtdeinit_kmix.la
+debian/tmp/opt/trinity/lib/libtdeinit_kmixctrl.la
+debian/tmp/opt/trinity/lib/libtdeinit_krec.la
+debian/tmp/opt/trinity/lib/libtdeinit_noatun.la
 debian/tmp/opt/trinity/lib/libkmidlib.la
 debian/tmp/opt/trinity/lib/libkmidlib.so
 debian/tmp/opt/trinity/lib/libmpeg.la
diff --git a/ubuntu/maverick/tdenetwork/debian/kdict-trinity.install b/ubuntu/maverick/tdenetwork/debian/kdict-trinity.install
index 24d312686..281f24270 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdict-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/kdict-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/kdict.la
 debian/tmp/opt/trinity/lib/trinity/kdict.so
 debian/tmp/opt/trinity/lib/trinity/kdict_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/kdict_panelapplet.so
-debian/tmp/opt/trinity/lib/libkdeinit_kdict.so
+debian/tmp/opt/trinity/lib/libtdeinit_kdict.so
 debian/tmp/opt/trinity/share/applications/kde/kdict.desktop
 debian/tmp/opt/trinity/share/apps/kdict/icons/crystalsvg/16x16/actions/define_clip.png
 debian/tmp/opt/trinity/share/apps/kdict/icons/crystalsvg/16x16/actions/query_erase.png
diff --git a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.install b/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.install
index 30d9f29b3..3c1146978 100644
--- a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/bin/dsirc
 debian/tmp/opt/trinity/bin/ksirc
 debian/tmp/opt/trinity/lib/trinity/ksirc.la
 debian/tmp/opt/trinity/lib/trinity/ksirc.so
-debian/tmp/opt/trinity/lib/libkdeinit_ksirc.so
+debian/tmp/opt/trinity/lib/libtdeinit_ksirc.so
 debian/tmp/opt/trinity/share/applications/kde/ksirc.desktop
 debian/tmp/opt/trinity/share/apps/ksirc/autodcc.pl
 debian/tmp/opt/trinity/share/apps/ksirc/eventsrc
diff --git a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.lintian b/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.lintian
index d4f2f589a..265515419 100644
--- a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.lintian
+++ b/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.lintian
@@ -1,3 +1,3 @@
-ksirc: no-shlibs-control-file opt/trinity/lib/libkdeinit_ksirc.so
-ksirc: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
-ksirc: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
+ksirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
+ksirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
+ksirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install b/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install
index eee07ec44..cc69d4cba 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install
@@ -61,8 +61,8 @@ debian/tmp/opt/trinity/include/kde/rss/image.h
 debian/tmp/opt/trinity/include/kde/rss/librss.h
 debian/tmp/opt/trinity/include/kde/rss/loader.h
 debian/tmp/opt/trinity/include/kde/rss/textinput.h
-debian/tmp/opt/trinity/lib/libkdeinit_kdict.la
-debian/tmp/opt/trinity/lib/libkdeinit_ksirc.la
+debian/tmp/opt/trinity/lib/libtdeinit_kdict.la
+debian/tmp/opt/trinity/lib/libtdeinit_ksirc.la
 debian/tmp/opt/trinity/lib/libkopete.la
 debian/tmp/opt/trinity/lib/libkopete.so
 debian/tmp/opt/trinity/lib/libkopete_msn_shared.la
diff --git a/ubuntu/maverick/tdepim/debian/changelog b/ubuntu/maverick/tdepim/debian/changelog
index 4dac80686..24807570c 100644
--- a/ubuntu/maverick/tdepim/debian/changelog
+++ b/ubuntu/maverick/tdepim/debian/changelog
@@ -943,7 +943,7 @@ tdepim (4:3.4.3-1) unstable; urgency=low
     + Fixes a FTBFS with newer versions of g++-4.0.
   * Rename libmimelib1c2 to libmimelib1c2a due to C++ allocator changes.
   * New patch 13_mimelib_self_contained.diff:
-    + Link against libkdefakes_pic.a instead of -lkdefakes to
+    + Link against libtdefakes_pic.a instead of -ltdefakes to
       eliminate mimelib's dependency on tdelibs.
     + Fix mimelib/config.h not to require the KDE or QT headers again.
       This allows dropping the libtdepim-dev dependency from
@@ -1106,7 +1106,7 @@ tdepim (4:3.4.2-1) unstable; urgency=low
     + Rename libmimelib1a -> libmimelib1c2 in order not to break
       lurker.  Also split out libkmime2 from this package while I'm
       at it so that lurker users don't have to install tdelibs4 --
-      at least, they won't have to once I can link libkdefakes statically
+      at least, they won't have to once I can link libtdefakes statically
       into mimelib (see bug #326113).
   * Add Vietnamese debconf translation.  Closes: #312159.
   * Remove 10_korganizer_makefile.diff, which has been applied in
diff --git a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.install b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.install
index 8bbaccc5d..b4087e1c1 100644
--- a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/bin/cervisia
-debian/tmp/opt/trinity/lib/libkdeinit_cervisia.la
-debian/tmp/opt/trinity/lib/libkdeinit_cervisia.so
+debian/tmp/opt/trinity/lib/libtdeinit_cervisia.la
+debian/tmp/opt/trinity/lib/libtdeinit_cervisia.so
 debian/tmp/opt/trinity/lib/trinity/cervisia.la
 debian/tmp/opt/trinity/lib/trinity/cervisia.so
 debian/tmp/opt/trinity/lib/trinity/libcervisiapart.la
diff --git a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.lintian b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.lintian
index d7a490dae..4e79c02c5 100644
--- a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.lintian
+++ b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.lintian
@@ -2,8 +2,8 @@
 cervisia: script-not-executable ./usr/share/apps/kconf_update/change_colors.pl
 cervisia: script-not-executable ./usr/share/apps/kconf_update/move_repositories.pl
 
-# This is from kdeinit black magic.
-cervisia: no-shlibs-control-file opt/trinity/lib/libkdeinit_cervisia.so
-cervisia: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_cervisia.so
-cervisia: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_cervisia.so
-cervisia: package-name-doesnt-match-sonames libkdeinit-cervisia
+# This is from tdeinit black magic.
+cervisia: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
+cervisia: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia: package-name-doesnt-match-sonames libtdeinit-cervisia
diff --git a/ubuntu/maverick/tdesdk/debian/changelog b/ubuntu/maverick/tdesdk/debian/changelog
index e041b19d5..288f761e6 100644
--- a/ubuntu/maverick/tdesdk/debian/changelog
+++ b/ubuntu/maverick/tdesdk/debian/changelog
@@ -476,7 +476,7 @@ tdesdk (4:3.4.2-2.1) unstable; urgency=medium
 tdesdk (4:3.4.2-2) unstable; urgency=low
 
   * Built against libfam-dev, not libgamin-dev (closes: #326547).
-  * Updated overrides files to account for kdeinit black magic.
+  * Updated overrides files to account for tdeinit black magic.
 
  -- Ben Burton <bab@debian.org>  Sun,  4 Sep 2005 10:58:17 +1000
 
@@ -536,8 +536,8 @@ tdesdk (4:3.4.1-0ubuntu3) breezy; urgency=low
 
 tdesdk (4:3.4.1-0ubuntu2) breezy; urgency=low
 
-  * Add libkdeinit_cvsservice.so to libcvsservice0.install
-  * Add cervisia.so and libkdeinit_cervisia.so to cervisia.install
+  * Add libtdeinit_cvsservice.so to libcvsservice0.install
+  * Add cervisia.so and libtdeinit_cervisia.so to cervisia.install
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu,  2 Jun 2005 01:33:59 +0000
 
diff --git a/ubuntu/maverick/tdesdk/debian/desktop-i18n/findfiles b/ubuntu/maverick/tdesdk/debian/desktop-i18n/findfiles
index 397948556..62e5012c2 100644
--- a/ubuntu/maverick/tdesdk/debian/desktop-i18n/findfiles
+++ b/ubuntu/maverick/tdesdk/debian/desktop-i18n/findfiles
@@ -28,7 +28,7 @@ find ./kimgio -name \*.kimgio -print 2>/dev/null | grep -v debian >> $filelist
 find ./noatun -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
 find ./noatun-plugins -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
 find ./amor/data -name \*rc -print 2>/dev/null | grep -v debian >> $filelist
-find ./kdeprint -name \*.print -print 2>/dev/null | grep -v debian >> $filelist 
+find ./tdeprint -name \*.print -print 2>/dev/null | grep -v debian >> $filelist 
 find . -name \*.kksrc -print 2>/dev/null | grep -v debian >> $filelist
 find ./kopete -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
 find . -name \*.kdevtemplate -print 2>/dev/null | grep -v debian >> $filelist
diff --git a/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install b/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install
index ee6134374..ac87e6efb 100644
--- a/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install
+++ b/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install
@@ -3,5 +3,5 @@ debian/tmp/opt/trinity/include/kde/cvsservice_stub.h
 debian/tmp/opt/trinity/include/kde/repository_stub.h
 debian/tmp/opt/trinity/lib/libcvsservice.la
 debian/tmp/opt/trinity/lib/libcvsservice.so
-debian/tmp/opt/trinity/lib/libkdeinit_cvsaskpass.la
-debian/tmp/opt/trinity/lib/libkdeinit_cvsservice.la
+debian/tmp/opt/trinity/lib/libtdeinit_cvsaskpass.la
+debian/tmp/opt/trinity/lib/libtdeinit_cvsservice.la
diff --git a/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.install b/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.install
index c1649ddd2..6f6370493 100644
--- a/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.install
@@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/cvsaskpass
 debian/tmp/opt/trinity/bin/cvsservice
 debian/tmp/opt/trinity/lib/libcvsservice.so.0
 debian/tmp/opt/trinity/lib/libcvsservice.so.0.0.1
-debian/tmp/opt/trinity/lib/libkdeinit_cvsaskpass.so
-debian/tmp/opt/trinity/lib/libkdeinit_cvsservice.so
+debian/tmp/opt/trinity/lib/libtdeinit_cvsaskpass.so
+debian/tmp/opt/trinity/lib/libtdeinit_cvsservice.so
 debian/tmp/opt/trinity/lib/trinity/cvsaskpass.la
 debian/tmp/opt/trinity/lib/trinity/cvsaskpass.so
 debian/tmp/opt/trinity/lib/trinity/cvsservice.la
diff --git a/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.lintian b/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.lintian
index 1430a5540..f3a4e3325 100644
--- a/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.lintian
+++ b/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.lintian
@@ -1,3 +1,3 @@
-# This is from kdeinit black magic.
-libcvsservice0: shlib-missing-in-control-file libkdeinit_cvsaskpass.so opt/trinity/lib/libkdeinit_cvsaskpass.so
-libcvsservice0: shlib-missing-in-control-file libkdeinit_cvsservice.so opt/trinity/lib/libkdeinit_cvsservice.so
+# This is from tdeinit black magic.
+libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
+libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
diff --git a/ubuntu/maverick/tdesdk/debian/man/kdekillall.1 b/ubuntu/maverick/tdesdk/debian/man/kdekillall.1
index 2a2c5c8a5..2bd5eb224 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kdekillall.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kdekillall.1
@@ -16,14 +16,14 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kdekillall \- kills processes started with kdeinit
+kdekillall \- kills processes started with tdeinit
 .SH SYNOPSIS
 .B kdekillall
 [ \fB\-\fP\fIsignal\fP ] \fIprocess-name\fP
 .SH DESCRIPTION
 \fBkdekillall\fP kills all processes with a particular name
-that were started through kdeinit.  Specifically, it kills all processes
-\fBkdeinit:\fP \fIprocess-name\fP.
+that were started through tdeinit.  Specifically, it kills all processes
+\fBtdeinit:\fP \fIprocess-name\fP.
 .PP
 This utility is part of the KDE Software Development Kit.
 .SH OPTIONS
diff --git a/ubuntu/maverick/tdetoys/debian/kweather-trinity.install b/ubuntu/maverick/tdetoys/debian/kweather-trinity.install
index 199f52605..ef03fcd89 100644
--- a/ubuntu/maverick/tdetoys/debian/kweather-trinity.install
+++ b/ubuntu/maverick/tdetoys/debian/kweather-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kweatherservice
 debian/tmp/opt/trinity/bin/kweatherreport
-debian/tmp/opt/trinity/lib/libkdeinit_kweatherreport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kweatherreport.la
+debian/tmp/opt/trinity/lib/libtdeinit_kweatherreport.so
+debian/tmp/opt/trinity/lib/libtdeinit_kweatherreport.la
 debian/tmp/opt/trinity/lib/trinity/kcm_weather.so
 debian/tmp/opt/trinity/lib/trinity/kcm_weather.la
 debian/tmp/opt/trinity/lib/trinity/kcm_weatherservice.so
diff --git a/ubuntu/maverick/tdetoys/debian/kweather-trinity.lintian b/ubuntu/maverick/tdetoys/debian/kweather-trinity.lintian
index e6fb3080a..b6c7e13d9 100644
--- a/ubuntu/maverick/tdetoys/debian/kweather-trinity.lintian
+++ b/ubuntu/maverick/tdetoys/debian/kweather-trinity.lintian
@@ -1,2 +1,2 @@
-kweather: no-shlibs-control-file usr/lib/trinity/libkdeinit_kweatherreport.so
-kweather: package-name-doesnt-match-sonames libkdeinit-kweatherreport
+kweather: no-shlibs-control-file usr/lib/trinity/libtdeinit_kweatherreport.so
+kweather: package-name-doesnt-match-sonames libtdeinit-kweatherreport
diff --git a/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian b/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian
index 7c958e5e4..2b8d3a553 100644
--- a/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian
+++ b/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-ark: no-shlibs-control-file opt/trinity/lib/libkdeinit_ark.so
-ark: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
-ark: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
+ark: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
+ark: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
diff --git a/ubuntu/maverick/tdeutils/debian/ark-trinity.install b/ubuntu/maverick/tdeutils/debian/ark-trinity.install
index bb908c9c3..fd8123f1a 100644
--- a/ubuntu/maverick/tdeutils/debian/ark-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/ark-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/ark.la
 debian/tmp/opt/trinity/lib/trinity/ark.so
 debian/tmp/opt/trinity/lib/trinity/libarkpart.la
 debian/tmp/opt/trinity/lib/trinity/libarkpart.so
-debian/tmp/opt/trinity/lib/libkdeinit_ark.so
+debian/tmp/opt/trinity/lib/libtdeinit_ark.so
 debian/tmp/opt/trinity/share/applications/kde/ark.desktop
 debian/tmp/opt/trinity/share/apps/ark/ark_part.rc
 debian/tmp/opt/trinity/share/apps/ark/ark_part_readonly.rc
diff --git a/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian b/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian
index d05acaa86..075ce6c50 100644
--- a/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-kcalc: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcalc.so
-kcalc: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
-kcalc: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
+kcalc: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
+kcalc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
diff --git a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.install b/ubuntu/maverick/tdeutils/debian/kcalc-trinity.install
index bf44a2749..b4806f5f0 100644
--- a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/kcalc-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kcalc
 debian/tmp/opt/trinity/lib/trinity/kcalc.la
 debian/tmp/opt/trinity/lib/trinity/kcalc.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcalc.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcalc.so
 debian/tmp/opt/trinity/share/applications/kde/kcalc.desktop
 debian/tmp/opt/trinity/share/apps/kcalc/kcalcui.rc
 debian/tmp/opt/trinity/share/apps/kconf_update/kcalcrc.upd
diff --git a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install b/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install
index 7753037cb..cf0ff5438 100644
--- a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/irkick.la
 debian/tmp/opt/trinity/lib/trinity/irkick.so
 debian/tmp/opt/trinity/lib/trinity/kcm_kcmlirc.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kcmlirc.so
-debian/tmp/opt/trinity/lib/libkdeinit_irkick.so
+debian/tmp/opt/trinity/lib/libtdeinit_irkick.so
 debian/tmp/opt/trinity/share/applications/kde/irkick.desktop
 debian/tmp/opt/trinity/share/applications/kde/kcmlirc.desktop
 debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/irkick.png
diff --git a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian b/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian
index 51b260d6a..986b7f7d4 100644
--- a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian
+++ b/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian
@@ -1,3 +1,3 @@
-kdelirc: no-shlibs-control-file opt/trinity/lib/libkdeinit_irkick.so
-kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_irkick.so
-kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_irkick.so
+kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
+kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
+kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/ubuntu/maverick/tdeutils/debian/kedit-trinity.install b/ubuntu/maverick/tdeutils/debian/kedit-trinity.install
index 0ecca6f75..9e70f971b 100644
--- a/ubuntu/maverick/tdeutils/debian/kedit-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/kedit-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kedit
 debian/tmp/opt/trinity/lib/trinity/kedit.la
 debian/tmp/opt/trinity/lib/trinity/kedit.so
-debian/tmp/opt/trinity/lib/libkdeinit_kedit.so
+debian/tmp/opt/trinity/lib/libtdeinit_kedit.so
 debian/tmp/opt/trinity/share/applications/kde/KEdit.desktop
 debian/tmp/opt/trinity/share/apps/kedit/keditui.rc
 debian/tmp/opt/trinity/share/config.kcfg/kedit.kcfg
diff --git a/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian b/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian
index 864682bca..a2a63b3ba 100644
--- a/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian
+++ b/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian
@@ -1,3 +1,3 @@
-kedit: no-shlibs-control-file opt/trinity/lib/libkdeinit_kedit.so
-kedit: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
-kedit: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
+kedit: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
+kedit: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install
index e6ba996f4..a3c425a38 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install
@@ -15,10 +15,10 @@ debian/tmp/opt/trinity/include/kde/ksim/themetypes.h
 debian/tmp/opt/trinity/include/kde/kwidgetstreamer.h
 debian/tmp/opt/trinity/lib/libkcmlaptop.la
 debian/tmp/opt/trinity/lib/libkcmlaptop.so
-debian/tmp/opt/trinity/lib/libkdeinit_ark.la
-debian/tmp/opt/trinity/lib/libkdeinit_irkick.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcalc.la
-debian/tmp/opt/trinity/lib/libkdeinit_kedit.la
+debian/tmp/opt/trinity/lib/libtdeinit_ark.la
+debian/tmp/opt/trinity/lib/libtdeinit_irkick.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcalc.la
+debian/tmp/opt/trinity/lib/libtdeinit_kedit.la
 debian/tmp/opt/trinity/lib/libkmilo.la
 debian/tmp/opt/trinity/lib/libkmilo.so
 debian/tmp/opt/trinity/lib/libkregexpeditorcommon.la