Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

777 files changed, 10419 insertions, 2744 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/dependencies/tqt3/debian/README.Debian b/debian/lenny/dependencies/tqt3/debian/README.Debian
new file mode 100644
index 000000000..99b460974
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/README.Debian
@@ -0,0 +1,277 @@
+Qt for Debian README
+--------------------
+
+1. Preface
+
+This README is intended to give developers and users exact information
+about how the qt-x11-free package provided by TrollTech AS has been packaged
+for Debian in case you either want to faciliate it for development 
+of applications and libraries or plugins using the Qt class library. With 
+qt-x11-3.1.1, the Debian packages have been massively restructured to get 
+the most out of theoriginal Qt package and spit the contents up into 
+several packages so that they make the most sensefor several groups of 
+users; developers, application users, translators of Qt-based 
+applications and Debian packagers who are packaging applications developed 
+with Qt.2. 
+
+2. General Overview
+
+As Qt is a huge package that contains a complete environment for 
+developers, it needs to be split up into several packages that make it 
+easier for everyone else to handle it and not to retquire 
+unnecessary disk space for end-users. Additionally, Qt can be configured 
+in several ways - and therefore also used in several ways. Qt development 
+usually retquires the environment variable QTDIR. As Debian is placing 
+libraries and header files in a tquite specific filesystem order, this 
+usually breaks setting a single environment variable to meet the 
+retquirements of packages. Therefore, symlinks are used to set up the system 
+to meet both, the Debian filesystem standard and the QTDIR variable. All of 
+Qt (so the QTDIR path) is available in /usr/share/tqt3. If you need to set 
+QTDIR, do export QTDIR=/usr/share/tqt3
+
+As far as the common build configuration goes, we note explicitely that the 
+Debian package of Qt will in very rare cases break the compilation (most 
+likely the linking) of applications on Debian which use Qt, in particular 
+utilizing styles in an incorrect way by deriving from one of the styles 
+that ship with Qt. In case you are a Debian packager and encounter 
+problems, contact Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org).
+We will tell you why things don't work and what you should communicate on 
+with the programmers of your application that you are packaging. The build 
+configuration generally is intended to provide a Qt version that is as 
+small as possible in terms of the memory size it retquires. Therefore, 
+everything inside Qt that can be compiled as plugins has been compiled that 
+way. This includes: 
+
+- imageformats: jpeg and mng - codecs (for languages like arab, japanese 
+  etc provided with Qt) 
+- sql drivers for databases (MySQL, ODBC and PostgreSQL)
+
+The only exception is the imageformat png which has been compiled built-in 
+due to the fact that there is literally no program that uses no icons at 
+all and icons are to be used preferrably in png format. The plugins are all 
+located under /usr/lib/tqt3/plugins. This is also the install location you
+should choose as a package maintainer for 
+qt-plugins so the user doesn't have to customize his library path for 
+loading Qt plugins. The only exception is that KDE delivers a set of Qt 
+plugins as well (mainly styles and designer plugins); those are placed in 
+/usr/lib/trinity/plugins. 
+
+QMotif Extension: As this code is only available in commercial environments 
+(and produces a static library libqmotif.a anyway that those commercial 
+applications have to be linked against in addition to Qt), we left out all 
+header files of the libtqt3-headers package that are belonging to this 
+QMotif extension.
+
+Oracle Database driver, Sybase & Microsoft SQL Server driver: Those drivers 
+are only available in a commercial version of Qt due to license 
+incompatibilities with the GPL. If you need to faciliate those drivers, 
+please visit http://www.trolltech.com and have a read at 
+http://doc.trolltech.com/3.0/sql-driver.html.
+  
+3. Packages (End-User) 
+
+The Qt built has been split up into several packages that allow for easy 
+installation for all types of users. The End-user usually only retquires to 
+have the following packages installed to run an application that links 
+against Qt:
+
+Threaded version:libtqt3-mt (the library libtqt-mt.so.* and libtqui.so.* for 
+loading designer-made user interfaces at runtime).
+
+Optionally depending on the program's retquirements:
+
+libtqt3-mt-odbc
+libtqt3-mt-mysql
+libtqt3-mt-psql 
+
+In addition to the libraries, it may make sense to install the program 
+qtconfig to customize the look and behaviorof Qt programs. If you have KDE 
+installed, the KDE control center will take this task automatically in most 
+cases. qtconfig is available in the package tqt3-qtconfig.
+
+Also, Qt programs can make use of the online-help tool that ships with Qt, 
+the Qt Assistant. The Assistant can be installed with the package 
+qt3-assistant.
+
+Qt Configuration files
+----------------------
+Qt programs most often use QSettings to store their information in configuration
+files. With Qt 3.2, the new option --sysconfdir has been introduced that allows
+us to use /etc/tqt3 as the system-wide location where qt-program specific global
+configuration files can go. If you're a programmer that wants to get familiar with
+that, please look at the examples, documentation and the code in designer or
+assistant as well as qtconfig.
+
+4. Packages (Package maintainers)
+
+In addition to the library, a package maintainer will retquire an additional 
+set of packages to compile a package that retquires Qt. Depending on the 
+version of the qt library, you will retquire a different set of packages; 
+the most common option should be to make your application link against the 
+multi-threaded version (-mt).Packages necessary for compiling Qt 
+applications from source:
+
+libtqt3-mt-dev   (use libtqt3-dev for linking against -lqt, this package only 
+                contains the .so files and the header file for libtqui.so)
+
+libtqt3-headers  (header files for libqt and libtqt-mt)
+ 
+qt3-dev-tools  (this package contains the tools uic and moc as well as 
+qmake, retquired for building Qt applications) 
+
+If, however, you encounter an older program not to compile with this set 
+read the FAQ at the end of this document.
+
+5. Packages (Developers)
+
+In addition to the packages that packagers retquire, a developer usually 
+will retquire the Qt API documentationas well as tools like the assistant, 
+linguist or designer. However, you should be fine with installing the API 
+documentation that you can browse with a webbrowser, optionally with the 
+assistant. They are available in /usr/share/doc/tqt3-doc/html.
+For a regular development environment, install tqt3-designer and tqt3-doc.
+
+For faciliating Qt's extended environment to write plugins for the Qt 
+Designer or extend the Designer as well as utilizing the Qt Assistant by 
+calling it from within your program, install tqt3-apps-dev, which contains
+the static libraries and header files retquired for this functionality.
+
+For Embedded Developers, the program qvfb (Qt Virtual Frambuffer) and 
+makeqpf (embedded fonts tool)have been packaged into 
+qt3-dev-tools-embedded. For developers that work on migrating their program 
+from any Qt version prior to Qt 3.x to the Qt 3.x platform you will find 
+additional tools in the tqt3-dev-tools-compat.
+
+For using the QTranslator class and where to find the qm-file for qt as 
+well as where to place your translations,see the next section.
+
+If your program doesn't compile with those settings in case you have 
+started your project with Qt 1.x or 2.x, please read the FAQ section at the 
+end of this document.
+
+5. Packages (Translators)
+
+In order to translate a Qt program into any other language, the Qt 3 way to 
+do this is to let the developer create a ts-file containing the strings 
+that the program exposes on the user interface. The tools to create the 
+ts-file and to create the final qm (Q-message binary) file, lupdate and 
+lrelease, are included in tqt3-dev-tools.The single translator that only 
+gets provided the ts file and has to return a translated ts file, it 
+is absolutely enough to install tqt3-linguist; the package tqt3-assistant can 
+be installed to access the online-help for the Qt Linguist itself.
+In case you're converting an application using Qt prior to Qt 3, you may 
+want to uitilize the tqt3-dev-tools-compat which include the necessary tools 
+to convert older qm files to the new ts file standard.
+
+Locations of message translations: 
+
+Qt ships with a set of translations for the strings used inside Qt. Those 
+translations will be installed into /usr/share/tqt3/translations (qm files 
+only), which equals $QTDIR/translations respectively 
+qInstallPath() + QString( "/translations" ). 
+
+The configure option --translationdir has been set to /usr/share/tqt3/translations
+accordingly since it was introduced in Qt 3.2. 
+
+To correctly enable your program to display the translations to the Qt 
+library and to load the translation of the program itself, we currently 
+suggest to either install your translations along with any other data files 
+into/usr/share/<appname>/, translation files into the subdirectory 
+translations (that is /usr/share/<appname>/translations) The code that your 
+application should use to load the Qt translation will have to look like 
+the following:    
+
+int main( int argc, char **argv )
+    {
+        QApplication app( argc, argv );
+
+        // translation file for Qt
+        QTranslator qt( 0 );
+        qt.load( QString( "qt_" ) + QTextCodec::locale(), qInstallPath() + 
+        QString( "/translations" );
+        app.installTranslator( &qt );
+
+        // translation file for application strings
+        QTranslator myapp( 0 );
+        myapp.load( QString( "myapp_" ) + QTextCodec::locale(), "." ); 
+        // use a substitue for $prefix/share/appname/translations here      
+        app.installTranslator( &myapp );
+
+6. Frequently Asked Questions
+
+Using Qt for Debian as a developer or packager 
+----------------------------------------------
+
+Q: I want to compile a source package that utilizes qmake to build the 
+Makefiles. What do I need to do to makeit work ?
+
+A: qmake retquires two environment variables to be set, QTDIR and QMAKESPEC. 
+To make it work, do
+export QTDIR=/usr/share/tqt3
+export QMAKESPEC=linux-g++
+
+Then run qmake -o Makefile <projectfile>.pro
+
+After that, the Makefile is correctly created to build your application on 
+Debian. As a packager, export thosetwo variables in the rules file before 
+calling qmake.
+
+Q: I have an application that when linking gives me symbol referencing 
+errors to Q*Style. Why does my applicationnot link correctly ?
+
+A: The author of the program is using the styles that ship with Qt directly 
+instead of using the QStylePlugin interface.If you are the author of the 
+program, change your program to use QStylePlugin. If you are a packager, 
+write to theauthor of the program that he is assuming that the styles 
+shipped with Qt are built-in to the library which is not the case on Debian 
+and that he please should fix this and use QStylePlugin.
+
+Q: Where are all the examples and tutorials ? And how do I build them ?
+
+A: Qt ships with examples and tutorials; so does the Linguist and Designer. 
+The tutorials and examples are compressed tarballs which you can unpack with 
+tar -zxvf into your home directory. Change into the tqt3-examples directory
+and run the provided ./build-examples script. All Qt examples and tutorials,
+including those for designer and the linguist, will be compiled. You will
+notice however, that those examples that inherit from style classes which
+are not built-in into Qt but configured as a plugin will not compile due
+to the fact that they can't link to the Qt library. 
+
+Q: I'm writing a pure Qt application and I want to ship it with a default 
+configuration file. Where does that global configuration file go if I make 
+use of the QSettings class ? 
+
+A: With qt-3.2.0, Trolltech has introduced a configure option to Qt called
+--sysconfdir which we intentionally set to /etc/tqt3 similar to /etc/trinity for
+KDE programs. Install your application's system wide configuration file
+to /etc/tqt3. 
+
+Q: I'm compiling a program and I have a compile error due to a missing 
+include. Why isn't that include not present in the Debian packages anymore 
+? It compiled with older versions of Debian packages of Qt !
+
+A: This may be due to two reasons: either the package still uses the old 
+includes from Qt 1.x or 2.x that got basically renamed by Trolltech due to 
+the naming convention. The filenames are now all following the scheme 
+
+ClassName -> classname.h. 
+
+Therefore, if you are the developer of the affected program, change your 
+sources according to this scheme. Qt ships with two tools, qt20fix and 
+qtrename140, to help developers migrate their API to the Qt 3 version, 
+which can help you in the transition upgrade to Qt 3.
+
+If you are affected by this as a packager, notify upstream to fix those 
+problems and in the meanwhile use libtqt3-compat-headers as a build 
+dependency which includes the compatibility headers that just include the 
+right files from the new API again.
+
+Q: I have a question not covered by this FAQ and README file. Who should I 
+turn to ?
+
+A: Please turn to Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org) 
+for any questions regarding Qt on Debian.
+
+ -- Ralf Nolden <nolden@kde.org>  Sun, 26 Jan 2003 20:39:19 +0100
+ -- Ralf Nolden <nolden@kde.org>  Mon,  1 Sep 2003 19:24:16 +0200
+ -- Modestas Vainius <modestas@vainius.eu> Fri, 22 Feb 2008 01:40:06 +0200
diff --git a/debian/lenny/dependencies/tqt3/debian/changelog b/debian/lenny/dependencies/tqt3/debian/changelog
new file mode 100644
index 000000000..3e813531e
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/changelog
@@ -0,0 +1,5 @@
+tqt-x11-free (3:3.3.8-d-0ubuntu0) maverick; urgency=low
+
+  * Upload of 3.3.8d (working revision) from GIT
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 22 Jul 2011 16:40:00 -0600
diff --git a/debian/lenny/dependencies/tqt3/debian/compat b/debian/lenny/dependencies/tqt3/debian/compat
new file mode 100644
index 000000000..1e8b31496
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/compat
@@ -0,0 +1 @@
+6
diff --git a/debian/lenny/dependencies/tqt3/debian/control b/debian/lenny/dependencies/tqt3/debian/control
new file mode 100644
index 000000000..fa495f168
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/control
@@ -0,0 +1,298 @@
+Source: tqt-x11-free
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>
+Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4),
+ libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4),
+ libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
+ libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
+ libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev,
+ libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev,
+ libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4),
+ libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev,
+ libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev
+Section: libs
+Priority: optional
+Standards-Version: 3.8.4
+Homepage: http://www.trinitydesktop.org
+
+Package: libtqt3-mt
+Architecture: any
+Section: libs
+Replaces: tqt3-tools (<< 2:3.0.2-20020306-1), libtqt3-helper, libtqt3, libtqt3c102-mt
+Depends: ${shlibs:Depends}, fontconfig
+Recommends: libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4)
+Conflicts: libtqt3c102-mt, libtqui1-emb, libtqt3c-mt
+Suggests: libtqt3-mt-psql, libtqt3-mt-mysql, libtqt3-mt-odbc
+Description: Qt GUI Library (Threaded runtime version), Version 3
+ This is the Trolltech Qt library, version 3. It's necessary for
+ applications that link against the libtqt-mt.so.3, e.g. all Trinity
+ applications.
+
+Package: libtqt3-mt-mysql
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Replaces: libtqt3-mysql (<= 2:3.1.1+cvs.20021220-1), libtqt3c102-mt-mysql
+Conflicts: libtqt3c102-mt-mysql, libtqt3c-mt-mysql
+Description: MySQL database driver for Qt3 (Threaded)
+ This package contains the threaded MySQL plugin for Qt3. Install it if
+ you intend to use or write Qt programs that are to access a MySQL DB.
+
+Package: libtqt3-mt-odbc
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Replaces: libtqt3-odbc (<= 2:3.1.1+cvs.20021220-1), libtqt3c102-mt-odbc
+Conflicts: libtqt3c102-mt-odbc, libtqt3c-mt-odbc
+Description: ODBC database driver for Qt3 (Threaded)
+ This package contains the threaded ODBC plugin for Qt3. Install it if
+ you intend to use or write Qt programs that are to access an ODBC DB.
+
+Package: libtqt3-mt-psql
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Replaces: libtqt3-psql (<= 2:3.1.1+cvs.20021220-1), libtqt3c102-mt-psql
+Conflicts: libtqt3c102-mt-psql, libtqt3c-mt-psql
+Description: PostgreSQL database driver for Qt3 (Threaded)
+ This package contains the threaded PostgreSQL plugin for Qt3.
+ Install it if you intend to use or write Qt programs that are
+ to access a PostgreSQL DB.
+
+#Not in Debian
+#Package: libtqt3-mt-ibase
+#Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
+#Section: libs
+#Depends: ${shlibs:Depends}
+#Conflicts: libtqt3c102-mt-ibase
+#Replaces: libtqt3c102-mt-ibase
+#Description: InterBase/FireBird database driver for Qt3 (Threaded)
+# This package contains the threaded InterBase/FireBird plugin
+# for Qt3. Install it if you intend to use or write Qt programs
+# that are to access an InterBase/FireBird DB.
+
+Package: libtqt3-mt-sqlite
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libtqt3c102-mt-sqlite
+Replaces: libtqt3c102-mt-sqlite
+Description: SQLite database driver for Qt3 (Threaded)
+ This package contains the threaded SQLite plugin for Qt3. Install
+ it if you intend to use or write Qt programs that are to access an
+ SQLite DB.
+
+Package: libtqt3-mt-dev
+Architecture: any
+Section: libdevel
+Replaces: libtqt-mt-dev, libtqt3-dev, libtqt3-helper, libtqt3-headers (<= 3:3.1.1-3), libtqt3-emb (<= 3:3.0.3-1)
+Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
+ libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4),
+ libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
+ libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev,
+ libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3),
+ libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev,
+ libxft-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev,
+ libglu1-mesa-dev | libglu-dev, libc6-dev, libtqt3-mt (= ${binary:Version}),
+ libtqt3-headers (= ${binary:Version}), tqt3-dev-tools (= ${binary:Version})
+Conflicts: libtqt-mt-dev, libtqt3-emb (<= 3:3.0.3-1), libtqt3-dev
+Recommends: libtqt3-compat-headers
+Suggests: libtqt3-i18n, tqt3-doc
+Description: Qt development files (Threaded)
+ Qt is a C++ class library optimized for graphical user interface
+ development. This package contains the libtqt-mt.so symlink, necessary
+ for building threaded Qt applications as well as the libtqui.so symlink
+ and the necessary header files for libtqui.so. (See README.Debian and
+ the Qt Documentation for instructions on libtqui.so)
+ .
+ WARNING: If you plan to build some older Qt3 applications, you will
+ most probably have to install the libtqt3-compat-headers package. It
+ contains all the headers which are not part of the official Qt3 API
+ anymore but which are still used by some programs. So if you encounter
+ problems with missing header files, please install this package first
+ before you send a bugreport.
+
+Package: libtqt3-headers
+Architecture: any
+Section: devel
+Recommends: libtqt3-mt-dev
+Replaces: libtqt3-mt-dev, libtqt3-dev, libtqt3-plugins-headers
+Description:  Qt3 header files
+ This package contains all header files for libqt and libtqt-mt which come
+ with Qt3. If you want to compile or develop programs which use Qt3, you
+ have to install this package.
+
+Package: libtqt3-compat-headers
+Architecture: any
+Section: devel
+Depends: libtqt3-headers (= ${binary:Version})
+Recommends: libtqt3-mt-dev
+Replaces: libtqt3-mt-dev (<= 3:3.1.1-2), libtqt3-dev (<= 3:3.1.1-2), libtqt3-headers (<= 3:3.1.1-2)
+Description: Qt 1.x and 2.x compatibility includes
+ This package contains header files that are intended for build
+ compatibility for applications that build with Qt3 but still use
+ deprecated includes. It is meant as an intermediate solution and
+ these header files are not part of the official Qt3 API.
+ All sourcecode that is still using the headers of this package is
+ subject to be changed to use the new header files which are in
+ libtqt3-headers.
+
+Package: tqt3-dev-tools
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Recommends: libtqt3-mt-dev
+Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev, tqt3-doc (<= 3:3.1.1-2)
+Conflicts: libqt-dev (<< 3:2.3.2-10), uic (<= 3:2.3.2-9)
+Description: Qt3 development tools
+ This package contains all tools that are necessary to build programs
+ that are written using Qt3. These are: qmake, uic and moc.
+ For Qt3 development, you most likely want to install this package.
+
+Package: tqt3-designer
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Recommends: tqt3-dev-tools
+Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev, tqt3-doc (= 3:3.3.4-8)
+Suggests: tqt3-assistant, tqt3-doc
+Conflicts: qt-designer (<= 3:2.3.2-9), qt-designer-doc
+Description: Qt3 Designer
+ The Qt Designer is a GUI design program that interactively lets you
+ construct user interfaces for the Qt library. Additionally it lets you
+ create whole project and works together with the database drivers
+ provided by Qt to create applications with easy database access through
+ Qt. The resulting user interface files can then be converted to
+ C++ classes using the uic commandline utility which is usually done
+ automatically for the developer with a project management with qmake
+ or automake.
+
+Package: tqt3-apps-dev
+Architecture: any
+Section: devel
+Depends: libtqt3-mt-dev
+Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
+Description: Qt3 Developer applications development files
+ This package is intended for developers who want to develop applications
+ using the additional static libraries that ship with the applications
+ included with Qt; the Qt Designer and the Qt Assistant.
+ It allows integrating additional enhancements into the Qt Designer
+ respectively faciliate the Qt Assistant from within your Qt application
+ to interactively call the Assistant for displaying online help that the
+ developer includes with his application.
+
+Package: tqt3-linguist
+Architecture: any
+Section: devel
+Suggests: tqt3-assistant
+Depends: ${shlibs:Depends}
+Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev, tqt3-doc (= 3:3.3.4-8)
+Description: The Qt3 Linguist
+ This package contains the Qt3 Linguist which provides translators a
+ tool perfect for translating any Qt-based application into other
+ languages and can be used and installed independently of any Qt
+ development files by the translator.
+
+Package: tqt3-assistant
+Architecture: any
+Section: x11
+Depends: ${shlibs:Depends}, tqt3-doc
+Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
+Description: The Qt3 assistant application
+ This package contains the Qt3 Assistant, an easy to use frontend for
+ the complete Qt3 documentation and serves as an online help viewer for
+ any Qt program that wants to give the usesr access to online help.
+ Within the Qt tools it is used as the help viewer for the online help
+ for the Qt3 Designer and Linguist as well as qmake and the Qt 3 API
+ documentation.
+ .
+ Developers of Qt Application who want to faciliate the Qt Assistant for online
+ help display should refer to the README.Debian file for libtqt3-mt-dev and
+ the package tqt3-apps-dev.
+
+Package: tqt3-qtconfig
+Architecture: any
+Section: x11
+Depends: ${shlibs:Depends}
+Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
+Description: The Qt3 Configuration Application
+ The Qt Configuration program allows endusers to configure the look
+ and behavior of any Qt3 application. It is mostly only necessary
+ on systems which don't run KDE because the KDE control center already
+ covers this configuration automatically for the users Qt3 applications
+ according to his desktop settings in KDE. However, if you need to run
+ CJK-fonts or other non-latin scripts, you will most likely want to
+ install this package.
+
+Package: tqt3-dev-tools-embedded
+Architecture: any
+Section: devel
+Recommends: libtqt3-mt-dev
+Depends: ${shlibs:Depends}
+Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
+Description: Tools to develop embedded Qt applications
+ This package contains applications only suitable for developing
+ applications with Qt Embedded and/or Qtopia. It provides the QVFB
+ program for simulating an embedded device desktop as well as makeqpf
+ for converting fonts to embedded fonts suitable for being utilized
+ by Qt Embedded applications.
+
+Package: tqt3-dev-tools-compat
+Architecture: any
+Section: devel
+Recommends: libtqt3-mt-dev
+Depends: ${shlibs:Depends}
+Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
+Description: Conversion utilities for Qt3 development
+ This package contains some older Qt tools (namely qt20fix qtrename140,
+ qm2ts, mergetr, findtr and msg2qm). These tools are needed only by
+ application developers who need to migrate any Qt application written
+ for Qt 1.x or 2.x over to Qt 3.x. The purpose of the tools are to
+ help fixing the changes with include file renaming as well as migrating
+ the message file format of Qt 2 translation files or any gettext-based
+ translation system to the Qt 3 system.
+
+Package: libtqt3-i18n
+Architecture: all
+Section: libs
+Recommends: libtqt3-mt
+Description: i18n files for Qt3 library
+ This package contains the internationalization files for the Qt library.
+ Qt applications that are internationalized will need to depend on this package
+ for full internationalization support of the application towards the end user.
+
+Package: tqt3-doc
+Architecture: all
+Section: doc
+Priority: extra
+Replaces: qt-doc
+Suggests: libtqt3-headers, tqt3-assistant | www-browser
+Description: Qt3 API documentation
+ This package contains the complete API documentation for Qt3.
+ Examples to coding are in tqt3-examples. The documentation is provided
+ in HTML and manpage format; the HTML version can be viewed in conjunction
+ with the Qt Assistant.
+
+Package: tqt3-examples
+Architecture: all
+Section: doc
+Priority: extra
+Depends: libtqt3-mt-dev (>= ${binary:Version})
+Suggests: tqt3-apps-dev
+Description:  Examples for Qt3
+ These are examples provided with Qt3. They may be especially useful for
+ you if you are learning to program in Qt as they cover tquite a lot of
+ things that are possible with Qt3.
+
+Package: tqt-x11-free-dbg
+Section: libdevel
+Architecture: any
+Priority: extra
+Depends: libtqt3-mt (= ${binary:Version}), gdb
+Conflicts: libtqt3-mt-dbg
+Replaces: libtqt3-mt-dbg
+Description: debugging symbols for tqt-x11-free binaries
+ This package contains the debugging symbols associated with tqt-x11-free.
+ They will automatically be used by gdb for debugging TQt-related
+ issues.
diff --git a/debian/lenny/dependencies/tqt3/debian/copyright b/debian/lenny/dependencies/tqt3/debian/copyright
new file mode 100644
index 000000000..3482b8b3a
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/copyright
@@ -0,0 +1,145 @@
+This is Debian GNU/Linux's prepackaged version of the Qt GUI Development
+library.
+
+This package was put together originally by me, Heiko Schlittermann
+<heiko@lotte.sax.de>, from the sources, which I obtained from
+ftp.troll.no. The changes were very minimal to nothing, - merely
+adding support for the Debian package maintenance scheme, by adding
+various debian/* files and by changing the propagate script to fit the
+Debian GNU/Linux filesystem structure.
+
+This package has since been temporarily taken over by Ivan Moore 
+<rkrusty@debian.org> until Heiko has time to work on it all again.
+
+In Jul 2002, Martin Loschwitz <madkiss@madkiss.org> overtook the package 
+maintenance for the QT3-packages.
+
+This packaged is maintained inside the Debian Qt/KDE Maintainers Team
+<debian-qt-kde@lists.debian.org> since Tue, 26 Jul 2005 19:06:03 +0200
+
+Qt 3.3 is triple licensed under the QPL, GPL 2 and GPL 3.
+
+It was downloaded from ftp://ftp.troll.no/qt/source
+
+ This file may be used under the terms of the GNU General
+ Public License versions 2.0 or 3.0 as published by the Free
+ Software Foundation and appearing in the files LICENSE.GPL2
+ and LICENSE.GPL3 included in the packaging of this file.
+ Alternatively you may (at your option) use any later version
+ of the GNU General Public License if such license has been
+ publicly approved by Trolltech ASA (or its successors, if any)
+ and the KDE Free Qt Foundation.
+
+Please refer to /usr/share/common-licenses/GPL-2 for complete GPL 2
+licence and /usr/share/common-licenses/GPL-3 for complete GPL 3
+licence.
+
+			     THE Q PUBLIC LICENSE
+				  version 1.0
+
+		   Copyright (C) 1999-2000 Troll Tech AS, Norway.
+		       Everyone is permitted to copy and
+		       distribute this license document.
+
+The intent of this license is to establish freedom to share and change the
+software regulated by this license under the open source model.
+
+This license applies to any software containing a notice placed by the
+copyright holder saying that it may be distributed under the terms of
+the Q Public License version 1.0.  Such software is herein referred to as
+the Software.  This license covers modification and distribution of the
+Software, use of third-party application programs based on the Software,
+and development of free software which uses the Software.
+
+				 Granted Rights
+
+1. You are granted the non-exclusive rights set forth in this license
+   provided you agree to and comply with any and all conditions in this
+   license.  Whole or partial distribution of the Software, or software
+   items that link with the Software, in any form signifies acceptance of
+   this license.
+
+2. You may copy and distribute the Software in unmodified form provided
+   that the entire package, including - but not restricted to - copyright,
+   trademark notices and disclaimers, as released by the initial developer
+   of the Software, is distributed.
+
+3. You may make modifications to the Software and distribute your
+   modifications, in a form that is separate from the Software, such as
+   patches. The following restrictions apply to modifications:
+
+     a. Modifications must not alter or remove any copyright notices in
+        the Software.
+
+     b. When modifications to the Software are released under this
+        license, a non-exclusive royalty-free right is granted to the
+        initial developer of the Software to distribute your modification
+        in future versions of the Software provided such versions remain
+        available under these terms in addition to any other license(s) of
+        the initial developer.
+
+4. You may distribute machine-executable forms of the Software or
+   machine-executable forms of modified versions of the Software, provided
+   that you meet these restrictions:
+
+     a. You must include this license document in the distribution.
+
+     b. You must ensure that all recipients of the machine-executable forms
+        are also able to receive the complete machine-readable source code
+        to the distributed Software, including all modifications, without
+        any charge beyond the costs of data transfer, and place prominent
+        notices in the distribution explaining this.
+
+     c. You must ensure that all modifications included in the
+        machine-executable forms are available under the terms of this
+        license.
+
+5. You may use the original or modified versions of the Software to
+   compile, link and run application programs legally developed by you
+   or by others.
+
+6. You may develop application programs, reusable components and other
+   software items that link with the original or modified versions of the
+   Software.  These items, when distributed, are subject to the following
+   retquirements:
+
+     a. You must ensure that all recipients of machine-executable forms of
+        these items are also able to receive and use the complete
+        machine-readable source code to the items without any charge
+        beyond the costs of data transfer.
+
+     b. You must explicitly license all recipients of your items to use
+        and re-distribute original and modified versions of the items in
+        both machine-executable and source code forms. The recipients must
+        be able to do so without any charges whatsoever, and they must be
+        able to re-distribute to anyone they choose.
+
+
+     c. If the items are not available to the general public, and the
+        initial developer of the Software requests a copy of the items,
+        then you must supply one.
+
+			    Limitations of Liability
+
+In no event shall the initial developers or copyright holders be liable
+for any damages whatsoever, including - but not restricted to - lost
+revenue or profits or other direct, indirect, special, incidental or
+consequential damages, even if they have been advised of the possibility
+of such damages, except to the extent invariable law, if any, provides
+otherwise.
+
+			          No Warranty
+
+The Software and this license document are provided AS IS with NO WARRANTY
+OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE.
+                                 Choice of Law
+
+This license is governed by the Laws of Norway. Disputes shall be settled
+by Oslo City Court.
+
+ The Qt GUI Toolkit is Copyright (C) 1994-2000 Trolltech AS.
+
+ You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ GNU General Public License version 2, which is display below.
+
diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-compat-headers.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-compat-headers.install
new file mode 100644
index 000000000..3adacbd90
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-compat-headers.install
@@ -0,0 +1,54 @@
+usr/include/tqt3/q1xcompatibility.h
+usr/include/tqt3/qapp.h
+usr/include/tqt3/qarray.h
+usr/include/tqt3/qbitarry.h
+usr/include/tqt3/qbttngrp.h
+usr/include/tqt3/qchkbox.h
+usr/include/tqt3/qclipbrd.h
+usr/include/tqt3/qcollect.h
+usr/include/tqt3/qcollection.h
+usr/include/tqt3/qcombo.h
+usr/include/tqt3/qconnect.h
+usr/include/tqt3/qdatetm.h
+usr/include/tqt3/qdrawutl.h
+usr/include/tqt3/qdstream.h
+usr/include/tqt3/qfiledef.h
+usr/include/tqt3/qfiledlg.h
+usr/include/tqt3/qfileinf.h
+usr/include/tqt3/qfontinf.h
+usr/include/tqt3/qfontmet.h
+usr/include/tqt3/qgrpbox.h
+usr/include/tqt3/qintcach.h
+usr/include/tqt3/qiodev.h
+usr/include/tqt3/qlcdnum.h
+usr/include/tqt3/qlined.h
+usr/include/tqt3/qlist.h
+usr/include/tqt3/qmenudta.h
+usr/include/tqt3/qmetaobj.h
+usr/include/tqt3/qmlined.h
+usr/include/tqt3/qmsgbox.h
+usr/include/tqt3/qmultilinedit.h
+usr/include/tqt3/qobjcoll.h
+usr/include/tqt3/qobjdefs.h
+usr/include/tqt3/qpaintd.h
+usr/include/tqt3/qpaintdc.h
+usr/include/tqt3/qpdevmet.h
+usr/include/tqt3/qpmcache.h
+usr/include/tqt3/qpntarry.h
+usr/include/tqt3/qpopmenu.h
+usr/include/tqt3/qprndlg.h
+usr/include/tqt3/qprogbar.h
+usr/include/tqt3/qprogdlg.h
+usr/include/tqt3/qpsprn.h
+usr/include/tqt3/qpushbt.h
+usr/include/tqt3/qqueue.h
+usr/include/tqt3/qradiobt.h
+usr/include/tqt3/qrangect.h
+usr/include/tqt3/qscrbar.h
+usr/include/tqt3/qsocknot.h
+usr/include/tqt3/qstack.h
+usr/include/tqt3/qtabdlg.h
+usr/include/tqt3/qtstream.h
+usr/include/tqt3/qvector.h
+usr/include/tqt3/qwidcoll.h
+usr/include/tqt3/qwindefs.h
diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-headers.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-headers.install
new file mode 100644
index 000000000..b08596ee9
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-headers.install
@@ -0,0 +1,271 @@
+usr/include/tqt3/private/*
+usr/include/tqt3/qabstractlayout.h
+usr/include/tqt3/qaccel.h
+usr/include/tqt3/qaccessible.h
+usr/include/tqt3/qaction.h
+usr/include/tqt3/qapplication.h
+usr/include/tqt3/qasciicache.h
+usr/include/tqt3/qasciidict.h
+usr/include/tqt3/qasyncimageio.h
+usr/include/tqt3/qasyncio.h
+usr/include/tqt3/qbig5codec.h
+usr/include/tqt3/qbitarray.h
+usr/include/tqt3/qbitmap.h
+usr/include/tqt3/qbrush.h
+usr/include/tqt3/qbuffer.h
+usr/include/tqt3/qbutton.h
+usr/include/tqt3/qbuttongroup.h
+usr/include/tqt3/qcache.h
+usr/include/tqt3/qcanvas.h
+usr/include/tqt3/qcdestyle.h
+usr/include/tqt3/qcheckbox.h
+usr/include/tqt3/qcleanuphandler.h
+usr/include/tqt3/qclipboard.h
+usr/include/tqt3/qcolor.h
+usr/include/tqt3/qcolordialog.h
+usr/include/tqt3/qcombobox.h
+usr/include/tqt3/qcommonstyle.h
+usr/include/tqt3/qcompactstyle.h
+usr/include/tqt3/qconnection.h
+usr/include/tqt3/qcstring.h
+usr/include/tqt3/qcursor.h
+usr/include/tqt3/qdatabrowser.h
+usr/include/tqt3/qdatastream.h
+usr/include/tqt3/qdatatable.h
+usr/include/tqt3/qdataview.h
+usr/include/tqt3/qdatetime.h
+usr/include/tqt3/qdatetimeedit.h
+usr/include/tqt3/qdeepcopy.h
+usr/include/tqt3/qdesktopwidget.h
+usr/include/tqt3/qdial.h
+usr/include/tqt3/qdialog.h
+usr/include/tqt3/qdict.h
+usr/include/tqt3/qdir.h
+usr/include/tqt3/qdns.h
+usr/include/tqt3/qdockarea.h
+usr/include/tqt3/qdockwindow.h
+usr/include/tqt3/qdom.h
+usr/include/tqt3/qdragobject.h
+usr/include/tqt3/qdrawutil.h
+usr/include/tqt3/qdropsite.h
+usr/include/tqt3/qeditorfactory.h
+usr/include/tqt3/qerrormessage.h
+usr/include/tqt3/qeucjpcodec.h
+usr/include/tqt3/qeuckrcodec.h
+usr/include/tqt3/qevent.h
+usr/include/tqt3/qeventloop.h
+usr/include/tqt3/qfeatures.h
+usr/include/tqt3/qfile.h
+usr/include/tqt3/qfiledialog.h
+usr/include/tqt3/qfileinfo.h
+usr/include/tqt3/qfocusdata.h
+usr/include/tqt3/qfont.h
+usr/include/tqt3/qfontdatabase.h
+usr/include/tqt3/qfontdialog.h
+usr/include/tqt3/qfontinfo.h
+usr/include/tqt3/qfontmetrics.h
+usr/include/tqt3/qframe.h
+usr/include/tqt3/qftp.h
+usr/include/tqt3/qgarray.h
+usr/include/tqt3/qgb18030codec.h
+usr/include/tqt3/qgbkcodec.h
+usr/include/tqt3/qgcache.h
+usr/include/tqt3/qgdict.h
+usr/include/tqt3/qgeneric.h
+usr/include/tqt3/qgif.h
+usr/include/tqt3/qglist.h
+usr/include/tqt3/qglobal.h
+usr/include/tqt3/qgplugin.h
+usr/include/tqt3/qgrid.h
+usr/include/tqt3/qgridview.h
+usr/include/tqt3/qgroupbox.h
+usr/include/tqt3/qguardedptr.h
+usr/include/tqt3/qgvector.h
+usr/include/tqt3/qhbox.h
+usr/include/tqt3/qhbuttongroup.h
+usr/include/tqt3/qheader.h
+usr/include/tqt3/qhgroupbox.h
+usr/include/tqt3/qhostaddress.h
+usr/include/tqt3/qhttp.h
+usr/include/tqt3/qiconset.h
+usr/include/tqt3/qiconview.h
+usr/include/tqt3/qimage.h
+usr/include/tqt3/qimageformatplugin.h
+usr/include/tqt3/qinputdialog.h
+usr/include/tqt3/qintcache.h
+usr/include/tqt3/qintdict.h
+usr/include/tqt3/qinterlacestyle.h
+usr/include/tqt3/qiodevice.h
+usr/include/tqt3/qjiscodec.h
+usr/include/tqt3/qjpegio.h
+usr/include/tqt3/qjpunicode.h
+usr/include/tqt3/qkeycode.h
+usr/include/tqt3/qkeysequence.h
+usr/include/tqt3/qlabel.h
+usr/include/tqt3/qlayout.h
+usr/include/tqt3/qlcdnumber.h
+usr/include/tqt3/qlibrary.h
+usr/include/tqt3/qlineedit.h
+usr/include/tqt3/qlistbox.h
+usr/include/tqt3/qlistview.h
+usr/include/tqt3/qlocale.h
+usr/include/tqt3/qlocalfs.h
+usr/include/tqt3/qmainwindow.h
+usr/include/tqt3/qmap.h
+usr/include/tqt3/qmemarray.h
+usr/include/tqt3/qmenubar.h
+usr/include/tqt3/qmenudata.h
+usr/include/tqt3/qmessagebox.h
+usr/include/tqt3/qmetaobject.h
+usr/include/tqt3/qmime.h
+usr/include/tqt3/qmngio.h
+usr/include/tqt3/qmotifstyle.h
+usr/include/tqt3/qmotifplusstyle.h
+usr/include/tqt3/qmovie.h
+usr/include/tqt3/qmultilineedit.h
+usr/include/tqt3/qmutex.h
+usr/include/tqt3/qnamespace.h
+usr/include/tqt3/qnetwork.h
+usr/include/tqt3/qnetworkprotocol.h
+usr/include/tqt3/qnp.h
+usr/include/tqt3/qobject.h
+usr/include/tqt3/qobjectcleanuphandler.h
+usr/include/tqt3/qobjectdefs.h
+usr/include/tqt3/qobjectdict.h
+usr/include/tqt3/qobjectlist.h
+usr/include/tqt3/qpaintdevice.h
+usr/include/tqt3/qpaintdevicedefs.h
+usr/include/tqt3/qpaintdevicemetrics.h
+usr/include/tqt3/qpainter.h
+usr/include/tqt3/qpair.h
+usr/include/tqt3/qpalette.h
+usr/include/tqt3/qpen.h
+usr/include/tqt3/qpicture.h
+usr/include/tqt3/qpixmap.h
+usr/include/tqt3/qpixmapcache.h
+usr/include/tqt3/qplatinumstyle.h
+usr/include/tqt3/qpngio.h
+usr/include/tqt3/qpoint.h
+usr/include/tqt3/qpointarray.h
+usr/include/tqt3/qpolygonscanner.h
+usr/include/tqt3/qpopupmenu.h
+usr/include/tqt3/qprintdialog.h
+usr/include/tqt3/qprinter.h
+usr/include/tqt3/qprocess.h
+usr/include/tqt3/qprogressbar.h
+usr/include/tqt3/qprogressdialog.h
+usr/include/tqt3/qptrcollection.h
+usr/include/tqt3/qptrdict.h
+usr/include/tqt3/qptrlist.h
+usr/include/tqt3/qptrqueue.h
+usr/include/tqt3/qptrstack.h
+usr/include/tqt3/qptrvector.h
+usr/include/tqt3/qpushbutton.h
+usr/include/tqt3/qradiobutton.h
+usr/include/tqt3/qrangecontrol.h
+usr/include/tqt3/qrect.h
+usr/include/tqt3/qregexp.h
+usr/include/tqt3/qregion.h
+usr/include/tqt3/qrtlcodec.h
+usr/include/tqt3/qscrollbar.h
+usr/include/tqt3/qscrollview.h
+usr/include/tqt3/qsemaphore.h
+usr/include/tqt3/qsemimodal.h
+usr/include/tqt3/qserversocket.h
+usr/include/tqt3/qsession.h
+usr/include/tqt3/qsessionmanager.h
+usr/include/tqt3/qsettings.h
+usr/include/tqt3/qsgistyle.h
+usr/include/tqt3/qshared.h
+usr/include/tqt3/qsignal.h
+usr/include/tqt3/qsignalmapper.h
+usr/include/tqt3/qsignalslotimp.h
+usr/include/tqt3/qsimplerichtext.h
+usr/include/tqt3/qsize.h
+usr/include/tqt3/qsizegrip.h
+usr/include/tqt3/qsizepolicy.h
+usr/include/tqt3/qsjiscodec.h
+usr/include/tqt3/qslider.h
+usr/include/tqt3/qsocket.h
+usr/include/tqt3/qsocketdevice.h
+usr/include/tqt3/qsocketnotifier.h
+usr/include/tqt3/qsortedlist.h
+usr/include/tqt3/qsound.h
+usr/include/tqt3/qspinbox.h
+usr/include/tqt3/qsplashscreen.h
+usr/include/tqt3/qsplitter.h
+usr/include/tqt3/qsql.h
+usr/include/tqt3/qsqlcursor.h
+usr/include/tqt3/qsqldatabase.h
+usr/include/tqt3/qsqldriver.h
+usr/include/tqt3/qsqldriverplugin.h
+usr/include/tqt3/qsqleditorfactory.h
+usr/include/tqt3/qsqlerror.h
+usr/include/tqt3/qsqlfield.h
+usr/include/tqt3/qsqlform.h
+usr/include/tqt3/qsqlindex.h
+usr/include/tqt3/qsqlpropertymap.h
+usr/include/tqt3/qsqlquery.h
+usr/include/tqt3/qsqlrecord.h
+usr/include/tqt3/qsqlresult.h
+usr/include/tqt3/qsqlselectcursor.h
+usr/include/tqt3/qstatusbar.h
+usr/include/tqt3/qstring.h
+usr/include/tqt3/qstringlist.h
+usr/include/tqt3/qstrlist.h
+usr/include/tqt3/qstrvec.h
+usr/include/tqt3/qstyle.h
+usr/include/tqt3/qstylefactory.h
+usr/include/tqt3/qstyleplugin.h
+usr/include/tqt3/qstylesheet.h
+usr/include/tqt3/qsyntaxhighlighter.h
+usr/include/tqt3/qt.h
+usr/include/tqt3/qtabbar.h
+usr/include/tqt3/qtabdialog.h
+usr/include/tqt3/qtable.h
+usr/include/tqt3/qtabwidget.h
+usr/include/tqt3/qtextbrowser.h
+usr/include/tqt3/qtextcodec.h
+usr/include/tqt3/qtextcodecfactory.h
+usr/include/tqt3/qtextcodecplugin.h
+usr/include/tqt3/qtextedit.h
+usr/include/tqt3/qtextstream.h
+usr/include/tqt3/qtextview.h
+usr/include/tqt3/qthread.h
+usr/include/tqt3/qthreadstorage.h
+usr/include/tqt3/qtimer.h
+usr/include/tqt3/qtl.h
+usr/include/tqt3/qtoolbar.h
+usr/include/tqt3/qtoolbox.h
+usr/include/tqt3/qtoolbutton.h
+usr/include/tqt3/qtooltip.h
+usr/include/tqt3/qtranslator.h
+usr/include/tqt3/qtsciicodec.h
+usr/include/tqt3/qurl.h
+usr/include/tqt3/qurlinfo.h
+usr/include/tqt3/qurloperator.h
+usr/include/tqt3/qutfcodec.h
+usr/include/tqt3/quuid.h
+usr/include/tqt3/qvalidator.h
+usr/include/tqt3/qvaluelist.h
+usr/include/tqt3/qvaluestack.h
+usr/include/tqt3/qvaluevector.h
+usr/include/tqt3/qvariant.h
+usr/include/tqt3/qvbox.h
+usr/include/tqt3/qvbuttongroup.h
+usr/include/tqt3/qvfbhdr.h
+usr/include/tqt3/qvgroupbox.h
+usr/include/tqt3/qwaitcondition.h
+usr/include/tqt3/qwhatsthis.h
+usr/include/tqt3/qwidget.h
+usr/include/tqt3/qwidgetintdict.h
+usr/include/tqt3/qwidgetlist.h
+usr/include/tqt3/qwidgetplugin.h
+usr/include/tqt3/qwidgetstack.h
+usr/include/tqt3/qwindowdefs.h
+usr/include/tqt3/qwindowsstyle.h
+usr/include/tqt3/qwinexport.h
+usr/include/tqt3/qwizard.h
+usr/include/tqt3/qwmatrix.h
+usr/include/tqt3/qworkspace.h
+usr/include/tqt3/qxml.h
diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-i18n.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-i18n.install
new file mode 100644
index 000000000..cd272202b
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-i18n.install
@@ -0,0 +1,8 @@
+usr/share/tqt3/translations/qt_ar.qm
+usr/share/tqt3/translations/qt_cs.qm
+usr/share/tqt3/translations/qt_de.qm
+usr/share/tqt3/translations/qt_es.qm
+usr/share/tqt3/translations/qt_fr.qm
+usr/share/tqt3/translations/qt_he.qm
+usr/share/tqt3/translations/qt_ru.qm
+usr/share/tqt3/translations/qt_sk.qm
diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-dev.docs b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-dev.docs
new file mode 100644
index 000000000..dbd9a5d19
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-dev.docs
@@ -0,0 +1,4 @@
+README
+README.immodule
+README-QT.TXT
+PLATFORMS
diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-dev.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-dev.install
new file mode 100644
index 000000000..43ee1dce7
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-dev.install
@@ -0,0 +1,9 @@
+usr/lib/libtqt-mt.la
+usr/lib/libtqt-mt.prl
+usr/lib/libtqt-mt.so
+usr/lib/libtqui.prl
+usr/lib/libtqui.so
+usr/lib/pkgconfig/tqt-mt.pc
+usr/include/tqt3/qgl.h
+usr/include/tqt3/qglcolormap.h
+usr/include/tqt3/qwidgetfactory.h
diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-dev.links b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-dev.links
new file mode 100644
index 000000000..d5ae6927d
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-dev.links
@@ -0,0 +1,7 @@
+/usr/lib/libtqt-mt.la /usr/share/tqt3/lib/libtqt-mt.la
+/usr/lib/libtqui.prl /usr/share/tqt3/lib/libtqui.prl
+/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so
+/usr/lib/libtqt-mt.prl /usr/share/tqt3/lib/libtqt-mt.prl
+/usr/lib/libtqt-mt.so.3.3.8 /usr/share/tqt3/lib/libtqt-mt.so
+/usr/include/tqt3 /usr/share/tqt3/include
+/usr/lib/tqt3/plugins /usr/share/tqt3/plugins
diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-ibase.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-ibase.install
new file mode 100644
index 000000000..37bbf0bb1
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-ibase.install
@@ -0,0 +1 @@
+usr/lib/tqt3/plugins/sqldrivers/libqsqlibase.so
diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-mysql.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-mysql.install
new file mode 100644
index 000000000..efdb699be
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-mysql.install
@@ -0,0 +1 @@
+usr/lib/tqt3/plugins/sqldrivers/libqsqlmysql.so
diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-odbc.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-odbc.install
new file mode 100644
index 000000000..3b949c134
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-odbc.install
@@ -0,0 +1 @@
+usr/lib/tqt3/plugins/sqldrivers/libqsqlodbc.so
diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-psql.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-psql.install
new file mode 100644
index 000000000..b93ebe333
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-psql.install
@@ -0,0 +1 @@
+usr/lib/tqt3/plugins/sqldrivers/libqsqlpsql.so
diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-sqlite.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-sqlite.install
new file mode 100644
index 000000000..928632aa1
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-sqlite.install
@@ -0,0 +1 @@
+usr/lib/tqt3/plugins/sqldrivers/libqsqlite.so
diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.docs b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.docs
new file mode 100644
index 000000000..dbd9a5d19
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.docs
@@ -0,0 +1,4 @@
+README
+README.immodule
+README-QT.TXT
+PLATFORMS
diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.install
new file mode 100644
index 000000000..519221dff
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.install
@@ -0,0 +1,6 @@
+usr/lib/libtqt-mt.so.*
+usr/lib/libtqui.so.1.*
+usr/lib/tqt3/plugins/imageformats/libqmng.so
+usr/lib/tqt3/plugins/inputmethods/*.so
+../../debian/qtrc etc/tqt3/                                                                              
+../../debian/qt_plugins_3.3rc etc/tqt3/                                                                  
diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.links b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.links
new file mode 100644
index 000000000..e7f6740f5
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.links
@@ -0,0 +1,5 @@
+/usr/lib/libtqui.so.1.0.0 /usr/lib/libtqui.so.1 
+/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1
+/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1.0
+/usr/lib/libtqt-mt.so.3.3.8 /usr/share/tqt3/lib/libtqt-mt.so.3
+/usr/lib/libtqt-mt.so.3.3.8 /usr/share/tqt3/lib/libtqt-mt.so.3.3
diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.postrm b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.postrm
new file mode 100644
index 000000000..bb679158a
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.postrm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" = "purge" ]; then
+  if [ -d "/usr/share/doc/libtqt3-mt/" ]; then
+    rm -rf /usr/share/doc/libtqt3-mt/
+  fi
+fi
+
+#DEBHELPER#
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop b/debian/lenny/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop
new file mode 100644
index 000000000..9ac108108
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=assistant-tqt3
+Name=Qt3 Assistant
+Name[de]=Qt3 Assistent
+Comment=Qt3 Helpcenter
+Comment[de]= Qt3 Hilfezentrum
+MimeType=application/x-assistant;
+Icon=assistant
+Terminal=false
+Type=Application
+Categories=Qt;Development;
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/build-examples.sh b/debian/lenny/dependencies/tqt3/debian/maintain/build-examples.sh
new file mode 100644
index 000000000..25da9bf59
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/maintain/build-examples.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+BUILDDIR=$PWD
+export QTDIR=/usr/share/tqt3
+
+# first copy over the libtqt-mt.so build configuration of .qmake.cache
+cp /usr/share/tqt3/.qmake.cache ./.qmake.cache
+
+# Now compile the examples. The themes example
+# won't work since qconfig.h is not really correct with the
+# ifdef's for the QT_NO_xyz_STYLE, so we use make -k to continue
+cd examples; qmake -o Makefile examples.pro; make -k
+
+# Now compile the tutorial.
+cd $BUILDDIR/tutorial; qmake -o Makefile tutorial.pro; make
+
+# Then the designer examples. 
+cd $BUILDDIR/tools/designer/examples
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do
+        cd $a && qmake -o Makefile $a.pro; make; cd ..;
+done
+
+# There is a bigger sql example in book/ with more subdirectories:
+cd book
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do
+        cd $a && qmake -o Makefile $a.pro; make; cd ..;
+done
+
+# Finally, build the linguist tutorials:
+cd $BUILDDIR/tools/linguist/tutorial
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do 
+	cd $a && qmake -o Makefile $a.pro; make; cd ..; 
+done
+
+# Return to the build directory
+cd $BUILDDIR 
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/designer-tqt3.desktop b/debian/lenny/dependencies/tqt3/debian/maintain/designer-tqt3.desktop
new file mode 100644
index 000000000..2872906ab
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/maintain/designer-tqt3.desktop
@@ -0,0 +1,77 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=designer-tqt3
+Name=Qt3 Designer
+Name[bg]=Qt3 Дизайнер
+Name[br]=Ergrafer Qt3
+Name[ca]=Dissenyador Qt3
+Name[cs]=Qt3 designer
+Name[de]=Qt3-Designer
+Name[eo]=Qt3-Desegnilo
+Name[es]=Diseñador Qt3
+Name[et]=Qt3 disainer
+Name[eu]=Qt3 Diseinatzailea
+Name[gl]=Deseñador de Qt3
+Name[he]=Qt בצעמ
+Name[it]=Designer Qt3
+Name[ja]=Qtデザイナー
+Name[ko]=Qt 디자이너
+Name[lv]=Qt3 Dizainers
+Name[mk]=Qt дизајнер
+Name[no]=Qt3-designer
+Name[oc]=Dessinador Qt3
+Name[pl]=Projektant Qt3
+Name[sk]=Qt3 Dizajnér
+Name[sl]=Snovalnik Qt3
+Name[ta]=Qt À¨¼ôÀ¡Ç÷
+Name[uk]=Дизайнер Qt
+Name[zh_CN.GB2312]=Qt 设计者
+Name[zh_TW.Big5]=Qt 設計器
+Comment=Qt3 interface designer
+Comment[az]=Qt3 axtar üz dizayn proqramı
+Comment[bg]=Qt3 interface дизайнер
+Comment[br]=Ergrafer etrefas Qt3
+Comment[ca]=Dissenyador d'interfícies Qt3
+Comment[cs]=Editor UI pro Qt3
+Comment[da]=Qt3 grænseflade designer
+Comment[de]=Schnittstellen-Designer für Qt3
+Comment[el]=Σχεδιασμός περιβάλλοντων Qt
+Comment[eo]=Qt3-Interfacdesegnilo
+Comment[es]=Diseñador de interfaces de Qt3
+Comment[et]=Qt3 dialoogide redaktor
+Comment[eu]=Qt3 interfaze diseinatzailea
+Comment[fi]=Qt:n käyttöliittymäsuunnittelija
+Comment[fr]=Conception d'interfaces avec Qt3
+Comment[gl]=Editor de interfaces de Qt3
+Comment[he]=Qt-ל םיקשממ בצעמ
+Comment[hu]=Qt3 felülettervező
+Comment[is]=Viðmótshönnunartól fyrir Qt3
+Comment[it]=Editor per le interfaccie Qt3
+Comment[ja]=Qtインターフェースデザイナー
+Comment[ko]=Qt 인터페이스 디자이너
+Comment[lt]=Qt3 sąsajos redaktorius
+Comment[lv]=Qt3 starsejas dizainers
+Comment[mk]=Дизајнер на Qt дијалози
+Comment[nl]=Qt3 interface-ontwerper
+Comment[no]=Qt3-grensesnittdesigner
+Comment[no_NY]=Redigering av Qt3-miljø
+Comment[oc]=Dessinador d'interfacies Qt3
+Comment[pl]=Projektant interfejsu Qt3
+Comment[pt]=Editor de interfaces do Qt3
+Comment[pt_BR]=Designer de interface Qt3
+Comment[ro]=Dezvoltator de interfeţe Qt3
+Comment[ru]=редактор интерфейсов приложений Qt
+Comment[sk]=Qt3 dizajnér rozhrania
+Comment[sl]=Snovalnik vmesnikov za Qt3
+Comment[sr]=Dizajner Qt3 interfejsa
+Comment[sv]=Editor för gränssnitt till Qt3
+Comment[ta]=Qt À¨¼ôÀ¡Ç÷
+Comment[tr]=Qt3 arayüz tasarım programı
+Comment[uk]=Редактор інтерфейсу для Qt
+Comment[zh_CN.GB2312]=Qt 界面设计程序
+Comment[zh_TW.Big5]=Qt 介面編輯器
+MimeType=application/x-designer;
+Icon=designer
+Terminal=false
+Type=Application
+Categories=Qt;Development;
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop b/debian/lenny/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop
new file mode 100644
index 000000000..e3a192980
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Exec=linguist-tqt3
+Name=Qt3 Linguist
+Name[de]=Qt3-Linguist
+Name[eo]=Qt3-Lingvisto
+Name[es]=Lingüista Qt3
+Name[ko]=Qt 언어학자
+Name[lv]=Qt3 Lingvists
+Comment=Tool for translating message catalogues of Qt3 based programs
+Comment[da]=Redskab til at oversætte Qt3 baserede programmer
+Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf Qt3 basieren
+Comment[eo]=Ilo por tradukado de mesaĝaroj de Qt3-bazitaj programoj
+Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en Qt3
+Comment[he]=Qt תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ
+Comment[hu]=Segédprogram a Qt3-alapú programok üzenetfájljainak lefordításához
+Comment[ko]=Qt를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구
+Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz Qt3 bāzētās programmās
+Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3
+Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3
+Comment[sv]=Verktyg för att översätta meddelandekataloger från Qt3-baserade program
+MimeType=application/x-linguist;
+Terminal=false
+Icon=linguist
+Type=Application
+Categories=Qt;Development
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/man/createcw.1 b/debian/lenny/dependencies/tqt3/debian/maintain/man/createcw.1
new file mode 100644
index 000000000..0959a2df1
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/maintain/man/createcw.1
@@ -0,0 +1,57 @@
+.TH "createcw" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+createcw \- custom widget description creater for Qt Designer
+.SH "SYNTAX"
+.LP 
+createcw <\fIfilename.cw\fP>
+.SH "DESCRIPTION"
+.LP 
+This small application makes it much easier to create
+custom widget descriptions for the Qt Designer. Using
+them you can use custom widgets in the Qt Designer
+including their signals, slots and properties.
+ 
+To do that normally you would have to enter all that
+information in the custom widget dialog in the Qt
+Designer for each widget. But this small tool can create
+for you these description files for your custom widgets
+which you then can simply import into the Qt Designer. So
+you can use your custom widgets without any additional
+work in your forms in the Qt Designer then.
+
+To do that you have to modify the sourcecode (main.cpp) a
+bit and recompile it afterwards. 
+
+STEP1: Include header files of the widgets for which a
+description should be created here. If you have a widget
+which is defined in the file mycustomwidget.h in
+/home/joedeveloper/src, write here 
+
+#include "/home/joedeveloper/src/mycustomwidget.h"
+
+STEP2: Instantiate all widgets for which a description
+should be created here and add them to the list wl. If
+your custom widget is e.g. called MyCustomWidget you
+would write here
+
+ Widget w;
+ w.w = new MyCustomWidget( 0, 0 );
+ w.include = "mycustomwidget.h";
+ w.location = "global";
+ wl.append( w );
+
+After that compile the program, link it with your custom
+widget (library or object file) and run it like this:
+
+ (unix): ./createcw mywidgets.cw
+ (win32): createcw mywidgets.cw
+
+After that you can import this description file into the
+Qt Designer using the Custom\-Widget Dialog (See
+Tools\->Custom\->Edit Custom Widgets... in the Qt Designer)
+and use these custom widget there in your forms.
+
+.SH "AUTHORS"
+.LP 
+Troll Tech <http://www.trolltech.com/>
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/man/designer.1 b/debian/lenny/dependencies/tqt3/debian/maintain/man/designer.1
new file mode 100644
index 000000000..4151e94a7
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/maintain/man/designer.1
@@ -0,0 +1,54 @@
+.TH "qt-designer" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qt\-designer \- Visual user interface designer for Qt.
+.SH "DESCRIPTION"
+.LP 
+Qt Designer simplifies the process of designing and
+creating graphical user interfaces (GUI) using the
+award\-winning Qt toolkit. Qt Designer is easy to learn.
+There are tutorials, walkthrough examples and the
+reference documentation accelerating you through the
+learning phase. After that, Qt Designer greatly reduces
+the time and effort needed to develop even the most
+complex dialogs with an easy\-to\-use GUI and an integrated
+help system.
+
+ Qt Designer provides a rich set of features aimed at
+making the creation of dialogs as easy and smooth as
+possible without reducing the power of Qt. It offers all
+the strength of the Qt layout system with a well\-designed
+user interface. This, combined with the Qt Designer's
+undo/redo system makes it simple to try different
+arrangements of the widgets until the result satisfies
+you.
+
+ Using Qt Designer's convenient property editor along
+with the dynamic Qt property system it is easy to set the
+initial state of your widgets. Special editors for some
+widgets (like listboxes, comboboxes, etc.) allow you to
+fill these widgets with content without writing any code.
+Using the object hierarchy view, the parent\-child
+relationship between the widgets of a dialog can be
+understood at a glance.
+
+ Integrating dialogs into a Qt project is straightforward
+thanks to the User Interface Compiler (UIC), which
+generates C++ code from the XML dialog description on the
+fly. The programmer can easily extend the functionality
+of the generated classes by subclassing without touching
+generated code at all or running the risk of loosing
+their changes.
+.SH "FILES"
+.LP 
+\fI/usr/share/qt/tools/designer/*\fP 
+.SH "ENVIRONMENT VARIABLES"
+.LP 
+.TP 
+\fBQTDIR\fP
+Specifies the Qt base directory.  On Debian systems this
+should be set to /usr/share/qt.  The /usr/bin/designer
+wrapper script takes care of this.
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/man/findtr.1 b/debian/lenny/dependencies/tqt3/debian/maintain/man/findtr.1
new file mode 100644
index 000000000..f1d3a87d5
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/maintain/man/findtr.1
@@ -0,0 +1,25 @@
+.TH "findtr" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+findtr \- Extracts information about text to be translated
+.SH "SYNTAX"
+.LP 
+findtr *.cpp *.h >myapp.po
+.SH "DESCRIPTION"
+.LP 
+
+Extracts information about text to be translated. It
+recognizes the tr() constructs described above and
+produces a file in ".po" format, a simple text format
+that your translation team will copy and edit. For
+example, the base .po file might be myapp.po and
+translated versions of the file would then be
+myapp_de.po, myapp_fr.po, and myapp_ja.po for
+translations in German, French and Japanese respectively.
+
+  findtr *.cpp *.h >myapp.po
+  copy myapp.po myapp_de.po
+  edit myapp_de.po
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/man/linguist.1 b/debian/lenny/dependencies/tqt3/debian/maintain/man/linguist.1
new file mode 100644
index 000000000..a0f99133b
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/maintain/man/linguist.1
@@ -0,0 +1,37 @@
+.TH LINGUIST 1 "28 August 2004"
+.SH "NAME"
+linguist \- Translation tool for Qt.
+
+.SH "SYNPOSIS"
+.B linguist
+[
+.I TRANSLATION
+]
+
+.SH "DESCRIPTION"
+.B Qt Linguist
+is a tool for adding translations to Qt applications. It
+introduces the concept of a translation "context" which
+means a group of phrases that appear together on the
+screen e.g. in the same menu or dialog.
+
+The only parameter accepted on the command line is 
+.I TRANSLATION
+wich is the name of the translation file you wish to open.
+
+.SH FILES
+.I ~/.qt/qt_designerrc
+.RS
+Per user configuration file.
+
+.SH SEE ALSO
+.B Qt Linguist
+is too complex to be described completely in the "man" page
+format. If your system is properly configured, you can access
+the full documentation within
+.B Qt Linguist
+under the Help menu.
+
+.SH AUTHOR
+This manual page was written by Jeremy Laine <jeremy.laine@m4x.org>,
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/man/makeqpf.1 b/debian/lenny/dependencies/tqt3/debian/maintain/man/makeqpf.1
new file mode 100644
index 000000000..37ddcfd4f
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/maintain/man/makeqpf.1
@@ -0,0 +1,26 @@
+.TH "makeqpf" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+makeqpf \- Create qpf files from TTF and BDF files.
+.SH "DESCRIPTION"
+.LP 
+Qt Prerendered Font (QPF) is a light\-weight non\-scalable
+font format specific to Qt/Embedded.  makeqpf is a tool
+that assists producing QPF files from TTF and BDF files.
+
+
+.SH "SYNTAX"
+qembed [ \fIgeneral\-files\fP ] <[ \fI\-\-images image\-files \fP]>
+.br 
+
+general\-files 
+  These files can be any type of file. 
+\-\-images image\-files 
+  These files must be in image formats supported by Qt. 
+
+.SH "FILES"
+.LP 
+\fI$(QTDIR)/etc/fonts/fontdir\fP 
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/man/mergetr.1 b/debian/lenny/dependencies/tqt3/debian/maintain/man/mergetr.1
new file mode 100644
index 000000000..9ed2a9f25
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/maintain/man/mergetr.1
@@ -0,0 +1,27 @@
+.TH "mergetr" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+mergetr \- Merge changes in translations
+.SH "SYNTAX"
+.LP 
+mergetr myapp_de.po myapp.po
+
+.SH "DESCRIPTION"
+.LP 
+When the texts in your program change as it is developed,
+a the base .po file can be regenerated using findtr,
+then mergetr can be used to merge the changes into the
+other .po files: 
+
+                mergetr myapp_de.po myapp.po
+                mergetr myapp_fr.po myapp.po
+                mergetr myapp_ja.po myapp.po
+
+
+The translation team then edits the new .po files to
+translate the new or changed texts. When texts change,
+the old text is included in the .po file as a comment to
+guide the new translation (no "fuzzy" matching is done).
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/man/msg2qm.1 b/debian/lenny/dependencies/tqt3/debian/maintain/man/msg2qm.1
new file mode 100644
index 000000000..7d22bbb96
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/maintain/man/msg2qm.1
@@ -0,0 +1,26 @@
+.TH "msg2qm" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+msg2qm \- Converts translated .po files to a Qt\-specific binary format.
+.SH "SYNTAX"
+.LP 
+msg2qm myapp_de.po myapp_de.qm
+.SH "DESCRIPTION"
+.LP 
+
+Converts translated .po files to a Qt\-specific binary
+format (".qm" Qt message files). The Qt message files
+are platform and locale independent, containing
+translations in Unicode and various hash tables to
+provide fast look\-up. 
+
+                msg2qm myapp_de.po myapp_de.qm
+                msg2qm myapp_fr.po myapp_fr.qm
+                msg2qm myapp_ja.po myapp_ja.qm
+
+
+In your application, use QTranslator::load() to load
+translation files appropriate for the user's language.
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/man/qembed.1 b/debian/lenny/dependencies/tqt3/debian/maintain/man/qembed.1
new file mode 100644
index 000000000..a9b262f10
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/maintain/man/qembed.1
@@ -0,0 +1,32 @@
+.TH "qembed" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qembed \- Converts arbitrary files into C++ code.
+.SH "DESCRIPTION"
+.LP 
+The QEmbed tool, found in qt/tools/qembed, converts
+arbitrary files into C++ code. This is useful for
+including image files and other resources directly into
+your application rather than loading the data from
+external files. 
+
+QEmbed can also generate uncompressed versions of images
+that can be included directly into your application,
+thus avoiding both the external file and the need to
+parse the image file format. This is useful for small
+images such as icons for which compression is not a
+great gain. 
+
+
+.SH "SYNTAX"
+qembed [ \fIgeneral\-files\fP ] <[ \fI\-\-images image\-files \fP]>
+.br 
+
+general\-files 
+  These files can be any type of file. 
+\-\-images image\-files 
+  These files must be in image formats supported by Qt. 
+
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/man/qt20fix.1 b/debian/lenny/dependencies/tqt3/debian/maintain/man/qt20fix.1
new file mode 100644
index 000000000..352921be8
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/maintain/man/qt20fix.1
@@ -0,0 +1,32 @@
+.TH "qt20fix" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qt20fix \- Helps clean namespace when porting an app from Qt1 to Qt2
+.SH "SYNTAX"
+.LP 
+qt20fix myapp.cpp
+
+.SH "DESCRIPTION"
+.LP 
+Qt 2.x is namespace\-clean, unlike 1.x. Qt now uses very
+few global identifiers. Identifiers like red, blue,
+LeftButton, AlignRight, Key_Up, Key_Down, NoBrush etc.
+are now part of a special class Qt (defined in
+qnamespace.h), which is inherited by most Qt classes.
+Member functions of classes that inherit from QWidget,
+etc. are totally unaffected, but code that is not in
+functions of classes inherited from Qt, you must qualify
+these identifiers like this: Qt::red, Qt::LeftButton,
+Qt::AlignRight, etc. 
+
+The qt/bin/qt20fix script helps to fix the code that
+needs adaption, though most code does not need changing.
+
+Compiling with \-DQT1COMPATIBILITY will help you get going
+with Qt 2.x \- it allows all the old "dirty namespace"
+identifiers from Qt 1.x to continue working. Without it,
+you'll get compile errors that can easily be fixed by
+searching this page for the clean identifiers. 
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/man/qtconfig.1 b/debian/lenny/dependencies/tqt3/debian/maintain/man/qtconfig.1
new file mode 100644
index 000000000..7e03bf49b
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/maintain/man/qtconfig.1
@@ -0,0 +1,17 @@
+.TH "qtconfig" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qtconfig \- Configuration tool for Qt
+.SH "DESCRIPTION"
+.LP 
+QConfig allows for GUI based configuration of Qt and
+ other Qt based sources.
+
+.SH "ENVIRONMENT VARIABLES"
+.LP 
+.TP 
+\fBQTDIR\fP
+Specifies the base Qt dir
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/man/qvfb.1 b/debian/lenny/dependencies/tqt3/debian/maintain/man/qvfb.1
new file mode 100644
index 000000000..89a91cf2a
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/maintain/man/qvfb.1
@@ -0,0 +1,66 @@
+.TH "qvfb" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qvfb \- Virtual framebuffer for Qt
+.SH "DESCRIPTION"
+.LP 
+The virtual framebuffer allows Qt/Embedded programs to be
+developed on your desktop machine, without switching
+between consoles and X11. 
+
+Start a Qt/Embedded master application (i.e., construct
+QApplication with QApplication::GuiServer flag or use the
+\-qws command line parameter). You will need to specify to
+the server that you wish to use the virtual framebuffer
+driver, e.g.: 
+
+    widgets \-qws \-display QVFb:0
+    
+You may prefer to set the QWS_DISPLAY environment
+variable to be QVFb:0. 
+
+qvfb supports the following command line options: 
+
+ \-width width: the width of the virtual framebuffer
+  (default: 240). 
+ \-height height: the height of the virtual framebuffer
+  (default: 320). 
+ \-depth depth: the depth of the virtual framebuffer (1, 8
+  or 32; default: 8). 
+ \-nocursor: do not display the X11 cursor in the
+  framebuffer window. 
+ \-qwsdisplay :id the Qt/Embedded display id to provide
+  (default: 0). 
+
+ Virtual Framebuffer Design 
+
+The virtual framebuffer emulates a framebuffer using a
+shared memory region (the virtual frame buffer) and a
+utility to display the framebuffer in a window (qvfb).
+The regions of the display that have changed are updated
+periodically, so you will see discrete snapshots of the
+framebuffer rather than each individual drawing
+operation. For this reason drawing problems such as
+flickering may not be apparent until the program is run
+using a real framebuffer. 
+
+The target refresh rate can be set via the "View|Refresh
+Rate" menu item. This will cause qvfb to check for
+updated regions more tquickly. The rate is a target only.
+If little drawing is being done, the framebuffer will not
+show any updates between drawing events. If an
+application is displaying an animation the updates will
+be frequent, and the application and qvfb will compete
+for processor time. 
+
+Mouse and keyboard events are passed to the Qt/Embedded
+master process via named pipes. 
+
+The virtual framebuffer is a development tool only. No
+security issues have been considered in the virtual
+framebuffer design. It should be avoided in a production
+environment; QT_NO_QWS_VFB should always be defined in
+production libraries. 
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/mkpatch.sh b/debian/lenny/dependencies/tqt3/debian/maintain/mkpatch.sh
new file mode 100644
index 000000000..609a44bc1
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/maintain/mkpatch.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+diff -Nru -x Makefile.cvs -x README.qt-copy -x upgrade_script.qt -x .cvsignore -x CVS -x include -x debian -x doc -x examples  -x 3rdparty -x images -x mkspecs -I '^\*\*\( $\| \$Id\)' -I '^\#\( $\| \$Id\)' qt-x11-free-3.1.1.old/ qt-x11-free-3.1.1/ > qtcopy.diff
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/tqt3config.desktop b/debian/lenny/dependencies/tqt3/debian/maintain/tqt3config.desktop
new file mode 100644
index 000000000..3965c1355
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/maintain/tqt3config.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=qtconfig-tqt3
+Name=Qt3 Configuration
+Name[de]=Qt3 Konfiguration
+Comment=A graphical configuration tool for programs using Qt 3
+Comment[de]=Ein grafisches Konfigurationstool für Qt3-Programme
+MimeType=application/x-qtconfig;
+Terminal=false
+Icon=qtconfig
+Type=Application
+Categories=Qt;Settings;
diff --git a/debian/lenny/dependencies/tqt3/debian/patches/06_disable_rpath.diff b/debian/lenny/dependencies/tqt3/debian/patches/06_disable_rpath.diff
new file mode 100644
index 000000000..27fc1426c
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/patches/06_disable_rpath.diff
@@ -0,0 +1,26 @@
+author: Martin Loschwitz <madkiss@madkiss.org>
+
+Disables the rpath settings in qmake.conf
+
+--- a/mkspecs/linux-g++/qmake.conf
++++ b/mkspecs/linux-g++/qmake.conf
+@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
+ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
+ QMAKE_LFLAGS_THREAD	=
+-QMAKE_RPATH		= -Wl,-rpath,
++QMAKE_RPATH		=
+ 
+ QMAKE_LIBS		=
+ QMAKE_LIBS_DYNLOAD	= -ldl
+--- a/mkspecs/linux-g++-64/qmake.conf
++++ b/mkspecs/linux-g++-64/qmake.conf
+@@ -58,7 +58,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
+ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
+ QMAKE_LFLAGS_THREAD	=
+-QMAKE_RPATH		= -Wl,-rpath,
++QMAKE_RPATH		=
+ 
+ QMAKE_LIBS		=
+ QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/debian/lenny/dependencies/tqt3/debian/patches/09_amd64_lib64.diff b/debian/lenny/dependencies/tqt3/debian/patches/09_amd64_lib64.diff
new file mode 100644
index 000000000..71b2b65e1
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/patches/09_amd64_lib64.diff
@@ -0,0 +1,16 @@
+--- a/mkspecs/linux-g++-64/qmake.conf
++++ b/mkspecs/linux-g++-64/qmake.conf
+@@ -43,11 +43,11 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_T
+ QMAKE_INCDIR		=
+ QMAKE_LIBDIR		=
+ QMAKE_INCDIR_X11	= /usr/X11R6/include
+-QMAKE_LIBDIR_X11	= /usr/X11R6/lib64
++QMAKE_LIBDIR_X11	= /usr/X11R6/lib
+ QMAKE_INCDIR_QT		= $(QTDIR)/include
+ QMAKE_LIBDIR_QT		= $(QTDIR)/lib
+ QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib64
++QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+ 
+ QMAKE_LINK		= g++
+ QMAKE_LINK_SHLIB	= g++
diff --git a/debian/lenny/dependencies/tqt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff b/debian/lenny/dependencies/tqt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
new file mode 100644
index 000000000..b4e71d35b
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
@@ -0,0 +1,50 @@
+author: Sune Vuorela <debian@pusling.com>
+
+--- a/configure
++++ b/configure
+@@ -34,7 +34,44 @@ SUPPORTED=
+ #-------------------------------------------------------------------------------
+ 
+ # need that throughout the script
+-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
++DPKG_ARCH=`(dpkg-architecture -qDEB_HOST_ARCH) 2>/dev/null` || UNAME_MACHINE=unknown
++case $DPKG_ARCH in 
++	amd64)
++		UNAME_MACHINE="x86_64"
++	;;
++	arm)
++		UNAME_MACHINE="armv4l"
++	;;
++	armel)
++		UNAME_MACHINE="armv5tel"
++	;;
++	hppa)
++		UNAME_MACHINE="parisc64"
++	;;
++	hurd-i386)
++		UNAME_MACHINE="i686-AT386"
++	;;
++	i386)
++		UNAME_MACHINE="i686"
++	;;
++	kfreebsd-amd64)
++		UNAME_MACHINE="x86_64"
++	;;
++	kfreebsd-i386)
++		UNAME_MACHINE="i586"
++	;;
++	mipsel)
++		UNAME_MACHINE="mips"
++	;;
++	powerpc)
++		UNAME_MACHINE="ppc"
++	;;
++	*)
++		UNAME_MACHINE="$DPKG_ARCH"
++	;;
++
++
++esac
+ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
diff --git a/debian/lenny/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff b/debian/lenny/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff
new file mode 100644
index 000000000..3c6394f33
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## kubuntu_06_fglrx_0_size_screen.diff.dpatch by  <jr@pechin3>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp
+--- qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp	2007-04-02 20:06:28.000000000 +0100
++++ qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp	2007-04-02 20:12:10.000000000 +0100
+@@ -526,11 +526,16 @@
+     Q_CHECK_PTR( dpisX );
+     Q_CHECK_PTR( dpisY );
+     for ( i = 0; i < screens; i++ ) {
+-	dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
+-
+-		     / (DisplayWidthMM(dpy,i)*10);
+-	dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5)
+-		     / (DisplayHeightMM(dpy,i)*10);
++       if (DisplayWidthMM(dpy,i) < 1)
++               dpisX[ i ] = 75; // default the dpi to 75.
++       else
++               dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
++                     / (DisplayWidthMM(dpy,i)*10);
++       if (DisplayHeightMM(dpy,i) < 1)
++               dpisY[ i ] = 75; // default the dpi to 75.
++       else
++               dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5)
++                     / (DisplayHeightMM(dpy,i)*10);
+     }
+ }
+ 
diff --git a/debian/lenny/dependencies/tqt3/debian/patches/series b/debian/lenny/dependencies/tqt3/debian/patches/series
new file mode 100644
index 000000000..7377c84c1
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/patches/series
@@ -0,0 +1,4 @@
+06_disable_rpath.diff
+09_amd64_lib64.diff
+72_dont_trust_uname-m_use_dpkg-arch_instead.diff
+kubuntu_06_fglrx_0_size_screen.diff
diff --git a/debian/lenny/dependencies/tqt3/debian/qt_plugins_3.3rc b/debian/lenny/dependencies/tqt3/debian/qt_plugins_3.3rc
new file mode 100644
index 000000000..e193b495c
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/qt_plugins_3.3rc
@@ -0,0 +1,4 @@
+[usr]
+lib/trinity/plugins/styles/plastik.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-09-29T20:06:31^e
+lib/tqt3/plugins/imageformats/libqmng.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-08-25T18:22:18^e
+
diff --git a/debian/lenny/dependencies/tqt3/debian/qtrc b/debian/lenny/dependencies/tqt3/debian/qtrc
new file mode 100644
index 000000000..3c977f4d1
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/qtrc
@@ -0,0 +1,32 @@
+[3.3]
+libraryPath=/usr/lib/trinity/plugins/
+
+[General]
+GUIEffects=general^eanimatecombo^e
+embedFonts=true
+enableXft=true
+font=Sans Serif,9,-1,5,50,0,0,0,0,0
+fontPath=\0
+useXft=true
+style=Plastik
+
+[KDE]
+contrast=7
+kdeAddedLibraryPaths=/usr/lib/trinity/plugins/^e
+
+[KWinPalette]
+activeBackground=#1f26ad
+activeBlend=#259bb8
+activeForeground=#ffffff
+activeTitleBtnBg=#e6e6e6
+frame=#efefef
+inactiveBackground=#cdcdcd
+inactiveBlend=#ababab
+inactiveForeground=#dddddd
+inactiveFrame=#efefef
+inactiveTitleBtnBg=#ebebeb
+
+[Palette]
+active=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e
+disabled=#808080^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#c7c7c7^e#ffffff^e#808080^e#ffffff^e#efefef^e#000000^e#567594^e#ffffff^e#0000ee^e#52188b^e
+inactive=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e
\ No newline at end of file
diff --git a/debian/lenny/dependencies/tqt3/debian/rules b/debian/lenny/dependencies/tqt3/debian/rules
new file mode 100755
index 000000000..c2fc2b997
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/rules
@@ -0,0 +1,482 @@
+#!/usr/bin/make -f
+
+# build variables
+export QTDIR=$(shell pwd)
+
+# re-set $(LD_LIBRARY_PATH)
+OLD_LD_LIBRARY_PATH := $(LD_LIBRARY_PATH)
+export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH)
+
+# fix path
+OLD_PATH := $(PATH)
+export PATH=$(QTDIR)/bin:$(OLD_PATH)
+
+DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+	PLATFORM_ARG = hurd-g++
+else #hurd
+ifeq ($(DEB_HOST_ARCH),sparc)
+	PLATFORM_ARG = linux-g++-sparc
+else #sparc
+	PLATFORM_ARG = linux-g++
+endif #sparc
+endif #hurd
+
+# quilt stuff
+include /usr/share/quilt/quilt.make
+
+# build variables (directorys)
+DEBIAN = $(shell pwd)/debian
+P_LIBS = $(DEBIAN)/libtqt3-mt
+P_DOC = $(DEBIAN)/tqt3-doc
+P_APPSDEV = $(DEBIAN)/tqt3-apps-dev
+P_HEADERS = $(DEBIAN)/libtqt3-headers
+P_QTMTDEV = $(DEBIAN)/libtqt3-mt-dev
+
+TMP_INSTALL = $(DEBIAN)/tmp-install
+
+CONFIGURE_OPTS = \
+		-prefix		"/usr"				\
+		-sysconfdir	"/etc/tqt3"			\
+		-datadir	"/usr/share/tqt3"		\
+		-headerdir	"/usr/include/tqt3"		\
+		-docdir		"/usr/share/tqt3/doc"		\
+		-plugindir	"/usr/lib/tqt3/plugins"		\
+		-translationdir	"/usr/share/tqt3/translations"	\
+						\
+		-thread				\
+		-shared				\
+		-fast				\
+		-no-exceptions			\
+		-platform $(PLATFORM_ARG)	\
+						\
+		-nis				\
+		-no-pch				\
+		-cups				\
+		-stl				\
+		-ipv6				\
+						\
+		-sm				\
+		-xshape				\
+		-xinerama			\
+		-xcursor			\
+		-xrandr				\
+		-xrender			\
+		-xft				\
+		-tablet				\
+		-xkb				\
+						\
+		-system-zlib			\
+		-system-libpng			\
+		-system-libmng			\
+		-system-libjpeg			\
+		-system-nas-sound		\
+						\
+		-enable-opengl			\
+		-dlopen-opengl			\
+						\
+		-qt-gif				\
+		-qt-imgfmt-png			\
+		-qt-imgfmt-jpeg			\
+		-plugin-imgfmt-mng		\
+						\
+		-plugin-sql-odbc		\
+		-plugin-sql-psql		\
+		-plugin-sql-mysql		\
+		-plugin-sql-sqlite		\
+						\
+		-I/usr/include/mysql		\
+		-I/usr/include/freetype2	\
+		-I`pg_config --includedir`	\
+						\
+		-L/usr/lib/$(DEB_HOST_MULTIARCH)	\
+						\
+		-lfontconfig			\
+		-inputmethod			\
+		# End of CONFIGURE_OPTS
+
+interbase_archs := i386 amd64 sparc powerpc
+ifneq ($(DEB_HOST_ARCH_CPU),$(findstring $(DEB_HOST_ARCH_CPU),$(interbase_archs)))
+	CONFIGURE_OPTS += -no-sql-ibase
+	IBASE = -Nlibtqt3-mt-ibase
+else
+	IBASE =
+endif
+
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+	CONFIGURE_OPTS += -no-sql-ibase
+	IBASE = -Nlibtqt3-mt-ibase
+endif
+
+ifeq ($(DEB_HOST_ARCH),arm)
+	CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
+endif
+
+build: libqt-thread-stamp
+
+	touch build-stamp
+
+libqt-thread-stamp: $(QUILT_STAMPFN)
+
+	@echo "QTDIR is ${QTDIR}"
+
+	dh_testdir
+
+	echo yes | ./configure $(CONFIGURE_OPTS)
+
+	rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
+	ln -s ../src/kernel/qinputcontext.h include/qinputcontext.h
+	ln -s ../src/inputmethod/qinputcontextfactory.h include/qinputcontextfactory.h
+	ln -s ../src/inputmethod/qinputcontextplugin.h include/qinputcontextplugin.h
+
+	# proceed
+	$(MAKE) sub-src sub-plugins sub-tools
+	$(MAKE) -C src INSTALL_ROOT=$(TMP_INSTALL) install_target
+	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) install
+	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install
+
+	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
+	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
+
+	cp bin/qtrename140 $(TMP_INSTALL)/usr/bin/
+	cp bin/qt20fix $(TMP_INSTALL)/usr/bin/
+	cp bin/findtr $(TMP_INSTALL)/usr/bin/
+
+	# build conv2ui
+	cd tools/designer/tools/conv2ui && $(MAKE)
+	cp bin/conv2ui $(TMP_INSTALL)/usr/bin/conv2ui
+
+	# build qvfb
+	cd tools/qvfb/ && $(MAKE)
+	cp tools/qvfb/qvfb $(TMP_INSTALL)/usr/bin/qvfb
+
+	# install qmake.cache file
+	install -d $(P_QTMTDEV)/usr/share/tqt3/
+	cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/tqt3#g" > $(P_QTMTDEV)/usr/share/tqt3/.qmake.cache
+
+	# install qconfig.h for the mt
+	install -m 644 -D include/qconfig.h $(P_QTMTDEV)/usr/include/tqt3/qconfig.h
+	install -m 644 -D include/qmodules.h $(P_QTMTDEV)/usr/include/tqt3/qmodules.h
+
+	install -m 644 -D include/qinputcontext.h $(P_HEADERS)/usr/include/tqt3/qinputcontext.h
+	install -m 644 -D include/qinputcontextfactory.h $(P_HEADERS)/usr/include/tqt3/qinputcontextfactory.h
+	install -m 644 -D include/qinputcontextplugin.h $(P_HEADERS)/usr/include/tqt3/qinputcontextplugin.h
+
+	touch libqt-thread-stamp
+
+clean: unpatch
+
+	dh_testdir
+
+	-rm -rf debian/patched
+	-rm -rf build-stamp libqt-thread-stamp
+
+	-chmod -R u+w *
+	-chmod a-x doc/html/layout?.png
+
+	if [ -f "src/Makefile" ]; then \
+		$(MAKE) -C src clean; $(MAKE) -C plugins/src distclean; $(MAKE) -C tools distclean; \
+		$(MAKE) -C tools/makeqpf distclean; $(MAKE) -C tools/qconfig distclean; $(MAKE) -C tools/qvfb distclean; \
+		$(MAKE) -C tools/msg2qm distclean; $(MAKE) -C tools/mergetr distclean; $(MAKE) -C tools/qembed distclean; \
+		$(MAKE) -C tools/designer/tools/conv2ui distclean; $(MAKE) -C tools/designer/tools/createcw distclean; \
+		$(MAKE) -C tools/designer/plugins/glade distclean; $(MAKE) -C tools/designer/plugins/qglwidget distclean; \
+		$(MAKE) -C config.tests/unix/largefile distclean; $(MAKE) -C qmake distclean; \
+	fi
+
+	-rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \
+		config.status bin/moc bin/qmake src/moc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \
+		src/tools/qconfig.cpp include/qconfig.h include/qmodules.h plugins/accessibleqtwidgets.prl \
+		config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \
+		config.tests/unix/ptrsize/ptrsizetest config.tests/unix/endian/endiantest.o \
+		config.tests/unix/endian/endiantest lib/tqt-mt.pc extensions/nsplugin/examples/trivial/libtrivial.prl \
+		extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer
+
+	rm -f qmake/*o
+	rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
+	rm -f src/.obj/debug-shared-mt/*o plugins/src/inputmethods/imsw-multi/.obj/debug-shared-mt/*o plugins/inputmethods/*so
+	rm -f plugins/src/inputmethods/imsw-none/.obj/debug-shared-mt/*o plugins/src/inputmethods/simple/.obj/debug-shared-mt/*o plugins/src/inputmethods/xim/.obj/debug-shared-mt/*o
+
+	# delete generated Makefiles but save the toplevel Makefile
+	-mv Makefile Makefile.save
+	for a in `find . -name 'Makefile'`; do rm -f "$$a"; done
+	-mv Makefile.save Makefile
+
+	cd examples/ && find . -name '.obj' | xargs rm -rf
+
+	dh_clean
+
+install: build
+
+	dh_testdir
+	dh_testroot
+
+	dh_clean -i
+	dh_installdirs
+
+	# fix .prl files
+	for a in $(TMP_INSTALL)/usr/lib/*prl; do cat "$$a" | sed \
+	"s#$(QTDIR)#/usr/share/tqt3#g" > "$$a".new && mv "$$a".new "$$a"; done
+
+	dh_install $(IBASE) --sourcedir=$(TMP_INSTALL)
+
+	## build tqt3-doc package
+	# copy all docs there first
+	install -d $(P_DOC)/usr/share/tqt3/doc/html/
+	for a in `cd $(TMP_INSTALL)/usr/share/tqt3/doc/html/ && find`; do cp $(TMP_INSTALL)/usr/share/tqt3/doc/html/"$$a" $(P_DOC)/usr/share/tqt3/doc/html/; done
+	#typo bugfix
+	sed -i -e 's/reveives/receives/' $(P_DOC)/usr/share/tqt3/doc/html/qwidget.html
+
+	## build designer package documentation
+	# tqt3-designer
+	install -d `pwd`/debian/tqt3-designer/usr/share/tqt3/doc/html/
+	for a in `cat doc/html/designer*.html doc/html/designer*.dcf | grep png | sed 's/^.*src=\"\([^\"]+\)\".*$$/\1/' | \
+	perl -pe 's#<\?p[^>]+>##' | tee outputfile | perl -ne '/<img [^>]*(src=\"[^"]+\")/; print $$1' | \
+	sed 's/src=//g' | sed 's/"/ /g'`; do cp doc/html/"$$a" `pwd`/debian/tqt3-designer/usr/share/tqt3/doc/html/ && \
+	rm -rf $(P_DOC)/usr/share/tqt3/doc/html/"$$a" || true; done
+	rm -rf outputfile `pwd`/debian/tqt3-designer/usr/share/tqt3/doc/html/logo32.png
+	rm -rf `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/designer*
+
+	## build linguist package documentation
+	# tqt3-linguist
+	install -d `pwd`/debian/tqt3-linguist/usr/share/tqt3/doc/html/
+	for a in `cat doc/html/linguist*.html doc/html/linguist*.dcf | grep png | sed 's/^.*src=\"\([^\"]+\)\".*$$/\1/' | \
+	perl -pe 's#<\?p[^>]+>##' | tee outputfile | perl -ne '/<img [^>]*(src=\"[^"]+\")/; print $$1' | \
+	sed 's/src=//g' | sed 's/"/ /g'`; do cp doc/html/"$$a" `pwd`/debian/tqt3-linguist/usr/share/tqt3/doc/html/ && \
+	rm -rf $(P_DOC)/usr/share/tqt3/doc/html/"$$a" || true; done
+	rm -rf outputfile `pwd`/debian/tqt3-linguist/usr/share/tqt3/doc/html/logo32.png
+	rm -rf `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/linguist*
+
+	## tqt3-assistant
+	# remove docs from tqt3-doc for qt-assistant
+	rm -rf `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/assistant*
+
+	## all packages
+	# install the overrides files
+	#for a in debian/overrides/*; do install -d debian/`echo "$$a" | sed 's/debian\/overrides\///g'`/usr/share/lintian/overrides; done
+	#for a in debian/overrides/*; do cp "$$a" debian/`echo "$$a" | sed 's/debian\/overrides\///g'`/usr/share/lintian/overrides/`echo "$$a" | sed 's/debian\/overrides\///g'`; done
+
+	chmod 644 debian/tqt3-dev-tools/usr/share/tqt3/mkspecs/aix-g++-64/qplatformdefs.h
+	chmod 644 debian/tqt3-dev-tools/usr/share/tqt3/mkspecs/macx-pbuilder/Info.plist.app
+
+binary-indep: build install
+
+	# Build architecture-independent files here.
+	dh_testdir
+	dh_testroot
+
+	dh_installdocs -i -XREADME.Debian
+	dh_installchangelogs -i changes-3.3.8
+	dh_installchangelogs -i changes-3.3.8b
+
+	find doc/man -path \*/CVS -prune -o -print | cpio -pmd $(P_DOC)/usr/share/tqt3/doc/
+
+	-rm -f `find $(P_DOC)/usr/share/tqt3/doc/ -name "*.o"`
+	find $(P_DOC) -type f -perm +0100 | xargs --no-run-if-empty rm -f
+
+	install -d $(P_DOC)/usr/share/man/man3/
+
+	for i in $(P_DOC)/usr/share/tqt3/doc/doc/man/man3/* ; do mv $$i $(P_DOC)/usr/share/man/man3/ ; done
+
+	-rm -rf $(P_DOC)/usr/share/tqt3/doc/doc
+
+	# other i18n files
+	for a in `cd translations/ && find . -name 'qt_*.qm' | sed 's/qt_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
+	install -m644 -D `pwd`/translations/qt_"$$a".qm `pwd`/debian/libtqt3-i18n/usr/share/tqt3/translations/qt_"$$a".qm; done
+
+	# logo32.png
+	cp `pwd`/doc/html/logo32.png `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/
+
+	# remove qmake html docu from tqt3-doc
+	rm -rf `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/qmake*
+
+	# create examples package
+	install -d `pwd`/debian/doc/tqt3-examples/tools/designer
+	install -d `pwd`/debian/doc/tqt3-examples/tools/linguist
+	cp -ax examples `pwd`/debian/doc/tqt3-examples
+	cp -ax tutorial `pwd`/debian/doc/tqt3-examples
+	cp -ax tools/designer/examples `pwd`/debian/doc/tqt3-examples/tools/designer/
+	cp -ax tools/linguist/tutorial `pwd`/debian/doc/tqt3-examples/tools/linguist/
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name 'tt1'`; do rm -f "$$a"; done
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name 'tt2'`; do rm -f "$$a"; done
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name 'tt3'`; do rm -f "$$a"; done
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name '.moc'`; do rm -rf "$$a"; done
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name '.obj'`; do rm -rf "$$a"; done
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name 'Makefile'`; do rm -f "$$a"; done
+	install -D `pwd`/debian/maintain/build-examples.sh `pwd`/debian/doc/tqt3-examples/build-examples
+	chmod 755 `pwd`/debian/doc/tqt3-examples/build-examples
+	cd `pwd`/debian/doc/ && tar cvvfz tqt3-examples.tar.gz tqt3-examples/
+	install -D `pwd`/debian/doc/tqt3-examples.tar.gz `pwd`/debian/tqt3-examples/usr/share/doc/tqt3-examples/tqt3-examples.tar.gz
+
+	# proceed
+	dh_compress -i -Xhtml/
+	dh_link -i
+
+	dh_fixperms -i
+	dh_installdeb -i
+
+	dh_perl -i
+	dh_shlibdeps -i
+
+	# fix shlibdeps madness
+	for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new &&  mv "$$a.new" "$$a"; done
+
+	dh_gencontrol -i
+	dh_md5sums -i
+
+	dh_builddeb -i
+
+binary-arch: build install
+
+	dh_testdir
+	dh_testroot
+	dh_installdirs -a
+
+	## create tqt3-apps-dev-package
+	install -d $(P_APPSDEV)/usr/include/tqt3/
+	cp `pwd`/tools/designer/interfaces/*.h $(P_APPSDEV)/usr/include/tqt3/
+	cp `pwd`/tools/designer/editor/*.h $(P_APPSDEV)/usr/include/tqt3/
+	rm -rf `pwd`/debian/tqt3-apps-dev/usr/include/tqt3/preferences.ui.h
+
+	## qvfb package
+	install -m644 -D `pwd`/tools/qvfb/pda.skin `pwd`/debian/tqt3-dev-tools-embedded/etc/tqt3/qvfb/pda.skin
+	install -m644 -D `pwd`/tools/qvfb/pda_down.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/qvfb/pda_down.png
+	install -m644 -D `pwd`/tools/qvfb/pda_up.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/qvfb/pda_up.png
+
+	# remove utterly ugle symlink
+	rm -rf `pwd`/debian/tqt3-dev-tools//usr/share/tqt3/mkspecs/linux-g++/linux-g++
+
+	# language file for linguist
+	install -d `pwd`/debian/tqt3-linguist/usr/share/doc/tqt3-linguist/
+	cp translations/qt_untranslated.ts `pwd`/debian/tqt3-linguist/usr/share/doc/tqt3-linguist/
+
+	# fix that stupid friggin professional file
+	perl -pi -e 's{\$$\$$QT_SOURCE_TREE}{$(QTDIR)}' src/qt_professional.pri
+
+	## i18n files for designer, linguist and assistant
+	(cd `pwd`/tools/designer/designer/ && lrelease designer.pro)
+	for a in `cd tools/designer/designer/ && find . -name 'designer_*.qm' | sed 's/designer_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
+	install -m644 -D tools/designer/designer/designer_"$$a".qm `pwd`/debian/tqt3-designer/usr/share/tqt3/translations/designer_"$$a".qm; done
+	rm -rf `pwd`/tools/designer/designer/*.qm
+
+	(cd `pwd`/tools/assistant/ && lrelease assistant.pro)
+	for a in `cd tools/assistant/ && find . -name 'assistant_*.qm' | sed 's/assistant_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
+	install -m644 -D tools/assistant/assistant_"$$a".qm `pwd`/debian/tqt3-assistant/usr/share/tqt3/translations/assistant_"$$a".qm; done
+	rm -rf `pwd`/tools/assistant/*.qm `pwd`/debian/libtqt3-i18n/usr/share/tqt3/translations/assistant_de.qm
+
+	(cd `pwd`/tools/linguist/linguist/ && lrelease linguist.pro)
+	for a in `cd tools/linguist/linguist/ && find . -name 'linguist_*.qm' | sed 's/linguist_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
+	install -m644 -D tools/linguist/linguist/linguist_"$$a".qm `pwd`/debian/tqt3-linguist/usr/share/tqt3/translations/linguist_"$$a".qm; done
+	rm -rf `pwd`/tools/linguist/linguist/*.qm
+
+	# desktop lnk files
+	install -m644 -D debian/maintain/designer-tqt3.desktop `pwd`/debian/tqt3-designer/usr/share/applications/designer-tqt3.desktop
+	install -m644 -D debian/maintain/linguist-tqt3.desktop `pwd`/debian/tqt3-linguist/usr/share/applications/linguist-tqt3.desktop
+
+	install -m644 -D debian/maintain/assistant-tqt3.desktop `pwd`/debian/tqt3-assistant/usr/share/applications/assistant-tqt3.desktop
+	install -m644 -D debian/maintain/tqt3config.desktop `pwd`/debian/tqt3-qtconfig/usr/share/applications/tqt3config.desktop
+
+	# include logo32 for every program
+	cd `pwd`/debian/tqt3-designer/usr/share/tqt3/doc/html && for a in `find . -name '*.html'`; \
+	do cat "$$a" | sed 's/logo32/logo32-designer/g' > "$$a".new && mv "$$a".new "$$a"; done
+
+	cd `pwd`/debian/tqt3-linguist/usr/share/tqt3/doc/html && for a in `find . -name '*.html'`; \
+	do cat "$$a" | sed 's/logo32/logo32-linguist/g' > "$$a".new && mv "$$a".new "$$a"; done
+
+	cd `pwd`/debian/tqt3-assistant/usr/share/tqt3/doc/html && for a in `find . -name '*.html'`; \
+	do cat "$$a" | sed 's/logo32/logo32-assistant/g' > "$$a".new && mv "$$a".new "$$a"; done
+
+	cd `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/doc/html && for a in `find . -name '*.html'`; \
+	do cat "$$a" | sed 's/logo32/logo32-qmake/g' > "$$a".new && mv "$$a".new "$$a"; done
+
+	for a in designer linguist assistant; do install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/tqt3-"$$a"/usr/share/tqt3/doc/html/logo32-"$$a".png; done
+	install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/doc/html/logo32-qmake.png
+
+	# fix qmake.conf files
+	cd `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/mkspecs/ && for a in *; do cd "$$a" && cat qmake.conf | sed 's/\$$(QTDIR)\/include/\/usr\/share\/tqt3\/include/g' | sed 's/\$$(QTDIR)/\/usr\/share\/tqt3/g' | \
+	sed 's/\-I\/usr\/include/&\/tqt3/g' >> qmake.conf.new && mv qmake.conf.new qmake.conf && cd ../; done
+
+	# build attic package and copy it to libtqt3-ompat-headers
+	cd `pwd`/src/ && tar cvvfz attic.tar.gz attic/
+	install -D `pwd`/src/attic.tar.gz `pwd`/debian/libtqt3-compat-headers/usr/share/doc/libtqt3-compat-headers/attic.tar.gz
+	rm -rf `pwd`/src/attic.tar.gz
+
+	# rename some binaries to make tqt3/4 installations possible
+	mv `pwd`/debian/tqt3-designer/usr/bin/designer `pwd`/debian/tqt3-designer/usr/bin/designer-tqt3
+	mv `pwd`/debian/tqt3-dev-tools/usr/bin/uic `pwd`/debian/tqt3-dev-tools/usr/bin/uic-tqt3
+	mv `pwd`/debian/tqt3-dev-tools/usr/bin/moc `pwd`/debian/tqt3-dev-tools/usr/bin/moc-tqt3
+	mv `pwd`/debian/tqt3-dev-tools/usr/bin/lupdate `pwd`/debian/tqt3-dev-tools/usr/bin/lupdate-tqt3
+	mv `pwd`/debian/tqt3-dev-tools/usr/bin/lrelease `pwd`/debian/tqt3-dev-tools/usr/bin/lrelease-tqt3
+	mv `pwd`/debian/tqt3-dev-tools/usr/bin/qmake `pwd`/debian/tqt3-dev-tools/usr/bin/qmake-tqt3
+	mv `pwd`/debian/tqt3-qtconfig/usr/bin/qtconfig `pwd`/debian/tqt3-qtconfig/usr/bin/qtconfig-tqt3
+	mv `pwd`/debian/tqt3-assistant/usr/bin/assistant `pwd`/debian/tqt3-assistant/usr/bin/assistant-tqt3
+	mv `pwd`/debian/tqt3-linguist/usr/bin/linguist `pwd`/debian/tqt3-linguist/usr/bin/linguist-tqt3
+
+	install -D debian/maintain/man/designer.1 `pwd`/debian/tqt3-designer/usr/share/man/man1/designer-tqt3.1
+	install -D doc/man/man1/moc.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/moc-tqt3.1
+	install -D doc/man/man1/uic.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/uic-tqt3.1
+	install -D doc/man/man1/lrelease.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/lrelease-tqt3.1
+	install -D doc/man/man1/lupdate.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/lupdate-tqt3.1
+	install -D debian/maintain/man/qtconfig.1 `pwd`/debian/tqt3-qtconfig/usr/share/man/man1/qtconfig-tqt3.1
+	install -D debian/maintain/man/linguist.1 `pwd`/debian/tqt3-linguist/usr/share/man/man1/linguist-tqt3.1
+
+	dh_link -ptqt3-designer usr/share/tqt3/doc/html usr/share/doc/tqt3-designer/html
+	dh_link -ptqt3-assistant usr/share/tqt3/doc/html usr/share/doc/tqt3-assistant/html
+	dh_link -ptqt3-linguist usr/share/tqt3/doc/html usr/share/doc/tqt3-linguist/html
+	dh_link -ptqt3-dev-tools usr/share/tqt3/doc/html usr/share/doc/tqt3-dev-tools/html
+
+	# install the manpages we have
+	dh_installman -ptqt3-designer debian/maintain/man/createcw.1
+	dh_installman -ptqt3-dev-tools-compat debian/maintain/man/qt20fix.1 debian/maintain/man/mergetr.1 debian/maintain/man/findtr.1 debian/maintain/man/msg2qm.1
+	dh_installman -ptqt3-dev-tools-embedded debian/maintain/man/makeqpf.1 debian/maintain/man/qvfb.1
+	dh_installman -ptqt3-dev-tools debian/maintain/man/qembed.1
+
+	# copy README.Debian
+	for a in libtqt3-mt-dev libtqt3-mt tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done
+
+	# install the qmake binary
+	rm -rf `pwd`/debian/tqt3-dev-tools/usr/bin/qmake
+	install -D `pwd`/qmake/qmake `pwd`/debian/tqt3-dev-tools/usr/bin/qmake-tqt3
+
+	# Install source for the designer tools, such as createcw.
+	cp -ra tools/designer/tools debian/tqt3-designer/usr/share/tqt3/tools
+	rm -f debian/tqt3-designer/usr/share/tqt3/tools/createcw/createcw
+	rm -rf debian/tqt3-designer/usr/share/tqt3/tools/createcw/.moc
+	rm -rf debian/tqt3-designer/usr/share/tqt3/tools/createcw/.obj
+	rm -f debian/tqt3-designer/usr/share/tqt3/tools/createcw/Makefile
+	rm -f debian/tqt3-designer/usr/share/tqt3/tools/conv2ui/conv2ui
+	rm -rf debian/tqt3-designer/usr/share/tqt3/tools/conv2ui/.moc
+	rm -rf debian/tqt3-designer/usr/share/tqt3/tools/conv2ui/.obj
+	rm -f debian/tqt3-designer/usr/share/tqt3/tools/conv2ui/Makefile
+
+	# run remaining debhelper scripts
+	dh_installdocs -a $(IBASE) -XREADME.Debian
+	dh_installmenu -a $(IBASE)
+
+	dh_installchangelogs -a $(IBASE) changes-3.3.8
+	dh_installchangelogs -a $(IBASE) changes-3.3.8b
+
+	dh_link -a $(IBASE)
+	dh_strip -a $(IBASE) --dbg-package=qt-x11-free-dbg
+	dh_compress -a $(IBASE)
+	dh_fixperms -a $(IBASE)
+
+	# run remaining debhelper scripts
+	dh_makeshlibs -a $(IBASE) -V
+	dh_installdeb -a $(IBASE)
+	dh_perl -a $(IBASE)
+	dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libtqt3-mt/usr/lib
+
+	# fix shlibdeps madness
+	for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new &&  mv "$$a.new" "$$a"; done
+
+	# fix conffiles file for tqt3-dev-tools-embedded
+	echo "/etc/tqt3/qvfb/pda.skin" > `pwd`/debian/tqt3-dev-tools-embedded/DEBIAN/conffiles
+
+	dh_gencontrol -a $(IBASE)
+	dh_md5sums -a $(IBASE)
+	dh_builddeb -a $(IBASE)
+
+binary: binary-indep binary-arch
+.PHONY: build binary-indep binary-arch binary install clean patch unpatch
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.install b/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.install
new file mode 100644
index 000000000..b69f266ef
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.install
@@ -0,0 +1,7 @@
+usr/lib/libeditor.prl
+usr/lib/libeditor.a
+usr/lib/libdesignercore.prl
+usr/lib/libdesignercore.a
+usr/lib/libqassistantclient.prl
+usr/lib/libqassistantclient.a
+usr/include/tqt3/qassistantclient.h
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.links b/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.links
new file mode 100644
index 000000000..b009faf61
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.links
@@ -0,0 +1,8 @@
+/usr/lib/libeditor.prl /usr/share/tqt3/lib/libeditor.prl
+/usr/lib/libeditor.a /usr/share/tqt3/lib/libeditor.a
+/usr/lib/libdesignercore.prl /usr/share/tqt3/lib/libdesignercore.prl
+/usr/lib/libdesignercore.a /usr/share/tqt3/lib/libdesignercore.a
+/usr/lib/libqassistantclient.prl /usr/share/tqt3/lib/libqassistantclient.prl
+/usr/lib/libqassistantclient.a /usr/share/tqt3/lib/libqassistantclient.a
+/usr/include/tqt3 /usr/share/tqt3/tools/designer/editor
+/usr/include/tqt3 /usr/share/tqt3/tools/designer/interfaces
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.install b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.install
new file mode 100644
index 000000000..3ec2f74fa
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.install
@@ -0,0 +1,3 @@
+usr/bin/assistant
+usr/share/tqt3/doc/html/assistant*html
+usr/share/tqt3/doc/html/assistant*dcf
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.links b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.links
new file mode 100644
index 000000000..909b4681d
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.links
@@ -0,0 +1 @@
+/usr/bin/assistant-tqt3 /usr/share/tqt3/bin/assistant
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.menu b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.menu
new file mode 100644
index 000000000..b47a494ac
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.menu
@@ -0,0 +1,6 @@
+?package(tqt3-assistant):\
+        needs="x11"\
+        section="Applications/Programming"\
+        hints="KDE"\
+        title="Qt3 Assistant"\
+        command="/usr/bin/assistant-tqt3"
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.postinst b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.postinst
new file mode 100644
index 000000000..c8b6ca8b3
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.postinst
@@ -0,0 +1,8 @@
+#!/bin/sh 
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/assistant assistant "/usr/bin/assistant-tqt3" "45" \
+
+#DEBHELPER#
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.prerm b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.prerm
new file mode 100644
index 000000000..1a45c259c
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove assistant "/usr/bin/assistant-tqt3"
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.install b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.install
new file mode 100644
index 000000000..f2db61219
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.install
@@ -0,0 +1,8 @@
+usr/bin/designer
+usr/bin/createcw
+usr/bin/conv2ui
+usr/share/tqt3/templates/*
+usr/share/tqt3/doc/html/designer*html
+usr/share/tqt3/doc/html/designer*dcf
+usr/share/tqt3/doc/html/designer*jpg
+usr/lib/tqt3/plugins/designer/*
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.links b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.links
new file mode 100644
index 000000000..550d68ec0
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.links
@@ -0,0 +1 @@
+/usr/bin/designer-tqt3 /usr/share/tqt3/bin/designer
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.menu b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.menu
new file mode 100644
index 000000000..cc01205eb
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.menu
@@ -0,0 +1,7 @@
+?package(tqt3-designer):\
+        needs="x11"\
+        section="Applications/Programming"\
+        hints="KDE"\
+        title="Qt3 Designer"\
+        command="/usr/bin/designer-tqt3"
+
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.postinst b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.postinst
new file mode 100644
index 000000000..bbbd836d0
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh 
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/designer designer "/usr/bin/designer-tqt3" "45" \
+	--slave /usr/share/man/man1/designer.1.gz designer.1.gz \
+	"/usr/share/man/man1/designer-tqt3.1.gz"
+
+#DEBHELPER#
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.prerm b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.prerm
new file mode 100644
index 000000000..14497092e
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove designer "/usr/bin/designer-tqt3"
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools-compat.install b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools-compat.install
new file mode 100644
index 000000000..838f6b827
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools-compat.install
@@ -0,0 +1,6 @@
+usr/bin/qt20fix
+usr/bin/qtrename140
+usr/bin/qm2ts
+usr/bin/mergetr
+usr/bin/findtr
+usr/bin/msg2qm
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install
new file mode 100644
index 000000000..2954f7a4c
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install
@@ -0,0 +1,2 @@
+usr/bin/makeqpf
+usr/bin/qvfb
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links
new file mode 100644
index 000000000..a0274c505
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links
@@ -0,0 +1,2 @@
+/usr/bin/makeqpf /usr/share/tqt3/bin/makeqpf
+/usr/bin/qvfb /usr/share/tqt3/bin/qvfb
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.install b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.install
new file mode 100644
index 000000000..d496d35b9
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.install
@@ -0,0 +1,9 @@
+usr/share/tqt3/mkspecs/*
+usr/share/tqt3/doc/html/qmake*html
+usr/share/tqt3/doc/html/qmake*dcf
+usr/bin/qmake
+usr/bin/lupdate
+usr/bin/lrelease
+usr/bin/uic
+usr/bin/moc
+usr/bin/qembed
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.links b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.links
new file mode 100644
index 000000000..0de57d25d
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.links
@@ -0,0 +1,7 @@
+/usr/share/tqt3/mkspecs/linux-g++ /usr/share/tqt3/mkspecs/default
+/usr/bin/qmake-tqt3 /usr/share/tqt3/bin/qmake
+/usr/bin/lupdate-tqt3 /usr/share/tqt3/bin/lupdate
+/usr/bin/lrelease-tqt3 /usr/share/tqt3/bin/lrelease
+/usr/bin/uic-tqt3 /usr/share/tqt3/bin/uic
+/usr/bin/moc-tqt3 /usr/share/tqt3/bin/moc
+/usr/bin/qembed /usr/share/tqt3/bin/qembed
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.postinst b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.postinst
new file mode 100644
index 000000000..75022d56f
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.postinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/moc moc "/usr/bin/moc-tqt3" "45" \
+	--slave /usr/share/man/man1/moc.1.gz moc.1.gz \
+	"/usr/share/man/man1/moc-tqt3.1.gz"
+
+update-alternatives --install \
+        /usr/bin/uic uic "/usr/bin/uic-tqt3" "45" \
+	--slave /usr/share/man/man1/uic.1.gz uic.1.gz \
+	"/usr/share/man/man1/uic-tqt3.1.gz"
+
+update-alternatives --install \
+        /usr/bin/lupdate lupdate "/usr/bin/lupdate-tqt3" "45" \
+	--slave /usr/share/man/man1/lupdate.1.gz lupdate.1.gz \
+	"/usr/share/man/man1/lupdate-tqt3.1.gz"
+		
+update-alternatives --install \
+        /usr/bin/lrelease lrelease "/usr/bin/lrelease-tqt3" "45" \
+	--slave /usr/share/man/man1/lrelease.1.gz lrelease.1.gz \
+	"/usr/share/man/man1/lrelease-tqt3.1.gz"
+
+update-alternatives --install \
+        /usr/bin/qmake qmake "/usr/bin/qmake-tqt3" "45" \
+
+#DEBHELPER#
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.prerm b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.prerm
new file mode 100644
index 000000000..c0a69bfe9
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.prerm
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove moc "/usr/bin/moc-tqt3"
+    update-alternatives --remove uic "/usr/bin/uic-tqt3"
+    update-alternatives --remove lupdate "/usr/bin/lupdate-tqt3"
+    update-alternatives --remove lrelease "/usr/bin/lrelease-tqt3"
+    update-alternatives --remove qmake "/usr/bin/qmake-tqt3"
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-doc.doc-base b/debian/lenny/dependencies/tqt3/debian/tqt3-doc.doc-base
new file mode 100644
index 000000000..8fd0c977f
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-doc.doc-base
@@ -0,0 +1,11 @@
+Document: tqt3-doc
+Title: Qt Reference Documentation
+Author: Troll Tech
+Abstract: Qt (TM) is a multi-platform C++ GUI toolkit. It is a product of
+ Troll Tech. It is supported on all major variants of Microsoft Windows and
+ Unix/X Windows. 
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/tqt3-doc/html/index.html
+Files: /usr/share/doc/tqt3-doc/html/*.html
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-doc.docs b/debian/lenny/dependencies/tqt3/debian/tqt3-doc.docs
new file mode 100644
index 000000000..f08fd0f02
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-doc.docs
@@ -0,0 +1,2 @@
+FAQ
+README-QT.TXT
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-doc.links b/debian/lenny/dependencies/tqt3/debian/tqt3-doc.links
new file mode 100644
index 000000000..dfec5318b
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-doc.links
@@ -0,0 +1,2 @@
+/usr/share/man/man3 /usr/share/tqt3/doc/man/man3
+/usr/share/tqt3/doc/html /usr/share/doc/tqt3-doc/html
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.install b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.install
new file mode 100644
index 000000000..7484d8534
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.install
@@ -0,0 +1,4 @@
+usr/bin/linguist
+usr/share/tqt3/phrasebooks/*
+usr/share/tqt3/doc/html/linguist*html
+usr/share/tqt3/doc/html/linguist*dcf
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.links b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.links
new file mode 100644
index 000000000..aa157aded
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.links
@@ -0,0 +1 @@
+/usr/bin/linguist-tqt3 /usr/share/tqt3/bin/linguist
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.menu b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.menu
new file mode 100644
index 000000000..6da50281a
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.menu
@@ -0,0 +1,6 @@
+?package(tqt3-linguist):\
+        needs="x11"\
+        section="Applications/Programming"\
+        hints="KDE"\
+        title="Qt3 Linguist"\
+        command="/usr/bin/linguist-tqt3"
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.postinst b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.postinst
new file mode 100644
index 000000000..1dadc79df
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh 
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/linguist linguist "/usr/bin/linguist-tqt3" "45" \
+	--slave /usr/share/man/man1/linguist.1.gz linguist.1.gz \
+	"/usr/share/man/man1/linguist-tqt3.1.gz"
+
+#DEBHELPER#
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.prerm b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.prerm
new file mode 100644
index 000000000..38de53b13
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove linguist "/usr/bin/linguist-tqt3"
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.install b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.install
new file mode 100644
index 000000000..8fcee756b
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.install
@@ -0,0 +1 @@
+usr/bin/qtconfig
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.links b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.links
new file mode 100644
index 000000000..52e4d5473
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.links
@@ -0,0 +1 @@
+/usr/bin/qtconfig-tqt3 /usr/share/tqt3/bin/qtconfig
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.menu b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.menu
new file mode 100644
index 000000000..e567b050b
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.menu
@@ -0,0 +1,8 @@
+?package(tqt3-qtconfig):\
+        needs="x11"\
+        section="Applications/System/Administration"\
+        title="Qt3 Config"\
+        longtitle="Qt3 Configuration Utility"\
+        hints="Qt3 config tool"\
+        command="/usr/bin/qtconfig-tqt3"
+
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.postinst b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.postinst
new file mode 100644
index 000000000..9449d5b8a
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh 
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/qtconfig qtconfig "/usr/bin/qtconfig-tqt3" "45" \
+	--slave /usr/share/man/man1/qtconfig.1.gz qtconfig.1.gz \
+	"/usr/share/man/man1/qtconfig-tqt3.1.gz"
+
+#DEBHELPER#
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.prerm b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.prerm
new file mode 100644
index 000000000..810bc0a93
--- /dev/null
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove qtconfig "/usr/bin/qtconfig-tqt3"
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/lenny/dependencies/tqtinterface/debian/control b/debian/lenny/dependencies/tqtinterface/debian/control
index d2b5de20b..8af4661b3 100644
--- a/debian/lenny/dependencies/tqtinterface/debian/control
+++ b/debian/lenny/dependencies/tqtinterface/debian/control
@@ -2,7 +2,7 @@ Source: libtqtinterface
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>> 4.0.0), libqt3-mt-dev, libavahi-tqt-dev, qt3-apps-dev, cmake, cdbs
+Build-Depends: debhelper (>> 4.0.0), libqt3-mt-dev, qt3-apps-dev, cmake, cdbs
 Standards-Version: 3.8.4
 
 Package: libtqtinterface
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/tdeprint-16.xpm
index 4f03a0b06..58b87a90d 100644
--- a/debian/lenny/tdebase/debian/icons/kdeprint-16.xpm
+++ b/debian/lenny/tdebase/debian/icons/tdeprint-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/lenny/tdebase/debian/icons/tdeprint.xpm
index f11005860..c10da523c 100644
--- a/debian/squeeze/tdebase/debian/icons/kdeprint.xpm
+++ b/debian/lenny/tdebase/debian/icons/tdeprint.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/debian/lenny/tdebase/debian/icons/tdeprintfax-16.xpm
index debb554b6..3e07385e5 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kdeprintfax-16.xpm
+++ b/debian/lenny/tdebase/debian/icons/tdeprintfax-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/debian/lenny/tdebase/debian/icons/tdeprintfax.xpm
index 6af142f57..9f5d6a2e7 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kdeprintfax.xpm
+++ b/debian/lenny/tdebase/debian/icons/tdeprintfax.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
deleted file mode 100644
index bd25acf54..000000000
--- a/debian/lenny/tdebase/debian/kdeprint-trinity.install
+++ /dev/null
@@ -1,150 +0,0 @@
-debian/tmp/opt/trinity/bin/kdeprintfax
-debian/tmp/opt/trinity/bin/kjobviewer
-debian/tmp/opt/trinity/bin/kprinter
-debian/tmp/opt/trinity/lib/trinity/kcm_printmgr.la
-debian/tmp/opt/trinity/lib/trinity/kcm_printmgr.so
-debian/tmp/opt/trinity/lib/trinity/kio_print.la
-debian/tmp/opt/trinity/lib/trinity/kio_print.so
-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/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/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/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/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/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/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/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/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/kjobviewer.svgz
-debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/printmgr.svgz
-debian/tmp/opt/trinity/share/mimelnk/print/class.desktop
-debian/tmp/opt/trinity/share/mimelnk/print/driver.desktop
-debian/tmp/opt/trinity/share/mimelnk/print/folder.desktop
-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/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
diff --git a/debian/lenny/tdebase/debian/kdeprint-trinity.lintian b/debian/lenny/tdebase/debian/kdeprint-trinity.lintian
deleted file mode 100644
index 6cac09d35..000000000
--- a/debian/lenny/tdebase/debian/kdeprint-trinity.lintian
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/debian/lenny/tdebase/debian/kdeprint-trinity.menu b/debian/lenny/tdebase/debian/kdeprint-trinity.menu
deleted file mode 100644
index 3140de34c..000000000
--- a/debian/lenny/tdebase/debian/kdeprint-trinity.menu
+++ /dev/null
@@ -1,35 +0,0 @@
-?package(kdeprint):\
-	needs="X11"\
-	section="Applications/System/Monitoring"\
-	hints="KDE"\
-	title="KJobViewer"\
-	icon32x32="/opt/trinity/share/pixmaps/kjobviewer.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kjobviewer-16.xpm"\
-	command="/opt/trinity/bin/kjobviewer --show --all"
-
-?package(kdeprint):\
-	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"\
-	command="/opt/trinity/bin/kprinter"
-
-?package(kdeprint):\
-	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"
-
-# Icon 32x32 kdeprint/kjobviewer/cr32-app-kjobviewer.png kjobviewer.xpm
-# Icon 16x16 kdeprint/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 kdeprint/kdeprintfax/cr32-app-kdeprintfax.png kdeprintfax.xpm
-# Icon 16x16 kdeprint/kdeprintfax/cr16-app-kdeprintfax.png kdeprintfax-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/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/squeeze/tdebase/debian/man/kdeprintfax-trinity.1 b/debian/lenny/tdebase/debian/man/tdeprintfax-trinity.1
index 0308ac1d8..353fb6529 100644
--- a/debian/squeeze/tdebase/debian/man/kdeprintfax-trinity.1
+++ b/debian/lenny/tdebase/debian/man/tdeprintfax-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/debian/lenny/tdebase/debian/man/tdesu-trinity.1
index e552d288c..8befa3c39 100644
--- a/ubuntu/maverick/tdebase/debian/man/kdesu-trinity.1
+++ b/debian/lenny/tdebase/debian/man/tdesu-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/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
deleted file mode 100644
index f43d9196b..000000000
--- a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: tdebase-doc-html-kdeprint
-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
-
diff --git a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.tdeprint b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
new file mode 100644
index 000000000..7610a4313
--- /dev/null
+++ b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
@@ -0,0 +1,10 @@
+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/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/tdebase/debian/tdeprint-trinity.install b/debian/lenny/tdebase/debian/tdeprint-trinity.install
new file mode 100644
index 000000000..69f67a958
--- /dev/null
+++ b/debian/lenny/tdebase/debian/tdeprint-trinity.install
@@ -0,0 +1,150 @@
+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
+debian/tmp/opt/trinity/lib/trinity/kcm_printmgr.so
+debian/tmp/opt/trinity/lib/trinity/kio_print.la
+debian/tmp/opt/trinity/lib/trinity/kio_print.so
+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/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/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/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/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/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/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/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/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/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
+debian/tmp/opt/trinity/share/mimelnk/print/driver.desktop
+debian/tmp/opt/trinity/share/mimelnk/print/folder.desktop
+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/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/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/tdeprint-trinity.lintian b/debian/lenny/tdebase/debian/tdeprint-trinity.lintian
new file mode 100644
index 000000000..9da8261d7
--- /dev/null
+++ b/debian/lenny/tdebase/debian/tdeprint-trinity.lintian
@@ -0,0 +1,4 @@
+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/tdeprint-trinity.manpages
index 6d4136bf9..55b9bfae7 100644
--- a/debian/lenny/tdebase/debian/kdeprint-trinity.manpages
+++ b/debian/lenny/tdebase/debian/tdeprint-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/tdeprint-trinity.menu b/debian/lenny/tdebase/debian/tdeprint-trinity.menu
new file mode 100644
index 000000000..1268aa55c
--- /dev/null
+++ b/debian/lenny/tdebase/debian/tdeprint-trinity.menu
@@ -0,0 +1,35 @@
+?package(tdeprint):\
+	needs="X11"\
+	section="Applications/System/Monitoring"\
+	hints="KDE"\
+	title="KJobViewer"\
+	icon32x32="/opt/trinity/share/pixmaps/kjobviewer.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kjobviewer-16.xpm"\
+	command="/opt/trinity/bin/kjobviewer --show --all"
+
+?package(tdeprint):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="KDE"\
+	title="KPrinter"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeprint.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeprint-16.xpm"\
+	command="/opt/trinity/bin/kprinter"
+
+?package(tdeprint):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="KDE"\
+	title="KDEPrintFax"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\
+	command="/opt/trinity/bin/tdeprintfax"
+
+# Icon 32x32 tdeprint/kjobviewer/cr32-app-kjobviewer.png kjobviewer.xpm
+# Icon 16x16 tdeprint/kjobviewer/cr16-app-kjobviewer.png kjobviewer-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 tdeprint/tdeprintfax/cr32-app-tdeprintfax.png tdeprintfax.xpm
+# Icon 16x16 tdeprint/tdeprintfax/cr16-app-tdeprintfax.png tdeprintfax-16.xpm
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/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/ubuntu/maverick/tdelibs/debian/man/kdeinit-trinity.1 b/debian/lenny/tdelibs/debian/man/tdeinit-trinity.1
index 1e1e10adf..1c3861783 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kdeinit-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/tdeinit-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/lenny/tdelibs/debian/man/tdeinit_shutdown-trinity.1
index 11081656a..679666846 100644
--- a/debian/squeeze/tdelibs/debian/man/kdeinit_shutdown-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/tdeinit_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/debian/lenny/tdelibs/debian/man/tdesu_stub-trinity.1
index 7a3800513..f21330cc4 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kdesu_stub-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/tdesu_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/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/dependencies/tqt3/debian/README.Debian b/debian/squeeze/dependencies/tqt3/debian/README.Debian
new file mode 100644
index 000000000..99b460974
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/README.Debian
@@ -0,0 +1,277 @@
+Qt for Debian README
+--------------------
+
+1. Preface
+
+This README is intended to give developers and users exact information
+about how the qt-x11-free package provided by TrollTech AS has been packaged
+for Debian in case you either want to faciliate it for development 
+of applications and libraries or plugins using the Qt class library. With 
+qt-x11-3.1.1, the Debian packages have been massively restructured to get 
+the most out of theoriginal Qt package and spit the contents up into 
+several packages so that they make the most sensefor several groups of 
+users; developers, application users, translators of Qt-based 
+applications and Debian packagers who are packaging applications developed 
+with Qt.2. 
+
+2. General Overview
+
+As Qt is a huge package that contains a complete environment for 
+developers, it needs to be split up into several packages that make it 
+easier for everyone else to handle it and not to retquire 
+unnecessary disk space for end-users. Additionally, Qt can be configured 
+in several ways - and therefore also used in several ways. Qt development 
+usually retquires the environment variable QTDIR. As Debian is placing 
+libraries and header files in a tquite specific filesystem order, this 
+usually breaks setting a single environment variable to meet the 
+retquirements of packages. Therefore, symlinks are used to set up the system 
+to meet both, the Debian filesystem standard and the QTDIR variable. All of 
+Qt (so the QTDIR path) is available in /usr/share/tqt3. If you need to set 
+QTDIR, do export QTDIR=/usr/share/tqt3
+
+As far as the common build configuration goes, we note explicitely that the 
+Debian package of Qt will in very rare cases break the compilation (most 
+likely the linking) of applications on Debian which use Qt, in particular 
+utilizing styles in an incorrect way by deriving from one of the styles 
+that ship with Qt. In case you are a Debian packager and encounter 
+problems, contact Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org).
+We will tell you why things don't work and what you should communicate on 
+with the programmers of your application that you are packaging. The build 
+configuration generally is intended to provide a Qt version that is as 
+small as possible in terms of the memory size it retquires. Therefore, 
+everything inside Qt that can be compiled as plugins has been compiled that 
+way. This includes: 
+
+- imageformats: jpeg and mng - codecs (for languages like arab, japanese 
+  etc provided with Qt) 
+- sql drivers for databases (MySQL, ODBC and PostgreSQL)
+
+The only exception is the imageformat png which has been compiled built-in 
+due to the fact that there is literally no program that uses no icons at 
+all and icons are to be used preferrably in png format. The plugins are all 
+located under /usr/lib/tqt3/plugins. This is also the install location you
+should choose as a package maintainer for 
+qt-plugins so the user doesn't have to customize his library path for 
+loading Qt plugins. The only exception is that KDE delivers a set of Qt 
+plugins as well (mainly styles and designer plugins); those are placed in 
+/usr/lib/trinity/plugins. 
+
+QMotif Extension: As this code is only available in commercial environments 
+(and produces a static library libqmotif.a anyway that those commercial 
+applications have to be linked against in addition to Qt), we left out all 
+header files of the libtqt3-headers package that are belonging to this 
+QMotif extension.
+
+Oracle Database driver, Sybase & Microsoft SQL Server driver: Those drivers 
+are only available in a commercial version of Qt due to license 
+incompatibilities with the GPL. If you need to faciliate those drivers, 
+please visit http://www.trolltech.com and have a read at 
+http://doc.trolltech.com/3.0/sql-driver.html.
+  
+3. Packages (End-User) 
+
+The Qt built has been split up into several packages that allow for easy 
+installation for all types of users. The End-user usually only retquires to 
+have the following packages installed to run an application that links 
+against Qt:
+
+Threaded version:libtqt3-mt (the library libtqt-mt.so.* and libtqui.so.* for 
+loading designer-made user interfaces at runtime).
+
+Optionally depending on the program's retquirements:
+
+libtqt3-mt-odbc
+libtqt3-mt-mysql
+libtqt3-mt-psql 
+
+In addition to the libraries, it may make sense to install the program 
+qtconfig to customize the look and behaviorof Qt programs. If you have KDE 
+installed, the KDE control center will take this task automatically in most 
+cases. qtconfig is available in the package tqt3-qtconfig.
+
+Also, Qt programs can make use of the online-help tool that ships with Qt, 
+the Qt Assistant. The Assistant can be installed with the package 
+qt3-assistant.
+
+Qt Configuration files
+----------------------
+Qt programs most often use QSettings to store their information in configuration
+files. With Qt 3.2, the new option --sysconfdir has been introduced that allows
+us to use /etc/tqt3 as the system-wide location where qt-program specific global
+configuration files can go. If you're a programmer that wants to get familiar with
+that, please look at the examples, documentation and the code in designer or
+assistant as well as qtconfig.
+
+4. Packages (Package maintainers)
+
+In addition to the library, a package maintainer will retquire an additional 
+set of packages to compile a package that retquires Qt. Depending on the 
+version of the qt library, you will retquire a different set of packages; 
+the most common option should be to make your application link against the 
+multi-threaded version (-mt).Packages necessary for compiling Qt 
+applications from source:
+
+libtqt3-mt-dev   (use libtqt3-dev for linking against -lqt, this package only 
+                contains the .so files and the header file for libtqui.so)
+
+libtqt3-headers  (header files for libqt and libtqt-mt)
+ 
+qt3-dev-tools  (this package contains the tools uic and moc as well as 
+qmake, retquired for building Qt applications) 
+
+If, however, you encounter an older program not to compile with this set 
+read the FAQ at the end of this document.
+
+5. Packages (Developers)
+
+In addition to the packages that packagers retquire, a developer usually 
+will retquire the Qt API documentationas well as tools like the assistant, 
+linguist or designer. However, you should be fine with installing the API 
+documentation that you can browse with a webbrowser, optionally with the 
+assistant. They are available in /usr/share/doc/tqt3-doc/html.
+For a regular development environment, install tqt3-designer and tqt3-doc.
+
+For faciliating Qt's extended environment to write plugins for the Qt 
+Designer or extend the Designer as well as utilizing the Qt Assistant by 
+calling it from within your program, install tqt3-apps-dev, which contains
+the static libraries and header files retquired for this functionality.
+
+For Embedded Developers, the program qvfb (Qt Virtual Frambuffer) and 
+makeqpf (embedded fonts tool)have been packaged into 
+qt3-dev-tools-embedded. For developers that work on migrating their program 
+from any Qt version prior to Qt 3.x to the Qt 3.x platform you will find 
+additional tools in the tqt3-dev-tools-compat.
+
+For using the QTranslator class and where to find the qm-file for qt as 
+well as where to place your translations,see the next section.
+
+If your program doesn't compile with those settings in case you have 
+started your project with Qt 1.x or 2.x, please read the FAQ section at the 
+end of this document.
+
+5. Packages (Translators)
+
+In order to translate a Qt program into any other language, the Qt 3 way to 
+do this is to let the developer create a ts-file containing the strings 
+that the program exposes on the user interface. The tools to create the 
+ts-file and to create the final qm (Q-message binary) file, lupdate and 
+lrelease, are included in tqt3-dev-tools.The single translator that only 
+gets provided the ts file and has to return a translated ts file, it 
+is absolutely enough to install tqt3-linguist; the package tqt3-assistant can 
+be installed to access the online-help for the Qt Linguist itself.
+In case you're converting an application using Qt prior to Qt 3, you may 
+want to uitilize the tqt3-dev-tools-compat which include the necessary tools 
+to convert older qm files to the new ts file standard.
+
+Locations of message translations: 
+
+Qt ships with a set of translations for the strings used inside Qt. Those 
+translations will be installed into /usr/share/tqt3/translations (qm files 
+only), which equals $QTDIR/translations respectively 
+qInstallPath() + QString( "/translations" ). 
+
+The configure option --translationdir has been set to /usr/share/tqt3/translations
+accordingly since it was introduced in Qt 3.2. 
+
+To correctly enable your program to display the translations to the Qt 
+library and to load the translation of the program itself, we currently 
+suggest to either install your translations along with any other data files 
+into/usr/share/<appname>/, translation files into the subdirectory 
+translations (that is /usr/share/<appname>/translations) The code that your 
+application should use to load the Qt translation will have to look like 
+the following:    
+
+int main( int argc, char **argv )
+    {
+        QApplication app( argc, argv );
+
+        // translation file for Qt
+        QTranslator qt( 0 );
+        qt.load( QString( "qt_" ) + QTextCodec::locale(), qInstallPath() + 
+        QString( "/translations" );
+        app.installTranslator( &qt );
+
+        // translation file for application strings
+        QTranslator myapp( 0 );
+        myapp.load( QString( "myapp_" ) + QTextCodec::locale(), "." ); 
+        // use a substitue for $prefix/share/appname/translations here      
+        app.installTranslator( &myapp );
+
+6. Frequently Asked Questions
+
+Using Qt for Debian as a developer or packager 
+----------------------------------------------
+
+Q: I want to compile a source package that utilizes qmake to build the 
+Makefiles. What do I need to do to makeit work ?
+
+A: qmake retquires two environment variables to be set, QTDIR and QMAKESPEC. 
+To make it work, do
+export QTDIR=/usr/share/tqt3
+export QMAKESPEC=linux-g++
+
+Then run qmake -o Makefile <projectfile>.pro
+
+After that, the Makefile is correctly created to build your application on 
+Debian. As a packager, export thosetwo variables in the rules file before 
+calling qmake.
+
+Q: I have an application that when linking gives me symbol referencing 
+errors to Q*Style. Why does my applicationnot link correctly ?
+
+A: The author of the program is using the styles that ship with Qt directly 
+instead of using the QStylePlugin interface.If you are the author of the 
+program, change your program to use QStylePlugin. If you are a packager, 
+write to theauthor of the program that he is assuming that the styles 
+shipped with Qt are built-in to the library which is not the case on Debian 
+and that he please should fix this and use QStylePlugin.
+
+Q: Where are all the examples and tutorials ? And how do I build them ?
+
+A: Qt ships with examples and tutorials; so does the Linguist and Designer. 
+The tutorials and examples are compressed tarballs which you can unpack with 
+tar -zxvf into your home directory. Change into the tqt3-examples directory
+and run the provided ./build-examples script. All Qt examples and tutorials,
+including those for designer and the linguist, will be compiled. You will
+notice however, that those examples that inherit from style classes which
+are not built-in into Qt but configured as a plugin will not compile due
+to the fact that they can't link to the Qt library. 
+
+Q: I'm writing a pure Qt application and I want to ship it with a default 
+configuration file. Where does that global configuration file go if I make 
+use of the QSettings class ? 
+
+A: With qt-3.2.0, Trolltech has introduced a configure option to Qt called
+--sysconfdir which we intentionally set to /etc/tqt3 similar to /etc/trinity for
+KDE programs. Install your application's system wide configuration file
+to /etc/tqt3. 
+
+Q: I'm compiling a program and I have a compile error due to a missing 
+include. Why isn't that include not present in the Debian packages anymore 
+? It compiled with older versions of Debian packages of Qt !
+
+A: This may be due to two reasons: either the package still uses the old 
+includes from Qt 1.x or 2.x that got basically renamed by Trolltech due to 
+the naming convention. The filenames are now all following the scheme 
+
+ClassName -> classname.h. 
+
+Therefore, if you are the developer of the affected program, change your 
+sources according to this scheme. Qt ships with two tools, qt20fix and 
+qtrename140, to help developers migrate their API to the Qt 3 version, 
+which can help you in the transition upgrade to Qt 3.
+
+If you are affected by this as a packager, notify upstream to fix those 
+problems and in the meanwhile use libtqt3-compat-headers as a build 
+dependency which includes the compatibility headers that just include the 
+right files from the new API again.
+
+Q: I have a question not covered by this FAQ and README file. Who should I 
+turn to ?
+
+A: Please turn to Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org) 
+for any questions regarding Qt on Debian.
+
+ -- Ralf Nolden <nolden@kde.org>  Sun, 26 Jan 2003 20:39:19 +0100
+ -- Ralf Nolden <nolden@kde.org>  Mon,  1 Sep 2003 19:24:16 +0200
+ -- Modestas Vainius <modestas@vainius.eu> Fri, 22 Feb 2008 01:40:06 +0200
diff --git a/debian/squeeze/dependencies/tqt3/debian/changelog b/debian/squeeze/dependencies/tqt3/debian/changelog
new file mode 100644
index 000000000..3e813531e
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/changelog
@@ -0,0 +1,5 @@
+tqt-x11-free (3:3.3.8-d-0ubuntu0) maverick; urgency=low
+
+  * Upload of 3.3.8d (working revision) from GIT
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 22 Jul 2011 16:40:00 -0600
diff --git a/debian/squeeze/dependencies/tqt3/debian/compat b/debian/squeeze/dependencies/tqt3/debian/compat
new file mode 100644
index 000000000..1e8b31496
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/compat
@@ -0,0 +1 @@
+6
diff --git a/debian/squeeze/dependencies/tqt3/debian/control b/debian/squeeze/dependencies/tqt3/debian/control
new file mode 100644
index 000000000..fa495f168
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/control
@@ -0,0 +1,298 @@
+Source: tqt-x11-free
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>
+Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4),
+ libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4),
+ libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
+ libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
+ libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev,
+ libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev,
+ libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4),
+ libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev,
+ libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev
+Section: libs
+Priority: optional
+Standards-Version: 3.8.4
+Homepage: http://www.trinitydesktop.org
+
+Package: libtqt3-mt
+Architecture: any
+Section: libs
+Replaces: tqt3-tools (<< 2:3.0.2-20020306-1), libtqt3-helper, libtqt3, libtqt3c102-mt
+Depends: ${shlibs:Depends}, fontconfig
+Recommends: libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4)
+Conflicts: libtqt3c102-mt, libtqui1-emb, libtqt3c-mt
+Suggests: libtqt3-mt-psql, libtqt3-mt-mysql, libtqt3-mt-odbc
+Description: Qt GUI Library (Threaded runtime version), Version 3
+ This is the Trolltech Qt library, version 3. It's necessary for
+ applications that link against the libtqt-mt.so.3, e.g. all Trinity
+ applications.
+
+Package: libtqt3-mt-mysql
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Replaces: libtqt3-mysql (<= 2:3.1.1+cvs.20021220-1), libtqt3c102-mt-mysql
+Conflicts: libtqt3c102-mt-mysql, libtqt3c-mt-mysql
+Description: MySQL database driver for Qt3 (Threaded)
+ This package contains the threaded MySQL plugin for Qt3. Install it if
+ you intend to use or write Qt programs that are to access a MySQL DB.
+
+Package: libtqt3-mt-odbc
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Replaces: libtqt3-odbc (<= 2:3.1.1+cvs.20021220-1), libtqt3c102-mt-odbc
+Conflicts: libtqt3c102-mt-odbc, libtqt3c-mt-odbc
+Description: ODBC database driver for Qt3 (Threaded)
+ This package contains the threaded ODBC plugin for Qt3. Install it if
+ you intend to use or write Qt programs that are to access an ODBC DB.
+
+Package: libtqt3-mt-psql
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Replaces: libtqt3-psql (<= 2:3.1.1+cvs.20021220-1), libtqt3c102-mt-psql
+Conflicts: libtqt3c102-mt-psql, libtqt3c-mt-psql
+Description: PostgreSQL database driver for Qt3 (Threaded)
+ This package contains the threaded PostgreSQL plugin for Qt3.
+ Install it if you intend to use or write Qt programs that are
+ to access a PostgreSQL DB.
+
+#Not in Debian
+#Package: libtqt3-mt-ibase
+#Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
+#Section: libs
+#Depends: ${shlibs:Depends}
+#Conflicts: libtqt3c102-mt-ibase
+#Replaces: libtqt3c102-mt-ibase
+#Description: InterBase/FireBird database driver for Qt3 (Threaded)
+# This package contains the threaded InterBase/FireBird plugin
+# for Qt3. Install it if you intend to use or write Qt programs
+# that are to access an InterBase/FireBird DB.
+
+Package: libtqt3-mt-sqlite
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libtqt3c102-mt-sqlite
+Replaces: libtqt3c102-mt-sqlite
+Description: SQLite database driver for Qt3 (Threaded)
+ This package contains the threaded SQLite plugin for Qt3. Install
+ it if you intend to use or write Qt programs that are to access an
+ SQLite DB.
+
+Package: libtqt3-mt-dev
+Architecture: any
+Section: libdevel
+Replaces: libtqt-mt-dev, libtqt3-dev, libtqt3-helper, libtqt3-headers (<= 3:3.1.1-3), libtqt3-emb (<= 3:3.0.3-1)
+Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
+ libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4),
+ libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
+ libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev,
+ libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3),
+ libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev,
+ libxft-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev,
+ libglu1-mesa-dev | libglu-dev, libc6-dev, libtqt3-mt (= ${binary:Version}),
+ libtqt3-headers (= ${binary:Version}), tqt3-dev-tools (= ${binary:Version})
+Conflicts: libtqt-mt-dev, libtqt3-emb (<= 3:3.0.3-1), libtqt3-dev
+Recommends: libtqt3-compat-headers
+Suggests: libtqt3-i18n, tqt3-doc
+Description: Qt development files (Threaded)
+ Qt is a C++ class library optimized for graphical user interface
+ development. This package contains the libtqt-mt.so symlink, necessary
+ for building threaded Qt applications as well as the libtqui.so symlink
+ and the necessary header files for libtqui.so. (See README.Debian and
+ the Qt Documentation for instructions on libtqui.so)
+ .
+ WARNING: If you plan to build some older Qt3 applications, you will
+ most probably have to install the libtqt3-compat-headers package. It
+ contains all the headers which are not part of the official Qt3 API
+ anymore but which are still used by some programs. So if you encounter
+ problems with missing header files, please install this package first
+ before you send a bugreport.
+
+Package: libtqt3-headers
+Architecture: any
+Section: devel
+Recommends: libtqt3-mt-dev
+Replaces: libtqt3-mt-dev, libtqt3-dev, libtqt3-plugins-headers
+Description:  Qt3 header files
+ This package contains all header files for libqt and libtqt-mt which come
+ with Qt3. If you want to compile or develop programs which use Qt3, you
+ have to install this package.
+
+Package: libtqt3-compat-headers
+Architecture: any
+Section: devel
+Depends: libtqt3-headers (= ${binary:Version})
+Recommends: libtqt3-mt-dev
+Replaces: libtqt3-mt-dev (<= 3:3.1.1-2), libtqt3-dev (<= 3:3.1.1-2), libtqt3-headers (<= 3:3.1.1-2)
+Description: Qt 1.x and 2.x compatibility includes
+ This package contains header files that are intended for build
+ compatibility for applications that build with Qt3 but still use
+ deprecated includes. It is meant as an intermediate solution and
+ these header files are not part of the official Qt3 API.
+ All sourcecode that is still using the headers of this package is
+ subject to be changed to use the new header files which are in
+ libtqt3-headers.
+
+Package: tqt3-dev-tools
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Recommends: libtqt3-mt-dev
+Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev, tqt3-doc (<= 3:3.1.1-2)
+Conflicts: libqt-dev (<< 3:2.3.2-10), uic (<= 3:2.3.2-9)
+Description: Qt3 development tools
+ This package contains all tools that are necessary to build programs
+ that are written using Qt3. These are: qmake, uic and moc.
+ For Qt3 development, you most likely want to install this package.
+
+Package: tqt3-designer
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Recommends: tqt3-dev-tools
+Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev, tqt3-doc (= 3:3.3.4-8)
+Suggests: tqt3-assistant, tqt3-doc
+Conflicts: qt-designer (<= 3:2.3.2-9), qt-designer-doc
+Description: Qt3 Designer
+ The Qt Designer is a GUI design program that interactively lets you
+ construct user interfaces for the Qt library. Additionally it lets you
+ create whole project and works together with the database drivers
+ provided by Qt to create applications with easy database access through
+ Qt. The resulting user interface files can then be converted to
+ C++ classes using the uic commandline utility which is usually done
+ automatically for the developer with a project management with qmake
+ or automake.
+
+Package: tqt3-apps-dev
+Architecture: any
+Section: devel
+Depends: libtqt3-mt-dev
+Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
+Description: Qt3 Developer applications development files
+ This package is intended for developers who want to develop applications
+ using the additional static libraries that ship with the applications
+ included with Qt; the Qt Designer and the Qt Assistant.
+ It allows integrating additional enhancements into the Qt Designer
+ respectively faciliate the Qt Assistant from within your Qt application
+ to interactively call the Assistant for displaying online help that the
+ developer includes with his application.
+
+Package: tqt3-linguist
+Architecture: any
+Section: devel
+Suggests: tqt3-assistant
+Depends: ${shlibs:Depends}
+Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev, tqt3-doc (= 3:3.3.4-8)
+Description: The Qt3 Linguist
+ This package contains the Qt3 Linguist which provides translators a
+ tool perfect for translating any Qt-based application into other
+ languages and can be used and installed independently of any Qt
+ development files by the translator.
+
+Package: tqt3-assistant
+Architecture: any
+Section: x11
+Depends: ${shlibs:Depends}, tqt3-doc
+Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
+Description: The Qt3 assistant application
+ This package contains the Qt3 Assistant, an easy to use frontend for
+ the complete Qt3 documentation and serves as an online help viewer for
+ any Qt program that wants to give the usesr access to online help.
+ Within the Qt tools it is used as the help viewer for the online help
+ for the Qt3 Designer and Linguist as well as qmake and the Qt 3 API
+ documentation.
+ .
+ Developers of Qt Application who want to faciliate the Qt Assistant for online
+ help display should refer to the README.Debian file for libtqt3-mt-dev and
+ the package tqt3-apps-dev.
+
+Package: tqt3-qtconfig
+Architecture: any
+Section: x11
+Depends: ${shlibs:Depends}
+Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
+Description: The Qt3 Configuration Application
+ The Qt Configuration program allows endusers to configure the look
+ and behavior of any Qt3 application. It is mostly only necessary
+ on systems which don't run KDE because the KDE control center already
+ covers this configuration automatically for the users Qt3 applications
+ according to his desktop settings in KDE. However, if you need to run
+ CJK-fonts or other non-latin scripts, you will most likely want to
+ install this package.
+
+Package: tqt3-dev-tools-embedded
+Architecture: any
+Section: devel
+Recommends: libtqt3-mt-dev
+Depends: ${shlibs:Depends}
+Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
+Description: Tools to develop embedded Qt applications
+ This package contains applications only suitable for developing
+ applications with Qt Embedded and/or Qtopia. It provides the QVFB
+ program for simulating an embedded device desktop as well as makeqpf
+ for converting fonts to embedded fonts suitable for being utilized
+ by Qt Embedded applications.
+
+Package: tqt3-dev-tools-compat
+Architecture: any
+Section: devel
+Recommends: libtqt3-mt-dev
+Depends: ${shlibs:Depends}
+Replaces: tqt3-tools, libtqt3-dev, libtqt3-mt-dev
+Description: Conversion utilities for Qt3 development
+ This package contains some older Qt tools (namely qt20fix qtrename140,
+ qm2ts, mergetr, findtr and msg2qm). These tools are needed only by
+ application developers who need to migrate any Qt application written
+ for Qt 1.x or 2.x over to Qt 3.x. The purpose of the tools are to
+ help fixing the changes with include file renaming as well as migrating
+ the message file format of Qt 2 translation files or any gettext-based
+ translation system to the Qt 3 system.
+
+Package: libtqt3-i18n
+Architecture: all
+Section: libs
+Recommends: libtqt3-mt
+Description: i18n files for Qt3 library
+ This package contains the internationalization files for the Qt library.
+ Qt applications that are internationalized will need to depend on this package
+ for full internationalization support of the application towards the end user.
+
+Package: tqt3-doc
+Architecture: all
+Section: doc
+Priority: extra
+Replaces: qt-doc
+Suggests: libtqt3-headers, tqt3-assistant | www-browser
+Description: Qt3 API documentation
+ This package contains the complete API documentation for Qt3.
+ Examples to coding are in tqt3-examples. The documentation is provided
+ in HTML and manpage format; the HTML version can be viewed in conjunction
+ with the Qt Assistant.
+
+Package: tqt3-examples
+Architecture: all
+Section: doc
+Priority: extra
+Depends: libtqt3-mt-dev (>= ${binary:Version})
+Suggests: tqt3-apps-dev
+Description:  Examples for Qt3
+ These are examples provided with Qt3. They may be especially useful for
+ you if you are learning to program in Qt as they cover tquite a lot of
+ things that are possible with Qt3.
+
+Package: tqt-x11-free-dbg
+Section: libdevel
+Architecture: any
+Priority: extra
+Depends: libtqt3-mt (= ${binary:Version}), gdb
+Conflicts: libtqt3-mt-dbg
+Replaces: libtqt3-mt-dbg
+Description: debugging symbols for tqt-x11-free binaries
+ This package contains the debugging symbols associated with tqt-x11-free.
+ They will automatically be used by gdb for debugging TQt-related
+ issues.
diff --git a/debian/squeeze/dependencies/tqt3/debian/copyright b/debian/squeeze/dependencies/tqt3/debian/copyright
new file mode 100644
index 000000000..3482b8b3a
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/copyright
@@ -0,0 +1,145 @@
+This is Debian GNU/Linux's prepackaged version of the Qt GUI Development
+library.
+
+This package was put together originally by me, Heiko Schlittermann
+<heiko@lotte.sax.de>, from the sources, which I obtained from
+ftp.troll.no. The changes were very minimal to nothing, - merely
+adding support for the Debian package maintenance scheme, by adding
+various debian/* files and by changing the propagate script to fit the
+Debian GNU/Linux filesystem structure.
+
+This package has since been temporarily taken over by Ivan Moore 
+<rkrusty@debian.org> until Heiko has time to work on it all again.
+
+In Jul 2002, Martin Loschwitz <madkiss@madkiss.org> overtook the package 
+maintenance for the QT3-packages.
+
+This packaged is maintained inside the Debian Qt/KDE Maintainers Team
+<debian-qt-kde@lists.debian.org> since Tue, 26 Jul 2005 19:06:03 +0200
+
+Qt 3.3 is triple licensed under the QPL, GPL 2 and GPL 3.
+
+It was downloaded from ftp://ftp.troll.no/qt/source
+
+ This file may be used under the terms of the GNU General
+ Public License versions 2.0 or 3.0 as published by the Free
+ Software Foundation and appearing in the files LICENSE.GPL2
+ and LICENSE.GPL3 included in the packaging of this file.
+ Alternatively you may (at your option) use any later version
+ of the GNU General Public License if such license has been
+ publicly approved by Trolltech ASA (or its successors, if any)
+ and the KDE Free Qt Foundation.
+
+Please refer to /usr/share/common-licenses/GPL-2 for complete GPL 2
+licence and /usr/share/common-licenses/GPL-3 for complete GPL 3
+licence.
+
+			     THE Q PUBLIC LICENSE
+				  version 1.0
+
+		   Copyright (C) 1999-2000 Troll Tech AS, Norway.
+		       Everyone is permitted to copy and
+		       distribute this license document.
+
+The intent of this license is to establish freedom to share and change the
+software regulated by this license under the open source model.
+
+This license applies to any software containing a notice placed by the
+copyright holder saying that it may be distributed under the terms of
+the Q Public License version 1.0.  Such software is herein referred to as
+the Software.  This license covers modification and distribution of the
+Software, use of third-party application programs based on the Software,
+and development of free software which uses the Software.
+
+				 Granted Rights
+
+1. You are granted the non-exclusive rights set forth in this license
+   provided you agree to and comply with any and all conditions in this
+   license.  Whole or partial distribution of the Software, or software
+   items that link with the Software, in any form signifies acceptance of
+   this license.
+
+2. You may copy and distribute the Software in unmodified form provided
+   that the entire package, including - but not restricted to - copyright,
+   trademark notices and disclaimers, as released by the initial developer
+   of the Software, is distributed.
+
+3. You may make modifications to the Software and distribute your
+   modifications, in a form that is separate from the Software, such as
+   patches. The following restrictions apply to modifications:
+
+     a. Modifications must not alter or remove any copyright notices in
+        the Software.
+
+     b. When modifications to the Software are released under this
+        license, a non-exclusive royalty-free right is granted to the
+        initial developer of the Software to distribute your modification
+        in future versions of the Software provided such versions remain
+        available under these terms in addition to any other license(s) of
+        the initial developer.
+
+4. You may distribute machine-executable forms of the Software or
+   machine-executable forms of modified versions of the Software, provided
+   that you meet these restrictions:
+
+     a. You must include this license document in the distribution.
+
+     b. You must ensure that all recipients of the machine-executable forms
+        are also able to receive the complete machine-readable source code
+        to the distributed Software, including all modifications, without
+        any charge beyond the costs of data transfer, and place prominent
+        notices in the distribution explaining this.
+
+     c. You must ensure that all modifications included in the
+        machine-executable forms are available under the terms of this
+        license.
+
+5. You may use the original or modified versions of the Software to
+   compile, link and run application programs legally developed by you
+   or by others.
+
+6. You may develop application programs, reusable components and other
+   software items that link with the original or modified versions of the
+   Software.  These items, when distributed, are subject to the following
+   retquirements:
+
+     a. You must ensure that all recipients of machine-executable forms of
+        these items are also able to receive and use the complete
+        machine-readable source code to the items without any charge
+        beyond the costs of data transfer.
+
+     b. You must explicitly license all recipients of your items to use
+        and re-distribute original and modified versions of the items in
+        both machine-executable and source code forms. The recipients must
+        be able to do so without any charges whatsoever, and they must be
+        able to re-distribute to anyone they choose.
+
+
+     c. If the items are not available to the general public, and the
+        initial developer of the Software requests a copy of the items,
+        then you must supply one.
+
+			    Limitations of Liability
+
+In no event shall the initial developers or copyright holders be liable
+for any damages whatsoever, including - but not restricted to - lost
+revenue or profits or other direct, indirect, special, incidental or
+consequential damages, even if they have been advised of the possibility
+of such damages, except to the extent invariable law, if any, provides
+otherwise.
+
+			          No Warranty
+
+The Software and this license document are provided AS IS with NO WARRANTY
+OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE.
+                                 Choice of Law
+
+This license is governed by the Laws of Norway. Disputes shall be settled
+by Oslo City Court.
+
+ The Qt GUI Toolkit is Copyright (C) 1994-2000 Trolltech AS.
+
+ You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ GNU General Public License version 2, which is display below.
+
diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-compat-headers.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-compat-headers.install
new file mode 100644
index 000000000..3adacbd90
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-compat-headers.install
@@ -0,0 +1,54 @@
+usr/include/tqt3/q1xcompatibility.h
+usr/include/tqt3/qapp.h
+usr/include/tqt3/qarray.h
+usr/include/tqt3/qbitarry.h
+usr/include/tqt3/qbttngrp.h
+usr/include/tqt3/qchkbox.h
+usr/include/tqt3/qclipbrd.h
+usr/include/tqt3/qcollect.h
+usr/include/tqt3/qcollection.h
+usr/include/tqt3/qcombo.h
+usr/include/tqt3/qconnect.h
+usr/include/tqt3/qdatetm.h
+usr/include/tqt3/qdrawutl.h
+usr/include/tqt3/qdstream.h
+usr/include/tqt3/qfiledef.h
+usr/include/tqt3/qfiledlg.h
+usr/include/tqt3/qfileinf.h
+usr/include/tqt3/qfontinf.h
+usr/include/tqt3/qfontmet.h
+usr/include/tqt3/qgrpbox.h
+usr/include/tqt3/qintcach.h
+usr/include/tqt3/qiodev.h
+usr/include/tqt3/qlcdnum.h
+usr/include/tqt3/qlined.h
+usr/include/tqt3/qlist.h
+usr/include/tqt3/qmenudta.h
+usr/include/tqt3/qmetaobj.h
+usr/include/tqt3/qmlined.h
+usr/include/tqt3/qmsgbox.h
+usr/include/tqt3/qmultilinedit.h
+usr/include/tqt3/qobjcoll.h
+usr/include/tqt3/qobjdefs.h
+usr/include/tqt3/qpaintd.h
+usr/include/tqt3/qpaintdc.h
+usr/include/tqt3/qpdevmet.h
+usr/include/tqt3/qpmcache.h
+usr/include/tqt3/qpntarry.h
+usr/include/tqt3/qpopmenu.h
+usr/include/tqt3/qprndlg.h
+usr/include/tqt3/qprogbar.h
+usr/include/tqt3/qprogdlg.h
+usr/include/tqt3/qpsprn.h
+usr/include/tqt3/qpushbt.h
+usr/include/tqt3/qqueue.h
+usr/include/tqt3/qradiobt.h
+usr/include/tqt3/qrangect.h
+usr/include/tqt3/qscrbar.h
+usr/include/tqt3/qsocknot.h
+usr/include/tqt3/qstack.h
+usr/include/tqt3/qtabdlg.h
+usr/include/tqt3/qtstream.h
+usr/include/tqt3/qvector.h
+usr/include/tqt3/qwidcoll.h
+usr/include/tqt3/qwindefs.h
diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-headers.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-headers.install
new file mode 100644
index 000000000..b08596ee9
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-headers.install
@@ -0,0 +1,271 @@
+usr/include/tqt3/private/*
+usr/include/tqt3/qabstractlayout.h
+usr/include/tqt3/qaccel.h
+usr/include/tqt3/qaccessible.h
+usr/include/tqt3/qaction.h
+usr/include/tqt3/qapplication.h
+usr/include/tqt3/qasciicache.h
+usr/include/tqt3/qasciidict.h
+usr/include/tqt3/qasyncimageio.h
+usr/include/tqt3/qasyncio.h
+usr/include/tqt3/qbig5codec.h
+usr/include/tqt3/qbitarray.h
+usr/include/tqt3/qbitmap.h
+usr/include/tqt3/qbrush.h
+usr/include/tqt3/qbuffer.h
+usr/include/tqt3/qbutton.h
+usr/include/tqt3/qbuttongroup.h
+usr/include/tqt3/qcache.h
+usr/include/tqt3/qcanvas.h
+usr/include/tqt3/qcdestyle.h
+usr/include/tqt3/qcheckbox.h
+usr/include/tqt3/qcleanuphandler.h
+usr/include/tqt3/qclipboard.h
+usr/include/tqt3/qcolor.h
+usr/include/tqt3/qcolordialog.h
+usr/include/tqt3/qcombobox.h
+usr/include/tqt3/qcommonstyle.h
+usr/include/tqt3/qcompactstyle.h
+usr/include/tqt3/qconnection.h
+usr/include/tqt3/qcstring.h
+usr/include/tqt3/qcursor.h
+usr/include/tqt3/qdatabrowser.h
+usr/include/tqt3/qdatastream.h
+usr/include/tqt3/qdatatable.h
+usr/include/tqt3/qdataview.h
+usr/include/tqt3/qdatetime.h
+usr/include/tqt3/qdatetimeedit.h
+usr/include/tqt3/qdeepcopy.h
+usr/include/tqt3/qdesktopwidget.h
+usr/include/tqt3/qdial.h
+usr/include/tqt3/qdialog.h
+usr/include/tqt3/qdict.h
+usr/include/tqt3/qdir.h
+usr/include/tqt3/qdns.h
+usr/include/tqt3/qdockarea.h
+usr/include/tqt3/qdockwindow.h
+usr/include/tqt3/qdom.h
+usr/include/tqt3/qdragobject.h
+usr/include/tqt3/qdrawutil.h
+usr/include/tqt3/qdropsite.h
+usr/include/tqt3/qeditorfactory.h
+usr/include/tqt3/qerrormessage.h
+usr/include/tqt3/qeucjpcodec.h
+usr/include/tqt3/qeuckrcodec.h
+usr/include/tqt3/qevent.h
+usr/include/tqt3/qeventloop.h
+usr/include/tqt3/qfeatures.h
+usr/include/tqt3/qfile.h
+usr/include/tqt3/qfiledialog.h
+usr/include/tqt3/qfileinfo.h
+usr/include/tqt3/qfocusdata.h
+usr/include/tqt3/qfont.h
+usr/include/tqt3/qfontdatabase.h
+usr/include/tqt3/qfontdialog.h
+usr/include/tqt3/qfontinfo.h
+usr/include/tqt3/qfontmetrics.h
+usr/include/tqt3/qframe.h
+usr/include/tqt3/qftp.h
+usr/include/tqt3/qgarray.h
+usr/include/tqt3/qgb18030codec.h
+usr/include/tqt3/qgbkcodec.h
+usr/include/tqt3/qgcache.h
+usr/include/tqt3/qgdict.h
+usr/include/tqt3/qgeneric.h
+usr/include/tqt3/qgif.h
+usr/include/tqt3/qglist.h
+usr/include/tqt3/qglobal.h
+usr/include/tqt3/qgplugin.h
+usr/include/tqt3/qgrid.h
+usr/include/tqt3/qgridview.h
+usr/include/tqt3/qgroupbox.h
+usr/include/tqt3/qguardedptr.h
+usr/include/tqt3/qgvector.h
+usr/include/tqt3/qhbox.h
+usr/include/tqt3/qhbuttongroup.h
+usr/include/tqt3/qheader.h
+usr/include/tqt3/qhgroupbox.h
+usr/include/tqt3/qhostaddress.h
+usr/include/tqt3/qhttp.h
+usr/include/tqt3/qiconset.h
+usr/include/tqt3/qiconview.h
+usr/include/tqt3/qimage.h
+usr/include/tqt3/qimageformatplugin.h
+usr/include/tqt3/qinputdialog.h
+usr/include/tqt3/qintcache.h
+usr/include/tqt3/qintdict.h
+usr/include/tqt3/qinterlacestyle.h
+usr/include/tqt3/qiodevice.h
+usr/include/tqt3/qjiscodec.h
+usr/include/tqt3/qjpegio.h
+usr/include/tqt3/qjpunicode.h
+usr/include/tqt3/qkeycode.h
+usr/include/tqt3/qkeysequence.h
+usr/include/tqt3/qlabel.h
+usr/include/tqt3/qlayout.h
+usr/include/tqt3/qlcdnumber.h
+usr/include/tqt3/qlibrary.h
+usr/include/tqt3/qlineedit.h
+usr/include/tqt3/qlistbox.h
+usr/include/tqt3/qlistview.h
+usr/include/tqt3/qlocale.h
+usr/include/tqt3/qlocalfs.h
+usr/include/tqt3/qmainwindow.h
+usr/include/tqt3/qmap.h
+usr/include/tqt3/qmemarray.h
+usr/include/tqt3/qmenubar.h
+usr/include/tqt3/qmenudata.h
+usr/include/tqt3/qmessagebox.h
+usr/include/tqt3/qmetaobject.h
+usr/include/tqt3/qmime.h
+usr/include/tqt3/qmngio.h
+usr/include/tqt3/qmotifstyle.h
+usr/include/tqt3/qmotifplusstyle.h
+usr/include/tqt3/qmovie.h
+usr/include/tqt3/qmultilineedit.h
+usr/include/tqt3/qmutex.h
+usr/include/tqt3/qnamespace.h
+usr/include/tqt3/qnetwork.h
+usr/include/tqt3/qnetworkprotocol.h
+usr/include/tqt3/qnp.h
+usr/include/tqt3/qobject.h
+usr/include/tqt3/qobjectcleanuphandler.h
+usr/include/tqt3/qobjectdefs.h
+usr/include/tqt3/qobjectdict.h
+usr/include/tqt3/qobjectlist.h
+usr/include/tqt3/qpaintdevice.h
+usr/include/tqt3/qpaintdevicedefs.h
+usr/include/tqt3/qpaintdevicemetrics.h
+usr/include/tqt3/qpainter.h
+usr/include/tqt3/qpair.h
+usr/include/tqt3/qpalette.h
+usr/include/tqt3/qpen.h
+usr/include/tqt3/qpicture.h
+usr/include/tqt3/qpixmap.h
+usr/include/tqt3/qpixmapcache.h
+usr/include/tqt3/qplatinumstyle.h
+usr/include/tqt3/qpngio.h
+usr/include/tqt3/qpoint.h
+usr/include/tqt3/qpointarray.h
+usr/include/tqt3/qpolygonscanner.h
+usr/include/tqt3/qpopupmenu.h
+usr/include/tqt3/qprintdialog.h
+usr/include/tqt3/qprinter.h
+usr/include/tqt3/qprocess.h
+usr/include/tqt3/qprogressbar.h
+usr/include/tqt3/qprogressdialog.h
+usr/include/tqt3/qptrcollection.h
+usr/include/tqt3/qptrdict.h
+usr/include/tqt3/qptrlist.h
+usr/include/tqt3/qptrqueue.h
+usr/include/tqt3/qptrstack.h
+usr/include/tqt3/qptrvector.h
+usr/include/tqt3/qpushbutton.h
+usr/include/tqt3/qradiobutton.h
+usr/include/tqt3/qrangecontrol.h
+usr/include/tqt3/qrect.h
+usr/include/tqt3/qregexp.h
+usr/include/tqt3/qregion.h
+usr/include/tqt3/qrtlcodec.h
+usr/include/tqt3/qscrollbar.h
+usr/include/tqt3/qscrollview.h
+usr/include/tqt3/qsemaphore.h
+usr/include/tqt3/qsemimodal.h
+usr/include/tqt3/qserversocket.h
+usr/include/tqt3/qsession.h
+usr/include/tqt3/qsessionmanager.h
+usr/include/tqt3/qsettings.h
+usr/include/tqt3/qsgistyle.h
+usr/include/tqt3/qshared.h
+usr/include/tqt3/qsignal.h
+usr/include/tqt3/qsignalmapper.h
+usr/include/tqt3/qsignalslotimp.h
+usr/include/tqt3/qsimplerichtext.h
+usr/include/tqt3/qsize.h
+usr/include/tqt3/qsizegrip.h
+usr/include/tqt3/qsizepolicy.h
+usr/include/tqt3/qsjiscodec.h
+usr/include/tqt3/qslider.h
+usr/include/tqt3/qsocket.h
+usr/include/tqt3/qsocketdevice.h
+usr/include/tqt3/qsocketnotifier.h
+usr/include/tqt3/qsortedlist.h
+usr/include/tqt3/qsound.h
+usr/include/tqt3/qspinbox.h
+usr/include/tqt3/qsplashscreen.h
+usr/include/tqt3/qsplitter.h
+usr/include/tqt3/qsql.h
+usr/include/tqt3/qsqlcursor.h
+usr/include/tqt3/qsqldatabase.h
+usr/include/tqt3/qsqldriver.h
+usr/include/tqt3/qsqldriverplugin.h
+usr/include/tqt3/qsqleditorfactory.h
+usr/include/tqt3/qsqlerror.h
+usr/include/tqt3/qsqlfield.h
+usr/include/tqt3/qsqlform.h
+usr/include/tqt3/qsqlindex.h
+usr/include/tqt3/qsqlpropertymap.h
+usr/include/tqt3/qsqlquery.h
+usr/include/tqt3/qsqlrecord.h
+usr/include/tqt3/qsqlresult.h
+usr/include/tqt3/qsqlselectcursor.h
+usr/include/tqt3/qstatusbar.h
+usr/include/tqt3/qstring.h
+usr/include/tqt3/qstringlist.h
+usr/include/tqt3/qstrlist.h
+usr/include/tqt3/qstrvec.h
+usr/include/tqt3/qstyle.h
+usr/include/tqt3/qstylefactory.h
+usr/include/tqt3/qstyleplugin.h
+usr/include/tqt3/qstylesheet.h
+usr/include/tqt3/qsyntaxhighlighter.h
+usr/include/tqt3/qt.h
+usr/include/tqt3/qtabbar.h
+usr/include/tqt3/qtabdialog.h
+usr/include/tqt3/qtable.h
+usr/include/tqt3/qtabwidget.h
+usr/include/tqt3/qtextbrowser.h
+usr/include/tqt3/qtextcodec.h
+usr/include/tqt3/qtextcodecfactory.h
+usr/include/tqt3/qtextcodecplugin.h
+usr/include/tqt3/qtextedit.h
+usr/include/tqt3/qtextstream.h
+usr/include/tqt3/qtextview.h
+usr/include/tqt3/qthread.h
+usr/include/tqt3/qthreadstorage.h
+usr/include/tqt3/qtimer.h
+usr/include/tqt3/qtl.h
+usr/include/tqt3/qtoolbar.h
+usr/include/tqt3/qtoolbox.h
+usr/include/tqt3/qtoolbutton.h
+usr/include/tqt3/qtooltip.h
+usr/include/tqt3/qtranslator.h
+usr/include/tqt3/qtsciicodec.h
+usr/include/tqt3/qurl.h
+usr/include/tqt3/qurlinfo.h
+usr/include/tqt3/qurloperator.h
+usr/include/tqt3/qutfcodec.h
+usr/include/tqt3/quuid.h
+usr/include/tqt3/qvalidator.h
+usr/include/tqt3/qvaluelist.h
+usr/include/tqt3/qvaluestack.h
+usr/include/tqt3/qvaluevector.h
+usr/include/tqt3/qvariant.h
+usr/include/tqt3/qvbox.h
+usr/include/tqt3/qvbuttongroup.h
+usr/include/tqt3/qvfbhdr.h
+usr/include/tqt3/qvgroupbox.h
+usr/include/tqt3/qwaitcondition.h
+usr/include/tqt3/qwhatsthis.h
+usr/include/tqt3/qwidget.h
+usr/include/tqt3/qwidgetintdict.h
+usr/include/tqt3/qwidgetlist.h
+usr/include/tqt3/qwidgetplugin.h
+usr/include/tqt3/qwidgetstack.h
+usr/include/tqt3/qwindowdefs.h
+usr/include/tqt3/qwindowsstyle.h
+usr/include/tqt3/qwinexport.h
+usr/include/tqt3/qwizard.h
+usr/include/tqt3/qwmatrix.h
+usr/include/tqt3/qworkspace.h
+usr/include/tqt3/qxml.h
diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-i18n.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-i18n.install
new file mode 100644
index 000000000..cd272202b
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-i18n.install
@@ -0,0 +1,8 @@
+usr/share/tqt3/translations/qt_ar.qm
+usr/share/tqt3/translations/qt_cs.qm
+usr/share/tqt3/translations/qt_de.qm
+usr/share/tqt3/translations/qt_es.qm
+usr/share/tqt3/translations/qt_fr.qm
+usr/share/tqt3/translations/qt_he.qm
+usr/share/tqt3/translations/qt_ru.qm
+usr/share/tqt3/translations/qt_sk.qm
diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-dev.docs b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-dev.docs
new file mode 100644
index 000000000..dbd9a5d19
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-dev.docs
@@ -0,0 +1,4 @@
+README
+README.immodule
+README-QT.TXT
+PLATFORMS
diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-dev.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-dev.install
new file mode 100644
index 000000000..43ee1dce7
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-dev.install
@@ -0,0 +1,9 @@
+usr/lib/libtqt-mt.la
+usr/lib/libtqt-mt.prl
+usr/lib/libtqt-mt.so
+usr/lib/libtqui.prl
+usr/lib/libtqui.so
+usr/lib/pkgconfig/tqt-mt.pc
+usr/include/tqt3/qgl.h
+usr/include/tqt3/qglcolormap.h
+usr/include/tqt3/qwidgetfactory.h
diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-dev.links b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-dev.links
new file mode 100644
index 000000000..d5ae6927d
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-dev.links
@@ -0,0 +1,7 @@
+/usr/lib/libtqt-mt.la /usr/share/tqt3/lib/libtqt-mt.la
+/usr/lib/libtqui.prl /usr/share/tqt3/lib/libtqui.prl
+/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so
+/usr/lib/libtqt-mt.prl /usr/share/tqt3/lib/libtqt-mt.prl
+/usr/lib/libtqt-mt.so.3.3.8 /usr/share/tqt3/lib/libtqt-mt.so
+/usr/include/tqt3 /usr/share/tqt3/include
+/usr/lib/tqt3/plugins /usr/share/tqt3/plugins
diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-ibase.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-ibase.install
new file mode 100644
index 000000000..37bbf0bb1
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-ibase.install
@@ -0,0 +1 @@
+usr/lib/tqt3/plugins/sqldrivers/libqsqlibase.so
diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-mysql.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-mysql.install
new file mode 100644
index 000000000..efdb699be
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-mysql.install
@@ -0,0 +1 @@
+usr/lib/tqt3/plugins/sqldrivers/libqsqlmysql.so
diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-odbc.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-odbc.install
new file mode 100644
index 000000000..3b949c134
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-odbc.install
@@ -0,0 +1 @@
+usr/lib/tqt3/plugins/sqldrivers/libqsqlodbc.so
diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-psql.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-psql.install
new file mode 100644
index 000000000..b93ebe333
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-psql.install
@@ -0,0 +1 @@
+usr/lib/tqt3/plugins/sqldrivers/libqsqlpsql.so
diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-sqlite.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-sqlite.install
new file mode 100644
index 000000000..928632aa1
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-sqlite.install
@@ -0,0 +1 @@
+usr/lib/tqt3/plugins/sqldrivers/libqsqlite.so
diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.docs b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.docs
new file mode 100644
index 000000000..dbd9a5d19
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.docs
@@ -0,0 +1,4 @@
+README
+README.immodule
+README-QT.TXT
+PLATFORMS
diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.install
new file mode 100644
index 000000000..519221dff
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.install
@@ -0,0 +1,6 @@
+usr/lib/libtqt-mt.so.*
+usr/lib/libtqui.so.1.*
+usr/lib/tqt3/plugins/imageformats/libqmng.so
+usr/lib/tqt3/plugins/inputmethods/*.so
+../../debian/qtrc etc/tqt3/                                                                              
+../../debian/qt_plugins_3.3rc etc/tqt3/                                                                  
diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.links b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.links
new file mode 100644
index 000000000..e7f6740f5
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.links
@@ -0,0 +1,5 @@
+/usr/lib/libtqui.so.1.0.0 /usr/lib/libtqui.so.1 
+/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1
+/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1.0
+/usr/lib/libtqt-mt.so.3.3.8 /usr/share/tqt3/lib/libtqt-mt.so.3
+/usr/lib/libtqt-mt.so.3.3.8 /usr/share/tqt3/lib/libtqt-mt.so.3.3
diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.postrm b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.postrm
new file mode 100644
index 000000000..bb679158a
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.postrm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" = "purge" ]; then
+  if [ -d "/usr/share/doc/libtqt3-mt/" ]; then
+    rm -rf /usr/share/doc/libtqt3-mt/
+  fi
+fi
+
+#DEBHELPER#
diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop b/debian/squeeze/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop
new file mode 100644
index 000000000..9ac108108
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=assistant-tqt3
+Name=Qt3 Assistant
+Name[de]=Qt3 Assistent
+Comment=Qt3 Helpcenter
+Comment[de]= Qt3 Hilfezentrum
+MimeType=application/x-assistant;
+Icon=assistant
+Terminal=false
+Type=Application
+Categories=Qt;Development;
diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/build-examples.sh b/debian/squeeze/dependencies/tqt3/debian/maintain/build-examples.sh
new file mode 100644
index 000000000..25da9bf59
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/maintain/build-examples.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+BUILDDIR=$PWD
+export QTDIR=/usr/share/tqt3
+
+# first copy over the libtqt-mt.so build configuration of .qmake.cache
+cp /usr/share/tqt3/.qmake.cache ./.qmake.cache
+
+# Now compile the examples. The themes example
+# won't work since qconfig.h is not really correct with the
+# ifdef's for the QT_NO_xyz_STYLE, so we use make -k to continue
+cd examples; qmake -o Makefile examples.pro; make -k
+
+# Now compile the tutorial.
+cd $BUILDDIR/tutorial; qmake -o Makefile tutorial.pro; make
+
+# Then the designer examples. 
+cd $BUILDDIR/tools/designer/examples
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do
+        cd $a && qmake -o Makefile $a.pro; make; cd ..;
+done
+
+# There is a bigger sql example in book/ with more subdirectories:
+cd book
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do
+        cd $a && qmake -o Makefile $a.pro; make; cd ..;
+done
+
+# Finally, build the linguist tutorials:
+cd $BUILDDIR/tools/linguist/tutorial
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do 
+	cd $a && qmake -o Makefile $a.pro; make; cd ..; 
+done
+
+# Return to the build directory
+cd $BUILDDIR 
diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/designer-tqt3.desktop b/debian/squeeze/dependencies/tqt3/debian/maintain/designer-tqt3.desktop
new file mode 100644
index 000000000..2872906ab
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/maintain/designer-tqt3.desktop
@@ -0,0 +1,77 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=designer-tqt3
+Name=Qt3 Designer
+Name[bg]=Qt3 Дизайнер
+Name[br]=Ergrafer Qt3
+Name[ca]=Dissenyador Qt3
+Name[cs]=Qt3 designer
+Name[de]=Qt3-Designer
+Name[eo]=Qt3-Desegnilo
+Name[es]=Diseñador Qt3
+Name[et]=Qt3 disainer
+Name[eu]=Qt3 Diseinatzailea
+Name[gl]=Deseñador de Qt3
+Name[he]=Qt בצעמ
+Name[it]=Designer Qt3
+Name[ja]=Qtデザイナー
+Name[ko]=Qt 디자이너
+Name[lv]=Qt3 Dizainers
+Name[mk]=Qt дизајнер
+Name[no]=Qt3-designer
+Name[oc]=Dessinador Qt3
+Name[pl]=Projektant Qt3
+Name[sk]=Qt3 Dizajnér
+Name[sl]=Snovalnik Qt3
+Name[ta]=Qt À¨¼ôÀ¡Ç÷
+Name[uk]=Дизайнер Qt
+Name[zh_CN.GB2312]=Qt 设计者
+Name[zh_TW.Big5]=Qt 設計器
+Comment=Qt3 interface designer
+Comment[az]=Qt3 axtar üz dizayn proqramı
+Comment[bg]=Qt3 interface дизайнер
+Comment[br]=Ergrafer etrefas Qt3
+Comment[ca]=Dissenyador d'interfícies Qt3
+Comment[cs]=Editor UI pro Qt3
+Comment[da]=Qt3 grænseflade designer
+Comment[de]=Schnittstellen-Designer für Qt3
+Comment[el]=Σχεδιασμός περιβάλλοντων Qt
+Comment[eo]=Qt3-Interfacdesegnilo
+Comment[es]=Diseñador de interfaces de Qt3
+Comment[et]=Qt3 dialoogide redaktor
+Comment[eu]=Qt3 interfaze diseinatzailea
+Comment[fi]=Qt:n käyttöliittymäsuunnittelija
+Comment[fr]=Conception d'interfaces avec Qt3
+Comment[gl]=Editor de interfaces de Qt3
+Comment[he]=Qt-ל םיקשממ בצעמ
+Comment[hu]=Qt3 felülettervező
+Comment[is]=Viðmótshönnunartól fyrir Qt3
+Comment[it]=Editor per le interfaccie Qt3
+Comment[ja]=Qtインターフェースデザイナー
+Comment[ko]=Qt 인터페이스 디자이너
+Comment[lt]=Qt3 sąsajos redaktorius
+Comment[lv]=Qt3 starsejas dizainers
+Comment[mk]=Дизајнер на Qt дијалози
+Comment[nl]=Qt3 interface-ontwerper
+Comment[no]=Qt3-grensesnittdesigner
+Comment[no_NY]=Redigering av Qt3-miljø
+Comment[oc]=Dessinador d'interfacies Qt3
+Comment[pl]=Projektant interfejsu Qt3
+Comment[pt]=Editor de interfaces do Qt3
+Comment[pt_BR]=Designer de interface Qt3
+Comment[ro]=Dezvoltator de interfeţe Qt3
+Comment[ru]=редактор интерфейсов приложений Qt
+Comment[sk]=Qt3 dizajnér rozhrania
+Comment[sl]=Snovalnik vmesnikov za Qt3
+Comment[sr]=Dizajner Qt3 interfejsa
+Comment[sv]=Editor för gränssnitt till Qt3
+Comment[ta]=Qt À¨¼ôÀ¡Ç÷
+Comment[tr]=Qt3 arayüz tasarım programı
+Comment[uk]=Редактор інтерфейсу для Qt
+Comment[zh_CN.GB2312]=Qt 界面设计程序
+Comment[zh_TW.Big5]=Qt 介面編輯器
+MimeType=application/x-designer;
+Icon=designer
+Terminal=false
+Type=Application
+Categories=Qt;Development;
diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop b/debian/squeeze/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop
new file mode 100644
index 000000000..e3a192980
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Exec=linguist-tqt3
+Name=Qt3 Linguist
+Name[de]=Qt3-Linguist
+Name[eo]=Qt3-Lingvisto
+Name[es]=Lingüista Qt3
+Name[ko]=Qt 언어학자
+Name[lv]=Qt3 Lingvists
+Comment=Tool for translating message catalogues of Qt3 based programs
+Comment[da]=Redskab til at oversætte Qt3 baserede programmer
+Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf Qt3 basieren
+Comment[eo]=Ilo por tradukado de mesaĝaroj de Qt3-bazitaj programoj
+Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en Qt3
+Comment[he]=Qt תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ
+Comment[hu]=Segédprogram a Qt3-alapú programok üzenetfájljainak lefordításához
+Comment[ko]=Qt를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구
+Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz Qt3 bāzētās programmās
+Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3
+Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3
+Comment[sv]=Verktyg för att översätta meddelandekataloger från Qt3-baserade program
+MimeType=application/x-linguist;
+Terminal=false
+Icon=linguist
+Type=Application
+Categories=Qt;Development
diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/man/createcw.1 b/debian/squeeze/dependencies/tqt3/debian/maintain/man/createcw.1
new file mode 100644
index 000000000..0959a2df1
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/maintain/man/createcw.1
@@ -0,0 +1,57 @@
+.TH "createcw" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+createcw \- custom widget description creater for Qt Designer
+.SH "SYNTAX"
+.LP 
+createcw <\fIfilename.cw\fP>
+.SH "DESCRIPTION"
+.LP 
+This small application makes it much easier to create
+custom widget descriptions for the Qt Designer. Using
+them you can use custom widgets in the Qt Designer
+including their signals, slots and properties.
+ 
+To do that normally you would have to enter all that
+information in the custom widget dialog in the Qt
+Designer for each widget. But this small tool can create
+for you these description files for your custom widgets
+which you then can simply import into the Qt Designer. So
+you can use your custom widgets without any additional
+work in your forms in the Qt Designer then.
+
+To do that you have to modify the sourcecode (main.cpp) a
+bit and recompile it afterwards. 
+
+STEP1: Include header files of the widgets for which a
+description should be created here. If you have a widget
+which is defined in the file mycustomwidget.h in
+/home/joedeveloper/src, write here 
+
+#include "/home/joedeveloper/src/mycustomwidget.h"
+
+STEP2: Instantiate all widgets for which a description
+should be created here and add them to the list wl. If
+your custom widget is e.g. called MyCustomWidget you
+would write here
+
+ Widget w;
+ w.w = new MyCustomWidget( 0, 0 );
+ w.include = "mycustomwidget.h";
+ w.location = "global";
+ wl.append( w );
+
+After that compile the program, link it with your custom
+widget (library or object file) and run it like this:
+
+ (unix): ./createcw mywidgets.cw
+ (win32): createcw mywidgets.cw
+
+After that you can import this description file into the
+Qt Designer using the Custom\-Widget Dialog (See
+Tools\->Custom\->Edit Custom Widgets... in the Qt Designer)
+and use these custom widget there in your forms.
+
+.SH "AUTHORS"
+.LP 
+Troll Tech <http://www.trolltech.com/>
diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/man/designer.1 b/debian/squeeze/dependencies/tqt3/debian/maintain/man/designer.1
new file mode 100644
index 000000000..4151e94a7
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/maintain/man/designer.1
@@ -0,0 +1,54 @@
+.TH "qt-designer" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qt\-designer \- Visual user interface designer for Qt.
+.SH "DESCRIPTION"
+.LP 
+Qt Designer simplifies the process of designing and
+creating graphical user interfaces (GUI) using the
+award\-winning Qt toolkit. Qt Designer is easy to learn.
+There are tutorials, walkthrough examples and the
+reference documentation accelerating you through the
+learning phase. After that, Qt Designer greatly reduces
+the time and effort needed to develop even the most
+complex dialogs with an easy\-to\-use GUI and an integrated
+help system.
+
+ Qt Designer provides a rich set of features aimed at
+making the creation of dialogs as easy and smooth as
+possible without reducing the power of Qt. It offers all
+the strength of the Qt layout system with a well\-designed
+user interface. This, combined with the Qt Designer's
+undo/redo system makes it simple to try different
+arrangements of the widgets until the result satisfies
+you.
+
+ Using Qt Designer's convenient property editor along
+with the dynamic Qt property system it is easy to set the
+initial state of your widgets. Special editors for some
+widgets (like listboxes, comboboxes, etc.) allow you to
+fill these widgets with content without writing any code.
+Using the object hierarchy view, the parent\-child
+relationship between the widgets of a dialog can be
+understood at a glance.
+
+ Integrating dialogs into a Qt project is straightforward
+thanks to the User Interface Compiler (UIC), which
+generates C++ code from the XML dialog description on the
+fly. The programmer can easily extend the functionality
+of the generated classes by subclassing without touching
+generated code at all or running the risk of loosing
+their changes.
+.SH "FILES"
+.LP 
+\fI/usr/share/qt/tools/designer/*\fP 
+.SH "ENVIRONMENT VARIABLES"
+.LP 
+.TP 
+\fBQTDIR\fP
+Specifies the Qt base directory.  On Debian systems this
+should be set to /usr/share/qt.  The /usr/bin/designer
+wrapper script takes care of this.
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/man/findtr.1 b/debian/squeeze/dependencies/tqt3/debian/maintain/man/findtr.1
new file mode 100644
index 000000000..f1d3a87d5
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/maintain/man/findtr.1
@@ -0,0 +1,25 @@
+.TH "findtr" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+findtr \- Extracts information about text to be translated
+.SH "SYNTAX"
+.LP 
+findtr *.cpp *.h >myapp.po
+.SH "DESCRIPTION"
+.LP 
+
+Extracts information about text to be translated. It
+recognizes the tr() constructs described above and
+produces a file in ".po" format, a simple text format
+that your translation team will copy and edit. For
+example, the base .po file might be myapp.po and
+translated versions of the file would then be
+myapp_de.po, myapp_fr.po, and myapp_ja.po for
+translations in German, French and Japanese respectively.
+
+  findtr *.cpp *.h >myapp.po
+  copy myapp.po myapp_de.po
+  edit myapp_de.po
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/man/linguist.1 b/debian/squeeze/dependencies/tqt3/debian/maintain/man/linguist.1
new file mode 100644
index 000000000..a0f99133b
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/maintain/man/linguist.1
@@ -0,0 +1,37 @@
+.TH LINGUIST 1 "28 August 2004"
+.SH "NAME"
+linguist \- Translation tool for Qt.
+
+.SH "SYNPOSIS"
+.B linguist
+[
+.I TRANSLATION
+]
+
+.SH "DESCRIPTION"
+.B Qt Linguist
+is a tool for adding translations to Qt applications. It
+introduces the concept of a translation "context" which
+means a group of phrases that appear together on the
+screen e.g. in the same menu or dialog.
+
+The only parameter accepted on the command line is 
+.I TRANSLATION
+wich is the name of the translation file you wish to open.
+
+.SH FILES
+.I ~/.qt/qt_designerrc
+.RS
+Per user configuration file.
+
+.SH SEE ALSO
+.B Qt Linguist
+is too complex to be described completely in the "man" page
+format. If your system is properly configured, you can access
+the full documentation within
+.B Qt Linguist
+under the Help menu.
+
+.SH AUTHOR
+This manual page was written by Jeremy Laine <jeremy.laine@m4x.org>,
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/man/makeqpf.1 b/debian/squeeze/dependencies/tqt3/debian/maintain/man/makeqpf.1
new file mode 100644
index 000000000..37ddcfd4f
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/maintain/man/makeqpf.1
@@ -0,0 +1,26 @@
+.TH "makeqpf" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+makeqpf \- Create qpf files from TTF and BDF files.
+.SH "DESCRIPTION"
+.LP 
+Qt Prerendered Font (QPF) is a light\-weight non\-scalable
+font format specific to Qt/Embedded.  makeqpf is a tool
+that assists producing QPF files from TTF and BDF files.
+
+
+.SH "SYNTAX"
+qembed [ \fIgeneral\-files\fP ] <[ \fI\-\-images image\-files \fP]>
+.br 
+
+general\-files 
+  These files can be any type of file. 
+\-\-images image\-files 
+  These files must be in image formats supported by Qt. 
+
+.SH "FILES"
+.LP 
+\fI$(QTDIR)/etc/fonts/fontdir\fP 
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/man/mergetr.1 b/debian/squeeze/dependencies/tqt3/debian/maintain/man/mergetr.1
new file mode 100644
index 000000000..9ed2a9f25
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/maintain/man/mergetr.1
@@ -0,0 +1,27 @@
+.TH "mergetr" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+mergetr \- Merge changes in translations
+.SH "SYNTAX"
+.LP 
+mergetr myapp_de.po myapp.po
+
+.SH "DESCRIPTION"
+.LP 
+When the texts in your program change as it is developed,
+a the base .po file can be regenerated using findtr,
+then mergetr can be used to merge the changes into the
+other .po files: 
+
+                mergetr myapp_de.po myapp.po
+                mergetr myapp_fr.po myapp.po
+                mergetr myapp_ja.po myapp.po
+
+
+The translation team then edits the new .po files to
+translate the new or changed texts. When texts change,
+the old text is included in the .po file as a comment to
+guide the new translation (no "fuzzy" matching is done).
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/man/msg2qm.1 b/debian/squeeze/dependencies/tqt3/debian/maintain/man/msg2qm.1
new file mode 100644
index 000000000..7d22bbb96
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/maintain/man/msg2qm.1
@@ -0,0 +1,26 @@
+.TH "msg2qm" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+msg2qm \- Converts translated .po files to a Qt\-specific binary format.
+.SH "SYNTAX"
+.LP 
+msg2qm myapp_de.po myapp_de.qm
+.SH "DESCRIPTION"
+.LP 
+
+Converts translated .po files to a Qt\-specific binary
+format (".qm" Qt message files). The Qt message files
+are platform and locale independent, containing
+translations in Unicode and various hash tables to
+provide fast look\-up. 
+
+                msg2qm myapp_de.po myapp_de.qm
+                msg2qm myapp_fr.po myapp_fr.qm
+                msg2qm myapp_ja.po myapp_ja.qm
+
+
+In your application, use QTranslator::load() to load
+translation files appropriate for the user's language.
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/man/qembed.1 b/debian/squeeze/dependencies/tqt3/debian/maintain/man/qembed.1
new file mode 100644
index 000000000..a9b262f10
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/maintain/man/qembed.1
@@ -0,0 +1,32 @@
+.TH "qembed" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qembed \- Converts arbitrary files into C++ code.
+.SH "DESCRIPTION"
+.LP 
+The QEmbed tool, found in qt/tools/qembed, converts
+arbitrary files into C++ code. This is useful for
+including image files and other resources directly into
+your application rather than loading the data from
+external files. 
+
+QEmbed can also generate uncompressed versions of images
+that can be included directly into your application,
+thus avoiding both the external file and the need to
+parse the image file format. This is useful for small
+images such as icons for which compression is not a
+great gain. 
+
+
+.SH "SYNTAX"
+qembed [ \fIgeneral\-files\fP ] <[ \fI\-\-images image\-files \fP]>
+.br 
+
+general\-files 
+  These files can be any type of file. 
+\-\-images image\-files 
+  These files must be in image formats supported by Qt. 
+
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/man/qt20fix.1 b/debian/squeeze/dependencies/tqt3/debian/maintain/man/qt20fix.1
new file mode 100644
index 000000000..352921be8
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/maintain/man/qt20fix.1
@@ -0,0 +1,32 @@
+.TH "qt20fix" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qt20fix \- Helps clean namespace when porting an app from Qt1 to Qt2
+.SH "SYNTAX"
+.LP 
+qt20fix myapp.cpp
+
+.SH "DESCRIPTION"
+.LP 
+Qt 2.x is namespace\-clean, unlike 1.x. Qt now uses very
+few global identifiers. Identifiers like red, blue,
+LeftButton, AlignRight, Key_Up, Key_Down, NoBrush etc.
+are now part of a special class Qt (defined in
+qnamespace.h), which is inherited by most Qt classes.
+Member functions of classes that inherit from QWidget,
+etc. are totally unaffected, but code that is not in
+functions of classes inherited from Qt, you must qualify
+these identifiers like this: Qt::red, Qt::LeftButton,
+Qt::AlignRight, etc. 
+
+The qt/bin/qt20fix script helps to fix the code that
+needs adaption, though most code does not need changing.
+
+Compiling with \-DQT1COMPATIBILITY will help you get going
+with Qt 2.x \- it allows all the old "dirty namespace"
+identifiers from Qt 1.x to continue working. Without it,
+you'll get compile errors that can easily be fixed by
+searching this page for the clean identifiers. 
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/man/qtconfig.1 b/debian/squeeze/dependencies/tqt3/debian/maintain/man/qtconfig.1
new file mode 100644
index 000000000..7e03bf49b
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/maintain/man/qtconfig.1
@@ -0,0 +1,17 @@
+.TH "qtconfig" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qtconfig \- Configuration tool for Qt
+.SH "DESCRIPTION"
+.LP 
+QConfig allows for GUI based configuration of Qt and
+ other Qt based sources.
+
+.SH "ENVIRONMENT VARIABLES"
+.LP 
+.TP 
+\fBQTDIR\fP
+Specifies the base Qt dir
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/man/qvfb.1 b/debian/squeeze/dependencies/tqt3/debian/maintain/man/qvfb.1
new file mode 100644
index 000000000..89a91cf2a
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/maintain/man/qvfb.1
@@ -0,0 +1,66 @@
+.TH "qvfb" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qvfb \- Virtual framebuffer for Qt
+.SH "DESCRIPTION"
+.LP 
+The virtual framebuffer allows Qt/Embedded programs to be
+developed on your desktop machine, without switching
+between consoles and X11. 
+
+Start a Qt/Embedded master application (i.e., construct
+QApplication with QApplication::GuiServer flag or use the
+\-qws command line parameter). You will need to specify to
+the server that you wish to use the virtual framebuffer
+driver, e.g.: 
+
+    widgets \-qws \-display QVFb:0
+    
+You may prefer to set the QWS_DISPLAY environment
+variable to be QVFb:0. 
+
+qvfb supports the following command line options: 
+
+ \-width width: the width of the virtual framebuffer
+  (default: 240). 
+ \-height height: the height of the virtual framebuffer
+  (default: 320). 
+ \-depth depth: the depth of the virtual framebuffer (1, 8
+  or 32; default: 8). 
+ \-nocursor: do not display the X11 cursor in the
+  framebuffer window. 
+ \-qwsdisplay :id the Qt/Embedded display id to provide
+  (default: 0). 
+
+ Virtual Framebuffer Design 
+
+The virtual framebuffer emulates a framebuffer using a
+shared memory region (the virtual frame buffer) and a
+utility to display the framebuffer in a window (qvfb).
+The regions of the display that have changed are updated
+periodically, so you will see discrete snapshots of the
+framebuffer rather than each individual drawing
+operation. For this reason drawing problems such as
+flickering may not be apparent until the program is run
+using a real framebuffer. 
+
+The target refresh rate can be set via the "View|Refresh
+Rate" menu item. This will cause qvfb to check for
+updated regions more tquickly. The rate is a target only.
+If little drawing is being done, the framebuffer will not
+show any updates between drawing events. If an
+application is displaying an animation the updates will
+be frequent, and the application and qvfb will compete
+for processor time. 
+
+Mouse and keyboard events are passed to the Qt/Embedded
+master process via named pipes. 
+
+The virtual framebuffer is a development tool only. No
+security issues have been considered in the virtual
+framebuffer design. It should be avoided in a production
+environment; QT_NO_QWS_VFB should always be defined in
+production libraries. 
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/mkpatch.sh b/debian/squeeze/dependencies/tqt3/debian/maintain/mkpatch.sh
new file mode 100644
index 000000000..609a44bc1
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/maintain/mkpatch.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+diff -Nru -x Makefile.cvs -x README.qt-copy -x upgrade_script.qt -x .cvsignore -x CVS -x include -x debian -x doc -x examples  -x 3rdparty -x images -x mkspecs -I '^\*\*\( $\| \$Id\)' -I '^\#\( $\| \$Id\)' qt-x11-free-3.1.1.old/ qt-x11-free-3.1.1/ > qtcopy.diff
diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/tqt3config.desktop b/debian/squeeze/dependencies/tqt3/debian/maintain/tqt3config.desktop
new file mode 100644
index 000000000..3965c1355
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/maintain/tqt3config.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=qtconfig-tqt3
+Name=Qt3 Configuration
+Name[de]=Qt3 Konfiguration
+Comment=A graphical configuration tool for programs using Qt 3
+Comment[de]=Ein grafisches Konfigurationstool für Qt3-Programme
+MimeType=application/x-qtconfig;
+Terminal=false
+Icon=qtconfig
+Type=Application
+Categories=Qt;Settings;
diff --git a/debian/squeeze/dependencies/tqt3/debian/patches/06_disable_rpath.diff b/debian/squeeze/dependencies/tqt3/debian/patches/06_disable_rpath.diff
new file mode 100644
index 000000000..27fc1426c
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/patches/06_disable_rpath.diff
@@ -0,0 +1,26 @@
+author: Martin Loschwitz <madkiss@madkiss.org>
+
+Disables the rpath settings in qmake.conf
+
+--- a/mkspecs/linux-g++/qmake.conf
++++ b/mkspecs/linux-g++/qmake.conf
+@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
+ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
+ QMAKE_LFLAGS_THREAD	=
+-QMAKE_RPATH		= -Wl,-rpath,
++QMAKE_RPATH		=
+ 
+ QMAKE_LIBS		=
+ QMAKE_LIBS_DYNLOAD	= -ldl
+--- a/mkspecs/linux-g++-64/qmake.conf
++++ b/mkspecs/linux-g++-64/qmake.conf
+@@ -58,7 +58,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
+ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
+ QMAKE_LFLAGS_THREAD	=
+-QMAKE_RPATH		= -Wl,-rpath,
++QMAKE_RPATH		=
+ 
+ QMAKE_LIBS		=
+ QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/debian/squeeze/dependencies/tqt3/debian/patches/09_amd64_lib64.diff b/debian/squeeze/dependencies/tqt3/debian/patches/09_amd64_lib64.diff
new file mode 100644
index 000000000..71b2b65e1
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/patches/09_amd64_lib64.diff
@@ -0,0 +1,16 @@
+--- a/mkspecs/linux-g++-64/qmake.conf
++++ b/mkspecs/linux-g++-64/qmake.conf
+@@ -43,11 +43,11 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_T
+ QMAKE_INCDIR		=
+ QMAKE_LIBDIR		=
+ QMAKE_INCDIR_X11	= /usr/X11R6/include
+-QMAKE_LIBDIR_X11	= /usr/X11R6/lib64
++QMAKE_LIBDIR_X11	= /usr/X11R6/lib
+ QMAKE_INCDIR_QT		= $(QTDIR)/include
+ QMAKE_LIBDIR_QT		= $(QTDIR)/lib
+ QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib64
++QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+ 
+ QMAKE_LINK		= g++
+ QMAKE_LINK_SHLIB	= g++
diff --git a/debian/squeeze/dependencies/tqt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff b/debian/squeeze/dependencies/tqt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
new file mode 100644
index 000000000..b4e71d35b
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
@@ -0,0 +1,50 @@
+author: Sune Vuorela <debian@pusling.com>
+
+--- a/configure
++++ b/configure
+@@ -34,7 +34,44 @@ SUPPORTED=
+ #-------------------------------------------------------------------------------
+ 
+ # need that throughout the script
+-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
++DPKG_ARCH=`(dpkg-architecture -qDEB_HOST_ARCH) 2>/dev/null` || UNAME_MACHINE=unknown
++case $DPKG_ARCH in 
++	amd64)
++		UNAME_MACHINE="x86_64"
++	;;
++	arm)
++		UNAME_MACHINE="armv4l"
++	;;
++	armel)
++		UNAME_MACHINE="armv5tel"
++	;;
++	hppa)
++		UNAME_MACHINE="parisc64"
++	;;
++	hurd-i386)
++		UNAME_MACHINE="i686-AT386"
++	;;
++	i386)
++		UNAME_MACHINE="i686"
++	;;
++	kfreebsd-amd64)
++		UNAME_MACHINE="x86_64"
++	;;
++	kfreebsd-i386)
++		UNAME_MACHINE="i586"
++	;;
++	mipsel)
++		UNAME_MACHINE="mips"
++	;;
++	powerpc)
++		UNAME_MACHINE="ppc"
++	;;
++	*)
++		UNAME_MACHINE="$DPKG_ARCH"
++	;;
++
++
++esac
+ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
diff --git a/debian/squeeze/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff b/debian/squeeze/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff
new file mode 100644
index 000000000..3c6394f33
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## kubuntu_06_fglrx_0_size_screen.diff.dpatch by  <jr@pechin3>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp
+--- qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp	2007-04-02 20:06:28.000000000 +0100
++++ qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp	2007-04-02 20:12:10.000000000 +0100
+@@ -526,11 +526,16 @@
+     Q_CHECK_PTR( dpisX );
+     Q_CHECK_PTR( dpisY );
+     for ( i = 0; i < screens; i++ ) {
+-	dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
+-
+-		     / (DisplayWidthMM(dpy,i)*10);
+-	dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5)
+-		     / (DisplayHeightMM(dpy,i)*10);
++       if (DisplayWidthMM(dpy,i) < 1)
++               dpisX[ i ] = 75; // default the dpi to 75.
++       else
++               dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
++                     / (DisplayWidthMM(dpy,i)*10);
++       if (DisplayHeightMM(dpy,i) < 1)
++               dpisY[ i ] = 75; // default the dpi to 75.
++       else
++               dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5)
++                     / (DisplayHeightMM(dpy,i)*10);
+     }
+ }
+ 
diff --git a/debian/squeeze/dependencies/tqt3/debian/patches/series b/debian/squeeze/dependencies/tqt3/debian/patches/series
new file mode 100644
index 000000000..7377c84c1
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/patches/series
@@ -0,0 +1,4 @@
+06_disable_rpath.diff
+09_amd64_lib64.diff
+72_dont_trust_uname-m_use_dpkg-arch_instead.diff
+kubuntu_06_fglrx_0_size_screen.diff
diff --git a/debian/squeeze/dependencies/tqt3/debian/qt_plugins_3.3rc b/debian/squeeze/dependencies/tqt3/debian/qt_plugins_3.3rc
new file mode 100644
index 000000000..e193b495c
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/qt_plugins_3.3rc
@@ -0,0 +1,4 @@
+[usr]
+lib/trinity/plugins/styles/plastik.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-09-29T20:06:31^e
+lib/tqt3/plugins/imageformats/libqmng.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-08-25T18:22:18^e
+
diff --git a/debian/squeeze/dependencies/tqt3/debian/qtrc b/debian/squeeze/dependencies/tqt3/debian/qtrc
new file mode 100644
index 000000000..3c977f4d1
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/qtrc
@@ -0,0 +1,32 @@
+[3.3]
+libraryPath=/usr/lib/trinity/plugins/
+
+[General]
+GUIEffects=general^eanimatecombo^e
+embedFonts=true
+enableXft=true
+font=Sans Serif,9,-1,5,50,0,0,0,0,0
+fontPath=\0
+useXft=true
+style=Plastik
+
+[KDE]
+contrast=7
+kdeAddedLibraryPaths=/usr/lib/trinity/plugins/^e
+
+[KWinPalette]
+activeBackground=#1f26ad
+activeBlend=#259bb8
+activeForeground=#ffffff
+activeTitleBtnBg=#e6e6e6
+frame=#efefef
+inactiveBackground=#cdcdcd
+inactiveBlend=#ababab
+inactiveForeground=#dddddd
+inactiveFrame=#efefef
+inactiveTitleBtnBg=#ebebeb
+
+[Palette]
+active=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e
+disabled=#808080^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#c7c7c7^e#ffffff^e#808080^e#ffffff^e#efefef^e#000000^e#567594^e#ffffff^e#0000ee^e#52188b^e
+inactive=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e
\ No newline at end of file
diff --git a/debian/squeeze/dependencies/tqt3/debian/rules b/debian/squeeze/dependencies/tqt3/debian/rules
new file mode 100755
index 000000000..c2fc2b997
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/rules
@@ -0,0 +1,482 @@
+#!/usr/bin/make -f
+
+# build variables
+export QTDIR=$(shell pwd)
+
+# re-set $(LD_LIBRARY_PATH)
+OLD_LD_LIBRARY_PATH := $(LD_LIBRARY_PATH)
+export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH)
+
+# fix path
+OLD_PATH := $(PATH)
+export PATH=$(QTDIR)/bin:$(OLD_PATH)
+
+DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+	PLATFORM_ARG = hurd-g++
+else #hurd
+ifeq ($(DEB_HOST_ARCH),sparc)
+	PLATFORM_ARG = linux-g++-sparc
+else #sparc
+	PLATFORM_ARG = linux-g++
+endif #sparc
+endif #hurd
+
+# quilt stuff
+include /usr/share/quilt/quilt.make
+
+# build variables (directorys)
+DEBIAN = $(shell pwd)/debian
+P_LIBS = $(DEBIAN)/libtqt3-mt
+P_DOC = $(DEBIAN)/tqt3-doc
+P_APPSDEV = $(DEBIAN)/tqt3-apps-dev
+P_HEADERS = $(DEBIAN)/libtqt3-headers
+P_QTMTDEV = $(DEBIAN)/libtqt3-mt-dev
+
+TMP_INSTALL = $(DEBIAN)/tmp-install
+
+CONFIGURE_OPTS = \
+		-prefix		"/usr"				\
+		-sysconfdir	"/etc/tqt3"			\
+		-datadir	"/usr/share/tqt3"		\
+		-headerdir	"/usr/include/tqt3"		\
+		-docdir		"/usr/share/tqt3/doc"		\
+		-plugindir	"/usr/lib/tqt3/plugins"		\
+		-translationdir	"/usr/share/tqt3/translations"	\
+						\
+		-thread				\
+		-shared				\
+		-fast				\
+		-no-exceptions			\
+		-platform $(PLATFORM_ARG)	\
+						\
+		-nis				\
+		-no-pch				\
+		-cups				\
+		-stl				\
+		-ipv6				\
+						\
+		-sm				\
+		-xshape				\
+		-xinerama			\
+		-xcursor			\
+		-xrandr				\
+		-xrender			\
+		-xft				\
+		-tablet				\
+		-xkb				\
+						\
+		-system-zlib			\
+		-system-libpng			\
+		-system-libmng			\
+		-system-libjpeg			\
+		-system-nas-sound		\
+						\
+		-enable-opengl			\
+		-dlopen-opengl			\
+						\
+		-qt-gif				\
+		-qt-imgfmt-png			\
+		-qt-imgfmt-jpeg			\
+		-plugin-imgfmt-mng		\
+						\
+		-plugin-sql-odbc		\
+		-plugin-sql-psql		\
+		-plugin-sql-mysql		\
+		-plugin-sql-sqlite		\
+						\
+		-I/usr/include/mysql		\
+		-I/usr/include/freetype2	\
+		-I`pg_config --includedir`	\
+						\
+		-L/usr/lib/$(DEB_HOST_MULTIARCH)	\
+						\
+		-lfontconfig			\
+		-inputmethod			\
+		# End of CONFIGURE_OPTS
+
+interbase_archs := i386 amd64 sparc powerpc
+ifneq ($(DEB_HOST_ARCH_CPU),$(findstring $(DEB_HOST_ARCH_CPU),$(interbase_archs)))
+	CONFIGURE_OPTS += -no-sql-ibase
+	IBASE = -Nlibtqt3-mt-ibase
+else
+	IBASE =
+endif
+
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+	CONFIGURE_OPTS += -no-sql-ibase
+	IBASE = -Nlibtqt3-mt-ibase
+endif
+
+ifeq ($(DEB_HOST_ARCH),arm)
+	CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
+endif
+
+build: libqt-thread-stamp
+
+	touch build-stamp
+
+libqt-thread-stamp: $(QUILT_STAMPFN)
+
+	@echo "QTDIR is ${QTDIR}"
+
+	dh_testdir
+
+	echo yes | ./configure $(CONFIGURE_OPTS)
+
+	rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
+	ln -s ../src/kernel/qinputcontext.h include/qinputcontext.h
+	ln -s ../src/inputmethod/qinputcontextfactory.h include/qinputcontextfactory.h
+	ln -s ../src/inputmethod/qinputcontextplugin.h include/qinputcontextplugin.h
+
+	# proceed
+	$(MAKE) sub-src sub-plugins sub-tools
+	$(MAKE) -C src INSTALL_ROOT=$(TMP_INSTALL) install_target
+	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) install
+	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install
+
+	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
+	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
+
+	cp bin/qtrename140 $(TMP_INSTALL)/usr/bin/
+	cp bin/qt20fix $(TMP_INSTALL)/usr/bin/
+	cp bin/findtr $(TMP_INSTALL)/usr/bin/
+
+	# build conv2ui
+	cd tools/designer/tools/conv2ui && $(MAKE)
+	cp bin/conv2ui $(TMP_INSTALL)/usr/bin/conv2ui
+
+	# build qvfb
+	cd tools/qvfb/ && $(MAKE)
+	cp tools/qvfb/qvfb $(TMP_INSTALL)/usr/bin/qvfb
+
+	# install qmake.cache file
+	install -d $(P_QTMTDEV)/usr/share/tqt3/
+	cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/tqt3#g" > $(P_QTMTDEV)/usr/share/tqt3/.qmake.cache
+
+	# install qconfig.h for the mt
+	install -m 644 -D include/qconfig.h $(P_QTMTDEV)/usr/include/tqt3/qconfig.h
+	install -m 644 -D include/qmodules.h $(P_QTMTDEV)/usr/include/tqt3/qmodules.h
+
+	install -m 644 -D include/qinputcontext.h $(P_HEADERS)/usr/include/tqt3/qinputcontext.h
+	install -m 644 -D include/qinputcontextfactory.h $(P_HEADERS)/usr/include/tqt3/qinputcontextfactory.h
+	install -m 644 -D include/qinputcontextplugin.h $(P_HEADERS)/usr/include/tqt3/qinputcontextplugin.h
+
+	touch libqt-thread-stamp
+
+clean: unpatch
+
+	dh_testdir
+
+	-rm -rf debian/patched
+	-rm -rf build-stamp libqt-thread-stamp
+
+	-chmod -R u+w *
+	-chmod a-x doc/html/layout?.png
+
+	if [ -f "src/Makefile" ]; then \
+		$(MAKE) -C src clean; $(MAKE) -C plugins/src distclean; $(MAKE) -C tools distclean; \
+		$(MAKE) -C tools/makeqpf distclean; $(MAKE) -C tools/qconfig distclean; $(MAKE) -C tools/qvfb distclean; \
+		$(MAKE) -C tools/msg2qm distclean; $(MAKE) -C tools/mergetr distclean; $(MAKE) -C tools/qembed distclean; \
+		$(MAKE) -C tools/designer/tools/conv2ui distclean; $(MAKE) -C tools/designer/tools/createcw distclean; \
+		$(MAKE) -C tools/designer/plugins/glade distclean; $(MAKE) -C tools/designer/plugins/qglwidget distclean; \
+		$(MAKE) -C config.tests/unix/largefile distclean; $(MAKE) -C qmake distclean; \
+	fi
+
+	-rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \
+		config.status bin/moc bin/qmake src/moc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \
+		src/tools/qconfig.cpp include/qconfig.h include/qmodules.h plugins/accessibleqtwidgets.prl \
+		config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \
+		config.tests/unix/ptrsize/ptrsizetest config.tests/unix/endian/endiantest.o \
+		config.tests/unix/endian/endiantest lib/tqt-mt.pc extensions/nsplugin/examples/trivial/libtrivial.prl \
+		extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer
+
+	rm -f qmake/*o
+	rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
+	rm -f src/.obj/debug-shared-mt/*o plugins/src/inputmethods/imsw-multi/.obj/debug-shared-mt/*o plugins/inputmethods/*so
+	rm -f plugins/src/inputmethods/imsw-none/.obj/debug-shared-mt/*o plugins/src/inputmethods/simple/.obj/debug-shared-mt/*o plugins/src/inputmethods/xim/.obj/debug-shared-mt/*o
+
+	# delete generated Makefiles but save the toplevel Makefile
+	-mv Makefile Makefile.save
+	for a in `find . -name 'Makefile'`; do rm -f "$$a"; done
+	-mv Makefile.save Makefile
+
+	cd examples/ && find . -name '.obj' | xargs rm -rf
+
+	dh_clean
+
+install: build
+
+	dh_testdir
+	dh_testroot
+
+	dh_clean -i
+	dh_installdirs
+
+	# fix .prl files
+	for a in $(TMP_INSTALL)/usr/lib/*prl; do cat "$$a" | sed \
+	"s#$(QTDIR)#/usr/share/tqt3#g" > "$$a".new && mv "$$a".new "$$a"; done
+
+	dh_install $(IBASE) --sourcedir=$(TMP_INSTALL)
+
+	## build tqt3-doc package
+	# copy all docs there first
+	install -d $(P_DOC)/usr/share/tqt3/doc/html/
+	for a in `cd $(TMP_INSTALL)/usr/share/tqt3/doc/html/ && find`; do cp $(TMP_INSTALL)/usr/share/tqt3/doc/html/"$$a" $(P_DOC)/usr/share/tqt3/doc/html/; done
+	#typo bugfix
+	sed -i -e 's/reveives/receives/' $(P_DOC)/usr/share/tqt3/doc/html/qwidget.html
+
+	## build designer package documentation
+	# tqt3-designer
+	install -d `pwd`/debian/tqt3-designer/usr/share/tqt3/doc/html/
+	for a in `cat doc/html/designer*.html doc/html/designer*.dcf | grep png | sed 's/^.*src=\"\([^\"]+\)\".*$$/\1/' | \
+	perl -pe 's#<\?p[^>]+>##' | tee outputfile | perl -ne '/<img [^>]*(src=\"[^"]+\")/; print $$1' | \
+	sed 's/src=//g' | sed 's/"/ /g'`; do cp doc/html/"$$a" `pwd`/debian/tqt3-designer/usr/share/tqt3/doc/html/ && \
+	rm -rf $(P_DOC)/usr/share/tqt3/doc/html/"$$a" || true; done
+	rm -rf outputfile `pwd`/debian/tqt3-designer/usr/share/tqt3/doc/html/logo32.png
+	rm -rf `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/designer*
+
+	## build linguist package documentation
+	# tqt3-linguist
+	install -d `pwd`/debian/tqt3-linguist/usr/share/tqt3/doc/html/
+	for a in `cat doc/html/linguist*.html doc/html/linguist*.dcf | grep png | sed 's/^.*src=\"\([^\"]+\)\".*$$/\1/' | \
+	perl -pe 's#<\?p[^>]+>##' | tee outputfile | perl -ne '/<img [^>]*(src=\"[^"]+\")/; print $$1' | \
+	sed 's/src=//g' | sed 's/"/ /g'`; do cp doc/html/"$$a" `pwd`/debian/tqt3-linguist/usr/share/tqt3/doc/html/ && \
+	rm -rf $(P_DOC)/usr/share/tqt3/doc/html/"$$a" || true; done
+	rm -rf outputfile `pwd`/debian/tqt3-linguist/usr/share/tqt3/doc/html/logo32.png
+	rm -rf `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/linguist*
+
+	## tqt3-assistant
+	# remove docs from tqt3-doc for qt-assistant
+	rm -rf `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/assistant*
+
+	## all packages
+	# install the overrides files
+	#for a in debian/overrides/*; do install -d debian/`echo "$$a" | sed 's/debian\/overrides\///g'`/usr/share/lintian/overrides; done
+	#for a in debian/overrides/*; do cp "$$a" debian/`echo "$$a" | sed 's/debian\/overrides\///g'`/usr/share/lintian/overrides/`echo "$$a" | sed 's/debian\/overrides\///g'`; done
+
+	chmod 644 debian/tqt3-dev-tools/usr/share/tqt3/mkspecs/aix-g++-64/qplatformdefs.h
+	chmod 644 debian/tqt3-dev-tools/usr/share/tqt3/mkspecs/macx-pbuilder/Info.plist.app
+
+binary-indep: build install
+
+	# Build architecture-independent files here.
+	dh_testdir
+	dh_testroot
+
+	dh_installdocs -i -XREADME.Debian
+	dh_installchangelogs -i changes-3.3.8
+	dh_installchangelogs -i changes-3.3.8b
+
+	find doc/man -path \*/CVS -prune -o -print | cpio -pmd $(P_DOC)/usr/share/tqt3/doc/
+
+	-rm -f `find $(P_DOC)/usr/share/tqt3/doc/ -name "*.o"`
+	find $(P_DOC) -type f -perm +0100 | xargs --no-run-if-empty rm -f
+
+	install -d $(P_DOC)/usr/share/man/man3/
+
+	for i in $(P_DOC)/usr/share/tqt3/doc/doc/man/man3/* ; do mv $$i $(P_DOC)/usr/share/man/man3/ ; done
+
+	-rm -rf $(P_DOC)/usr/share/tqt3/doc/doc
+
+	# other i18n files
+	for a in `cd translations/ && find . -name 'qt_*.qm' | sed 's/qt_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
+	install -m644 -D `pwd`/translations/qt_"$$a".qm `pwd`/debian/libtqt3-i18n/usr/share/tqt3/translations/qt_"$$a".qm; done
+
+	# logo32.png
+	cp `pwd`/doc/html/logo32.png `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/
+
+	# remove qmake html docu from tqt3-doc
+	rm -rf `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/qmake*
+
+	# create examples package
+	install -d `pwd`/debian/doc/tqt3-examples/tools/designer
+	install -d `pwd`/debian/doc/tqt3-examples/tools/linguist
+	cp -ax examples `pwd`/debian/doc/tqt3-examples
+	cp -ax tutorial `pwd`/debian/doc/tqt3-examples
+	cp -ax tools/designer/examples `pwd`/debian/doc/tqt3-examples/tools/designer/
+	cp -ax tools/linguist/tutorial `pwd`/debian/doc/tqt3-examples/tools/linguist/
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name 'tt1'`; do rm -f "$$a"; done
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name 'tt2'`; do rm -f "$$a"; done
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name 'tt3'`; do rm -f "$$a"; done
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name '.moc'`; do rm -rf "$$a"; done
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name '.obj'`; do rm -rf "$$a"; done
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name 'Makefile'`; do rm -f "$$a"; done
+	install -D `pwd`/debian/maintain/build-examples.sh `pwd`/debian/doc/tqt3-examples/build-examples
+	chmod 755 `pwd`/debian/doc/tqt3-examples/build-examples
+	cd `pwd`/debian/doc/ && tar cvvfz tqt3-examples.tar.gz tqt3-examples/
+	install -D `pwd`/debian/doc/tqt3-examples.tar.gz `pwd`/debian/tqt3-examples/usr/share/doc/tqt3-examples/tqt3-examples.tar.gz
+
+	# proceed
+	dh_compress -i -Xhtml/
+	dh_link -i
+
+	dh_fixperms -i
+	dh_installdeb -i
+
+	dh_perl -i
+	dh_shlibdeps -i
+
+	# fix shlibdeps madness
+	for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new &&  mv "$$a.new" "$$a"; done
+
+	dh_gencontrol -i
+	dh_md5sums -i
+
+	dh_builddeb -i
+
+binary-arch: build install
+
+	dh_testdir
+	dh_testroot
+	dh_installdirs -a
+
+	## create tqt3-apps-dev-package
+	install -d $(P_APPSDEV)/usr/include/tqt3/
+	cp `pwd`/tools/designer/interfaces/*.h $(P_APPSDEV)/usr/include/tqt3/
+	cp `pwd`/tools/designer/editor/*.h $(P_APPSDEV)/usr/include/tqt3/
+	rm -rf `pwd`/debian/tqt3-apps-dev/usr/include/tqt3/preferences.ui.h
+
+	## qvfb package
+	install -m644 -D `pwd`/tools/qvfb/pda.skin `pwd`/debian/tqt3-dev-tools-embedded/etc/tqt3/qvfb/pda.skin
+	install -m644 -D `pwd`/tools/qvfb/pda_down.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/qvfb/pda_down.png
+	install -m644 -D `pwd`/tools/qvfb/pda_up.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/qvfb/pda_up.png
+
+	# remove utterly ugle symlink
+	rm -rf `pwd`/debian/tqt3-dev-tools//usr/share/tqt3/mkspecs/linux-g++/linux-g++
+
+	# language file for linguist
+	install -d `pwd`/debian/tqt3-linguist/usr/share/doc/tqt3-linguist/
+	cp translations/qt_untranslated.ts `pwd`/debian/tqt3-linguist/usr/share/doc/tqt3-linguist/
+
+	# fix that stupid friggin professional file
+	perl -pi -e 's{\$$\$$QT_SOURCE_TREE}{$(QTDIR)}' src/qt_professional.pri
+
+	## i18n files for designer, linguist and assistant
+	(cd `pwd`/tools/designer/designer/ && lrelease designer.pro)
+	for a in `cd tools/designer/designer/ && find . -name 'designer_*.qm' | sed 's/designer_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
+	install -m644 -D tools/designer/designer/designer_"$$a".qm `pwd`/debian/tqt3-designer/usr/share/tqt3/translations/designer_"$$a".qm; done
+	rm -rf `pwd`/tools/designer/designer/*.qm
+
+	(cd `pwd`/tools/assistant/ && lrelease assistant.pro)
+	for a in `cd tools/assistant/ && find . -name 'assistant_*.qm' | sed 's/assistant_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
+	install -m644 -D tools/assistant/assistant_"$$a".qm `pwd`/debian/tqt3-assistant/usr/share/tqt3/translations/assistant_"$$a".qm; done
+	rm -rf `pwd`/tools/assistant/*.qm `pwd`/debian/libtqt3-i18n/usr/share/tqt3/translations/assistant_de.qm
+
+	(cd `pwd`/tools/linguist/linguist/ && lrelease linguist.pro)
+	for a in `cd tools/linguist/linguist/ && find . -name 'linguist_*.qm' | sed 's/linguist_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
+	install -m644 -D tools/linguist/linguist/linguist_"$$a".qm `pwd`/debian/tqt3-linguist/usr/share/tqt3/translations/linguist_"$$a".qm; done
+	rm -rf `pwd`/tools/linguist/linguist/*.qm
+
+	# desktop lnk files
+	install -m644 -D debian/maintain/designer-tqt3.desktop `pwd`/debian/tqt3-designer/usr/share/applications/designer-tqt3.desktop
+	install -m644 -D debian/maintain/linguist-tqt3.desktop `pwd`/debian/tqt3-linguist/usr/share/applications/linguist-tqt3.desktop
+
+	install -m644 -D debian/maintain/assistant-tqt3.desktop `pwd`/debian/tqt3-assistant/usr/share/applications/assistant-tqt3.desktop
+	install -m644 -D debian/maintain/tqt3config.desktop `pwd`/debian/tqt3-qtconfig/usr/share/applications/tqt3config.desktop
+
+	# include logo32 for every program
+	cd `pwd`/debian/tqt3-designer/usr/share/tqt3/doc/html && for a in `find . -name '*.html'`; \
+	do cat "$$a" | sed 's/logo32/logo32-designer/g' > "$$a".new && mv "$$a".new "$$a"; done
+
+	cd `pwd`/debian/tqt3-linguist/usr/share/tqt3/doc/html && for a in `find . -name '*.html'`; \
+	do cat "$$a" | sed 's/logo32/logo32-linguist/g' > "$$a".new && mv "$$a".new "$$a"; done
+
+	cd `pwd`/debian/tqt3-assistant/usr/share/tqt3/doc/html && for a in `find . -name '*.html'`; \
+	do cat "$$a" | sed 's/logo32/logo32-assistant/g' > "$$a".new && mv "$$a".new "$$a"; done
+
+	cd `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/doc/html && for a in `find . -name '*.html'`; \
+	do cat "$$a" | sed 's/logo32/logo32-qmake/g' > "$$a".new && mv "$$a".new "$$a"; done
+
+	for a in designer linguist assistant; do install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/tqt3-"$$a"/usr/share/tqt3/doc/html/logo32-"$$a".png; done
+	install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/doc/html/logo32-qmake.png
+
+	# fix qmake.conf files
+	cd `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/mkspecs/ && for a in *; do cd "$$a" && cat qmake.conf | sed 's/\$$(QTDIR)\/include/\/usr\/share\/tqt3\/include/g' | sed 's/\$$(QTDIR)/\/usr\/share\/tqt3/g' | \
+	sed 's/\-I\/usr\/include/&\/tqt3/g' >> qmake.conf.new && mv qmake.conf.new qmake.conf && cd ../; done
+
+	# build attic package and copy it to libtqt3-ompat-headers
+	cd `pwd`/src/ && tar cvvfz attic.tar.gz attic/
+	install -D `pwd`/src/attic.tar.gz `pwd`/debian/libtqt3-compat-headers/usr/share/doc/libtqt3-compat-headers/attic.tar.gz
+	rm -rf `pwd`/src/attic.tar.gz
+
+	# rename some binaries to make tqt3/4 installations possible
+	mv `pwd`/debian/tqt3-designer/usr/bin/designer `pwd`/debian/tqt3-designer/usr/bin/designer-tqt3
+	mv `pwd`/debian/tqt3-dev-tools/usr/bin/uic `pwd`/debian/tqt3-dev-tools/usr/bin/uic-tqt3
+	mv `pwd`/debian/tqt3-dev-tools/usr/bin/moc `pwd`/debian/tqt3-dev-tools/usr/bin/moc-tqt3
+	mv `pwd`/debian/tqt3-dev-tools/usr/bin/lupdate `pwd`/debian/tqt3-dev-tools/usr/bin/lupdate-tqt3
+	mv `pwd`/debian/tqt3-dev-tools/usr/bin/lrelease `pwd`/debian/tqt3-dev-tools/usr/bin/lrelease-tqt3
+	mv `pwd`/debian/tqt3-dev-tools/usr/bin/qmake `pwd`/debian/tqt3-dev-tools/usr/bin/qmake-tqt3
+	mv `pwd`/debian/tqt3-qtconfig/usr/bin/qtconfig `pwd`/debian/tqt3-qtconfig/usr/bin/qtconfig-tqt3
+	mv `pwd`/debian/tqt3-assistant/usr/bin/assistant `pwd`/debian/tqt3-assistant/usr/bin/assistant-tqt3
+	mv `pwd`/debian/tqt3-linguist/usr/bin/linguist `pwd`/debian/tqt3-linguist/usr/bin/linguist-tqt3
+
+	install -D debian/maintain/man/designer.1 `pwd`/debian/tqt3-designer/usr/share/man/man1/designer-tqt3.1
+	install -D doc/man/man1/moc.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/moc-tqt3.1
+	install -D doc/man/man1/uic.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/uic-tqt3.1
+	install -D doc/man/man1/lrelease.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/lrelease-tqt3.1
+	install -D doc/man/man1/lupdate.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/lupdate-tqt3.1
+	install -D debian/maintain/man/qtconfig.1 `pwd`/debian/tqt3-qtconfig/usr/share/man/man1/qtconfig-tqt3.1
+	install -D debian/maintain/man/linguist.1 `pwd`/debian/tqt3-linguist/usr/share/man/man1/linguist-tqt3.1
+
+	dh_link -ptqt3-designer usr/share/tqt3/doc/html usr/share/doc/tqt3-designer/html
+	dh_link -ptqt3-assistant usr/share/tqt3/doc/html usr/share/doc/tqt3-assistant/html
+	dh_link -ptqt3-linguist usr/share/tqt3/doc/html usr/share/doc/tqt3-linguist/html
+	dh_link -ptqt3-dev-tools usr/share/tqt3/doc/html usr/share/doc/tqt3-dev-tools/html
+
+	# install the manpages we have
+	dh_installman -ptqt3-designer debian/maintain/man/createcw.1
+	dh_installman -ptqt3-dev-tools-compat debian/maintain/man/qt20fix.1 debian/maintain/man/mergetr.1 debian/maintain/man/findtr.1 debian/maintain/man/msg2qm.1
+	dh_installman -ptqt3-dev-tools-embedded debian/maintain/man/makeqpf.1 debian/maintain/man/qvfb.1
+	dh_installman -ptqt3-dev-tools debian/maintain/man/qembed.1
+
+	# copy README.Debian
+	for a in libtqt3-mt-dev libtqt3-mt tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done
+
+	# install the qmake binary
+	rm -rf `pwd`/debian/tqt3-dev-tools/usr/bin/qmake
+	install -D `pwd`/qmake/qmake `pwd`/debian/tqt3-dev-tools/usr/bin/qmake-tqt3
+
+	# Install source for the designer tools, such as createcw.
+	cp -ra tools/designer/tools debian/tqt3-designer/usr/share/tqt3/tools
+	rm -f debian/tqt3-designer/usr/share/tqt3/tools/createcw/createcw
+	rm -rf debian/tqt3-designer/usr/share/tqt3/tools/createcw/.moc
+	rm -rf debian/tqt3-designer/usr/share/tqt3/tools/createcw/.obj
+	rm -f debian/tqt3-designer/usr/share/tqt3/tools/createcw/Makefile
+	rm -f debian/tqt3-designer/usr/share/tqt3/tools/conv2ui/conv2ui
+	rm -rf debian/tqt3-designer/usr/share/tqt3/tools/conv2ui/.moc
+	rm -rf debian/tqt3-designer/usr/share/tqt3/tools/conv2ui/.obj
+	rm -f debian/tqt3-designer/usr/share/tqt3/tools/conv2ui/Makefile
+
+	# run remaining debhelper scripts
+	dh_installdocs -a $(IBASE) -XREADME.Debian
+	dh_installmenu -a $(IBASE)
+
+	dh_installchangelogs -a $(IBASE) changes-3.3.8
+	dh_installchangelogs -a $(IBASE) changes-3.3.8b
+
+	dh_link -a $(IBASE)
+	dh_strip -a $(IBASE) --dbg-package=qt-x11-free-dbg
+	dh_compress -a $(IBASE)
+	dh_fixperms -a $(IBASE)
+
+	# run remaining debhelper scripts
+	dh_makeshlibs -a $(IBASE) -V
+	dh_installdeb -a $(IBASE)
+	dh_perl -a $(IBASE)
+	dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libtqt3-mt/usr/lib
+
+	# fix shlibdeps madness
+	for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new &&  mv "$$a.new" "$$a"; done
+
+	# fix conffiles file for tqt3-dev-tools-embedded
+	echo "/etc/tqt3/qvfb/pda.skin" > `pwd`/debian/tqt3-dev-tools-embedded/DEBIAN/conffiles
+
+	dh_gencontrol -a $(IBASE)
+	dh_md5sums -a $(IBASE)
+	dh_builddeb -a $(IBASE)
+
+binary: binary-indep binary-arch
+.PHONY: build binary-indep binary-arch binary install clean patch unpatch
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.install
new file mode 100644
index 000000000..b69f266ef
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.install
@@ -0,0 +1,7 @@
+usr/lib/libeditor.prl
+usr/lib/libeditor.a
+usr/lib/libdesignercore.prl
+usr/lib/libdesignercore.a
+usr/lib/libqassistantclient.prl
+usr/lib/libqassistantclient.a
+usr/include/tqt3/qassistantclient.h
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.links b/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.links
new file mode 100644
index 000000000..b009faf61
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.links
@@ -0,0 +1,8 @@
+/usr/lib/libeditor.prl /usr/share/tqt3/lib/libeditor.prl
+/usr/lib/libeditor.a /usr/share/tqt3/lib/libeditor.a
+/usr/lib/libdesignercore.prl /usr/share/tqt3/lib/libdesignercore.prl
+/usr/lib/libdesignercore.a /usr/share/tqt3/lib/libdesignercore.a
+/usr/lib/libqassistantclient.prl /usr/share/tqt3/lib/libqassistantclient.prl
+/usr/lib/libqassistantclient.a /usr/share/tqt3/lib/libqassistantclient.a
+/usr/include/tqt3 /usr/share/tqt3/tools/designer/editor
+/usr/include/tqt3 /usr/share/tqt3/tools/designer/interfaces
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.install
new file mode 100644
index 000000000..3ec2f74fa
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.install
@@ -0,0 +1,3 @@
+usr/bin/assistant
+usr/share/tqt3/doc/html/assistant*html
+usr/share/tqt3/doc/html/assistant*dcf
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.links b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.links
new file mode 100644
index 000000000..909b4681d
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.links
@@ -0,0 +1 @@
+/usr/bin/assistant-tqt3 /usr/share/tqt3/bin/assistant
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.menu b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.menu
new file mode 100644
index 000000000..b47a494ac
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.menu
@@ -0,0 +1,6 @@
+?package(tqt3-assistant):\
+        needs="x11"\
+        section="Applications/Programming"\
+        hints="KDE"\
+        title="Qt3 Assistant"\
+        command="/usr/bin/assistant-tqt3"
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.postinst b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.postinst
new file mode 100644
index 000000000..c8b6ca8b3
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.postinst
@@ -0,0 +1,8 @@
+#!/bin/sh 
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/assistant assistant "/usr/bin/assistant-tqt3" "45" \
+
+#DEBHELPER#
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.prerm b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.prerm
new file mode 100644
index 000000000..1a45c259c
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove assistant "/usr/bin/assistant-tqt3"
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.install
new file mode 100644
index 000000000..f2db61219
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.install
@@ -0,0 +1,8 @@
+usr/bin/designer
+usr/bin/createcw
+usr/bin/conv2ui
+usr/share/tqt3/templates/*
+usr/share/tqt3/doc/html/designer*html
+usr/share/tqt3/doc/html/designer*dcf
+usr/share/tqt3/doc/html/designer*jpg
+usr/lib/tqt3/plugins/designer/*
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.links b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.links
new file mode 100644
index 000000000..550d68ec0
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.links
@@ -0,0 +1 @@
+/usr/bin/designer-tqt3 /usr/share/tqt3/bin/designer
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.menu b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.menu
new file mode 100644
index 000000000..cc01205eb
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.menu
@@ -0,0 +1,7 @@
+?package(tqt3-designer):\
+        needs="x11"\
+        section="Applications/Programming"\
+        hints="KDE"\
+        title="Qt3 Designer"\
+        command="/usr/bin/designer-tqt3"
+
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.postinst b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.postinst
new file mode 100644
index 000000000..bbbd836d0
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh 
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/designer designer "/usr/bin/designer-tqt3" "45" \
+	--slave /usr/share/man/man1/designer.1.gz designer.1.gz \
+	"/usr/share/man/man1/designer-tqt3.1.gz"
+
+#DEBHELPER#
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.prerm b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.prerm
new file mode 100644
index 000000000..14497092e
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove designer "/usr/bin/designer-tqt3"
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools-compat.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools-compat.install
new file mode 100644
index 000000000..838f6b827
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools-compat.install
@@ -0,0 +1,6 @@
+usr/bin/qt20fix
+usr/bin/qtrename140
+usr/bin/qm2ts
+usr/bin/mergetr
+usr/bin/findtr
+usr/bin/msg2qm
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install
new file mode 100644
index 000000000..2954f7a4c
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install
@@ -0,0 +1,2 @@
+usr/bin/makeqpf
+usr/bin/qvfb
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links
new file mode 100644
index 000000000..a0274c505
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links
@@ -0,0 +1,2 @@
+/usr/bin/makeqpf /usr/share/tqt3/bin/makeqpf
+/usr/bin/qvfb /usr/share/tqt3/bin/qvfb
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.install
new file mode 100644
index 000000000..d496d35b9
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.install
@@ -0,0 +1,9 @@
+usr/share/tqt3/mkspecs/*
+usr/share/tqt3/doc/html/qmake*html
+usr/share/tqt3/doc/html/qmake*dcf
+usr/bin/qmake
+usr/bin/lupdate
+usr/bin/lrelease
+usr/bin/uic
+usr/bin/moc
+usr/bin/qembed
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.links b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.links
new file mode 100644
index 000000000..0de57d25d
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.links
@@ -0,0 +1,7 @@
+/usr/share/tqt3/mkspecs/linux-g++ /usr/share/tqt3/mkspecs/default
+/usr/bin/qmake-tqt3 /usr/share/tqt3/bin/qmake
+/usr/bin/lupdate-tqt3 /usr/share/tqt3/bin/lupdate
+/usr/bin/lrelease-tqt3 /usr/share/tqt3/bin/lrelease
+/usr/bin/uic-tqt3 /usr/share/tqt3/bin/uic
+/usr/bin/moc-tqt3 /usr/share/tqt3/bin/moc
+/usr/bin/qembed /usr/share/tqt3/bin/qembed
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.postinst b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.postinst
new file mode 100644
index 000000000..75022d56f
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.postinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/moc moc "/usr/bin/moc-tqt3" "45" \
+	--slave /usr/share/man/man1/moc.1.gz moc.1.gz \
+	"/usr/share/man/man1/moc-tqt3.1.gz"
+
+update-alternatives --install \
+        /usr/bin/uic uic "/usr/bin/uic-tqt3" "45" \
+	--slave /usr/share/man/man1/uic.1.gz uic.1.gz \
+	"/usr/share/man/man1/uic-tqt3.1.gz"
+
+update-alternatives --install \
+        /usr/bin/lupdate lupdate "/usr/bin/lupdate-tqt3" "45" \
+	--slave /usr/share/man/man1/lupdate.1.gz lupdate.1.gz \
+	"/usr/share/man/man1/lupdate-tqt3.1.gz"
+		
+update-alternatives --install \
+        /usr/bin/lrelease lrelease "/usr/bin/lrelease-tqt3" "45" \
+	--slave /usr/share/man/man1/lrelease.1.gz lrelease.1.gz \
+	"/usr/share/man/man1/lrelease-tqt3.1.gz"
+
+update-alternatives --install \
+        /usr/bin/qmake qmake "/usr/bin/qmake-tqt3" "45" \
+
+#DEBHELPER#
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.prerm b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.prerm
new file mode 100644
index 000000000..c0a69bfe9
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.prerm
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove moc "/usr/bin/moc-tqt3"
+    update-alternatives --remove uic "/usr/bin/uic-tqt3"
+    update-alternatives --remove lupdate "/usr/bin/lupdate-tqt3"
+    update-alternatives --remove lrelease "/usr/bin/lrelease-tqt3"
+    update-alternatives --remove qmake "/usr/bin/qmake-tqt3"
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-doc.doc-base b/debian/squeeze/dependencies/tqt3/debian/tqt3-doc.doc-base
new file mode 100644
index 000000000..8fd0c977f
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-doc.doc-base
@@ -0,0 +1,11 @@
+Document: tqt3-doc
+Title: Qt Reference Documentation
+Author: Troll Tech
+Abstract: Qt (TM) is a multi-platform C++ GUI toolkit. It is a product of
+ Troll Tech. It is supported on all major variants of Microsoft Windows and
+ Unix/X Windows. 
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/tqt3-doc/html/index.html
+Files: /usr/share/doc/tqt3-doc/html/*.html
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-doc.docs b/debian/squeeze/dependencies/tqt3/debian/tqt3-doc.docs
new file mode 100644
index 000000000..f08fd0f02
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-doc.docs
@@ -0,0 +1,2 @@
+FAQ
+README-QT.TXT
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-doc.links b/debian/squeeze/dependencies/tqt3/debian/tqt3-doc.links
new file mode 100644
index 000000000..dfec5318b
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-doc.links
@@ -0,0 +1,2 @@
+/usr/share/man/man3 /usr/share/tqt3/doc/man/man3
+/usr/share/tqt3/doc/html /usr/share/doc/tqt3-doc/html
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.install
new file mode 100644
index 000000000..7484d8534
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.install
@@ -0,0 +1,4 @@
+usr/bin/linguist
+usr/share/tqt3/phrasebooks/*
+usr/share/tqt3/doc/html/linguist*html
+usr/share/tqt3/doc/html/linguist*dcf
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.links b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.links
new file mode 100644
index 000000000..aa157aded
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.links
@@ -0,0 +1 @@
+/usr/bin/linguist-tqt3 /usr/share/tqt3/bin/linguist
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.menu b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.menu
new file mode 100644
index 000000000..6da50281a
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.menu
@@ -0,0 +1,6 @@
+?package(tqt3-linguist):\
+        needs="x11"\
+        section="Applications/Programming"\
+        hints="KDE"\
+        title="Qt3 Linguist"\
+        command="/usr/bin/linguist-tqt3"
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.postinst b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.postinst
new file mode 100644
index 000000000..1dadc79df
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh 
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/linguist linguist "/usr/bin/linguist-tqt3" "45" \
+	--slave /usr/share/man/man1/linguist.1.gz linguist.1.gz \
+	"/usr/share/man/man1/linguist-tqt3.1.gz"
+
+#DEBHELPER#
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.prerm b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.prerm
new file mode 100644
index 000000000..38de53b13
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove linguist "/usr/bin/linguist-tqt3"
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.install
new file mode 100644
index 000000000..8fcee756b
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.install
@@ -0,0 +1 @@
+usr/bin/qtconfig
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.links b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.links
new file mode 100644
index 000000000..52e4d5473
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.links
@@ -0,0 +1 @@
+/usr/bin/qtconfig-tqt3 /usr/share/tqt3/bin/qtconfig
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.menu b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.menu
new file mode 100644
index 000000000..e567b050b
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.menu
@@ -0,0 +1,8 @@
+?package(tqt3-qtconfig):\
+        needs="x11"\
+        section="Applications/System/Administration"\
+        title="Qt3 Config"\
+        longtitle="Qt3 Configuration Utility"\
+        hints="Qt3 config tool"\
+        command="/usr/bin/qtconfig-tqt3"
+
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.postinst b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.postinst
new file mode 100644
index 000000000..9449d5b8a
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh 
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/qtconfig qtconfig "/usr/bin/qtconfig-tqt3" "45" \
+	--slave /usr/share/man/man1/qtconfig.1.gz qtconfig.1.gz \
+	"/usr/share/man/man1/qtconfig-tqt3.1.gz"
+
+#DEBHELPER#
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.prerm b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.prerm
new file mode 100644
index 000000000..810bc0a93
--- /dev/null
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove qtconfig "/usr/bin/qtconfig-tqt3"
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/control b/debian/squeeze/dependencies/tqtinterface/debian/control
index d2b5de20b..8af4661b3 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/control
+++ b/debian/squeeze/dependencies/tqtinterface/debian/control
@@ -2,7 +2,7 @@ Source: libtqtinterface
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>> 4.0.0), libqt3-mt-dev, libavahi-tqt-dev, qt3-apps-dev, cmake, cdbs
+Build-Depends: debhelper (>> 4.0.0), libqt3-mt-dev, qt3-apps-dev, cmake, cdbs
 Standards-Version: 3.8.4
 
 Package: libtqtinterface
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/ubuntu/maverick/tdebase/debian/icons/kdeprint-16.xpm b/debian/squeeze/tdebase/debian/icons/tdeprint-16.xpm
index 4f03a0b06..58b87a90d 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kdeprint-16.xpm
+++ b/debian/squeeze/tdebase/debian/icons/tdeprint-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/squeeze/tdebase/debian/icons/tdeprint.xpm
index f11005860..c10da523c 100644
--- a/debian/lenny/tdebase/debian/icons/kdeprint.xpm
+++ b/debian/squeeze/tdebase/debian/icons/tdeprint.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/squeeze/tdebase/debian/icons/tdeprintfax-16.xpm
index debb554b6..3e07385e5 100644
--- a/debian/lenny/tdebase/debian/icons/kdeprintfax-16.xpm
+++ b/debian/squeeze/tdebase/debian/icons/tdeprintfax-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/tdeprintfax.xpm
index 6af142f57..9f5d6a2e7 100644
--- a/debian/squeeze/tdebase/debian/icons/kdeprintfax.xpm
+++ b/debian/squeeze/tdebase/debian/icons/tdeprintfax.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
deleted file mode 100644
index bd25acf54..000000000
--- a/debian/squeeze/tdebase/debian/kdeprint-trinity.install
+++ /dev/null
@@ -1,150 +0,0 @@
-debian/tmp/opt/trinity/bin/kdeprintfax
-debian/tmp/opt/trinity/bin/kjobviewer
-debian/tmp/opt/trinity/bin/kprinter
-debian/tmp/opt/trinity/lib/trinity/kcm_printmgr.la
-debian/tmp/opt/trinity/lib/trinity/kcm_printmgr.so
-debian/tmp/opt/trinity/lib/trinity/kio_print.la
-debian/tmp/opt/trinity/lib/trinity/kio_print.so
-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/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/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/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/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/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/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/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/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/kjobviewer.svgz
-debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/printmgr.svgz
-debian/tmp/opt/trinity/share/mimelnk/print/class.desktop
-debian/tmp/opt/trinity/share/mimelnk/print/driver.desktop
-debian/tmp/opt/trinity/share/mimelnk/print/folder.desktop
-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/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
diff --git a/debian/squeeze/tdebase/debian/kdeprint-trinity.lintian b/debian/squeeze/tdebase/debian/kdeprint-trinity.lintian
deleted file mode 100644
index 6cac09d35..000000000
--- a/debian/squeeze/tdebase/debian/kdeprint-trinity.lintian
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/debian/squeeze/tdebase/debian/kdeprint-trinity.menu b/debian/squeeze/tdebase/debian/kdeprint-trinity.menu
deleted file mode 100644
index 3140de34c..000000000
--- a/debian/squeeze/tdebase/debian/kdeprint-trinity.menu
+++ /dev/null
@@ -1,35 +0,0 @@
-?package(kdeprint):\
-	needs="X11"\
-	section="Applications/System/Monitoring"\
-	hints="KDE"\
-	title="KJobViewer"\
-	icon32x32="/opt/trinity/share/pixmaps/kjobviewer.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kjobviewer-16.xpm"\
-	command="/opt/trinity/bin/kjobviewer --show --all"
-
-?package(kdeprint):\
-	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"\
-	command="/opt/trinity/bin/kprinter"
-
-?package(kdeprint):\
-	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"
-
-# Icon 32x32 kdeprint/kjobviewer/cr32-app-kjobviewer.png kjobviewer.xpm
-# Icon 16x16 kdeprint/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 kdeprint/kdeprintfax/cr32-app-kdeprintfax.png kdeprintfax.xpm
-# Icon 16x16 kdeprint/kdeprintfax/cr16-app-kdeprintfax.png kdeprintfax-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/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/lenny/tdebase/debian/man/kdeprintfax-trinity.1 b/debian/squeeze/tdebase/debian/man/tdeprintfax-trinity.1
index 0308ac1d8..353fb6529 100644
--- a/debian/lenny/tdebase/debian/man/kdeprintfax-trinity.1
+++ b/debian/squeeze/tdebase/debian/man/tdeprintfax-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/squeeze/tdebase/debian/man/tdesu-trinity.1
index e552d288c..8befa3c39 100644
--- a/debian/lenny/tdebase/debian/man/kdesu-trinity.1
+++ b/debian/squeeze/tdebase/debian/man/tdesu-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/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
deleted file mode 100644
index f43d9196b..000000000
--- a/debian/squeeze/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: tdebase-doc-html-kdeprint
-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
-
diff --git a/debian/squeeze/tdebase/debian/tdebase-doc-html.doc-base.tdeprint b/debian/squeeze/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
new file mode 100644
index 000000000..7610a4313
--- /dev/null
+++ b/debian/squeeze/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
@@ -0,0 +1,10 @@
+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/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/tdebase/debian/tdeprint-trinity.install b/debian/squeeze/tdebase/debian/tdeprint-trinity.install
new file mode 100644
index 000000000..69f67a958
--- /dev/null
+++ b/debian/squeeze/tdebase/debian/tdeprint-trinity.install
@@ -0,0 +1,150 @@
+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
+debian/tmp/opt/trinity/lib/trinity/kcm_printmgr.so
+debian/tmp/opt/trinity/lib/trinity/kio_print.la
+debian/tmp/opt/trinity/lib/trinity/kio_print.so
+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/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/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/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/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/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/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/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/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/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
+debian/tmp/opt/trinity/share/mimelnk/print/driver.desktop
+debian/tmp/opt/trinity/share/mimelnk/print/folder.desktop
+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/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/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/tdeprint-trinity.lintian b/debian/squeeze/tdebase/debian/tdeprint-trinity.lintian
new file mode 100644
index 000000000..9da8261d7
--- /dev/null
+++ b/debian/squeeze/tdebase/debian/tdeprint-trinity.lintian
@@ -0,0 +1,4 @@
+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/tdeprint-trinity.manpages
index 6d4136bf9..55b9bfae7 100644
--- a/debian/squeeze/tdebase/debian/kdeprint-trinity.manpages
+++ b/debian/squeeze/tdebase/debian/tdeprint-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/tdeprint-trinity.menu b/debian/squeeze/tdebase/debian/tdeprint-trinity.menu
new file mode 100644
index 000000000..1268aa55c
--- /dev/null
+++ b/debian/squeeze/tdebase/debian/tdeprint-trinity.menu
@@ -0,0 +1,35 @@
+?package(tdeprint):\
+	needs="X11"\
+	section="Applications/System/Monitoring"\
+	hints="KDE"\
+	title="KJobViewer"\
+	icon32x32="/opt/trinity/share/pixmaps/kjobviewer.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kjobviewer-16.xpm"\
+	command="/opt/trinity/bin/kjobviewer --show --all"
+
+?package(tdeprint):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="KDE"\
+	title="KPrinter"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeprint.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeprint-16.xpm"\
+	command="/opt/trinity/bin/kprinter"
+
+?package(tdeprint):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="KDE"\
+	title="KDEPrintFax"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\
+	command="/opt/trinity/bin/tdeprintfax"
+
+# Icon 32x32 tdeprint/kjobviewer/cr32-app-kjobviewer.png kjobviewer.xpm
+# Icon 16x16 tdeprint/kjobviewer/cr16-app-kjobviewer.png kjobviewer-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 tdeprint/tdeprintfax/cr32-app-tdeprintfax.png tdeprintfax.xpm
+# Icon 16x16 tdeprint/tdeprintfax/cr16-app-tdeprintfax.png tdeprintfax-16.xpm
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/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/man/kdeinit-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1
index 1e1e10adf..1c3861783 100644
--- a/debian/squeeze/tdelibs/debian/man/kdeinit-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdeinit-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/squeeze/tdelibs/debian/man/tdeinit_shutdown-trinity.1
index 11081656a..679666846 100644
--- a/debian/lenny/tdelibs/debian/man/kdeinit_shutdown-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdeinit_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/tdesu_stub-trinity.1
index 7a3800513..f21330cc4 100644
--- a/debian/squeeze/tdelibs/debian/man/kdesu_stub-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdesu_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/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/dependencies/tqt3/debian/README.Debian b/ubuntu/maverick/dependencies/tqt3/debian/README.Debian
new file mode 100644
index 000000000..99b460974
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/README.Debian
@@ -0,0 +1,277 @@
+Qt for Debian README
+--------------------
+
+1. Preface
+
+This README is intended to give developers and users exact information
+about how the qt-x11-free package provided by TrollTech AS has been packaged
+for Debian in case you either want to faciliate it for development 
+of applications and libraries or plugins using the Qt class library. With 
+qt-x11-3.1.1, the Debian packages have been massively restructured to get 
+the most out of theoriginal Qt package and spit the contents up into 
+several packages so that they make the most sensefor several groups of 
+users; developers, application users, translators of Qt-based 
+applications and Debian packagers who are packaging applications developed 
+with Qt.2. 
+
+2. General Overview
+
+As Qt is a huge package that contains a complete environment for 
+developers, it needs to be split up into several packages that make it 
+easier for everyone else to handle it and not to retquire 
+unnecessary disk space for end-users. Additionally, Qt can be configured 
+in several ways - and therefore also used in several ways. Qt development 
+usually retquires the environment variable QTDIR. As Debian is placing 
+libraries and header files in a tquite specific filesystem order, this 
+usually breaks setting a single environment variable to meet the 
+retquirements of packages. Therefore, symlinks are used to set up the system 
+to meet both, the Debian filesystem standard and the QTDIR variable. All of 
+Qt (so the QTDIR path) is available in /usr/share/tqt3. If you need to set 
+QTDIR, do export QTDIR=/usr/share/tqt3
+
+As far as the common build configuration goes, we note explicitely that the 
+Debian package of Qt will in very rare cases break the compilation (most 
+likely the linking) of applications on Debian which use Qt, in particular 
+utilizing styles in an incorrect way by deriving from one of the styles 
+that ship with Qt. In case you are a Debian packager and encounter 
+problems, contact Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org).
+We will tell you why things don't work and what you should communicate on 
+with the programmers of your application that you are packaging. The build 
+configuration generally is intended to provide a Qt version that is as 
+small as possible in terms of the memory size it retquires. Therefore, 
+everything inside Qt that can be compiled as plugins has been compiled that 
+way. This includes: 
+
+- imageformats: jpeg and mng - codecs (for languages like arab, japanese 
+  etc provided with Qt) 
+- sql drivers for databases (MySQL, ODBC and PostgreSQL)
+
+The only exception is the imageformat png which has been compiled built-in 
+due to the fact that there is literally no program that uses no icons at 
+all and icons are to be used preferrably in png format. The plugins are all 
+located under /usr/lib/tqt3/plugins. This is also the install location you
+should choose as a package maintainer for 
+qt-plugins so the user doesn't have to customize his library path for 
+loading Qt plugins. The only exception is that KDE delivers a set of Qt 
+plugins as well (mainly styles and designer plugins); those are placed in 
+/usr/lib/trinity/plugins. 
+
+QMotif Extension: As this code is only available in commercial environments 
+(and produces a static library libqmotif.a anyway that those commercial 
+applications have to be linked against in addition to Qt), we left out all 
+header files of the libtqt3-headers package that are belonging to this 
+QMotif extension.
+
+Oracle Database driver, Sybase & Microsoft SQL Server driver: Those drivers 
+are only available in a commercial version of Qt due to license 
+incompatibilities with the GPL. If you need to faciliate those drivers, 
+please visit http://www.trolltech.com and have a read at 
+http://doc.trolltech.com/3.0/sql-driver.html.
+  
+3. Packages (End-User) 
+
+The Qt built has been split up into several packages that allow for easy 
+installation for all types of users. The End-user usually only retquires to 
+have the following packages installed to run an application that links 
+against Qt:
+
+Threaded version:libtqt3-mt (the library libtqt-mt.so.* and libtqui.so.* for 
+loading designer-made user interfaces at runtime).
+
+Optionally depending on the program's retquirements:
+
+libtqt3-mt-odbc
+libtqt3-mt-mysql
+libtqt3-mt-psql 
+
+In addition to the libraries, it may make sense to install the program 
+qtconfig to customize the look and behaviorof Qt programs. If you have KDE 
+installed, the KDE control center will take this task automatically in most 
+cases. qtconfig is available in the package tqt3-qtconfig.
+
+Also, Qt programs can make use of the online-help tool that ships with Qt, 
+the Qt Assistant. The Assistant can be installed with the package 
+qt3-assistant.
+
+Qt Configuration files
+----------------------
+Qt programs most often use QSettings to store their information in configuration
+files. With Qt 3.2, the new option --sysconfdir has been introduced that allows
+us to use /etc/tqt3 as the system-wide location where qt-program specific global
+configuration files can go. If you're a programmer that wants to get familiar with
+that, please look at the examples, documentation and the code in designer or
+assistant as well as qtconfig.
+
+4. Packages (Package maintainers)
+
+In addition to the library, a package maintainer will retquire an additional 
+set of packages to compile a package that retquires Qt. Depending on the 
+version of the qt library, you will retquire a different set of packages; 
+the most common option should be to make your application link against the 
+multi-threaded version (-mt).Packages necessary for compiling Qt 
+applications from source:
+
+libtqt3-mt-dev   (use libtqt3-dev for linking against -lqt, this package only 
+                contains the .so files and the header file for libtqui.so)
+
+libtqt3-headers  (header files for libqt and libtqt-mt)
+ 
+qt3-dev-tools  (this package contains the tools uic and moc as well as 
+qmake, retquired for building Qt applications) 
+
+If, however, you encounter an older program not to compile with this set 
+read the FAQ at the end of this document.
+
+5. Packages (Developers)
+
+In addition to the packages that packagers retquire, a developer usually 
+will retquire the Qt API documentationas well as tools like the assistant, 
+linguist or designer. However, you should be fine with installing the API 
+documentation that you can browse with a webbrowser, optionally with the 
+assistant. They are available in /usr/share/doc/tqt3-doc/html.
+For a regular development environment, install tqt3-designer and tqt3-doc.
+
+For faciliating Qt's extended environment to write plugins for the Qt 
+Designer or extend the Designer as well as utilizing the Qt Assistant by 
+calling it from within your program, install tqt3-apps-dev, which contains
+the static libraries and header files retquired for this functionality.
+
+For Embedded Developers, the program qvfb (Qt Virtual Frambuffer) and 
+makeqpf (embedded fonts tool)have been packaged into 
+qt3-dev-tools-embedded. For developers that work on migrating their program 
+from any Qt version prior to Qt 3.x to the Qt 3.x platform you will find 
+additional tools in the tqt3-dev-tools-compat.
+
+For using the QTranslator class and where to find the qm-file for qt as 
+well as where to place your translations,see the next section.
+
+If your program doesn't compile with those settings in case you have 
+started your project with Qt 1.x or 2.x, please read the FAQ section at the 
+end of this document.
+
+5. Packages (Translators)
+
+In order to translate a Qt program into any other language, the Qt 3 way to 
+do this is to let the developer create a ts-file containing the strings 
+that the program exposes on the user interface. The tools to create the 
+ts-file and to create the final qm (Q-message binary) file, lupdate and 
+lrelease, are included in tqt3-dev-tools.The single translator that only 
+gets provided the ts file and has to return a translated ts file, it 
+is absolutely enough to install tqt3-linguist; the package tqt3-assistant can 
+be installed to access the online-help for the Qt Linguist itself.
+In case you're converting an application using Qt prior to Qt 3, you may 
+want to uitilize the tqt3-dev-tools-compat which include the necessary tools 
+to convert older qm files to the new ts file standard.
+
+Locations of message translations: 
+
+Qt ships with a set of translations for the strings used inside Qt. Those 
+translations will be installed into /usr/share/tqt3/translations (qm files 
+only), which equals $QTDIR/translations respectively 
+qInstallPath() + QString( "/translations" ). 
+
+The configure option --translationdir has been set to /usr/share/tqt3/translations
+accordingly since it was introduced in Qt 3.2. 
+
+To correctly enable your program to display the translations to the Qt 
+library and to load the translation of the program itself, we currently 
+suggest to either install your translations along with any other data files 
+into/usr/share/<appname>/, translation files into the subdirectory 
+translations (that is /usr/share/<appname>/translations) The code that your 
+application should use to load the Qt translation will have to look like 
+the following:    
+
+int main( int argc, char **argv )
+    {
+        QApplication app( argc, argv );
+
+        // translation file for Qt
+        QTranslator qt( 0 );
+        qt.load( QString( "qt_" ) + QTextCodec::locale(), qInstallPath() + 
+        QString( "/translations" );
+        app.installTranslator( &qt );
+
+        // translation file for application strings
+        QTranslator myapp( 0 );
+        myapp.load( QString( "myapp_" ) + QTextCodec::locale(), "." ); 
+        // use a substitue for $prefix/share/appname/translations here      
+        app.installTranslator( &myapp );
+
+6. Frequently Asked Questions
+
+Using Qt for Debian as a developer or packager 
+----------------------------------------------
+
+Q: I want to compile a source package that utilizes qmake to build the 
+Makefiles. What do I need to do to makeit work ?
+
+A: qmake retquires two environment variables to be set, QTDIR and QMAKESPEC. 
+To make it work, do
+export QTDIR=/usr/share/tqt3
+export QMAKESPEC=linux-g++
+
+Then run qmake -o Makefile <projectfile>.pro
+
+After that, the Makefile is correctly created to build your application on 
+Debian. As a packager, export thosetwo variables in the rules file before 
+calling qmake.
+
+Q: I have an application that when linking gives me symbol referencing 
+errors to Q*Style. Why does my applicationnot link correctly ?
+
+A: The author of the program is using the styles that ship with Qt directly 
+instead of using the QStylePlugin interface.If you are the author of the 
+program, change your program to use QStylePlugin. If you are a packager, 
+write to theauthor of the program that he is assuming that the styles 
+shipped with Qt are built-in to the library which is not the case on Debian 
+and that he please should fix this and use QStylePlugin.
+
+Q: Where are all the examples and tutorials ? And how do I build them ?
+
+A: Qt ships with examples and tutorials; so does the Linguist and Designer. 
+The tutorials and examples are compressed tarballs which you can unpack with 
+tar -zxvf into your home directory. Change into the tqt3-examples directory
+and run the provided ./build-examples script. All Qt examples and tutorials,
+including those for designer and the linguist, will be compiled. You will
+notice however, that those examples that inherit from style classes which
+are not built-in into Qt but configured as a plugin will not compile due
+to the fact that they can't link to the Qt library. 
+
+Q: I'm writing a pure Qt application and I want to ship it with a default 
+configuration file. Where does that global configuration file go if I make 
+use of the QSettings class ? 
+
+A: With qt-3.2.0, Trolltech has introduced a configure option to Qt called
+--sysconfdir which we intentionally set to /etc/tqt3 similar to /etc/trinity for
+KDE programs. Install your application's system wide configuration file
+to /etc/tqt3. 
+
+Q: I'm compiling a program and I have a compile error due to a missing 
+include. Why isn't that include not present in the Debian packages anymore 
+? It compiled with older versions of Debian packages of Qt !
+
+A: This may be due to two reasons: either the package still uses the old 
+includes from Qt 1.x or 2.x that got basically renamed by Trolltech due to 
+the naming convention. The filenames are now all following the scheme 
+
+ClassName -> classname.h. 
+
+Therefore, if you are the developer of the affected program, change your 
+sources according to this scheme. Qt ships with two tools, qt20fix and 
+qtrename140, to help developers migrate their API to the Qt 3 version, 
+which can help you in the transition upgrade to Qt 3.
+
+If you are affected by this as a packager, notify upstream to fix those 
+problems and in the meanwhile use libtqt3-compat-headers as a build 
+dependency which includes the compatibility headers that just include the 
+right files from the new API again.
+
+Q: I have a question not covered by this FAQ and README file. Who should I 
+turn to ?
+
+A: Please turn to Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org) 
+for any questions regarding Qt on Debian.
+
+ -- Ralf Nolden <nolden@kde.org>  Sun, 26 Jan 2003 20:39:19 +0100
+ -- Ralf Nolden <nolden@kde.org>  Mon,  1 Sep 2003 19:24:16 +0200
+ -- Modestas Vainius <modestas@vainius.eu> Fri, 22 Feb 2008 01:40:06 +0200
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/changelog b/ubuntu/maverick/dependencies/tqt3/debian/changelog
new file mode 100644
index 000000000..3e813531e
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/changelog
@@ -0,0 +1,5 @@
+tqt-x11-free (3:3.3.8-d-0ubuntu0) maverick; urgency=low
+
+  * Upload of 3.3.8d (working revision) from GIT
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 22 Jul 2011 16:40:00 -0600
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/compat b/ubuntu/maverick/dependencies/tqt3/debian/compat
new file mode 100644
index 000000000..1e8b31496
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/compat
@@ -0,0 +1 @@
+6
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/control b/ubuntu/maverick/dependencies/tqt3/debian/control
new file mode 100644
index 000000000..926e9700e
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/control
@@ -0,0 +1,320 @@
+Source: tqt-x11-free
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>
+Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4),
+ libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4),
+ libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
+ libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
+ libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev,
+ libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev,
+ libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4),
+ libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev,
+ libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev
+Section: libs
+Priority: optional
+Standards-Version: 3.8.4
+Homepage: http://www.trinitydesktop.org
+
+Package: libtqt3-mt
+Architecture: any
+Section: libs
+Replaces: libtqt3-mt (<< 4:3.5.13)
+Breaks: libtqt3-mt (<< 4:3.5.13)
+Depends: ${shlibs:Depends}, fontconfig
+Recommends: libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4)
+Conflicts: libtqt3c102-mt, libtqui1-emb, libtqt3c-mt
+Suggests: libtqt3-mt-psql, libtqt3-mt-mysql, libtqt3-mt-odbc
+Description: Qt GUI Library (Threaded runtime version), Version 3
+ This is the Trolltech Qt library, version 3. It's necessary for
+ applications that link against the libtqt-mt.so.3, e.g. all Trinity
+ applications.
+
+Package: libtqt3-mt-mysql
+Architecture: any
+Section: libs
+Replaces: libtqt3-mt-mysql (<< 4:3.5.13)
+Breaks: libtqt3-mt-mysql (<< 4:3.5.13)
+Depends: ${shlibs:Depends}
+Conflicts: libtqt3c102-mt-mysql, libtqt3c-mt-mysql
+Description: MySQL database driver for Qt3 (Threaded)
+ This package contains the threaded MySQL plugin for Qt3. Install it if
+ you intend to use or write Qt programs that are to access a MySQL DB.
+
+Package: libtqt3-mt-odbc
+Architecture: any
+Section: libs
+Replaces: libtqt3-mt-odbc (<< 4:3.5.13)
+Breaks: libtqt3-mt-odbc (<< 4:3.5.13)
+Depends: ${shlibs:Depends}
+Conflicts: libtqt3c102-mt-odbc, libtqt3c-mt-odbc
+Description: ODBC database driver for Qt3 (Threaded)
+ This package contains the threaded ODBC plugin for Qt3. Install it if
+ you intend to use or write Qt programs that are to access an ODBC DB.
+
+Package: libtqt3-mt-psql
+Architecture: any
+Section: libs
+Replaces: libtqt3-mt-psql (<< 4:3.5.13)
+Breaks: libtqt3-mt-psql (<< 4:3.5.13)
+Depends: ${shlibs:Depends}
+Conflicts: libtqt3c102-mt-psql, libtqt3c-mt-psql
+Description: PostgreSQL database driver for Qt3 (Threaded)
+ This package contains the threaded PostgreSQL plugin for Qt3.
+ Install it if you intend to use or write Qt programs that are
+ to access a PostgreSQL DB.
+
+#Not in Kubuntu
+#Package: libtqt3-mt-ibase
+#Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
+#Section: libs
+#Depends: ${shlibs:Depends}
+#Conflicts: libtqt3c102-mt-ibase
+#Replaces: libtqt3c102-mt-ibase
+#Description: InterBase/FireBird database driver for Qt3 (Threaded)
+# This package contains the threaded InterBase/FireBird plugin
+# for Qt3. Install it if you intend to use or write Qt programs
+# that are to access an InterBase/FireBird DB.
+
+Package: libtqt3-mt-sqlite
+Architecture: any
+Section: libs
+Replaces: libtqt3-mt-sqlite (<< 4:3.5.13)
+Breaks: libtqt3-mt-sqlite (<< 4:3.5.13)
+Depends: ${shlibs:Depends}
+Conflicts: libtqt3c102-mt-sqlite
+Description: SQLite database driver for Qt3 (Threaded)
+ This package contains the threaded SQLite plugin for Qt3. Install
+ it if you intend to use or write Qt programs that are to access an
+ SQLite DB.
+
+Package: libtqt3-mt-dev
+Architecture: any
+Section: libdevel
+Replaces: libtqt3-mt-dev (<< 4:3.5.13)
+Breaks: libtqt3-mt-dev (<< 4:3.5.13)
+Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
+ libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4),
+ libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
+ libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev,
+ libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3),
+ libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev,
+ libxft-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev,
+ libglu1-mesa-dev | libglu-dev, libc6-dev, libtqt3-mt (= ${binary:Version}),
+ libtqt3-headers (= ${binary:Version}), tqt3-dev-tools (= ${binary:Version})
+Conflicts: libtqt-mt-dev, libtqt3-emb (<= 3:3.0.3-1), libtqt3-dev
+Recommends: libtqt3-compat-headers
+Suggests: libtqt3-i18n, tqt3-doc
+Description: Qt development files (Threaded)
+ Qt is a C++ class library optimized for graphical user interface
+ development. This package contains the libtqt-mt.so symlink, necessary
+ for building threaded Qt applications as well as the libtqui.so symlink
+ and the necessary header files for libtqui.so. (See README.Debian and
+ the Qt Documentation for instructions on libtqui.so)
+ .
+ WARNING: If you plan to build some older Qt3 applications, you will
+ most probably have to install the libtqt3-compat-headers package. It
+ contains all the headers which are not part of the official Qt3 API
+ anymore but which are still used by some programs. So if you encounter
+ problems with missing header files, please install this package first
+ before you send a bugreport.
+
+Package: libtqt3-headers
+Architecture: any
+Section: devel
+Replaces: libtqt3-headers (<< 4:3.5.13)
+Breaks: libtqt3-headers (<< 4:3.5.13)
+Recommends: libtqt3-mt-dev
+Description:  Qt3 header files
+ This package contains all header files for libqt and libtqt-mt which come
+ with Qt3. If you want to compile or develop programs which use Qt3, you
+ have to install this package.
+
+Package: libtqt3-compat-headers
+Architecture: any
+Section: devel
+Replaces: libtqt3-compat-headers (<< 4:3.5.13)
+Breaks: libtqt3-compat-headers (<< 4:3.5.13)
+Depends: libtqt3-headers (= ${binary:Version})
+Recommends: libtqt3-mt-dev
+Description: Qt 1.x and 2.x compatibility includes
+ This package contains header files that are intended for build
+ compatibility for applications that build with Qt3 but still use
+ deprecated includes. It is meant as an intermediate solution and
+ these header files are not part of the official Qt3 API.
+ All sourcecode that is still using the headers of this package is
+ subject to be changed to use the new header files which are in
+ libtqt3-headers.
+
+Package: tqt3-dev-tools
+Architecture: any
+Section: devel
+Replaces: tqt3-dev-tools (<< 4:3.5.13)
+Breaks: tqt3-dev-tools (<< 4:3.5.13)
+Depends: ${shlibs:Depends}
+Recommends: libtqt3-mt-dev
+Conflicts: libqt-dev (<< 3:2.3.2-10), uic (<= 3:2.3.2-9)
+Description: Qt3 development tools
+ This package contains all tools that are necessary to build programs
+ that are written using Qt3. These are: qmake, uic and moc.
+ For Qt3 development, you most likely want to install this package.
+
+Package: tqt3-designer
+Architecture: any
+Section: devel
+Replaces: tqt3-designer (<< 4:3.5.13)
+Breaks: tqt3-designer (<< 4:3.5.13)
+Depends: ${shlibs:Depends}
+Recommends: tqt3-dev-tools
+Suggests: tqt3-assistant, tqt3-doc
+Conflicts: qt-designer (<= 3:2.3.2-9), qt-designer-doc
+Description: Qt3 Designer
+ The Qt Designer is a GUI design program that interactively lets you
+ construct user interfaces for the Qt library. Additionally it lets you
+ create whole project and works together with the database drivers
+ provided by Qt to create applications with easy database access through
+ Qt. The resulting user interface files can then be converted to
+ C++ classes using the uic commandline utility which is usually done
+ automatically for the developer with a project management with qmake
+ or automake.
+
+Package: tqt3-apps-dev
+Architecture: any
+Section: devel
+Replaces: tqt3-apps-dev (<< 4:3.5.13)
+Breaks: tqt3-apps-dev (<< 4:3.5.13)
+Depends: libtqt3-mt-dev
+Description: Qt3 Developer applications development files
+ This package is intended for developers who want to develop applications
+ using the additional static libraries that ship with the applications
+ included with Qt; the Qt Designer and the Qt Assistant.
+ It allows integrating additional enhancements into the Qt Designer
+ respectively faciliate the Qt Assistant from within your Qt application
+ to interactively call the Assistant for displaying online help that the
+ developer includes with his application.
+
+Package: tqt3-linguist
+Architecture: any
+Section: devel
+Replaces: tqt3-linguist (<< 4:3.5.13)
+Breaks: tqt3-linguist (<< 4:3.5.13)
+Suggests: tqt3-assistant
+Depends: ${shlibs:Depends}
+Description: The Qt3 Linguist
+ This package contains the Qt3 Linguist which provides translators a
+ tool perfect for translating any Qt-based application into other
+ languages and can be used and installed independently of any Qt
+ development files by the translator.
+
+Package: tqt3-assistant
+Architecture: any
+Section: x11
+Replaces: tqt3-assistant (<< 4:3.5.13)
+Breaks: tqt3-assistant (<< 4:3.5.13)
+Depends: ${shlibs:Depends}, tqt3-doc
+Description: The Qt3 assistant application
+ This package contains the Qt3 Assistant, an easy to use frontend for
+ the complete Qt3 documentation and serves as an online help viewer for
+ any Qt program that wants to give the usesr access to online help.
+ Within the Qt tools it is used as the help viewer for the online help
+ for the Qt3 Designer and Linguist as well as qmake and the Qt 3 API
+ documentation.
+ .
+ Developers of Qt Application who want to faciliate the Qt Assistant for online
+ help display should refer to the README.Debian file for libtqt3-mt-dev and
+ the package tqt3-apps-dev.
+
+Package: tqt3-qtconfig
+Architecture: any
+Section: x11
+Replaces: tqt3-qtconfig (<< 4:3.5.13)
+Breaks: tqt3-qtconfig (<< 4:3.5.13)
+Depends: ${shlibs:Depends}
+Description: The Qt3 Configuration Application
+ The Qt Configuration program allows endusers to configure the look
+ and behavior of any Qt3 application. It is mostly only necessary
+ on systems which don't run KDE because the KDE control center already
+ covers this configuration automatically for the users Qt3 applications
+ according to his desktop settings in KDE. However, if you need to run
+ CJK-fonts or other non-latin scripts, you will most likely want to
+ install this package.
+
+Package: tqt3-dev-tools-embedded
+Architecture: any
+Section: devel
+Replaces: tqt3-dev-tools-embedded (<< 4:3.5.13)
+Breaks: tqt3-dev-tools-embedded (<< 4:3.5.13)
+Recommends: libtqt3-mt-dev
+Depends: ${shlibs:Depends}
+Description: Tools to develop embedded Qt applications
+ This package contains applications only suitable for developing
+ applications with Qt Embedded and/or Qtopia. It provides the QVFB
+ program for simulating an embedded device desktop as well as makeqpf
+ for converting fonts to embedded fonts suitable for being utilized
+ by Qt Embedded applications.
+
+Package: tqt3-dev-tools-compat
+Architecture: any
+Section: devel
+Replaces: tqt3-dev-tools-compat (<< 4:3.5.13)
+Breaks: tqt3-dev-tools-compat (<< 4:3.5.13)
+Recommends: libtqt3-mt-dev
+Depends: ${shlibs:Depends}
+Description: Conversion utilities for Qt3 development
+ This package contains some older Qt tools (namely qt20fix qtrename140,
+ qm2ts, mergetr, findtr and msg2qm). These tools are needed only by
+ application developers who need to migrate any Qt application written
+ for Qt 1.x or 2.x over to Qt 3.x. The purpose of the tools are to
+ help fixing the changes with include file renaming as well as migrating
+ the message file format of Qt 2 translation files or any gettext-based
+ translation system to the Qt 3 system.
+
+Package: libtqt3-i18n
+Architecture: all
+Section: libs
+Replaces: libtqt3-i18n (<< 4:3.5.13)
+Breaks: libtqt3-i18n (<< 4:3.5.13)
+Recommends: libtqt3-mt
+Description: i18n files for Qt3 library
+ This package contains the internationalization files for the Qt library.
+ Qt applications that are internationalized will need to depend on this package
+ for full internationalization support of the application towards the end user.
+
+Package: tqt3-doc
+Architecture: all
+Section: doc
+Replaces: tqt3-doc (<< 4:3.5.13)
+Breaks: tqt3-doc (<< 4:3.5.13)
+Priority: extra
+Suggests: libtqt3-headers, tqt3-assistant | www-browser
+Description: Qt3 API documentation
+ This package contains the complete API documentation for Qt3.
+ Examples to coding are in tqt3-examples. The documentation is provided
+ in HTML and manpage format; the HTML version can be viewed in conjunction
+ with the Qt Assistant.
+
+Package: tqt3-examples
+Architecture: all
+Section: doc
+Replaces: tqt3-examples (<< 4:3.5.13)
+Breaks: tqt3-examples (<< 4:3.5.13)
+Priority: extra
+Depends: libtqt3-mt-dev (>= ${binary:Version})
+Suggests: tqt3-apps-dev
+Description:  Examples for Qt3
+ These are examples provided with Qt3. They may be especially useful for
+ you if you are learning to program in Qt as they cover tquite a lot of
+ things that are possible with Qt3.
+
+Package: tqt-x11-free-dbg
+Section: libdevel
+Architecture: any
+Replaces: tqt-x11-free-dbg (<< 4:3.5.13)
+Breaks: tqt-x11-free-dbg (<< 4:3.5.13)
+Priority: extra
+Depends: libtqt3-mt (= ${binary:Version}), gdb
+Conflicts: libtqt3-mt-dbg
+Description: debugging symbols for tqt-x11-free binaries
+ This package contains the debugging symbols associated with tqt-x11-free.
+ They will automatically be used by gdb for debugging TQt-related
+ issues.
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/copyright b/ubuntu/maverick/dependencies/tqt3/debian/copyright
new file mode 100644
index 000000000..3482b8b3a
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/copyright
@@ -0,0 +1,145 @@
+This is Debian GNU/Linux's prepackaged version of the Qt GUI Development
+library.
+
+This package was put together originally by me, Heiko Schlittermann
+<heiko@lotte.sax.de>, from the sources, which I obtained from
+ftp.troll.no. The changes were very minimal to nothing, - merely
+adding support for the Debian package maintenance scheme, by adding
+various debian/* files and by changing the propagate script to fit the
+Debian GNU/Linux filesystem structure.
+
+This package has since been temporarily taken over by Ivan Moore 
+<rkrusty@debian.org> until Heiko has time to work on it all again.
+
+In Jul 2002, Martin Loschwitz <madkiss@madkiss.org> overtook the package 
+maintenance for the QT3-packages.
+
+This packaged is maintained inside the Debian Qt/KDE Maintainers Team
+<debian-qt-kde@lists.debian.org> since Tue, 26 Jul 2005 19:06:03 +0200
+
+Qt 3.3 is triple licensed under the QPL, GPL 2 and GPL 3.
+
+It was downloaded from ftp://ftp.troll.no/qt/source
+
+ This file may be used under the terms of the GNU General
+ Public License versions 2.0 or 3.0 as published by the Free
+ Software Foundation and appearing in the files LICENSE.GPL2
+ and LICENSE.GPL3 included in the packaging of this file.
+ Alternatively you may (at your option) use any later version
+ of the GNU General Public License if such license has been
+ publicly approved by Trolltech ASA (or its successors, if any)
+ and the KDE Free Qt Foundation.
+
+Please refer to /usr/share/common-licenses/GPL-2 for complete GPL 2
+licence and /usr/share/common-licenses/GPL-3 for complete GPL 3
+licence.
+
+			     THE Q PUBLIC LICENSE
+				  version 1.0
+
+		   Copyright (C) 1999-2000 Troll Tech AS, Norway.
+		       Everyone is permitted to copy and
+		       distribute this license document.
+
+The intent of this license is to establish freedom to share and change the
+software regulated by this license under the open source model.
+
+This license applies to any software containing a notice placed by the
+copyright holder saying that it may be distributed under the terms of
+the Q Public License version 1.0.  Such software is herein referred to as
+the Software.  This license covers modification and distribution of the
+Software, use of third-party application programs based on the Software,
+and development of free software which uses the Software.
+
+				 Granted Rights
+
+1. You are granted the non-exclusive rights set forth in this license
+   provided you agree to and comply with any and all conditions in this
+   license.  Whole or partial distribution of the Software, or software
+   items that link with the Software, in any form signifies acceptance of
+   this license.
+
+2. You may copy and distribute the Software in unmodified form provided
+   that the entire package, including - but not restricted to - copyright,
+   trademark notices and disclaimers, as released by the initial developer
+   of the Software, is distributed.
+
+3. You may make modifications to the Software and distribute your
+   modifications, in a form that is separate from the Software, such as
+   patches. The following restrictions apply to modifications:
+
+     a. Modifications must not alter or remove any copyright notices in
+        the Software.
+
+     b. When modifications to the Software are released under this
+        license, a non-exclusive royalty-free right is granted to the
+        initial developer of the Software to distribute your modification
+        in future versions of the Software provided such versions remain
+        available under these terms in addition to any other license(s) of
+        the initial developer.
+
+4. You may distribute machine-executable forms of the Software or
+   machine-executable forms of modified versions of the Software, provided
+   that you meet these restrictions:
+
+     a. You must include this license document in the distribution.
+
+     b. You must ensure that all recipients of the machine-executable forms
+        are also able to receive the complete machine-readable source code
+        to the distributed Software, including all modifications, without
+        any charge beyond the costs of data transfer, and place prominent
+        notices in the distribution explaining this.
+
+     c. You must ensure that all modifications included in the
+        machine-executable forms are available under the terms of this
+        license.
+
+5. You may use the original or modified versions of the Software to
+   compile, link and run application programs legally developed by you
+   or by others.
+
+6. You may develop application programs, reusable components and other
+   software items that link with the original or modified versions of the
+   Software.  These items, when distributed, are subject to the following
+   retquirements:
+
+     a. You must ensure that all recipients of machine-executable forms of
+        these items are also able to receive and use the complete
+        machine-readable source code to the items without any charge
+        beyond the costs of data transfer.
+
+     b. You must explicitly license all recipients of your items to use
+        and re-distribute original and modified versions of the items in
+        both machine-executable and source code forms. The recipients must
+        be able to do so without any charges whatsoever, and they must be
+        able to re-distribute to anyone they choose.
+
+
+     c. If the items are not available to the general public, and the
+        initial developer of the Software requests a copy of the items,
+        then you must supply one.
+
+			    Limitations of Liability
+
+In no event shall the initial developers or copyright holders be liable
+for any damages whatsoever, including - but not restricted to - lost
+revenue or profits or other direct, indirect, special, incidental or
+consequential damages, even if they have been advised of the possibility
+of such damages, except to the extent invariable law, if any, provides
+otherwise.
+
+			          No Warranty
+
+The Software and this license document are provided AS IS with NO WARRANTY
+OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE.
+                                 Choice of Law
+
+This license is governed by the Laws of Norway. Disputes shall be settled
+by Oslo City Court.
+
+ The Qt GUI Toolkit is Copyright (C) 1994-2000 Trolltech AS.
+
+ You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ GNU General Public License version 2, which is display below.
+
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-compat-headers.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-compat-headers.install
new file mode 100644
index 000000000..3adacbd90
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-compat-headers.install
@@ -0,0 +1,54 @@
+usr/include/tqt3/q1xcompatibility.h
+usr/include/tqt3/qapp.h
+usr/include/tqt3/qarray.h
+usr/include/tqt3/qbitarry.h
+usr/include/tqt3/qbttngrp.h
+usr/include/tqt3/qchkbox.h
+usr/include/tqt3/qclipbrd.h
+usr/include/tqt3/qcollect.h
+usr/include/tqt3/qcollection.h
+usr/include/tqt3/qcombo.h
+usr/include/tqt3/qconnect.h
+usr/include/tqt3/qdatetm.h
+usr/include/tqt3/qdrawutl.h
+usr/include/tqt3/qdstream.h
+usr/include/tqt3/qfiledef.h
+usr/include/tqt3/qfiledlg.h
+usr/include/tqt3/qfileinf.h
+usr/include/tqt3/qfontinf.h
+usr/include/tqt3/qfontmet.h
+usr/include/tqt3/qgrpbox.h
+usr/include/tqt3/qintcach.h
+usr/include/tqt3/qiodev.h
+usr/include/tqt3/qlcdnum.h
+usr/include/tqt3/qlined.h
+usr/include/tqt3/qlist.h
+usr/include/tqt3/qmenudta.h
+usr/include/tqt3/qmetaobj.h
+usr/include/tqt3/qmlined.h
+usr/include/tqt3/qmsgbox.h
+usr/include/tqt3/qmultilinedit.h
+usr/include/tqt3/qobjcoll.h
+usr/include/tqt3/qobjdefs.h
+usr/include/tqt3/qpaintd.h
+usr/include/tqt3/qpaintdc.h
+usr/include/tqt3/qpdevmet.h
+usr/include/tqt3/qpmcache.h
+usr/include/tqt3/qpntarry.h
+usr/include/tqt3/qpopmenu.h
+usr/include/tqt3/qprndlg.h
+usr/include/tqt3/qprogbar.h
+usr/include/tqt3/qprogdlg.h
+usr/include/tqt3/qpsprn.h
+usr/include/tqt3/qpushbt.h
+usr/include/tqt3/qqueue.h
+usr/include/tqt3/qradiobt.h
+usr/include/tqt3/qrangect.h
+usr/include/tqt3/qscrbar.h
+usr/include/tqt3/qsocknot.h
+usr/include/tqt3/qstack.h
+usr/include/tqt3/qtabdlg.h
+usr/include/tqt3/qtstream.h
+usr/include/tqt3/qvector.h
+usr/include/tqt3/qwidcoll.h
+usr/include/tqt3/qwindefs.h
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-headers.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-headers.install
new file mode 100644
index 000000000..b08596ee9
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-headers.install
@@ -0,0 +1,271 @@
+usr/include/tqt3/private/*
+usr/include/tqt3/qabstractlayout.h
+usr/include/tqt3/qaccel.h
+usr/include/tqt3/qaccessible.h
+usr/include/tqt3/qaction.h
+usr/include/tqt3/qapplication.h
+usr/include/tqt3/qasciicache.h
+usr/include/tqt3/qasciidict.h
+usr/include/tqt3/qasyncimageio.h
+usr/include/tqt3/qasyncio.h
+usr/include/tqt3/qbig5codec.h
+usr/include/tqt3/qbitarray.h
+usr/include/tqt3/qbitmap.h
+usr/include/tqt3/qbrush.h
+usr/include/tqt3/qbuffer.h
+usr/include/tqt3/qbutton.h
+usr/include/tqt3/qbuttongroup.h
+usr/include/tqt3/qcache.h
+usr/include/tqt3/qcanvas.h
+usr/include/tqt3/qcdestyle.h
+usr/include/tqt3/qcheckbox.h
+usr/include/tqt3/qcleanuphandler.h
+usr/include/tqt3/qclipboard.h
+usr/include/tqt3/qcolor.h
+usr/include/tqt3/qcolordialog.h
+usr/include/tqt3/qcombobox.h
+usr/include/tqt3/qcommonstyle.h
+usr/include/tqt3/qcompactstyle.h
+usr/include/tqt3/qconnection.h
+usr/include/tqt3/qcstring.h
+usr/include/tqt3/qcursor.h
+usr/include/tqt3/qdatabrowser.h
+usr/include/tqt3/qdatastream.h
+usr/include/tqt3/qdatatable.h
+usr/include/tqt3/qdataview.h
+usr/include/tqt3/qdatetime.h
+usr/include/tqt3/qdatetimeedit.h
+usr/include/tqt3/qdeepcopy.h
+usr/include/tqt3/qdesktopwidget.h
+usr/include/tqt3/qdial.h
+usr/include/tqt3/qdialog.h
+usr/include/tqt3/qdict.h
+usr/include/tqt3/qdir.h
+usr/include/tqt3/qdns.h
+usr/include/tqt3/qdockarea.h
+usr/include/tqt3/qdockwindow.h
+usr/include/tqt3/qdom.h
+usr/include/tqt3/qdragobject.h
+usr/include/tqt3/qdrawutil.h
+usr/include/tqt3/qdropsite.h
+usr/include/tqt3/qeditorfactory.h
+usr/include/tqt3/qerrormessage.h
+usr/include/tqt3/qeucjpcodec.h
+usr/include/tqt3/qeuckrcodec.h
+usr/include/tqt3/qevent.h
+usr/include/tqt3/qeventloop.h
+usr/include/tqt3/qfeatures.h
+usr/include/tqt3/qfile.h
+usr/include/tqt3/qfiledialog.h
+usr/include/tqt3/qfileinfo.h
+usr/include/tqt3/qfocusdata.h
+usr/include/tqt3/qfont.h
+usr/include/tqt3/qfontdatabase.h
+usr/include/tqt3/qfontdialog.h
+usr/include/tqt3/qfontinfo.h
+usr/include/tqt3/qfontmetrics.h
+usr/include/tqt3/qframe.h
+usr/include/tqt3/qftp.h
+usr/include/tqt3/qgarray.h
+usr/include/tqt3/qgb18030codec.h
+usr/include/tqt3/qgbkcodec.h
+usr/include/tqt3/qgcache.h
+usr/include/tqt3/qgdict.h
+usr/include/tqt3/qgeneric.h
+usr/include/tqt3/qgif.h
+usr/include/tqt3/qglist.h
+usr/include/tqt3/qglobal.h
+usr/include/tqt3/qgplugin.h
+usr/include/tqt3/qgrid.h
+usr/include/tqt3/qgridview.h
+usr/include/tqt3/qgroupbox.h
+usr/include/tqt3/qguardedptr.h
+usr/include/tqt3/qgvector.h
+usr/include/tqt3/qhbox.h
+usr/include/tqt3/qhbuttongroup.h
+usr/include/tqt3/qheader.h
+usr/include/tqt3/qhgroupbox.h
+usr/include/tqt3/qhostaddress.h
+usr/include/tqt3/qhttp.h
+usr/include/tqt3/qiconset.h
+usr/include/tqt3/qiconview.h
+usr/include/tqt3/qimage.h
+usr/include/tqt3/qimageformatplugin.h
+usr/include/tqt3/qinputdialog.h
+usr/include/tqt3/qintcache.h
+usr/include/tqt3/qintdict.h
+usr/include/tqt3/qinterlacestyle.h
+usr/include/tqt3/qiodevice.h
+usr/include/tqt3/qjiscodec.h
+usr/include/tqt3/qjpegio.h
+usr/include/tqt3/qjpunicode.h
+usr/include/tqt3/qkeycode.h
+usr/include/tqt3/qkeysequence.h
+usr/include/tqt3/qlabel.h
+usr/include/tqt3/qlayout.h
+usr/include/tqt3/qlcdnumber.h
+usr/include/tqt3/qlibrary.h
+usr/include/tqt3/qlineedit.h
+usr/include/tqt3/qlistbox.h
+usr/include/tqt3/qlistview.h
+usr/include/tqt3/qlocale.h
+usr/include/tqt3/qlocalfs.h
+usr/include/tqt3/qmainwindow.h
+usr/include/tqt3/qmap.h
+usr/include/tqt3/qmemarray.h
+usr/include/tqt3/qmenubar.h
+usr/include/tqt3/qmenudata.h
+usr/include/tqt3/qmessagebox.h
+usr/include/tqt3/qmetaobject.h
+usr/include/tqt3/qmime.h
+usr/include/tqt3/qmngio.h
+usr/include/tqt3/qmotifstyle.h
+usr/include/tqt3/qmotifplusstyle.h
+usr/include/tqt3/qmovie.h
+usr/include/tqt3/qmultilineedit.h
+usr/include/tqt3/qmutex.h
+usr/include/tqt3/qnamespace.h
+usr/include/tqt3/qnetwork.h
+usr/include/tqt3/qnetworkprotocol.h
+usr/include/tqt3/qnp.h
+usr/include/tqt3/qobject.h
+usr/include/tqt3/qobjectcleanuphandler.h
+usr/include/tqt3/qobjectdefs.h
+usr/include/tqt3/qobjectdict.h
+usr/include/tqt3/qobjectlist.h
+usr/include/tqt3/qpaintdevice.h
+usr/include/tqt3/qpaintdevicedefs.h
+usr/include/tqt3/qpaintdevicemetrics.h
+usr/include/tqt3/qpainter.h
+usr/include/tqt3/qpair.h
+usr/include/tqt3/qpalette.h
+usr/include/tqt3/qpen.h
+usr/include/tqt3/qpicture.h
+usr/include/tqt3/qpixmap.h
+usr/include/tqt3/qpixmapcache.h
+usr/include/tqt3/qplatinumstyle.h
+usr/include/tqt3/qpngio.h
+usr/include/tqt3/qpoint.h
+usr/include/tqt3/qpointarray.h
+usr/include/tqt3/qpolygonscanner.h
+usr/include/tqt3/qpopupmenu.h
+usr/include/tqt3/qprintdialog.h
+usr/include/tqt3/qprinter.h
+usr/include/tqt3/qprocess.h
+usr/include/tqt3/qprogressbar.h
+usr/include/tqt3/qprogressdialog.h
+usr/include/tqt3/qptrcollection.h
+usr/include/tqt3/qptrdict.h
+usr/include/tqt3/qptrlist.h
+usr/include/tqt3/qptrqueue.h
+usr/include/tqt3/qptrstack.h
+usr/include/tqt3/qptrvector.h
+usr/include/tqt3/qpushbutton.h
+usr/include/tqt3/qradiobutton.h
+usr/include/tqt3/qrangecontrol.h
+usr/include/tqt3/qrect.h
+usr/include/tqt3/qregexp.h
+usr/include/tqt3/qregion.h
+usr/include/tqt3/qrtlcodec.h
+usr/include/tqt3/qscrollbar.h
+usr/include/tqt3/qscrollview.h
+usr/include/tqt3/qsemaphore.h
+usr/include/tqt3/qsemimodal.h
+usr/include/tqt3/qserversocket.h
+usr/include/tqt3/qsession.h
+usr/include/tqt3/qsessionmanager.h
+usr/include/tqt3/qsettings.h
+usr/include/tqt3/qsgistyle.h
+usr/include/tqt3/qshared.h
+usr/include/tqt3/qsignal.h
+usr/include/tqt3/qsignalmapper.h
+usr/include/tqt3/qsignalslotimp.h
+usr/include/tqt3/qsimplerichtext.h
+usr/include/tqt3/qsize.h
+usr/include/tqt3/qsizegrip.h
+usr/include/tqt3/qsizepolicy.h
+usr/include/tqt3/qsjiscodec.h
+usr/include/tqt3/qslider.h
+usr/include/tqt3/qsocket.h
+usr/include/tqt3/qsocketdevice.h
+usr/include/tqt3/qsocketnotifier.h
+usr/include/tqt3/qsortedlist.h
+usr/include/tqt3/qsound.h
+usr/include/tqt3/qspinbox.h
+usr/include/tqt3/qsplashscreen.h
+usr/include/tqt3/qsplitter.h
+usr/include/tqt3/qsql.h
+usr/include/tqt3/qsqlcursor.h
+usr/include/tqt3/qsqldatabase.h
+usr/include/tqt3/qsqldriver.h
+usr/include/tqt3/qsqldriverplugin.h
+usr/include/tqt3/qsqleditorfactory.h
+usr/include/tqt3/qsqlerror.h
+usr/include/tqt3/qsqlfield.h
+usr/include/tqt3/qsqlform.h
+usr/include/tqt3/qsqlindex.h
+usr/include/tqt3/qsqlpropertymap.h
+usr/include/tqt3/qsqlquery.h
+usr/include/tqt3/qsqlrecord.h
+usr/include/tqt3/qsqlresult.h
+usr/include/tqt3/qsqlselectcursor.h
+usr/include/tqt3/qstatusbar.h
+usr/include/tqt3/qstring.h
+usr/include/tqt3/qstringlist.h
+usr/include/tqt3/qstrlist.h
+usr/include/tqt3/qstrvec.h
+usr/include/tqt3/qstyle.h
+usr/include/tqt3/qstylefactory.h
+usr/include/tqt3/qstyleplugin.h
+usr/include/tqt3/qstylesheet.h
+usr/include/tqt3/qsyntaxhighlighter.h
+usr/include/tqt3/qt.h
+usr/include/tqt3/qtabbar.h
+usr/include/tqt3/qtabdialog.h
+usr/include/tqt3/qtable.h
+usr/include/tqt3/qtabwidget.h
+usr/include/tqt3/qtextbrowser.h
+usr/include/tqt3/qtextcodec.h
+usr/include/tqt3/qtextcodecfactory.h
+usr/include/tqt3/qtextcodecplugin.h
+usr/include/tqt3/qtextedit.h
+usr/include/tqt3/qtextstream.h
+usr/include/tqt3/qtextview.h
+usr/include/tqt3/qthread.h
+usr/include/tqt3/qthreadstorage.h
+usr/include/tqt3/qtimer.h
+usr/include/tqt3/qtl.h
+usr/include/tqt3/qtoolbar.h
+usr/include/tqt3/qtoolbox.h
+usr/include/tqt3/qtoolbutton.h
+usr/include/tqt3/qtooltip.h
+usr/include/tqt3/qtranslator.h
+usr/include/tqt3/qtsciicodec.h
+usr/include/tqt3/qurl.h
+usr/include/tqt3/qurlinfo.h
+usr/include/tqt3/qurloperator.h
+usr/include/tqt3/qutfcodec.h
+usr/include/tqt3/quuid.h
+usr/include/tqt3/qvalidator.h
+usr/include/tqt3/qvaluelist.h
+usr/include/tqt3/qvaluestack.h
+usr/include/tqt3/qvaluevector.h
+usr/include/tqt3/qvariant.h
+usr/include/tqt3/qvbox.h
+usr/include/tqt3/qvbuttongroup.h
+usr/include/tqt3/qvfbhdr.h
+usr/include/tqt3/qvgroupbox.h
+usr/include/tqt3/qwaitcondition.h
+usr/include/tqt3/qwhatsthis.h
+usr/include/tqt3/qwidget.h
+usr/include/tqt3/qwidgetintdict.h
+usr/include/tqt3/qwidgetlist.h
+usr/include/tqt3/qwidgetplugin.h
+usr/include/tqt3/qwidgetstack.h
+usr/include/tqt3/qwindowdefs.h
+usr/include/tqt3/qwindowsstyle.h
+usr/include/tqt3/qwinexport.h
+usr/include/tqt3/qwizard.h
+usr/include/tqt3/qwmatrix.h
+usr/include/tqt3/qworkspace.h
+usr/include/tqt3/qxml.h
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-i18n.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-i18n.install
new file mode 100644
index 000000000..cd272202b
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-i18n.install
@@ -0,0 +1,8 @@
+usr/share/tqt3/translations/qt_ar.qm
+usr/share/tqt3/translations/qt_cs.qm
+usr/share/tqt3/translations/qt_de.qm
+usr/share/tqt3/translations/qt_es.qm
+usr/share/tqt3/translations/qt_fr.qm
+usr/share/tqt3/translations/qt_he.qm
+usr/share/tqt3/translations/qt_ru.qm
+usr/share/tqt3/translations/qt_sk.qm
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.docs b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.docs
new file mode 100644
index 000000000..dbd9a5d19
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.docs
@@ -0,0 +1,4 @@
+README
+README.immodule
+README-QT.TXT
+PLATFORMS
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.install
new file mode 100644
index 000000000..43ee1dce7
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.install
@@ -0,0 +1,9 @@
+usr/lib/libtqt-mt.la
+usr/lib/libtqt-mt.prl
+usr/lib/libtqt-mt.so
+usr/lib/libtqui.prl
+usr/lib/libtqui.so
+usr/lib/pkgconfig/tqt-mt.pc
+usr/include/tqt3/qgl.h
+usr/include/tqt3/qglcolormap.h
+usr/include/tqt3/qwidgetfactory.h
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.links b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.links
new file mode 100644
index 000000000..d5ae6927d
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.links
@@ -0,0 +1,7 @@
+/usr/lib/libtqt-mt.la /usr/share/tqt3/lib/libtqt-mt.la
+/usr/lib/libtqui.prl /usr/share/tqt3/lib/libtqui.prl
+/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so
+/usr/lib/libtqt-mt.prl /usr/share/tqt3/lib/libtqt-mt.prl
+/usr/lib/libtqt-mt.so.3.3.8 /usr/share/tqt3/lib/libtqt-mt.so
+/usr/include/tqt3 /usr/share/tqt3/include
+/usr/lib/tqt3/plugins /usr/share/tqt3/plugins
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-ibase.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-ibase.install
new file mode 100644
index 000000000..37bbf0bb1
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-ibase.install
@@ -0,0 +1 @@
+usr/lib/tqt3/plugins/sqldrivers/libqsqlibase.so
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-mysql.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-mysql.install
new file mode 100644
index 000000000..efdb699be
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-mysql.install
@@ -0,0 +1 @@
+usr/lib/tqt3/plugins/sqldrivers/libqsqlmysql.so
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-odbc.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-odbc.install
new file mode 100644
index 000000000..3b949c134
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-odbc.install
@@ -0,0 +1 @@
+usr/lib/tqt3/plugins/sqldrivers/libqsqlodbc.so
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-psql.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-psql.install
new file mode 100644
index 000000000..b93ebe333
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-psql.install
@@ -0,0 +1 @@
+usr/lib/tqt3/plugins/sqldrivers/libqsqlpsql.so
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-sqlite.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-sqlite.install
new file mode 100644
index 000000000..928632aa1
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-sqlite.install
@@ -0,0 +1 @@
+usr/lib/tqt3/plugins/sqldrivers/libqsqlite.so
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.docs b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.docs
new file mode 100644
index 000000000..dbd9a5d19
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.docs
@@ -0,0 +1,4 @@
+README
+README.immodule
+README-QT.TXT
+PLATFORMS
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.install
new file mode 100644
index 000000000..519221dff
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.install
@@ -0,0 +1,6 @@
+usr/lib/libtqt-mt.so.*
+usr/lib/libtqui.so.1.*
+usr/lib/tqt3/plugins/imageformats/libqmng.so
+usr/lib/tqt3/plugins/inputmethods/*.so
+../../debian/qtrc etc/tqt3/                                                                              
+../../debian/qt_plugins_3.3rc etc/tqt3/                                                                  
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.links b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.links
new file mode 100644
index 000000000..e7f6740f5
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.links
@@ -0,0 +1,5 @@
+/usr/lib/libtqui.so.1.0.0 /usr/lib/libtqui.so.1 
+/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1
+/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1.0
+/usr/lib/libtqt-mt.so.3.3.8 /usr/share/tqt3/lib/libtqt-mt.so.3
+/usr/lib/libtqt-mt.so.3.3.8 /usr/share/tqt3/lib/libtqt-mt.so.3.3
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.postrm b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.postrm
new file mode 100644
index 000000000..bb679158a
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.postrm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" = "purge" ]; then
+  if [ -d "/usr/share/doc/libtqt3-mt/" ]; then
+    rm -rf /usr/share/doc/libtqt3-mt/
+  fi
+fi
+
+#DEBHELPER#
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop b/ubuntu/maverick/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop
new file mode 100644
index 000000000..9ac108108
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=assistant-tqt3
+Name=Qt3 Assistant
+Name[de]=Qt3 Assistent
+Comment=Qt3 Helpcenter
+Comment[de]= Qt3 Hilfezentrum
+MimeType=application/x-assistant;
+Icon=assistant
+Terminal=false
+Type=Application
+Categories=Qt;Development;
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/build-examples.sh b/ubuntu/maverick/dependencies/tqt3/debian/maintain/build-examples.sh
new file mode 100644
index 000000000..25da9bf59
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/build-examples.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+BUILDDIR=$PWD
+export QTDIR=/usr/share/tqt3
+
+# first copy over the libtqt-mt.so build configuration of .qmake.cache
+cp /usr/share/tqt3/.qmake.cache ./.qmake.cache
+
+# Now compile the examples. The themes example
+# won't work since qconfig.h is not really correct with the
+# ifdef's for the QT_NO_xyz_STYLE, so we use make -k to continue
+cd examples; qmake -o Makefile examples.pro; make -k
+
+# Now compile the tutorial.
+cd $BUILDDIR/tutorial; qmake -o Makefile tutorial.pro; make
+
+# Then the designer examples. 
+cd $BUILDDIR/tools/designer/examples
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do
+        cd $a && qmake -o Makefile $a.pro; make; cd ..;
+done
+
+# There is a bigger sql example in book/ with more subdirectories:
+cd book
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do
+        cd $a && qmake -o Makefile $a.pro; make; cd ..;
+done
+
+# Finally, build the linguist tutorials:
+cd $BUILDDIR/tools/linguist/tutorial
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do 
+	cd $a && qmake -o Makefile $a.pro; make; cd ..; 
+done
+
+# Return to the build directory
+cd $BUILDDIR 
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/designer-tqt3.desktop b/ubuntu/maverick/dependencies/tqt3/debian/maintain/designer-tqt3.desktop
new file mode 100644
index 000000000..2872906ab
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/designer-tqt3.desktop
@@ -0,0 +1,77 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=designer-tqt3
+Name=Qt3 Designer
+Name[bg]=Qt3 Дизайнер
+Name[br]=Ergrafer Qt3
+Name[ca]=Dissenyador Qt3
+Name[cs]=Qt3 designer
+Name[de]=Qt3-Designer
+Name[eo]=Qt3-Desegnilo
+Name[es]=Diseñador Qt3
+Name[et]=Qt3 disainer
+Name[eu]=Qt3 Diseinatzailea
+Name[gl]=Deseñador de Qt3
+Name[he]=Qt בצעמ
+Name[it]=Designer Qt3
+Name[ja]=Qtデザイナー
+Name[ko]=Qt 디자이너
+Name[lv]=Qt3 Dizainers
+Name[mk]=Qt дизајнер
+Name[no]=Qt3-designer
+Name[oc]=Dessinador Qt3
+Name[pl]=Projektant Qt3
+Name[sk]=Qt3 Dizajnér
+Name[sl]=Snovalnik Qt3
+Name[ta]=Qt À¨¼ôÀ¡Ç÷
+Name[uk]=Дизайнер Qt
+Name[zh_CN.GB2312]=Qt 设计者
+Name[zh_TW.Big5]=Qt 設計器
+Comment=Qt3 interface designer
+Comment[az]=Qt3 axtar üz dizayn proqramı
+Comment[bg]=Qt3 interface дизайнер
+Comment[br]=Ergrafer etrefas Qt3
+Comment[ca]=Dissenyador d'interfícies Qt3
+Comment[cs]=Editor UI pro Qt3
+Comment[da]=Qt3 grænseflade designer
+Comment[de]=Schnittstellen-Designer für Qt3
+Comment[el]=Σχεδιασμός περιβάλλοντων Qt
+Comment[eo]=Qt3-Interfacdesegnilo
+Comment[es]=Diseñador de interfaces de Qt3
+Comment[et]=Qt3 dialoogide redaktor
+Comment[eu]=Qt3 interfaze diseinatzailea
+Comment[fi]=Qt:n käyttöliittymäsuunnittelija
+Comment[fr]=Conception d'interfaces avec Qt3
+Comment[gl]=Editor de interfaces de Qt3
+Comment[he]=Qt-ל םיקשממ בצעמ
+Comment[hu]=Qt3 felülettervező
+Comment[is]=Viðmótshönnunartól fyrir Qt3
+Comment[it]=Editor per le interfaccie Qt3
+Comment[ja]=Qtインターフェースデザイナー
+Comment[ko]=Qt 인터페이스 디자이너
+Comment[lt]=Qt3 sąsajos redaktorius
+Comment[lv]=Qt3 starsejas dizainers
+Comment[mk]=Дизајнер на Qt дијалози
+Comment[nl]=Qt3 interface-ontwerper
+Comment[no]=Qt3-grensesnittdesigner
+Comment[no_NY]=Redigering av Qt3-miljø
+Comment[oc]=Dessinador d'interfacies Qt3
+Comment[pl]=Projektant interfejsu Qt3
+Comment[pt]=Editor de interfaces do Qt3
+Comment[pt_BR]=Designer de interface Qt3
+Comment[ro]=Dezvoltator de interfeţe Qt3
+Comment[ru]=редактор интерфейсов приложений Qt
+Comment[sk]=Qt3 dizajnér rozhrania
+Comment[sl]=Snovalnik vmesnikov za Qt3
+Comment[sr]=Dizajner Qt3 interfejsa
+Comment[sv]=Editor för gränssnitt till Qt3
+Comment[ta]=Qt À¨¼ôÀ¡Ç÷
+Comment[tr]=Qt3 arayüz tasarım programı
+Comment[uk]=Редактор інтерфейсу для Qt
+Comment[zh_CN.GB2312]=Qt 界面设计程序
+Comment[zh_TW.Big5]=Qt 介面編輯器
+MimeType=application/x-designer;
+Icon=designer
+Terminal=false
+Type=Application
+Categories=Qt;Development;
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop b/ubuntu/maverick/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop
new file mode 100644
index 000000000..e3a192980
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Exec=linguist-tqt3
+Name=Qt3 Linguist
+Name[de]=Qt3-Linguist
+Name[eo]=Qt3-Lingvisto
+Name[es]=Lingüista Qt3
+Name[ko]=Qt 언어학자
+Name[lv]=Qt3 Lingvists
+Comment=Tool for translating message catalogues of Qt3 based programs
+Comment[da]=Redskab til at oversætte Qt3 baserede programmer
+Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf Qt3 basieren
+Comment[eo]=Ilo por tradukado de mesaĝaroj de Qt3-bazitaj programoj
+Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en Qt3
+Comment[he]=Qt תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ
+Comment[hu]=Segédprogram a Qt3-alapú programok üzenetfájljainak lefordításához
+Comment[ko]=Qt를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구
+Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz Qt3 bāzētās programmās
+Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3
+Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3
+Comment[sv]=Verktyg för att översätta meddelandekataloger från Qt3-baserade program
+MimeType=application/x-linguist;
+Terminal=false
+Icon=linguist
+Type=Application
+Categories=Qt;Development
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/createcw.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/createcw.1
new file mode 100644
index 000000000..0959a2df1
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/createcw.1
@@ -0,0 +1,57 @@
+.TH "createcw" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+createcw \- custom widget description creater for Qt Designer
+.SH "SYNTAX"
+.LP 
+createcw <\fIfilename.cw\fP>
+.SH "DESCRIPTION"
+.LP 
+This small application makes it much easier to create
+custom widget descriptions for the Qt Designer. Using
+them you can use custom widgets in the Qt Designer
+including their signals, slots and properties.
+ 
+To do that normally you would have to enter all that
+information in the custom widget dialog in the Qt
+Designer for each widget. But this small tool can create
+for you these description files for your custom widgets
+which you then can simply import into the Qt Designer. So
+you can use your custom widgets without any additional
+work in your forms in the Qt Designer then.
+
+To do that you have to modify the sourcecode (main.cpp) a
+bit and recompile it afterwards. 
+
+STEP1: Include header files of the widgets for which a
+description should be created here. If you have a widget
+which is defined in the file mycustomwidget.h in
+/home/joedeveloper/src, write here 
+
+#include "/home/joedeveloper/src/mycustomwidget.h"
+
+STEP2: Instantiate all widgets for which a description
+should be created here and add them to the list wl. If
+your custom widget is e.g. called MyCustomWidget you
+would write here
+
+ Widget w;
+ w.w = new MyCustomWidget( 0, 0 );
+ w.include = "mycustomwidget.h";
+ w.location = "global";
+ wl.append( w );
+
+After that compile the program, link it with your custom
+widget (library or object file) and run it like this:
+
+ (unix): ./createcw mywidgets.cw
+ (win32): createcw mywidgets.cw
+
+After that you can import this description file into the
+Qt Designer using the Custom\-Widget Dialog (See
+Tools\->Custom\->Edit Custom Widgets... in the Qt Designer)
+and use these custom widget there in your forms.
+
+.SH "AUTHORS"
+.LP 
+Troll Tech <http://www.trolltech.com/>
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/designer.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/designer.1
new file mode 100644
index 000000000..4151e94a7
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/designer.1
@@ -0,0 +1,54 @@
+.TH "qt-designer" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qt\-designer \- Visual user interface designer for Qt.
+.SH "DESCRIPTION"
+.LP 
+Qt Designer simplifies the process of designing and
+creating graphical user interfaces (GUI) using the
+award\-winning Qt toolkit. Qt Designer is easy to learn.
+There are tutorials, walkthrough examples and the
+reference documentation accelerating you through the
+learning phase. After that, Qt Designer greatly reduces
+the time and effort needed to develop even the most
+complex dialogs with an easy\-to\-use GUI and an integrated
+help system.
+
+ Qt Designer provides a rich set of features aimed at
+making the creation of dialogs as easy and smooth as
+possible without reducing the power of Qt. It offers all
+the strength of the Qt layout system with a well\-designed
+user interface. This, combined with the Qt Designer's
+undo/redo system makes it simple to try different
+arrangements of the widgets until the result satisfies
+you.
+
+ Using Qt Designer's convenient property editor along
+with the dynamic Qt property system it is easy to set the
+initial state of your widgets. Special editors for some
+widgets (like listboxes, comboboxes, etc.) allow you to
+fill these widgets with content without writing any code.
+Using the object hierarchy view, the parent\-child
+relationship between the widgets of a dialog can be
+understood at a glance.
+
+ Integrating dialogs into a Qt project is straightforward
+thanks to the User Interface Compiler (UIC), which
+generates C++ code from the XML dialog description on the
+fly. The programmer can easily extend the functionality
+of the generated classes by subclassing without touching
+generated code at all or running the risk of loosing
+their changes.
+.SH "FILES"
+.LP 
+\fI/usr/share/qt/tools/designer/*\fP 
+.SH "ENVIRONMENT VARIABLES"
+.LP 
+.TP 
+\fBQTDIR\fP
+Specifies the Qt base directory.  On Debian systems this
+should be set to /usr/share/qt.  The /usr/bin/designer
+wrapper script takes care of this.
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/findtr.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/findtr.1
new file mode 100644
index 000000000..f1d3a87d5
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/findtr.1
@@ -0,0 +1,25 @@
+.TH "findtr" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+findtr \- Extracts information about text to be translated
+.SH "SYNTAX"
+.LP 
+findtr *.cpp *.h >myapp.po
+.SH "DESCRIPTION"
+.LP 
+
+Extracts information about text to be translated. It
+recognizes the tr() constructs described above and
+produces a file in ".po" format, a simple text format
+that your translation team will copy and edit. For
+example, the base .po file might be myapp.po and
+translated versions of the file would then be
+myapp_de.po, myapp_fr.po, and myapp_ja.po for
+translations in German, French and Japanese respectively.
+
+  findtr *.cpp *.h >myapp.po
+  copy myapp.po myapp_de.po
+  edit myapp_de.po
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/linguist.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/linguist.1
new file mode 100644
index 000000000..a0f99133b
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/linguist.1
@@ -0,0 +1,37 @@
+.TH LINGUIST 1 "28 August 2004"
+.SH "NAME"
+linguist \- Translation tool for Qt.
+
+.SH "SYNPOSIS"
+.B linguist
+[
+.I TRANSLATION
+]
+
+.SH "DESCRIPTION"
+.B Qt Linguist
+is a tool for adding translations to Qt applications. It
+introduces the concept of a translation "context" which
+means a group of phrases that appear together on the
+screen e.g. in the same menu or dialog.
+
+The only parameter accepted on the command line is 
+.I TRANSLATION
+wich is the name of the translation file you wish to open.
+
+.SH FILES
+.I ~/.qt/qt_designerrc
+.RS
+Per user configuration file.
+
+.SH SEE ALSO
+.B Qt Linguist
+is too complex to be described completely in the "man" page
+format. If your system is properly configured, you can access
+the full documentation within
+.B Qt Linguist
+under the Help menu.
+
+.SH AUTHOR
+This manual page was written by Jeremy Laine <jeremy.laine@m4x.org>,
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/makeqpf.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/makeqpf.1
new file mode 100644
index 000000000..37ddcfd4f
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/makeqpf.1
@@ -0,0 +1,26 @@
+.TH "makeqpf" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+makeqpf \- Create qpf files from TTF and BDF files.
+.SH "DESCRIPTION"
+.LP 
+Qt Prerendered Font (QPF) is a light\-weight non\-scalable
+font format specific to Qt/Embedded.  makeqpf is a tool
+that assists producing QPF files from TTF and BDF files.
+
+
+.SH "SYNTAX"
+qembed [ \fIgeneral\-files\fP ] <[ \fI\-\-images image\-files \fP]>
+.br 
+
+general\-files 
+  These files can be any type of file. 
+\-\-images image\-files 
+  These files must be in image formats supported by Qt. 
+
+.SH "FILES"
+.LP 
+\fI$(QTDIR)/etc/fonts/fontdir\fP 
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/mergetr.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/mergetr.1
new file mode 100644
index 000000000..9ed2a9f25
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/mergetr.1
@@ -0,0 +1,27 @@
+.TH "mergetr" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+mergetr \- Merge changes in translations
+.SH "SYNTAX"
+.LP 
+mergetr myapp_de.po myapp.po
+
+.SH "DESCRIPTION"
+.LP 
+When the texts in your program change as it is developed,
+a the base .po file can be regenerated using findtr,
+then mergetr can be used to merge the changes into the
+other .po files: 
+
+                mergetr myapp_de.po myapp.po
+                mergetr myapp_fr.po myapp.po
+                mergetr myapp_ja.po myapp.po
+
+
+The translation team then edits the new .po files to
+translate the new or changed texts. When texts change,
+the old text is included in the .po file as a comment to
+guide the new translation (no "fuzzy" matching is done).
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/msg2qm.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/msg2qm.1
new file mode 100644
index 000000000..7d22bbb96
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/msg2qm.1
@@ -0,0 +1,26 @@
+.TH "msg2qm" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+msg2qm \- Converts translated .po files to a Qt\-specific binary format.
+.SH "SYNTAX"
+.LP 
+msg2qm myapp_de.po myapp_de.qm
+.SH "DESCRIPTION"
+.LP 
+
+Converts translated .po files to a Qt\-specific binary
+format (".qm" Qt message files). The Qt message files
+are platform and locale independent, containing
+translations in Unicode and various hash tables to
+provide fast look\-up. 
+
+                msg2qm myapp_de.po myapp_de.qm
+                msg2qm myapp_fr.po myapp_fr.qm
+                msg2qm myapp_ja.po myapp_ja.qm
+
+
+In your application, use QTranslator::load() to load
+translation files appropriate for the user's language.
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qembed.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qembed.1
new file mode 100644
index 000000000..a9b262f10
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qembed.1
@@ -0,0 +1,32 @@
+.TH "qembed" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qembed \- Converts arbitrary files into C++ code.
+.SH "DESCRIPTION"
+.LP 
+The QEmbed tool, found in qt/tools/qembed, converts
+arbitrary files into C++ code. This is useful for
+including image files and other resources directly into
+your application rather than loading the data from
+external files. 
+
+QEmbed can also generate uncompressed versions of images
+that can be included directly into your application,
+thus avoiding both the external file and the need to
+parse the image file format. This is useful for small
+images such as icons for which compression is not a
+great gain. 
+
+
+.SH "SYNTAX"
+qembed [ \fIgeneral\-files\fP ] <[ \fI\-\-images image\-files \fP]>
+.br 
+
+general\-files 
+  These files can be any type of file. 
+\-\-images image\-files 
+  These files must be in image formats supported by Qt. 
+
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qt20fix.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qt20fix.1
new file mode 100644
index 000000000..352921be8
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qt20fix.1
@@ -0,0 +1,32 @@
+.TH "qt20fix" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qt20fix \- Helps clean namespace when porting an app from Qt1 to Qt2
+.SH "SYNTAX"
+.LP 
+qt20fix myapp.cpp
+
+.SH "DESCRIPTION"
+.LP 
+Qt 2.x is namespace\-clean, unlike 1.x. Qt now uses very
+few global identifiers. Identifiers like red, blue,
+LeftButton, AlignRight, Key_Up, Key_Down, NoBrush etc.
+are now part of a special class Qt (defined in
+qnamespace.h), which is inherited by most Qt classes.
+Member functions of classes that inherit from QWidget,
+etc. are totally unaffected, but code that is not in
+functions of classes inherited from Qt, you must qualify
+these identifiers like this: Qt::red, Qt::LeftButton,
+Qt::AlignRight, etc. 
+
+The qt/bin/qt20fix script helps to fix the code that
+needs adaption, though most code does not need changing.
+
+Compiling with \-DQT1COMPATIBILITY will help you get going
+with Qt 2.x \- it allows all the old "dirty namespace"
+identifiers from Qt 1.x to continue working. Without it,
+you'll get compile errors that can easily be fixed by
+searching this page for the clean identifiers. 
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qtconfig.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qtconfig.1
new file mode 100644
index 000000000..7e03bf49b
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qtconfig.1
@@ -0,0 +1,17 @@
+.TH "qtconfig" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qtconfig \- Configuration tool for Qt
+.SH "DESCRIPTION"
+.LP 
+QConfig allows for GUI based configuration of Qt and
+ other Qt based sources.
+
+.SH "ENVIRONMENT VARIABLES"
+.LP 
+.TP 
+\fBQTDIR\fP
+Specifies the base Qt dir
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qvfb.1 b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qvfb.1
new file mode 100644
index 000000000..89a91cf2a
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/man/qvfb.1
@@ -0,0 +1,66 @@
+.TH "qvfb" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.SH "NAME"
+.LP 
+qvfb \- Virtual framebuffer for Qt
+.SH "DESCRIPTION"
+.LP 
+The virtual framebuffer allows Qt/Embedded programs to be
+developed on your desktop machine, without switching
+between consoles and X11. 
+
+Start a Qt/Embedded master application (i.e., construct
+QApplication with QApplication::GuiServer flag or use the
+\-qws command line parameter). You will need to specify to
+the server that you wish to use the virtual framebuffer
+driver, e.g.: 
+
+    widgets \-qws \-display QVFb:0
+    
+You may prefer to set the QWS_DISPLAY environment
+variable to be QVFb:0. 
+
+qvfb supports the following command line options: 
+
+ \-width width: the width of the virtual framebuffer
+  (default: 240). 
+ \-height height: the height of the virtual framebuffer
+  (default: 320). 
+ \-depth depth: the depth of the virtual framebuffer (1, 8
+  or 32; default: 8). 
+ \-nocursor: do not display the X11 cursor in the
+  framebuffer window. 
+ \-qwsdisplay :id the Qt/Embedded display id to provide
+  (default: 0). 
+
+ Virtual Framebuffer Design 
+
+The virtual framebuffer emulates a framebuffer using a
+shared memory region (the virtual frame buffer) and a
+utility to display the framebuffer in a window (qvfb).
+The regions of the display that have changed are updated
+periodically, so you will see discrete snapshots of the
+framebuffer rather than each individual drawing
+operation. For this reason drawing problems such as
+flickering may not be apparent until the program is run
+using a real framebuffer. 
+
+The target refresh rate can be set via the "View|Refresh
+Rate" menu item. This will cause qvfb to check for
+updated regions more tquickly. The rate is a target only.
+If little drawing is being done, the framebuffer will not
+show any updates between drawing events. If an
+application is displaying an animation the updates will
+be frequent, and the application and qvfb will compete
+for processor time. 
+
+Mouse and keyboard events are passed to the Qt/Embedded
+master process via named pipes. 
+
+The virtual framebuffer is a development tool only. No
+security issues have been considered in the virtual
+framebuffer design. It should be avoided in a production
+environment; QT_NO_QWS_VFB should always be defined in
+production libraries. 
+.SH "AUTHORS"
+.LP 
+TrollTech <http://www.trolltech.com/>
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/mkpatch.sh b/ubuntu/maverick/dependencies/tqt3/debian/maintain/mkpatch.sh
new file mode 100644
index 000000000..609a44bc1
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/mkpatch.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+diff -Nru -x Makefile.cvs -x README.qt-copy -x upgrade_script.qt -x .cvsignore -x CVS -x include -x debian -x doc -x examples  -x 3rdparty -x images -x mkspecs -I '^\*\*\( $\| \$Id\)' -I '^\#\( $\| \$Id\)' qt-x11-free-3.1.1.old/ qt-x11-free-3.1.1/ > qtcopy.diff
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/tqt3config.desktop b/ubuntu/maverick/dependencies/tqt3/debian/maintain/tqt3config.desktop
new file mode 100644
index 000000000..3965c1355
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/tqt3config.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=qtconfig-tqt3
+Name=Qt3 Configuration
+Name[de]=Qt3 Konfiguration
+Comment=A graphical configuration tool for programs using Qt 3
+Comment[de]=Ein grafisches Konfigurationstool für Qt3-Programme
+MimeType=application/x-qtconfig;
+Terminal=false
+Icon=qtconfig
+Type=Application
+Categories=Qt;Settings;
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/patches/06_disable_rpath.diff b/ubuntu/maverick/dependencies/tqt3/debian/patches/06_disable_rpath.diff
new file mode 100644
index 000000000..27fc1426c
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/patches/06_disable_rpath.diff
@@ -0,0 +1,26 @@
+author: Martin Loschwitz <madkiss@madkiss.org>
+
+Disables the rpath settings in qmake.conf
+
+--- a/mkspecs/linux-g++/qmake.conf
++++ b/mkspecs/linux-g++/qmake.conf
+@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
+ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
+ QMAKE_LFLAGS_THREAD	=
+-QMAKE_RPATH		= -Wl,-rpath,
++QMAKE_RPATH		=
+ 
+ QMAKE_LIBS		=
+ QMAKE_LIBS_DYNLOAD	= -ldl
+--- a/mkspecs/linux-g++-64/qmake.conf
++++ b/mkspecs/linux-g++-64/qmake.conf
+@@ -58,7 +58,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
+ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
+ QMAKE_LFLAGS_THREAD	=
+-QMAKE_RPATH		= -Wl,-rpath,
++QMAKE_RPATH		=
+ 
+ QMAKE_LIBS		=
+ QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/patches/09_amd64_lib64.diff b/ubuntu/maverick/dependencies/tqt3/debian/patches/09_amd64_lib64.diff
new file mode 100644
index 000000000..71b2b65e1
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/patches/09_amd64_lib64.diff
@@ -0,0 +1,16 @@
+--- a/mkspecs/linux-g++-64/qmake.conf
++++ b/mkspecs/linux-g++-64/qmake.conf
+@@ -43,11 +43,11 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_T
+ QMAKE_INCDIR		=
+ QMAKE_LIBDIR		=
+ QMAKE_INCDIR_X11	= /usr/X11R6/include
+-QMAKE_LIBDIR_X11	= /usr/X11R6/lib64
++QMAKE_LIBDIR_X11	= /usr/X11R6/lib
+ QMAKE_INCDIR_QT		= $(QTDIR)/include
+ QMAKE_LIBDIR_QT		= $(QTDIR)/lib
+ QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib64
++QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+ 
+ QMAKE_LINK		= g++
+ QMAKE_LINK_SHLIB	= g++
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff b/ubuntu/maverick/dependencies/tqt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
new file mode 100644
index 000000000..b4e71d35b
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
@@ -0,0 +1,50 @@
+author: Sune Vuorela <debian@pusling.com>
+
+--- a/configure
++++ b/configure
+@@ -34,7 +34,44 @@ SUPPORTED=
+ #-------------------------------------------------------------------------------
+ 
+ # need that throughout the script
+-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
++DPKG_ARCH=`(dpkg-architecture -qDEB_HOST_ARCH) 2>/dev/null` || UNAME_MACHINE=unknown
++case $DPKG_ARCH in 
++	amd64)
++		UNAME_MACHINE="x86_64"
++	;;
++	arm)
++		UNAME_MACHINE="armv4l"
++	;;
++	armel)
++		UNAME_MACHINE="armv5tel"
++	;;
++	hppa)
++		UNAME_MACHINE="parisc64"
++	;;
++	hurd-i386)
++		UNAME_MACHINE="i686-AT386"
++	;;
++	i386)
++		UNAME_MACHINE="i686"
++	;;
++	kfreebsd-amd64)
++		UNAME_MACHINE="x86_64"
++	;;
++	kfreebsd-i386)
++		UNAME_MACHINE="i586"
++	;;
++	mipsel)
++		UNAME_MACHINE="mips"
++	;;
++	powerpc)
++		UNAME_MACHINE="ppc"
++	;;
++	*)
++		UNAME_MACHINE="$DPKG_ARCH"
++	;;
++
++
++esac
+ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff b/ubuntu/maverick/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff
new file mode 100644
index 000000000..3c6394f33
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## kubuntu_06_fglrx_0_size_screen.diff.dpatch by  <jr@pechin3>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp
+--- qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp	2007-04-02 20:06:28.000000000 +0100
++++ qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp	2007-04-02 20:12:10.000000000 +0100
+@@ -526,11 +526,16 @@
+     Q_CHECK_PTR( dpisX );
+     Q_CHECK_PTR( dpisY );
+     for ( i = 0; i < screens; i++ ) {
+-	dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
+-
+-		     / (DisplayWidthMM(dpy,i)*10);
+-	dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5)
+-		     / (DisplayHeightMM(dpy,i)*10);
++       if (DisplayWidthMM(dpy,i) < 1)
++               dpisX[ i ] = 75; // default the dpi to 75.
++       else
++               dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
++                     / (DisplayWidthMM(dpy,i)*10);
++       if (DisplayHeightMM(dpy,i) < 1)
++               dpisY[ i ] = 75; // default the dpi to 75.
++       else
++               dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5)
++                     / (DisplayHeightMM(dpy,i)*10);
+     }
+ }
+ 
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/patches/series b/ubuntu/maverick/dependencies/tqt3/debian/patches/series
new file mode 100644
index 000000000..7377c84c1
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/patches/series
@@ -0,0 +1,4 @@
+06_disable_rpath.diff
+09_amd64_lib64.diff
+72_dont_trust_uname-m_use_dpkg-arch_instead.diff
+kubuntu_06_fglrx_0_size_screen.diff
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/qt_plugins_3.3rc b/ubuntu/maverick/dependencies/tqt3/debian/qt_plugins_3.3rc
new file mode 100644
index 000000000..e193b495c
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/qt_plugins_3.3rc
@@ -0,0 +1,4 @@
+[usr]
+lib/trinity/plugins/styles/plastik.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-09-29T20:06:31^e
+lib/tqt3/plugins/imageformats/libqmng.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-08-25T18:22:18^e
+
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/qtrc b/ubuntu/maverick/dependencies/tqt3/debian/qtrc
new file mode 100644
index 000000000..3c977f4d1
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/qtrc
@@ -0,0 +1,32 @@
+[3.3]
+libraryPath=/usr/lib/trinity/plugins/
+
+[General]
+GUIEffects=general^eanimatecombo^e
+embedFonts=true
+enableXft=true
+font=Sans Serif,9,-1,5,50,0,0,0,0,0
+fontPath=\0
+useXft=true
+style=Plastik
+
+[KDE]
+contrast=7
+kdeAddedLibraryPaths=/usr/lib/trinity/plugins/^e
+
+[KWinPalette]
+activeBackground=#1f26ad
+activeBlend=#259bb8
+activeForeground=#ffffff
+activeTitleBtnBg=#e6e6e6
+frame=#efefef
+inactiveBackground=#cdcdcd
+inactiveBlend=#ababab
+inactiveForeground=#dddddd
+inactiveFrame=#efefef
+inactiveTitleBtnBg=#ebebeb
+
+[Palette]
+active=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e
+disabled=#808080^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#c7c7c7^e#ffffff^e#808080^e#ffffff^e#efefef^e#000000^e#567594^e#ffffff^e#0000ee^e#52188b^e
+inactive=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e
\ No newline at end of file
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/rules b/ubuntu/maverick/dependencies/tqt3/debian/rules
new file mode 100755
index 000000000..c2fc2b997
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/rules
@@ -0,0 +1,482 @@
+#!/usr/bin/make -f
+
+# build variables
+export QTDIR=$(shell pwd)
+
+# re-set $(LD_LIBRARY_PATH)
+OLD_LD_LIBRARY_PATH := $(LD_LIBRARY_PATH)
+export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH)
+
+# fix path
+OLD_PATH := $(PATH)
+export PATH=$(QTDIR)/bin:$(OLD_PATH)
+
+DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+	PLATFORM_ARG = hurd-g++
+else #hurd
+ifeq ($(DEB_HOST_ARCH),sparc)
+	PLATFORM_ARG = linux-g++-sparc
+else #sparc
+	PLATFORM_ARG = linux-g++
+endif #sparc
+endif #hurd
+
+# quilt stuff
+include /usr/share/quilt/quilt.make
+
+# build variables (directorys)
+DEBIAN = $(shell pwd)/debian
+P_LIBS = $(DEBIAN)/libtqt3-mt
+P_DOC = $(DEBIAN)/tqt3-doc
+P_APPSDEV = $(DEBIAN)/tqt3-apps-dev
+P_HEADERS = $(DEBIAN)/libtqt3-headers
+P_QTMTDEV = $(DEBIAN)/libtqt3-mt-dev
+
+TMP_INSTALL = $(DEBIAN)/tmp-install
+
+CONFIGURE_OPTS = \
+		-prefix		"/usr"				\
+		-sysconfdir	"/etc/tqt3"			\
+		-datadir	"/usr/share/tqt3"		\
+		-headerdir	"/usr/include/tqt3"		\
+		-docdir		"/usr/share/tqt3/doc"		\
+		-plugindir	"/usr/lib/tqt3/plugins"		\
+		-translationdir	"/usr/share/tqt3/translations"	\
+						\
+		-thread				\
+		-shared				\
+		-fast				\
+		-no-exceptions			\
+		-platform $(PLATFORM_ARG)	\
+						\
+		-nis				\
+		-no-pch				\
+		-cups				\
+		-stl				\
+		-ipv6				\
+						\
+		-sm				\
+		-xshape				\
+		-xinerama			\
+		-xcursor			\
+		-xrandr				\
+		-xrender			\
+		-xft				\
+		-tablet				\
+		-xkb				\
+						\
+		-system-zlib			\
+		-system-libpng			\
+		-system-libmng			\
+		-system-libjpeg			\
+		-system-nas-sound		\
+						\
+		-enable-opengl			\
+		-dlopen-opengl			\
+						\
+		-qt-gif				\
+		-qt-imgfmt-png			\
+		-qt-imgfmt-jpeg			\
+		-plugin-imgfmt-mng		\
+						\
+		-plugin-sql-odbc		\
+		-plugin-sql-psql		\
+		-plugin-sql-mysql		\
+		-plugin-sql-sqlite		\
+						\
+		-I/usr/include/mysql		\
+		-I/usr/include/freetype2	\
+		-I`pg_config --includedir`	\
+						\
+		-L/usr/lib/$(DEB_HOST_MULTIARCH)	\
+						\
+		-lfontconfig			\
+		-inputmethod			\
+		# End of CONFIGURE_OPTS
+
+interbase_archs := i386 amd64 sparc powerpc
+ifneq ($(DEB_HOST_ARCH_CPU),$(findstring $(DEB_HOST_ARCH_CPU),$(interbase_archs)))
+	CONFIGURE_OPTS += -no-sql-ibase
+	IBASE = -Nlibtqt3-mt-ibase
+else
+	IBASE =
+endif
+
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+	CONFIGURE_OPTS += -no-sql-ibase
+	IBASE = -Nlibtqt3-mt-ibase
+endif
+
+ifeq ($(DEB_HOST_ARCH),arm)
+	CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
+endif
+
+build: libqt-thread-stamp
+
+	touch build-stamp
+
+libqt-thread-stamp: $(QUILT_STAMPFN)
+
+	@echo "QTDIR is ${QTDIR}"
+
+	dh_testdir
+
+	echo yes | ./configure $(CONFIGURE_OPTS)
+
+	rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
+	ln -s ../src/kernel/qinputcontext.h include/qinputcontext.h
+	ln -s ../src/inputmethod/qinputcontextfactory.h include/qinputcontextfactory.h
+	ln -s ../src/inputmethod/qinputcontextplugin.h include/qinputcontextplugin.h
+
+	# proceed
+	$(MAKE) sub-src sub-plugins sub-tools
+	$(MAKE) -C src INSTALL_ROOT=$(TMP_INSTALL) install_target
+	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) install
+	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install
+
+	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
+	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
+
+	cp bin/qtrename140 $(TMP_INSTALL)/usr/bin/
+	cp bin/qt20fix $(TMP_INSTALL)/usr/bin/
+	cp bin/findtr $(TMP_INSTALL)/usr/bin/
+
+	# build conv2ui
+	cd tools/designer/tools/conv2ui && $(MAKE)
+	cp bin/conv2ui $(TMP_INSTALL)/usr/bin/conv2ui
+
+	# build qvfb
+	cd tools/qvfb/ && $(MAKE)
+	cp tools/qvfb/qvfb $(TMP_INSTALL)/usr/bin/qvfb
+
+	# install qmake.cache file
+	install -d $(P_QTMTDEV)/usr/share/tqt3/
+	cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/tqt3#g" > $(P_QTMTDEV)/usr/share/tqt3/.qmake.cache
+
+	# install qconfig.h for the mt
+	install -m 644 -D include/qconfig.h $(P_QTMTDEV)/usr/include/tqt3/qconfig.h
+	install -m 644 -D include/qmodules.h $(P_QTMTDEV)/usr/include/tqt3/qmodules.h
+
+	install -m 644 -D include/qinputcontext.h $(P_HEADERS)/usr/include/tqt3/qinputcontext.h
+	install -m 644 -D include/qinputcontextfactory.h $(P_HEADERS)/usr/include/tqt3/qinputcontextfactory.h
+	install -m 644 -D include/qinputcontextplugin.h $(P_HEADERS)/usr/include/tqt3/qinputcontextplugin.h
+
+	touch libqt-thread-stamp
+
+clean: unpatch
+
+	dh_testdir
+
+	-rm -rf debian/patched
+	-rm -rf build-stamp libqt-thread-stamp
+
+	-chmod -R u+w *
+	-chmod a-x doc/html/layout?.png
+
+	if [ -f "src/Makefile" ]; then \
+		$(MAKE) -C src clean; $(MAKE) -C plugins/src distclean; $(MAKE) -C tools distclean; \
+		$(MAKE) -C tools/makeqpf distclean; $(MAKE) -C tools/qconfig distclean; $(MAKE) -C tools/qvfb distclean; \
+		$(MAKE) -C tools/msg2qm distclean; $(MAKE) -C tools/mergetr distclean; $(MAKE) -C tools/qembed distclean; \
+		$(MAKE) -C tools/designer/tools/conv2ui distclean; $(MAKE) -C tools/designer/tools/createcw distclean; \
+		$(MAKE) -C tools/designer/plugins/glade distclean; $(MAKE) -C tools/designer/plugins/qglwidget distclean; \
+		$(MAKE) -C config.tests/unix/largefile distclean; $(MAKE) -C qmake distclean; \
+	fi
+
+	-rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \
+		config.status bin/moc bin/qmake src/moc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \
+		src/tools/qconfig.cpp include/qconfig.h include/qmodules.h plugins/accessibleqtwidgets.prl \
+		config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \
+		config.tests/unix/ptrsize/ptrsizetest config.tests/unix/endian/endiantest.o \
+		config.tests/unix/endian/endiantest lib/tqt-mt.pc extensions/nsplugin/examples/trivial/libtrivial.prl \
+		extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer
+
+	rm -f qmake/*o
+	rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
+	rm -f src/.obj/debug-shared-mt/*o plugins/src/inputmethods/imsw-multi/.obj/debug-shared-mt/*o plugins/inputmethods/*so
+	rm -f plugins/src/inputmethods/imsw-none/.obj/debug-shared-mt/*o plugins/src/inputmethods/simple/.obj/debug-shared-mt/*o plugins/src/inputmethods/xim/.obj/debug-shared-mt/*o
+
+	# delete generated Makefiles but save the toplevel Makefile
+	-mv Makefile Makefile.save
+	for a in `find . -name 'Makefile'`; do rm -f "$$a"; done
+	-mv Makefile.save Makefile
+
+	cd examples/ && find . -name '.obj' | xargs rm -rf
+
+	dh_clean
+
+install: build
+
+	dh_testdir
+	dh_testroot
+
+	dh_clean -i
+	dh_installdirs
+
+	# fix .prl files
+	for a in $(TMP_INSTALL)/usr/lib/*prl; do cat "$$a" | sed \
+	"s#$(QTDIR)#/usr/share/tqt3#g" > "$$a".new && mv "$$a".new "$$a"; done
+
+	dh_install $(IBASE) --sourcedir=$(TMP_INSTALL)
+
+	## build tqt3-doc package
+	# copy all docs there first
+	install -d $(P_DOC)/usr/share/tqt3/doc/html/
+	for a in `cd $(TMP_INSTALL)/usr/share/tqt3/doc/html/ && find`; do cp $(TMP_INSTALL)/usr/share/tqt3/doc/html/"$$a" $(P_DOC)/usr/share/tqt3/doc/html/; done
+	#typo bugfix
+	sed -i -e 's/reveives/receives/' $(P_DOC)/usr/share/tqt3/doc/html/qwidget.html
+
+	## build designer package documentation
+	# tqt3-designer
+	install -d `pwd`/debian/tqt3-designer/usr/share/tqt3/doc/html/
+	for a in `cat doc/html/designer*.html doc/html/designer*.dcf | grep png | sed 's/^.*src=\"\([^\"]+\)\".*$$/\1/' | \
+	perl -pe 's#<\?p[^>]+>##' | tee outputfile | perl -ne '/<img [^>]*(src=\"[^"]+\")/; print $$1' | \
+	sed 's/src=//g' | sed 's/"/ /g'`; do cp doc/html/"$$a" `pwd`/debian/tqt3-designer/usr/share/tqt3/doc/html/ && \
+	rm -rf $(P_DOC)/usr/share/tqt3/doc/html/"$$a" || true; done
+	rm -rf outputfile `pwd`/debian/tqt3-designer/usr/share/tqt3/doc/html/logo32.png
+	rm -rf `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/designer*
+
+	## build linguist package documentation
+	# tqt3-linguist
+	install -d `pwd`/debian/tqt3-linguist/usr/share/tqt3/doc/html/
+	for a in `cat doc/html/linguist*.html doc/html/linguist*.dcf | grep png | sed 's/^.*src=\"\([^\"]+\)\".*$$/\1/' | \
+	perl -pe 's#<\?p[^>]+>##' | tee outputfile | perl -ne '/<img [^>]*(src=\"[^"]+\")/; print $$1' | \
+	sed 's/src=//g' | sed 's/"/ /g'`; do cp doc/html/"$$a" `pwd`/debian/tqt3-linguist/usr/share/tqt3/doc/html/ && \
+	rm -rf $(P_DOC)/usr/share/tqt3/doc/html/"$$a" || true; done
+	rm -rf outputfile `pwd`/debian/tqt3-linguist/usr/share/tqt3/doc/html/logo32.png
+	rm -rf `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/linguist*
+
+	## tqt3-assistant
+	# remove docs from tqt3-doc for qt-assistant
+	rm -rf `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/assistant*
+
+	## all packages
+	# install the overrides files
+	#for a in debian/overrides/*; do install -d debian/`echo "$$a" | sed 's/debian\/overrides\///g'`/usr/share/lintian/overrides; done
+	#for a in debian/overrides/*; do cp "$$a" debian/`echo "$$a" | sed 's/debian\/overrides\///g'`/usr/share/lintian/overrides/`echo "$$a" | sed 's/debian\/overrides\///g'`; done
+
+	chmod 644 debian/tqt3-dev-tools/usr/share/tqt3/mkspecs/aix-g++-64/qplatformdefs.h
+	chmod 644 debian/tqt3-dev-tools/usr/share/tqt3/mkspecs/macx-pbuilder/Info.plist.app
+
+binary-indep: build install
+
+	# Build architecture-independent files here.
+	dh_testdir
+	dh_testroot
+
+	dh_installdocs -i -XREADME.Debian
+	dh_installchangelogs -i changes-3.3.8
+	dh_installchangelogs -i changes-3.3.8b
+
+	find doc/man -path \*/CVS -prune -o -print | cpio -pmd $(P_DOC)/usr/share/tqt3/doc/
+
+	-rm -f `find $(P_DOC)/usr/share/tqt3/doc/ -name "*.o"`
+	find $(P_DOC) -type f -perm +0100 | xargs --no-run-if-empty rm -f
+
+	install -d $(P_DOC)/usr/share/man/man3/
+
+	for i in $(P_DOC)/usr/share/tqt3/doc/doc/man/man3/* ; do mv $$i $(P_DOC)/usr/share/man/man3/ ; done
+
+	-rm -rf $(P_DOC)/usr/share/tqt3/doc/doc
+
+	# other i18n files
+	for a in `cd translations/ && find . -name 'qt_*.qm' | sed 's/qt_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
+	install -m644 -D `pwd`/translations/qt_"$$a".qm `pwd`/debian/libtqt3-i18n/usr/share/tqt3/translations/qt_"$$a".qm; done
+
+	# logo32.png
+	cp `pwd`/doc/html/logo32.png `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/
+
+	# remove qmake html docu from tqt3-doc
+	rm -rf `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/qmake*
+
+	# create examples package
+	install -d `pwd`/debian/doc/tqt3-examples/tools/designer
+	install -d `pwd`/debian/doc/tqt3-examples/tools/linguist
+	cp -ax examples `pwd`/debian/doc/tqt3-examples
+	cp -ax tutorial `pwd`/debian/doc/tqt3-examples
+	cp -ax tools/designer/examples `pwd`/debian/doc/tqt3-examples/tools/designer/
+	cp -ax tools/linguist/tutorial `pwd`/debian/doc/tqt3-examples/tools/linguist/
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name 'tt1'`; do rm -f "$$a"; done
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name 'tt2'`; do rm -f "$$a"; done
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name 'tt3'`; do rm -f "$$a"; done
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name '.moc'`; do rm -rf "$$a"; done
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name '.obj'`; do rm -rf "$$a"; done
+	for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name 'Makefile'`; do rm -f "$$a"; done
+	install -D `pwd`/debian/maintain/build-examples.sh `pwd`/debian/doc/tqt3-examples/build-examples
+	chmod 755 `pwd`/debian/doc/tqt3-examples/build-examples
+	cd `pwd`/debian/doc/ && tar cvvfz tqt3-examples.tar.gz tqt3-examples/
+	install -D `pwd`/debian/doc/tqt3-examples.tar.gz `pwd`/debian/tqt3-examples/usr/share/doc/tqt3-examples/tqt3-examples.tar.gz
+
+	# proceed
+	dh_compress -i -Xhtml/
+	dh_link -i
+
+	dh_fixperms -i
+	dh_installdeb -i
+
+	dh_perl -i
+	dh_shlibdeps -i
+
+	# fix shlibdeps madness
+	for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new &&  mv "$$a.new" "$$a"; done
+
+	dh_gencontrol -i
+	dh_md5sums -i
+
+	dh_builddeb -i
+
+binary-arch: build install
+
+	dh_testdir
+	dh_testroot
+	dh_installdirs -a
+
+	## create tqt3-apps-dev-package
+	install -d $(P_APPSDEV)/usr/include/tqt3/
+	cp `pwd`/tools/designer/interfaces/*.h $(P_APPSDEV)/usr/include/tqt3/
+	cp `pwd`/tools/designer/editor/*.h $(P_APPSDEV)/usr/include/tqt3/
+	rm -rf `pwd`/debian/tqt3-apps-dev/usr/include/tqt3/preferences.ui.h
+
+	## qvfb package
+	install -m644 -D `pwd`/tools/qvfb/pda.skin `pwd`/debian/tqt3-dev-tools-embedded/etc/tqt3/qvfb/pda.skin
+	install -m644 -D `pwd`/tools/qvfb/pda_down.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/qvfb/pda_down.png
+	install -m644 -D `pwd`/tools/qvfb/pda_up.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/qvfb/pda_up.png
+
+	# remove utterly ugle symlink
+	rm -rf `pwd`/debian/tqt3-dev-tools//usr/share/tqt3/mkspecs/linux-g++/linux-g++
+
+	# language file for linguist
+	install -d `pwd`/debian/tqt3-linguist/usr/share/doc/tqt3-linguist/
+	cp translations/qt_untranslated.ts `pwd`/debian/tqt3-linguist/usr/share/doc/tqt3-linguist/
+
+	# fix that stupid friggin professional file
+	perl -pi -e 's{\$$\$$QT_SOURCE_TREE}{$(QTDIR)}' src/qt_professional.pri
+
+	## i18n files for designer, linguist and assistant
+	(cd `pwd`/tools/designer/designer/ && lrelease designer.pro)
+	for a in `cd tools/designer/designer/ && find . -name 'designer_*.qm' | sed 's/designer_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
+	install -m644 -D tools/designer/designer/designer_"$$a".qm `pwd`/debian/tqt3-designer/usr/share/tqt3/translations/designer_"$$a".qm; done
+	rm -rf `pwd`/tools/designer/designer/*.qm
+
+	(cd `pwd`/tools/assistant/ && lrelease assistant.pro)
+	for a in `cd tools/assistant/ && find . -name 'assistant_*.qm' | sed 's/assistant_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
+	install -m644 -D tools/assistant/assistant_"$$a".qm `pwd`/debian/tqt3-assistant/usr/share/tqt3/translations/assistant_"$$a".qm; done
+	rm -rf `pwd`/tools/assistant/*.qm `pwd`/debian/libtqt3-i18n/usr/share/tqt3/translations/assistant_de.qm
+
+	(cd `pwd`/tools/linguist/linguist/ && lrelease linguist.pro)
+	for a in `cd tools/linguist/linguist/ && find . -name 'linguist_*.qm' | sed 's/linguist_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
+	install -m644 -D tools/linguist/linguist/linguist_"$$a".qm `pwd`/debian/tqt3-linguist/usr/share/tqt3/translations/linguist_"$$a".qm; done
+	rm -rf `pwd`/tools/linguist/linguist/*.qm
+
+	# desktop lnk files
+	install -m644 -D debian/maintain/designer-tqt3.desktop `pwd`/debian/tqt3-designer/usr/share/applications/designer-tqt3.desktop
+	install -m644 -D debian/maintain/linguist-tqt3.desktop `pwd`/debian/tqt3-linguist/usr/share/applications/linguist-tqt3.desktop
+
+	install -m644 -D debian/maintain/assistant-tqt3.desktop `pwd`/debian/tqt3-assistant/usr/share/applications/assistant-tqt3.desktop
+	install -m644 -D debian/maintain/tqt3config.desktop `pwd`/debian/tqt3-qtconfig/usr/share/applications/tqt3config.desktop
+
+	# include logo32 for every program
+	cd `pwd`/debian/tqt3-designer/usr/share/tqt3/doc/html && for a in `find . -name '*.html'`; \
+	do cat "$$a" | sed 's/logo32/logo32-designer/g' > "$$a".new && mv "$$a".new "$$a"; done
+
+	cd `pwd`/debian/tqt3-linguist/usr/share/tqt3/doc/html && for a in `find . -name '*.html'`; \
+	do cat "$$a" | sed 's/logo32/logo32-linguist/g' > "$$a".new && mv "$$a".new "$$a"; done
+
+	cd `pwd`/debian/tqt3-assistant/usr/share/tqt3/doc/html && for a in `find . -name '*.html'`; \
+	do cat "$$a" | sed 's/logo32/logo32-assistant/g' > "$$a".new && mv "$$a".new "$$a"; done
+
+	cd `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/doc/html && for a in `find . -name '*.html'`; \
+	do cat "$$a" | sed 's/logo32/logo32-qmake/g' > "$$a".new && mv "$$a".new "$$a"; done
+
+	for a in designer linguist assistant; do install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/tqt3-"$$a"/usr/share/tqt3/doc/html/logo32-"$$a".png; done
+	install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/doc/html/logo32-qmake.png
+
+	# fix qmake.conf files
+	cd `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/mkspecs/ && for a in *; do cd "$$a" && cat qmake.conf | sed 's/\$$(QTDIR)\/include/\/usr\/share\/tqt3\/include/g' | sed 's/\$$(QTDIR)/\/usr\/share\/tqt3/g' | \
+	sed 's/\-I\/usr\/include/&\/tqt3/g' >> qmake.conf.new && mv qmake.conf.new qmake.conf && cd ../; done
+
+	# build attic package and copy it to libtqt3-ompat-headers
+	cd `pwd`/src/ && tar cvvfz attic.tar.gz attic/
+	install -D `pwd`/src/attic.tar.gz `pwd`/debian/libtqt3-compat-headers/usr/share/doc/libtqt3-compat-headers/attic.tar.gz
+	rm -rf `pwd`/src/attic.tar.gz
+
+	# rename some binaries to make tqt3/4 installations possible
+	mv `pwd`/debian/tqt3-designer/usr/bin/designer `pwd`/debian/tqt3-designer/usr/bin/designer-tqt3
+	mv `pwd`/debian/tqt3-dev-tools/usr/bin/uic `pwd`/debian/tqt3-dev-tools/usr/bin/uic-tqt3
+	mv `pwd`/debian/tqt3-dev-tools/usr/bin/moc `pwd`/debian/tqt3-dev-tools/usr/bin/moc-tqt3
+	mv `pwd`/debian/tqt3-dev-tools/usr/bin/lupdate `pwd`/debian/tqt3-dev-tools/usr/bin/lupdate-tqt3
+	mv `pwd`/debian/tqt3-dev-tools/usr/bin/lrelease `pwd`/debian/tqt3-dev-tools/usr/bin/lrelease-tqt3
+	mv `pwd`/debian/tqt3-dev-tools/usr/bin/qmake `pwd`/debian/tqt3-dev-tools/usr/bin/qmake-tqt3
+	mv `pwd`/debian/tqt3-qtconfig/usr/bin/qtconfig `pwd`/debian/tqt3-qtconfig/usr/bin/qtconfig-tqt3
+	mv `pwd`/debian/tqt3-assistant/usr/bin/assistant `pwd`/debian/tqt3-assistant/usr/bin/assistant-tqt3
+	mv `pwd`/debian/tqt3-linguist/usr/bin/linguist `pwd`/debian/tqt3-linguist/usr/bin/linguist-tqt3
+
+	install -D debian/maintain/man/designer.1 `pwd`/debian/tqt3-designer/usr/share/man/man1/designer-tqt3.1
+	install -D doc/man/man1/moc.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/moc-tqt3.1
+	install -D doc/man/man1/uic.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/uic-tqt3.1
+	install -D doc/man/man1/lrelease.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/lrelease-tqt3.1
+	install -D doc/man/man1/lupdate.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/lupdate-tqt3.1
+	install -D debian/maintain/man/qtconfig.1 `pwd`/debian/tqt3-qtconfig/usr/share/man/man1/qtconfig-tqt3.1
+	install -D debian/maintain/man/linguist.1 `pwd`/debian/tqt3-linguist/usr/share/man/man1/linguist-tqt3.1
+
+	dh_link -ptqt3-designer usr/share/tqt3/doc/html usr/share/doc/tqt3-designer/html
+	dh_link -ptqt3-assistant usr/share/tqt3/doc/html usr/share/doc/tqt3-assistant/html
+	dh_link -ptqt3-linguist usr/share/tqt3/doc/html usr/share/doc/tqt3-linguist/html
+	dh_link -ptqt3-dev-tools usr/share/tqt3/doc/html usr/share/doc/tqt3-dev-tools/html
+
+	# install the manpages we have
+	dh_installman -ptqt3-designer debian/maintain/man/createcw.1
+	dh_installman -ptqt3-dev-tools-compat debian/maintain/man/qt20fix.1 debian/maintain/man/mergetr.1 debian/maintain/man/findtr.1 debian/maintain/man/msg2qm.1
+	dh_installman -ptqt3-dev-tools-embedded debian/maintain/man/makeqpf.1 debian/maintain/man/qvfb.1
+	dh_installman -ptqt3-dev-tools debian/maintain/man/qembed.1
+
+	# copy README.Debian
+	for a in libtqt3-mt-dev libtqt3-mt tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done
+
+	# install the qmake binary
+	rm -rf `pwd`/debian/tqt3-dev-tools/usr/bin/qmake
+	install -D `pwd`/qmake/qmake `pwd`/debian/tqt3-dev-tools/usr/bin/qmake-tqt3
+
+	# Install source for the designer tools, such as createcw.
+	cp -ra tools/designer/tools debian/tqt3-designer/usr/share/tqt3/tools
+	rm -f debian/tqt3-designer/usr/share/tqt3/tools/createcw/createcw
+	rm -rf debian/tqt3-designer/usr/share/tqt3/tools/createcw/.moc
+	rm -rf debian/tqt3-designer/usr/share/tqt3/tools/createcw/.obj
+	rm -f debian/tqt3-designer/usr/share/tqt3/tools/createcw/Makefile
+	rm -f debian/tqt3-designer/usr/share/tqt3/tools/conv2ui/conv2ui
+	rm -rf debian/tqt3-designer/usr/share/tqt3/tools/conv2ui/.moc
+	rm -rf debian/tqt3-designer/usr/share/tqt3/tools/conv2ui/.obj
+	rm -f debian/tqt3-designer/usr/share/tqt3/tools/conv2ui/Makefile
+
+	# run remaining debhelper scripts
+	dh_installdocs -a $(IBASE) -XREADME.Debian
+	dh_installmenu -a $(IBASE)
+
+	dh_installchangelogs -a $(IBASE) changes-3.3.8
+	dh_installchangelogs -a $(IBASE) changes-3.3.8b
+
+	dh_link -a $(IBASE)
+	dh_strip -a $(IBASE) --dbg-package=qt-x11-free-dbg
+	dh_compress -a $(IBASE)
+	dh_fixperms -a $(IBASE)
+
+	# run remaining debhelper scripts
+	dh_makeshlibs -a $(IBASE) -V
+	dh_installdeb -a $(IBASE)
+	dh_perl -a $(IBASE)
+	dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libtqt3-mt/usr/lib
+
+	# fix shlibdeps madness
+	for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new &&  mv "$$a.new" "$$a"; done
+
+	# fix conffiles file for tqt3-dev-tools-embedded
+	echo "/etc/tqt3/qvfb/pda.skin" > `pwd`/debian/tqt3-dev-tools-embedded/DEBIAN/conffiles
+
+	dh_gencontrol -a $(IBASE)
+	dh_md5sums -a $(IBASE)
+	dh_builddeb -a $(IBASE)
+
+binary: binary-indep binary-arch
+.PHONY: build binary-indep binary-arch binary install clean patch unpatch
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install
new file mode 100644
index 000000000..b69f266ef
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install
@@ -0,0 +1,7 @@
+usr/lib/libeditor.prl
+usr/lib/libeditor.a
+usr/lib/libdesignercore.prl
+usr/lib/libdesignercore.a
+usr/lib/libqassistantclient.prl
+usr/lib/libqassistantclient.a
+usr/include/tqt3/qassistantclient.h
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.links b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.links
new file mode 100644
index 000000000..b009faf61
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.links
@@ -0,0 +1,8 @@
+/usr/lib/libeditor.prl /usr/share/tqt3/lib/libeditor.prl
+/usr/lib/libeditor.a /usr/share/tqt3/lib/libeditor.a
+/usr/lib/libdesignercore.prl /usr/share/tqt3/lib/libdesignercore.prl
+/usr/lib/libdesignercore.a /usr/share/tqt3/lib/libdesignercore.a
+/usr/lib/libqassistantclient.prl /usr/share/tqt3/lib/libqassistantclient.prl
+/usr/lib/libqassistantclient.a /usr/share/tqt3/lib/libqassistantclient.a
+/usr/include/tqt3 /usr/share/tqt3/tools/designer/editor
+/usr/include/tqt3 /usr/share/tqt3/tools/designer/interfaces
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.install
new file mode 100644
index 000000000..3ec2f74fa
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.install
@@ -0,0 +1,3 @@
+usr/bin/assistant
+usr/share/tqt3/doc/html/assistant*html
+usr/share/tqt3/doc/html/assistant*dcf
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.links b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.links
new file mode 100644
index 000000000..909b4681d
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.links
@@ -0,0 +1 @@
+/usr/bin/assistant-tqt3 /usr/share/tqt3/bin/assistant
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.menu b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.menu
new file mode 100644
index 000000000..b47a494ac
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.menu
@@ -0,0 +1,6 @@
+?package(tqt3-assistant):\
+        needs="x11"\
+        section="Applications/Programming"\
+        hints="KDE"\
+        title="Qt3 Assistant"\
+        command="/usr/bin/assistant-tqt3"
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.postinst b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.postinst
new file mode 100644
index 000000000..c8b6ca8b3
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.postinst
@@ -0,0 +1,8 @@
+#!/bin/sh 
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/assistant assistant "/usr/bin/assistant-tqt3" "45" \
+
+#DEBHELPER#
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.prerm b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.prerm
new file mode 100644
index 000000000..1a45c259c
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove assistant "/usr/bin/assistant-tqt3"
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.install
new file mode 100644
index 000000000..f2db61219
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.install
@@ -0,0 +1,8 @@
+usr/bin/designer
+usr/bin/createcw
+usr/bin/conv2ui
+usr/share/tqt3/templates/*
+usr/share/tqt3/doc/html/designer*html
+usr/share/tqt3/doc/html/designer*dcf
+usr/share/tqt3/doc/html/designer*jpg
+usr/lib/tqt3/plugins/designer/*
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.links b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.links
new file mode 100644
index 000000000..550d68ec0
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.links
@@ -0,0 +1 @@
+/usr/bin/designer-tqt3 /usr/share/tqt3/bin/designer
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.menu b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.menu
new file mode 100644
index 000000000..cc01205eb
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.menu
@@ -0,0 +1,7 @@
+?package(tqt3-designer):\
+        needs="x11"\
+        section="Applications/Programming"\
+        hints="KDE"\
+        title="Qt3 Designer"\
+        command="/usr/bin/designer-tqt3"
+
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.postinst b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.postinst
new file mode 100644
index 000000000..bbbd836d0
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh 
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/designer designer "/usr/bin/designer-tqt3" "45" \
+	--slave /usr/share/man/man1/designer.1.gz designer.1.gz \
+	"/usr/share/man/man1/designer-tqt3.1.gz"
+
+#DEBHELPER#
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.prerm b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.prerm
new file mode 100644
index 000000000..14497092e
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove designer "/usr/bin/designer-tqt3"
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools-compat.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools-compat.install
new file mode 100644
index 000000000..838f6b827
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools-compat.install
@@ -0,0 +1,6 @@
+usr/bin/qt20fix
+usr/bin/qtrename140
+usr/bin/qm2ts
+usr/bin/mergetr
+usr/bin/findtr
+usr/bin/msg2qm
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install
new file mode 100644
index 000000000..2954f7a4c
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install
@@ -0,0 +1,2 @@
+usr/bin/makeqpf
+usr/bin/qvfb
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links
new file mode 100644
index 000000000..a0274c505
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links
@@ -0,0 +1,2 @@
+/usr/bin/makeqpf /usr/share/tqt3/bin/makeqpf
+/usr/bin/qvfb /usr/share/tqt3/bin/qvfb
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.install
new file mode 100644
index 000000000..d496d35b9
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.install
@@ -0,0 +1,9 @@
+usr/share/tqt3/mkspecs/*
+usr/share/tqt3/doc/html/qmake*html
+usr/share/tqt3/doc/html/qmake*dcf
+usr/bin/qmake
+usr/bin/lupdate
+usr/bin/lrelease
+usr/bin/uic
+usr/bin/moc
+usr/bin/qembed
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.links b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.links
new file mode 100644
index 000000000..0de57d25d
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.links
@@ -0,0 +1,7 @@
+/usr/share/tqt3/mkspecs/linux-g++ /usr/share/tqt3/mkspecs/default
+/usr/bin/qmake-tqt3 /usr/share/tqt3/bin/qmake
+/usr/bin/lupdate-tqt3 /usr/share/tqt3/bin/lupdate
+/usr/bin/lrelease-tqt3 /usr/share/tqt3/bin/lrelease
+/usr/bin/uic-tqt3 /usr/share/tqt3/bin/uic
+/usr/bin/moc-tqt3 /usr/share/tqt3/bin/moc
+/usr/bin/qembed /usr/share/tqt3/bin/qembed
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.postinst b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.postinst
new file mode 100644
index 000000000..75022d56f
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.postinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/moc moc "/usr/bin/moc-tqt3" "45" \
+	--slave /usr/share/man/man1/moc.1.gz moc.1.gz \
+	"/usr/share/man/man1/moc-tqt3.1.gz"
+
+update-alternatives --install \
+        /usr/bin/uic uic "/usr/bin/uic-tqt3" "45" \
+	--slave /usr/share/man/man1/uic.1.gz uic.1.gz \
+	"/usr/share/man/man1/uic-tqt3.1.gz"
+
+update-alternatives --install \
+        /usr/bin/lupdate lupdate "/usr/bin/lupdate-tqt3" "45" \
+	--slave /usr/share/man/man1/lupdate.1.gz lupdate.1.gz \
+	"/usr/share/man/man1/lupdate-tqt3.1.gz"
+		
+update-alternatives --install \
+        /usr/bin/lrelease lrelease "/usr/bin/lrelease-tqt3" "45" \
+	--slave /usr/share/man/man1/lrelease.1.gz lrelease.1.gz \
+	"/usr/share/man/man1/lrelease-tqt3.1.gz"
+
+update-alternatives --install \
+        /usr/bin/qmake qmake "/usr/bin/qmake-tqt3" "45" \
+
+#DEBHELPER#
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.prerm b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.prerm
new file mode 100644
index 000000000..c0a69bfe9
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.prerm
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove moc "/usr/bin/moc-tqt3"
+    update-alternatives --remove uic "/usr/bin/uic-tqt3"
+    update-alternatives --remove lupdate "/usr/bin/lupdate-tqt3"
+    update-alternatives --remove lrelease "/usr/bin/lrelease-tqt3"
+    update-alternatives --remove qmake "/usr/bin/qmake-tqt3"
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-doc.doc-base b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-doc.doc-base
new file mode 100644
index 000000000..8fd0c977f
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-doc.doc-base
@@ -0,0 +1,11 @@
+Document: tqt3-doc
+Title: Qt Reference Documentation
+Author: Troll Tech
+Abstract: Qt (TM) is a multi-platform C++ GUI toolkit. It is a product of
+ Troll Tech. It is supported on all major variants of Microsoft Windows and
+ Unix/X Windows. 
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/tqt3-doc/html/index.html
+Files: /usr/share/doc/tqt3-doc/html/*.html
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-doc.docs b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-doc.docs
new file mode 100644
index 000000000..f08fd0f02
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-doc.docs
@@ -0,0 +1,2 @@
+FAQ
+README-QT.TXT
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-doc.links b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-doc.links
new file mode 100644
index 000000000..dfec5318b
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-doc.links
@@ -0,0 +1,2 @@
+/usr/share/man/man3 /usr/share/tqt3/doc/man/man3
+/usr/share/tqt3/doc/html /usr/share/doc/tqt3-doc/html
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.install
new file mode 100644
index 000000000..7484d8534
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.install
@@ -0,0 +1,4 @@
+usr/bin/linguist
+usr/share/tqt3/phrasebooks/*
+usr/share/tqt3/doc/html/linguist*html
+usr/share/tqt3/doc/html/linguist*dcf
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.links b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.links
new file mode 100644
index 000000000..aa157aded
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.links
@@ -0,0 +1 @@
+/usr/bin/linguist-tqt3 /usr/share/tqt3/bin/linguist
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.menu b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.menu
new file mode 100644
index 000000000..6da50281a
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.menu
@@ -0,0 +1,6 @@
+?package(tqt3-linguist):\
+        needs="x11"\
+        section="Applications/Programming"\
+        hints="KDE"\
+        title="Qt3 Linguist"\
+        command="/usr/bin/linguist-tqt3"
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.postinst b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.postinst
new file mode 100644
index 000000000..1dadc79df
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh 
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/linguist linguist "/usr/bin/linguist-tqt3" "45" \
+	--slave /usr/share/man/man1/linguist.1.gz linguist.1.gz \
+	"/usr/share/man/man1/linguist-tqt3.1.gz"
+
+#DEBHELPER#
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.prerm b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.prerm
new file mode 100644
index 000000000..38de53b13
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove linguist "/usr/bin/linguist-tqt3"
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.install
new file mode 100644
index 000000000..8fcee756b
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.install
@@ -0,0 +1 @@
+usr/bin/qtconfig
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.links b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.links
new file mode 100644
index 000000000..52e4d5473
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.links
@@ -0,0 +1 @@
+/usr/bin/qtconfig-tqt3 /usr/share/tqt3/bin/qtconfig
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.menu b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.menu
new file mode 100644
index 000000000..e567b050b
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.menu
@@ -0,0 +1,8 @@
+?package(tqt3-qtconfig):\
+        needs="x11"\
+        section="Applications/System/Administration"\
+        title="Qt3 Config"\
+        longtitle="Qt3 Configuration Utility"\
+        hints="Qt3 config tool"\
+        command="/usr/bin/qtconfig-tqt3"
+
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.postinst b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.postinst
new file mode 100644
index 000000000..9449d5b8a
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh 
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/qtconfig qtconfig "/usr/bin/qtconfig-tqt3" "45" \
+	--slave /usr/share/man/man1/qtconfig.1.gz qtconfig.1.gz \
+	"/usr/share/man/man1/qtconfig-tqt3.1.gz"
+
+#DEBHELPER#
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.prerm b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.prerm
new file mode 100644
index 000000000..810bc0a93
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove qtconfig "/usr/bin/qtconfig-tqt3"
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/control b/ubuntu/maverick/dependencies/tqtinterface/debian/control
index 8893caa29..82f413a8f 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/control
+++ b/ubuntu/maverick/dependencies/tqtinterface/debian/control
@@ -2,7 +2,7 @@ Source: libtqtinterface
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>> 4.0.0), libqt3-mt-dev, libavahi-tqt-dev, qt3-apps-dev, cmake, cdbs
+Build-Depends: debhelper (>> 4.0.0), libqt3-mt-dev, qt3-apps-dev, cmake, cdbs
 Standards-Version: 3.8.4
 
 Package: libtqtinterface
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/debian/squeeze/tdebase/debian/icons/kdeprint-16.xpm b/ubuntu/maverick/tdebase/debian/icons/tdeprint-16.xpm
index 4f03a0b06..58b87a90d 100644
--- a/debian/squeeze/tdebase/debian/icons/kdeprint-16.xpm
+++ b/ubuntu/maverick/tdebase/debian/icons/tdeprint-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/tdeprint.xpm
index f11005860..c10da523c 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kdeprint.xpm
+++ b/ubuntu/maverick/tdebase/debian/icons/tdeprint.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/ubuntu/maverick/tdebase/debian/icons/tdeprintfax-16.xpm
index debb554b6..3e07385e5 100644
--- a/debian/squeeze/tdebase/debian/icons/kdeprintfax-16.xpm
+++ b/ubuntu/maverick/tdebase/debian/icons/tdeprintfax-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/ubuntu/maverick/tdebase/debian/icons/tdeprintfax.xpm
index 6af142f57..9f5d6a2e7 100644
--- a/debian/lenny/tdebase/debian/icons/kdeprintfax.xpm
+++ b/ubuntu/maverick/tdebase/debian/icons/tdeprintfax.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
deleted file mode 100644
index bd25acf54..000000000
--- a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.install
+++ /dev/null
@@ -1,150 +0,0 @@
-debian/tmp/opt/trinity/bin/kdeprintfax
-debian/tmp/opt/trinity/bin/kjobviewer
-debian/tmp/opt/trinity/bin/kprinter
-debian/tmp/opt/trinity/lib/trinity/kcm_printmgr.la
-debian/tmp/opt/trinity/lib/trinity/kcm_printmgr.so
-debian/tmp/opt/trinity/lib/trinity/kio_print.la
-debian/tmp/opt/trinity/lib/trinity/kio_print.so
-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/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/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/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/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/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/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/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/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/kjobviewer.svgz
-debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/printmgr.svgz
-debian/tmp/opt/trinity/share/mimelnk/print/class.desktop
-debian/tmp/opt/trinity/share/mimelnk/print/driver.desktop
-debian/tmp/opt/trinity/share/mimelnk/print/folder.desktop
-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/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
diff --git a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.lintian b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.lintian
deleted file mode 100644
index 6cac09d35..000000000
--- a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.lintian
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.menu b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.menu
deleted file mode 100644
index 3140de34c..000000000
--- a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.menu
+++ /dev/null
@@ -1,35 +0,0 @@
-?package(kdeprint):\
-	needs="X11"\
-	section="Applications/System/Monitoring"\
-	hints="KDE"\
-	title="KJobViewer"\
-	icon32x32="/opt/trinity/share/pixmaps/kjobviewer.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kjobviewer-16.xpm"\
-	command="/opt/trinity/bin/kjobviewer --show --all"
-
-?package(kdeprint):\
-	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"\
-	command="/opt/trinity/bin/kprinter"
-
-?package(kdeprint):\
-	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"
-
-# Icon 32x32 kdeprint/kjobviewer/cr32-app-kjobviewer.png kjobviewer.xpm
-# Icon 16x16 kdeprint/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 kdeprint/kdeprintfax/cr32-app-kdeprintfax.png kdeprintfax.xpm
-# Icon 16x16 kdeprint/kdeprintfax/cr16-app-kdeprintfax.png kdeprintfax-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/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/man/kdeprintfax-trinity.1 b/ubuntu/maverick/tdebase/debian/man/tdeprintfax-trinity.1
index 0308ac1d8..353fb6529 100644
--- a/ubuntu/maverick/tdebase/debian/man/kdeprintfax-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/tdeprintfax-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/ubuntu/maverick/tdebase/debian/man/tdesu-trinity.1
index e552d288c..8befa3c39 100644
--- a/debian/squeeze/tdebase/debian/man/kdesu-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/tdesu-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/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_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_tdeprintfax_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
deleted file mode 100644
index f43d9196b..000000000
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: tdebase-doc-html-kdeprint
-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
-
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdeprint b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
new file mode 100644
index 000000000..7610a4313
--- /dev/null
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
@@ -0,0 +1,10 @@
+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/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/tdebase/debian/tdeprint-trinity.install b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.install
new file mode 100644
index 000000000..69f67a958
--- /dev/null
+++ b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.install
@@ -0,0 +1,150 @@
+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
+debian/tmp/opt/trinity/lib/trinity/kcm_printmgr.so
+debian/tmp/opt/trinity/lib/trinity/kio_print.la
+debian/tmp/opt/trinity/lib/trinity/kio_print.so
+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/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/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/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/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/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/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/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/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/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
+debian/tmp/opt/trinity/share/mimelnk/print/driver.desktop
+debian/tmp/opt/trinity/share/mimelnk/print/folder.desktop
+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/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/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/tdeprint-trinity.lintian b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.lintian
new file mode 100644
index 000000000..9da8261d7
--- /dev/null
+++ b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.lintian
@@ -0,0 +1,4 @@
+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/tdeprint-trinity.manpages
index 6d4136bf9..55b9bfae7 100644
--- a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.manpages
+++ b/ubuntu/maverick/tdebase/debian/tdeprint-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/tdeprint-trinity.menu b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.menu
new file mode 100644
index 000000000..1268aa55c
--- /dev/null
+++ b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.menu
@@ -0,0 +1,35 @@
+?package(tdeprint):\
+	needs="X11"\
+	section="Applications/System/Monitoring"\
+	hints="KDE"\
+	title="KJobViewer"\
+	icon32x32="/opt/trinity/share/pixmaps/kjobviewer.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kjobviewer-16.xpm"\
+	command="/opt/trinity/bin/kjobviewer --show --all"
+
+?package(tdeprint):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="KDE"\
+	title="KPrinter"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeprint.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeprint-16.xpm"\
+	command="/opt/trinity/bin/kprinter"
+
+?package(tdeprint):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="KDE"\
+	title="KDEPrintFax"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\
+	command="/opt/trinity/bin/tdeprintfax"
+
+# Icon 32x32 tdeprint/kjobviewer/cr32-app-kjobviewer.png kjobviewer.xpm
+# Icon 16x16 tdeprint/kjobviewer/cr16-app-kjobviewer.png kjobviewer-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 tdeprint/tdeprintfax/cr32-app-tdeprintfax.png tdeprintfax.xpm
+# Icon 16x16 tdeprint/tdeprintfax/cr16-app-tdeprintfax.png tdeprintfax-16.xpm
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/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/debian/lenny/tdelibs/debian/man/kdeinit-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1
index 1e1e10adf..1c3861783 100644
--- a/debian/lenny/tdelibs/debian/man/kdeinit-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/tdeinit-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/tdeinit_shutdown-trinity.1
index 11081656a..679666846 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kdeinit_shutdown-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/tdeinit_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/ubuntu/maverick/tdelibs/debian/man/tdesu_stub-trinity.1
index 7a3800513..f21330cc4 100644
--- a/debian/lenny/tdelibs/debian/man/kdesu_stub-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/tdesu_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/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