Update Debian and Ubuntu packaging to match recent renaming

8 files changed, 346 insertions, 346 deletions

diff --git a/debian/lenny/tdelibs/debian/changelog b/debian/lenny/tdelibs/debian/changelog
index 60b5c5d56..6a9f72874 100644
--- a/debian/lenny/tdelibs/debian/changelog
+++ b/debian/lenny/tdelibs/debian/changelog
@@ -388,7 +388,7 @@ tdelibs (4:3.5.7.dfsg.1-5) unstable; urgency=low
   +++ Changes by Fathi Boudra:
 
   * Move binaries to tdelibs4-dev: kconfig_compiler, ksvgtopng,
-    kunittestmodrunner, makekdewidgets, preparetips.
+    tdeunittestmodrunner, makekdewidgets, preparetips.
     Allow tdelibs5-dev co-installable alongside tdelibs4c2a.
 
   * Suggests perl-suid instead Recommends. (Closes: #437414)
@@ -602,7 +602,7 @@ tdelibs (4:3.5.7.dfsg.1-1) unstable; urgency=low
   * Resync debian/patches:
     - Remove, applied upstream: 
        22_konq_scroll2top_before_new_page_fix.diff,
-       25_khtml_non_existant_page_crash.diff,
+       25_tdehtml_non_existant_page_crash.diff,
        45_konqueror-CVE-2007-0537.diff,
        46_CVE-2007-1564-tdelibs-3.5.6.diff,
        47_tdelibs-kjs-utf8-parsing.diff.
@@ -731,7 +731,7 @@ tdelibs (4:3.5.6-0ubuntu3) feisty; urgency=low
 
 tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low
 
-  * Add kubuntu_67_kwallet_auto_save.diff
+  * Add kubuntu_67_tdewallet_auto_save.diff
     Kwallet auto-saves any modification.
     Closes Malone #67521
 
@@ -740,7 +740,7 @@ tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low
 tdelibs (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * Remove 02_kate_tdeprint_fixes_branch.diff
-  * Update 27_kdnssd_avahi.dif
+  * Update 27_tdednssd_avahi.dif
   * Remove 33_cups12_kprinter_fixes.diff
   * Remove 35_cups_unify_ipp_uri_assembling.diff
   * Remove 36_tdeprintd_64bit_fix.diff
@@ -823,8 +823,8 @@ tdelibs (4:3.5.6.r1.dfsg.1-3) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
-  * Add 44_sync_kwallet_changes to make kwallet write changes to disk
-    immediately, avoiding losing passwords if kwallet doesn't shutdown
+  * Add 44_sync_tdewallet_changes to make tdewallet write changes to disk
+    immediately, avoiding losing passwords if tdewallet doesn't shutdown
     cleanly. Patch by Josh Metzler. (Closes: #407272)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 18 Apr 2007 14:45:54 +0100
@@ -835,7 +835,7 @@ tdelibs (4:3.5.6.r1.dfsg.1-2) experimental; urgency=low
 
   * Fix the bug of KDE 3.5.6 - an annoying issue with konqueror scrolling to the top
     of the old page before loading a new one. Patch from upstream svn (22nd patch).
-  * New patch (No. 25) from KDE bug #128564. Fixes khtml crash on loading
+  * New patch (No. 25) from KDE bug #128564. Fixes tdehtml crash on loading
     some non existing pages when javascript is disabled (Closes: #408413).
     Probably fixes these KDE bugs too: #126812, #127137, #135117, #138449.
 
@@ -861,11 +861,11 @@ tdelibs (4:3.5.6.dfsg.1-1) experimental; urgency=low
 
   * New upstream release:
     * Fixes "Up arrow confused with PrintScrn on evdev keyboards". (Closes: #400887)
-    * Fixes infinite recursion in khtml when rendering combination of blocks
+    * Fixes infinite recursion in tdehtml when rendering combination of blocks
       with overflow:auto and float:right styles. (Closes: #392547)
     * Fixes "Fatal IO error: client killed" problem in knode. (Closes: #356142)
-    * Fixes non-standard rendering of floats (khtml). (Closes: #357017)
-    * Fixes konqueror (khtml) crash when resolving ns in a stylesheet
+    * Fixes non-standard rendering of floats (tdehtml). (Closes: #357017)
+    * Fixes konqueror (tdehtml) crash when resolving ns in a stylesheet
       @imported from external one. (Closes: #401937)
 
   +++ Changes by Modestas Vainius:
@@ -1016,7 +1016,7 @@ tdelibs (4:3.5.4-1) unstable; urgency=low
 
   * new upstreal release:
 
-    + Fixes null dereference in khtml, which could cause the browser to crash.
+    + Fixes null dereference in tdehtml, which could cause the browser to crash.
       This resolves CVE-2006-3672. Thankfully not every reproducible Konq crash
       bug gets a CVE number... (Closes: #378962)
 
@@ -1297,7 +1297,7 @@ tdelibs (4:3.5.3-1) unstable; urgency=low
 
 tdelibs (4:3.5.2-2) unstable; urgency=low
 
-  * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for khtml.
+  * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for tdehtml.
     Pages which, since the last upload, didn't render at all, or only showed
     headers, should be fixed.
 
@@ -1384,7 +1384,7 @@ tdelibs (4:3.5.1-1) unstable; urgency=low
 
   +++ Changes by Isaac Clerencia:
 
-  * Apply patch 27_kdnssd_avahi.diff to replace dummy tdelibs kdnssd
+  * Apply patch 27_tdednssd_avahi.diff to replace dummy tdelibs tdednssd
     implementation with a working avahi-based one.
 
   * Add Build-Depends on libavahi-client-dev and libavahi-qt3-dev to get
@@ -1432,7 +1432,7 @@ tdelibs (4:3.5.0-1) alioth; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Remove an old conffile from KDE 3.3, ktexteditor_autobookmarkerrc, on
+  * Remove an old conffile from KDE 3.3, tdetexteditor_autobookmarkerrc, on
     upgrade. (Closes: #339491)
 
   * Bump DH_COMPAT to 5. No changes, except tdelibs4c2a-dbg is replaced by
@@ -1607,20 +1607,20 @@ tdelibs (4:3.5.2-0ubuntu0) dapper; urgency=low
 tdelibs (4:3.5.1-0ubuntu11) dapper; urgency=low
 
   * Remove stray comma from configure.in.in in 
-    kubuntu_27_kdnssd_avahi.diff that stopped it picking up 
+    kubuntu_27_tdednssd_avahi.diff that stopped it picking up 
     -lavahi-common
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Mar 2006 17:35:07 +0000
 
 tdelibs (4:3.5.1-0ubuntu10) dapper; urgency=low
 
-  * Fix include path in kubuntu_27_kdnssd_avahi.diff patch
+  * Fix include path in kubuntu_27_tdednssd_avahi.diff patch
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 10 Mar 2006 15:34:38 +0000
 
 tdelibs (4:3.5.1-0ubuntu9) dapper; urgency=low
 
-  * Update 27_kdnssd_avahi.diff now called kubuntu_27_kdnssd_avahi.diff to 
+  * Update 27_tdednssd_avahi.diff now called kubuntu_27_tdednssd_avahi.diff to 
     fix crash when avahi is not installed
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  9 Mar 2006 09:59:35 +0000
@@ -1675,7 +1675,7 @@ tdelibs (4:3.5.1-0ubuntu2) dapper; urgency=low
 tdelibs (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
-  * Sync 27_kdnssd_avahi.diff with Debian
+  * Sync 27_tdednssd_avahi.diff with Debian
   * Use control-dapper and control-breezy for to allow for backports
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 15:04:54 +0000
@@ -1726,22 +1726,22 @@ tdelibs (4:3.5.0-0ubuntu7) dapper; urgency=low
 
 tdelibs (4:3.5.0-0ubuntu6) dapper; urgency=low
 
-  * Remove libkdnssd depend from tdelibs4-dev
+  * Remove libtdednssd depend from tdelibs4-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 09:09:29 +0000
 
 tdelibs (4:3.5.0-0ubuntu5) dapper; urgency=low
 
-  * Add kubuntu_27_kdnssd_avahi.diff for avahi support directly in
+  * Add kubuntu_27_tdednssd_avahi.diff for avahi support directly in
     tdelibs
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Jan 2006 21:14:20 +0000
 
 tdelibs (4:3.5.0-0ubuntu4) dapper; urgency=low
 
-  * Do not install kdnssd library files, they now come from
-    libkdnssd1-avahi package.  Development files stay in tdelibs4-dev.
-  * Add depends on libkdnssd1-avahi from tdelibs4-dev
+  * Do not install tdednssd library files, they now come from
+    libtdednssd1-avahi package.  Development files stay in tdelibs4-dev.
+  * Add depends on libtdednssd1-avahi from tdelibs4-dev
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Jan 2006 01:25:52 +0000
 
@@ -1754,7 +1754,7 @@ tdelibs (4:3.5.0-0ubuntu3) dapper; urgency=low
 
 tdelibs (4:3.5.0-0ubuntu2) dapper; urgency=low
 
-  * Add back updated kubuntu_06_kwallet_simplify_string.diff
+  * Add back updated kubuntu_06_tdewallet_simplify_string.diff
     and kubuntu_03_applications_menu_entries_move.diff
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Dec 2005 14:34:41 +0000
@@ -1849,7 +1849,7 @@ tdelibs (4:3.4.2-4) unstable; urgency=low
 
   +++ Changes by Adeodato Simó:
 
-  * Use khtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of
+  * Use tdehtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of
     whitespace around tags found inside <pre>. This was making konqueror
     sometimes ignore blank lines in pre mode, which made this friendly
     maintainer of yours terribly unhappy when visiting bts.turmzimmer.net.
@@ -2010,7 +2010,7 @@ tdelibs (4:3.4.1-0ubuntu9) breezy; urgency=low
 
 tdelibs (4:3.4.1-0ubuntu8) breezy; urgency=low
 
-  * Add kubuntu_06_kwallet_simplify_string.diff to simplify KWallet question
+  * Add kubuntu_06_tdewallet_simplify_string.diff to simplify KWallet question
   * Add kubuntu_07_rubberband.diff for pretty file manager selection
   * Add versioned build-dep on libxrender-dev and tighten version 
     build-dep of Qt to ensure libXrender.la changes
@@ -2374,7 +2374,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low
     for CAN-2004-1158. [CM]
 
   * Removed patches:
-    - post-3.3.1-tdelibs-khtml.diff and post-3.3.1-tdelibs-kio.diff since
+    - post-3.3.1-tdelibs-tdehtml.diff and post-3.3.1-tdelibs-kio.diff since
       these fixes are in KDE_3_3_BRANCH. [CM]
 
   * New patches:
@@ -2395,7 +2395,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low
 
   * New entries in debian/tdelibs4-dev.install:
     - usr/include/kiobuffer.h
-    - usr/include/kwallettypes.h
+    - usr/include/tdewallettypes.h
 
   * debian/control:
     - removed unneeded build-dependency on automake1.9. [CM]
@@ -2437,8 +2437,8 @@ tdelibs (4:3.3.1-2) unstable; urgency=medium
   * Include patch to fix CAN-2004-1171 ("plain text password exposure").
     Closes half of #285126. Notes about the patches:
 
-    - post-3.3.1-tdelibs-khtml.diff: dropped hunks #2 and #3 of patch to
-      khtml_part.cpp, since they were whitespace adjustments and were causing
+    - post-3.3.1-tdelibs-tdehtml.diff: dropped hunks #2 and #3 of patch to
+      tdehtml_part.cpp, since they were whitespace adjustments and were causing
       failures to apply.
 
     - post-3.3.1-tdelibs-kio.diff: the patch as given in the KDE Advisory
@@ -2838,7 +2838,7 @@ tdelibs (4:2.2.2-2) unstable; urgency=low
   * Remove recommends for libssl as I'm breaking policy by recommending
     something outside of main.  Will put this back once libssl goes into
     main.
-  * libkmid | libkmid-alsa to help users out a bit
+  * libtdemid | libtdemid-alsa to help users out a bit
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 22 Nov 2001 20:14:00 -0700
 
@@ -3027,7 +3027,7 @@ tdelibs (4:2.2.0-0.1beta1-1) unstable; urgency=low
  
   * synce with upstream
   * Drop optimization down for cross arch building
-  * Move libkscreensaver.so over to -dev package where it belongs
+  * Move libtdescreensaver.so over to -dev package where it belongs
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 25 Jul 2001 03:35:00 -0700
 
@@ -3106,7 +3106,7 @@ tdelibs (4:2.2.0-0beta1-1) unstable; urgency=low
   * Add Debian menu items: cupsdconf
   * New packages: tdelibs3-cups
   * Moving kdoc and qt-doc into Build-Depends-Indep
-  * Add Provides in for libarts-alsa/libkmid-alsa
+  * Add Provides in for libarts-alsa/libtdemid-alsa
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
 
@@ -3150,7 +3150,7 @@ tdelibs (4:2.1.1-4) unstable; urgency=low
 tdelibs (4:2.1.1-3) unstable; urgency=low
  
   * Sync with upstream.  
-    Includes several khtml fixes
+    Includes several tdehtml fixes
     Memory leak fix
     Proxy Authentication fix
   * Update pam file for kde, add more documentation in it and modify defaults
@@ -3198,7 +3198,7 @@ tdelibs (4:2.1.0.1-3) unstable; urgency=low
 tdelibs (4:2.1.0.1-2) unstable; urgency=low
  
   * More upstream fixes
-    several khtml fixes especially with css
+    several tdehtml fixes especially with css
     more font fixes
     more session fixes..hopefully solving some of the reports
   * built with new kdoc
@@ -3298,8 +3298,8 @@ tdelibs (4:2.1-20010118-1) unstable; urgency=low
      fix JS and onmouseovers
    * mimetype fixes (Closes: #76455)
    * fix build order for libarts-alsa
-   * breaking out libkmid to avoid unnessary depends (Closes: #82901, #82924)
-   * libarts and libkmid are Recommends of tdelibs3 and not dependant now
+   * breaking out libtdemid to avoid unnessary depends (Closes: #82901, #82924)
+   * libarts and libtdemid are Recommends of tdelibs3 and not dependant now
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 18 Jan 2001 13:00:00 -0700
 
diff --git a/debian/lenny/tdelibs/debian/copyright b/debian/lenny/tdelibs/debian/copyright
index 7c67eaede..945a09ca9 100644
--- a/debian/lenny/tdelibs/debian/copyright
+++ b/debian/lenny/tdelibs/debian/copyright
@@ -14,9 +14,9 @@ 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, tdecore, kded, tdefx,
-tdeprint, tdesu, tdeui, kdewidgets, khtml, kimgio, kinit, kio, kioslave, kjs,
-kparts, ksmartcard, kspell, kstyles, libkmid, libkscreensaver
+libartskde, interfaces, kabc, kate, tdecert, kconf_update, tdecore, kded, tdefx,
+tdeprint, tdesu, tdeui, kdewidgets, tdehtml, kimgio, kinit, kio, kioslave, kjs,
+tdeparts, ksmartcard, tdespell, kstyles, libtdemid, libtdescreensaver
 ------------------------------------------------------------------------------
 LGPL
 
diff --git a/debian/lenny/tdelibs/debian/man/kunittestmodrunner-trinity.1 b/debian/lenny/tdelibs/debian/man/tdeunittestmodrunner-trinity.1
index b61b06654..56c4f3bc6 100644
--- a/debian/lenny/tdelibs/debian/man/kunittestmodrunner-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/tdeunittestmodrunner-trinity.1
@@ -1,18 +1,18 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KUNITTESTMODRUNNER 1 "Jun 2006" "K Desktop Environment" "KUnitTest modules runner"
 .SH NAME
-kunittestmodrunner
+tdeunittestmodrunner
 \- a KDE command\-line application to run KUnitTest modules
 .SH SYNOPSIS
-\fBkunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] 
+\fBtdeunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] 
 .SH DESCRIPTION
-\fBkunittestmodrunner\fP is a command\-line application to run KUnitTest modules.
-It loads all kunittest_*.la modules in the current directory. The exit code is the number of unexpected failures.
+\fBtdeunittestmodrunner\fP is a command\-line application to run KUnitTest modules.
+It loads all tdeunittest_*.la modules in the current directory. The exit code is the number of unexpected failures.
 .SH OPTIONS
 .SS Options:
 .TP
 .BR  \-\-query \ [ regexp ]
-Only run modules whose filenames match the regexp. [^kunittest_.*\.la$]
+Only run modules whose filenames match the regexp. [^tdeunittest_.*\.la$]
 .TP
 .BR  \-\-folder \ [ folder ]
 Only run tests modules which are found in the folder. Use the query option to select modules. [.]
@@ -141,7 +141,7 @@ sets the application GUI style
 sets the client geometry of the main widget \- see man X for the argument format
 .SS
 .SH SEE ALSO
-.BR kunittestguimodrunner (1)
+.BR tdeunittestguimodrunner (1)
 .sp 1
 .TP
 .BR http://developer.kde.org
diff --git a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
index 88bf85c86..9bcd52fc7 100644
--- a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
@@ -15,7 +15,7 @@ debian/tmp/etc/trinity/kthemestylerc
 debian/tmp/etc/trinity/language.codes
 debian/tmp/etc/trinity/ui/kprintpreviewui.rc
 debian/tmp/etc/trinity/ui/ui_standards.rc
-debian/tmp/opt/trinity/share/applications/tde/kresources.desktop
+debian/tmp/opt/trinity/share/applications/tde/tderesources.desktop
 debian/tmp/opt/trinity/share/apps/dcopidlng/Ast.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/Iter.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kalyptus
@@ -35,9 +35,9 @@ debian/tmp/opt/trinity/share/apps/katepart/scripts/script-indent-c-char.js
 debian/tmp/opt/trinity/share/apps/katepart/scripts/script-indent-c-newline.js
 debian/tmp/opt/trinity/share/apps/katepart/scripts/sort.js
 debian/tmp/opt/trinity/share/apps/katepart/syntax/*.xml
-debian/tmp/opt/trinity/share/apps/kcertpart/kcertpart.rc
+debian/tmp/opt/trinity/share/apps/tdecertpart/tdecertpart.rc
 debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_instantmessenger.desktop
-debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_ktexteditor.desktop
+debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_tdetexteditor.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/tdeprintrc.upd
@@ -229,22 +229,22 @@ debian/tmp/opt/trinity/share/apps/kdewidgets/pics/ktimewidget.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kurlcomborequester.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kurllabel.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kurlrequester.png
-debian/tmp/opt/trinity/share/apps/khtml/css/html4.css
-debian/tmp/opt/trinity/share/apps/khtml/css/quirks.css
-debian/tmp/opt/trinity/share/apps/khtml/domain_info
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/128x128/actions/bug.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/bug.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/images_display.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/wallet_open.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/22x22/actions/bug.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/22x22/actions/images_display.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/32x32/actions/bug.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/32x32/actions/images_display.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/48x48/actions/bug.png
-debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/64x64/actions/bug.png
-debian/tmp/opt/trinity/share/apps/khtml/khtml_browser.rc
-debian/tmp/opt/trinity/share/apps/khtml/khtml_popupmenu.rc
-debian/tmp/opt/trinity/share/apps/khtml/khtml.rc
+debian/tmp/opt/trinity/share/apps/tdehtml/css/html4.css
+debian/tmp/opt/trinity/share/apps/tdehtml/css/quirks.css
+debian/tmp/opt/trinity/share/apps/tdehtml/domain_info
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/128x128/actions/bug.png
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/bug.png
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/images_display.png
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/wallet_open.png
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/bug.png
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/images_display.png
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/bug.png
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/images_display.png
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/48x48/actions/bug.png
+debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/64x64/actions/bug.png
+debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_browser.rc
+debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_popupmenu.rc
+debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml.rc
 debian/tmp/opt/trinity/share/apps/kio_uiserver/icons/crystalsvg/16x16/apps/kio_uiserver.png
 debian/tmp/opt/trinity/share/apps/kjava/icons/crystalsvg/16x16/actions/java.png
 debian/tmp/opt/trinity/share/apps/kjava/kjava.jar
@@ -1714,10 +1714,10 @@ debian/tmp/opt/trinity/share/apps/kstyle/themes/qtplatinum.themerc
 debian/tmp/opt/trinity/share/apps/kstyle/themes/qtsgi.themerc
 debian/tmp/opt/trinity/share/apps/kstyle/themes/qtwindows.themerc
 debian/tmp/opt/trinity/share/apps/kstyle/themes/riscos.themerc
-debian/tmp/opt/trinity/share/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc
-debian/tmp/opt/trinity/share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc
-debian/tmp/opt/trinity/share/apps/ktexteditor_isearch/ktexteditor_isearchui.rc
-debian/tmp/opt/trinity/share/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc
+debian/tmp/opt/trinity/share/apps/tdetexteditor_docwordcompletion/docwordcompletionui.rc
+debian/tmp/opt/trinity/share/apps/tdetexteditor_insertfile/tdetexteditor_insertfileui.rc
+debian/tmp/opt/trinity/share/apps/tdetexteditor_isearch/tdetexteditor_isearchui.rc
+debian/tmp/opt/trinity/share/apps/tdetexteditor_kdatatool/tdetexteditor_kdatatoolui.rc
 debian/tmp/opt/trinity/share/apps/LICENSES/ARTISTIC
 debian/tmp/opt/trinity/share/apps/LICENSES/BSD
 debian/tmp/opt/trinity/share/apps/LICENSES/GPL_V2
@@ -1780,9 +1780,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-docbottom.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-doctop.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/x11-license.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/xml.dcl
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/index.docbook
 debian/tmp/opt/trinity/share/emoticons/Default/angry.png
 debian/tmp/opt/trinity/share/emoticons/Default/bat.png
 debian/tmp/opt/trinity/share/emoticons/Default/beer.png
@@ -1922,7 +1922,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/image.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/info.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/karbon_karbon.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/kexi_kexi.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/kmultiple.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/tdemultiple.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/koffice.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/krita_kra.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/log.png
@@ -2354,7 +2354,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kchart_chrt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kexi_kexi.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kformula_kfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kivio_flw.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kmultiple.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/tdemultiple.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kpresenter_kpr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/krita_kra.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kspread_ksp.png
@@ -2723,7 +2723,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kchart_chrt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kexi_kexi.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kformula_kfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kivio_flw.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kmultiple.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/tdemultiple.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/koffice.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kpresenter_kpr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/krita_kra.png
@@ -3102,7 +3102,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kchart_chrt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kexi_kexi.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kformula_kfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kivio_flw.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kmultiple.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/tdemultiple.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kpresenter_kpr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/krita_kra.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kspread_ksp.png
@@ -3332,7 +3332,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kchart_chrt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kexi_kexi.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kformula_kfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kivio_flw.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kmultiple.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/tdemultiple.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/koffice.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kpresenter_kpr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/krita_kra.png
@@ -3517,7 +3517,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/karbon_karbon.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kchart_chrt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kformula_kfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kivio_flw.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kmultiple.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/tdemultiple.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/koffice.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kpresenter_kpr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/krita_kra.png
@@ -3600,35 +3600,35 @@ debian/tmp/opt/trinity/share/services/jp2.kimgio
 debian/tmp/opt/trinity/share/services/jpeg.kimgio
 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/tdecertpart.desktop
 debian/tmp/opt/trinity/share/services/kded/kcookiejar.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
-debian/tmp/opt/trinity/share/services/kded/kwalletd.desktop
+debian/tmp/opt/trinity/share/services/kded/tdewalletd.desktop
 debian/tmp/opt/trinity/share/services/kded/proxyscout.desktop
 debian/tmp/opt/trinity/share/services/kgzipfilter.desktop
-debian/tmp/opt/trinity/share/services/khtml.desktop
-debian/tmp/opt/trinity/share/services/khtmlimage.desktop
+debian/tmp/opt/trinity/share/services/tdehtml.desktop
+debian/tmp/opt/trinity/share/services/tdehtmlimage.desktop
 debian/tmp/opt/trinity/share/services/kio_uiserver.desktop
 debian/tmp/opt/trinity/share/services/kjavaappletviewer.desktop
 debian/tmp/opt/trinity/share/services/kmailservice.protocol
-debian/tmp/opt/trinity/share/services/kmultipart.desktop
+debian/tmp/opt/trinity/share/services/tdemultipart.desktop
 debian/tmp/opt/trinity/share/services/knotify.desktop
-debian/tmp/opt/trinity/share/services/kresources/kabc/dir.desktop
-debian/tmp/opt/trinity/share/services/kresources/kabc/file.desktop
-debian/tmp/opt/trinity/share/services/kresources/kabc/net.desktop
-debian/tmp/opt/trinity/share/services/kresources/kabc/ldapkio.desktop
-debian/tmp/opt/trinity/share/services/kresources/kabc_manager.desktop
+debian/tmp/opt/trinity/share/services/tderesources/kabc/dir.desktop
+debian/tmp/opt/trinity/share/services/tderesources/kabc/file.desktop
+debian/tmp/opt/trinity/share/services/tderesources/kabc/net.desktop
+debian/tmp/opt/trinity/share/services/tderesources/kabc/ldapkio.desktop
+debian/tmp/opt/trinity/share/services/tderesources/kabc_manager.desktop
 
-debian/tmp/opt/trinity/share/services/kspell_aspell.desktop
-debian/tmp/opt/trinity/share/services/kspell_hspell.desktop
-debian/tmp/opt/trinity/share/services/kspell_ispell.desktop
-debian/tmp/opt/trinity/share/services/ktexteditor_docwordcompletion.desktop
-debian/tmp/opt/trinity/share/services/ktexteditor_insertfile.desktop
-debian/tmp/opt/trinity/share/services/ktexteditor_isearch.desktop
-debian/tmp/opt/trinity/share/services/ktexteditor_kdatatool.desktop
+debian/tmp/opt/trinity/share/services/tdespell_aspell.desktop
+debian/tmp/opt/trinity/share/services/tdespell_hspell.desktop
+debian/tmp/opt/trinity/share/services/tdespell_ispell.desktop
+debian/tmp/opt/trinity/share/services/tdetexteditor_docwordcompletion.desktop
+debian/tmp/opt/trinity/share/services/tdetexteditor_insertfile.desktop
+debian/tmp/opt/trinity/share/services/tdetexteditor_isearch.desktop
+debian/tmp/opt/trinity/share/services/tdetexteditor_kdatatool.desktop
 debian/tmp/opt/trinity/share/services/metainfo.protocol
 debian/tmp/opt/trinity/share/services/mms.protocol
 debian/tmp/opt/trinity/share/services/mmst.protocol
@@ -3667,21 +3667,21 @@ debian/tmp/opt/trinity/share/servicetypes/kcomprfilter.desktop
 debian/tmp/opt/trinity/share/servicetypes/kdatatool.desktop
 debian/tmp/opt/trinity/share/servicetypes/kdedmodule.desktop
 debian/tmp/opt/trinity/share/servicetypes/kfileplugin.desktop
-debian/tmp/opt/trinity/share/servicetypes/kmediaplayer.desktop
-debian/tmp/opt/trinity/share/servicetypes/kmediaplayerengine.desktop
+debian/tmp/opt/trinity/share/servicetypes/tdemediaplayer.desktop
+debian/tmp/opt/trinity/share/servicetypes/tdemediaplayerengine.desktop
 debian/tmp/opt/trinity/share/servicetypes/kpart.desktop
 debian/tmp/opt/trinity/share/servicetypes/kplugininfo.desktop
 debian/tmp/opt/trinity/share/servicetypes/kpropsdlgplugin.desktop
 debian/tmp/opt/trinity/share/servicetypes/kregexpeditor.desktop
-debian/tmp/opt/trinity/share/servicetypes/kresources_manager.desktop
-debian/tmp/opt/trinity/share/servicetypes/kresources_plugin.desktop
+debian/tmp/opt/trinity/share/servicetypes/tderesources_manager.desktop
+debian/tmp/opt/trinity/share/servicetypes/tderesources_plugin.desktop
 debian/tmp/opt/trinity/share/servicetypes/krop.desktop
 debian/tmp/opt/trinity/share/servicetypes/krwp.desktop
 debian/tmp/opt/trinity/share/servicetypes/kscan.desktop
-debian/tmp/opt/trinity/share/servicetypes/kspellclient.desktop
-debian/tmp/opt/trinity/share/servicetypes/ktexteditor.desktop
-debian/tmp/opt/trinity/share/servicetypes/ktexteditoreditor.desktop
-debian/tmp/opt/trinity/share/servicetypes/ktexteditorplugin.desktop
+debian/tmp/opt/trinity/share/servicetypes/tdespellclient.desktop
+debian/tmp/opt/trinity/share/servicetypes/tdetexteditor.desktop
+debian/tmp/opt/trinity/share/servicetypes/tdetexteditoreditor.desktop
+debian/tmp/opt/trinity/share/servicetypes/tdetexteditorplugin.desktop
 debian/tmp/opt/trinity/share/servicetypes/kurifilterplugin.desktop
 debian/tmp/opt/trinity/share/servicetypes/renamedlgplugin.desktop
 debian/tmp/opt/trinity/share/servicetypes/scriptinterface.desktop
diff --git a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.preinst b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.preinst
index 452b17bfc..c6c9c016f 100644
--- a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.preinst
+++ b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.preinst
@@ -10,7 +10,7 @@ case "$1" in
 	rm -f /etc/trinity/colors/40\ Colors
 	rm -f /etc/trinity/colors/Royal
 	rm -f /etc/trinity/colors/Web
-	rm -f /etc/trinity/ktexteditor_autobookmarkerrc
+	rm -f /etc/trinity/tdetexteditor_autobookmarkerrc
 	[ -f "$FILE" ] || exit 0
 	MD5SUMOLD=`md5sum $FILE | awk '{print $1}'`
 	if dpkg --compare-versions "$2" lt "4:3.4.0-0pre5"; then
diff --git a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
index 30baf6aa3..6f7afbc0c 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/bin/dcopidl2cpp
 debian/tmp/opt/trinity/bin/dcopidlng
 debian/tmp/opt/trinity/bin/kconfig_compiler
 debian/tmp/opt/trinity/bin/ksvgtopng
-debian/tmp/opt/trinity/bin/kunittestmodrunner
+debian/tmp/opt/trinity/bin/tdeunittestmodrunner
 debian/tmp/opt/trinity/bin/makekdewidgets
 debian/tmp/opt/trinity/bin/preparetips
 
@@ -291,11 +291,11 @@ debian/tmp/opt/trinity/include/khexedit/charcolumninterface.h
 debian/tmp/opt/trinity/include/khexedit/clipboardinterface.h
 debian/tmp/opt/trinity/include/khexedit/valuecolumninterface.h
 debian/tmp/opt/trinity/include/khexedit/zoominterface.h
-debian/tmp/opt/trinity/include/khtmldefaults.h
-debian/tmp/opt/trinity/include/khtml_events.h
-debian/tmp/opt/trinity/include/khtml_part.h
-debian/tmp/opt/trinity/include/khtml_settings.h
-debian/tmp/opt/trinity/include/khtmlview.h
+debian/tmp/opt/trinity/include/tdehtmldefaults.h
+debian/tmp/opt/trinity/include/tdehtml_events.h
+debian/tmp/opt/trinity/include/tdehtml_part.h
+debian/tmp/opt/trinity/include/tdehtml_settings.h
+debian/tmp/opt/trinity/include/tdehtmlview.h
 debian/tmp/opt/trinity/include/khttpproxysocketdevice.h
 debian/tmp/opt/trinity/include/kicondialog.h
 debian/tmp/opt/trinity/include/kiconeffect.h
@@ -308,8 +308,8 @@ debian/tmp/opt/trinity/include/kimageeffect.h
 debian/tmp/opt/trinity/include/kimagefilepreview.h
 debian/tmp/opt/trinity/include/kimageio.h
 debian/tmp/opt/trinity/include/kimiface.h
-debian/tmp/opt/trinity/include/kimproxy.h
-debian/tmp/opt/trinity/include/kimproxyiface.h
+debian/tmp/opt/trinity/include/tdeimproxy.h
+debian/tmp/opt/trinity/include/tdeimproxyiface.h
 debian/tmp/opt/trinity/include/kinputdialog.h
 debian/tmp/opt/trinity/include/kinstance.h
 debian/tmp/opt/trinity/include/kio/authinfo.h
@@ -329,7 +329,7 @@ debian/tmp/opt/trinity/include/kio/job.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
+debian/tmp/opt/trinity/include/kio/tdentlm.h
 debian/tmp/opt/trinity/include/kio/metainfojob.h
 debian/tmp/opt/trinity/include/kio/netaccess.h
 debian/tmp/opt/trinity/include/kio/observer.h
@@ -388,24 +388,24 @@ debian/tmp/opt/trinity/include/kmainwindow.h
 debian/tmp/opt/trinity/include/kmainwindowiface.h
 debian/tmp/opt/trinity/include/kmanagerselection.h
 debian/tmp/opt/trinity/include/kmdcodec.h
-debian/tmp/opt/trinity/include/kmdichildarea.h
-debian/tmp/opt/trinity/include/kmdichildfrmcaption.h
-debian/tmp/opt/trinity/include/kmdichildfrm.h
-debian/tmp/opt/trinity/include/kmdichildview.h
-debian/tmp/opt/trinity/include/kmdidefines.h
-debian/tmp/opt/trinity/include/kmdi/global.h
-debian/tmp/opt/trinity/include/kmdiiterator.h
-debian/tmp/opt/trinity/include/kmdilistiterator.h
-debian/tmp/opt/trinity/include/kmdimainfrm.h
-debian/tmp/opt/trinity/include/kmdi/mainwindow.h
-debian/tmp/opt/trinity/include/kmdinulliterator.h
-debian/tmp/opt/trinity/include/kmdi/tabwidget.h
-debian/tmp/opt/trinity/include/kmditaskbar.h
-debian/tmp/opt/trinity/include/kmdi/toolviewaccessor.h
-debian/tmp/opt/trinity/include/kmditoolviewaccessor.h
-debian/tmp/opt/trinity/include/kmediaplayer/playerdcopobject.h
-debian/tmp/opt/trinity/include/kmediaplayer/player.h
-debian/tmp/opt/trinity/include/kmediaplayer/view.h
+debian/tmp/opt/trinity/include/tdemdichildarea.h
+debian/tmp/opt/trinity/include/tdemdichildfrmcaption.h
+debian/tmp/opt/trinity/include/tdemdichildfrm.h
+debian/tmp/opt/trinity/include/tdemdichildview.h
+debian/tmp/opt/trinity/include/tdemdidefines.h
+debian/tmp/opt/trinity/include/tdemdi/global.h
+debian/tmp/opt/trinity/include/tdemdiiterator.h
+debian/tmp/opt/trinity/include/tdemdilistiterator.h
+debian/tmp/opt/trinity/include/tdemdimainfrm.h
+debian/tmp/opt/trinity/include/tdemdi/mainwindow.h
+debian/tmp/opt/trinity/include/tdemdinulliterator.h
+debian/tmp/opt/trinity/include/tdemdi/tabwidget.h
+debian/tmp/opt/trinity/include/tdemditaskbar.h
+debian/tmp/opt/trinity/include/tdemdi/toolviewaccessor.h
+debian/tmp/opt/trinity/include/tdemditoolviewaccessor.h
+debian/tmp/opt/trinity/include/tdemediaplayer/playerdcopobject.h
+debian/tmp/opt/trinity/include/tdemediaplayer/player.h
+debian/tmp/opt/trinity/include/tdemediaplayer/view.h
 debian/tmp/opt/trinity/include/kmenubar.h
 debian/tmp/opt/trinity/include/kmessagebox.h
 debian/tmp/opt/trinity/include/kmimemagic.h
@@ -414,10 +414,10 @@ debian/tmp/opt/trinity/include/kmimetypechooser.h
 debian/tmp/opt/trinity/include/kmimetype.h
 debian/tmp/opt/trinity/include/kmimetyperesolver.h
 debian/tmp/opt/trinity/include/kmountpoint.h
-debian/tmp/opt/trinity/include/kmulticastsocketdevice.h
-debian/tmp/opt/trinity/include/kmulticastsocket.h
-debian/tmp/opt/trinity/include/kmultipledrag.h
-debian/tmp/opt/trinity/include/kmultitabbar.h
+debian/tmp/opt/trinity/include/tdemulticastsocketdevice.h
+debian/tmp/opt/trinity/include/tdemulticastsocket.h
+debian/tmp/opt/trinity/include/tdemultipledrag.h
+debian/tmp/opt/trinity/include/tdemultitabbar.h
 debian/tmp/opt/trinity/include/knetworkinterface.h
 debian/tmp/opt/trinity/include/knewstuff/downloaddialog.h
 debian/tmp/opt/trinity/include/knewstuff/engine.h
@@ -442,20 +442,20 @@ debian/tmp/opt/trinity/include/kpanelapplet.h
 debian/tmp/opt/trinity/include/kpanelappmenu.h
 debian/tmp/opt/trinity/include/kpanelextension.h
 debian/tmp/opt/trinity/include/kpanelmenu.h
-debian/tmp/opt/trinity/include/kparts/browserextension.h
-debian/tmp/opt/trinity/include/kparts/browserinterface.h
-debian/tmp/opt/trinity/include/kparts/browserrun.h
-debian/tmp/opt/trinity/include/kparts/componentfactory.h
-debian/tmp/opt/trinity/include/kparts/dockmainwindow.h
-debian/tmp/opt/trinity/include/kparts/event.h
-debian/tmp/opt/trinity/include/kparts/factory.h
-debian/tmp/opt/trinity/include/kparts/genericfactory.h
-debian/tmp/opt/trinity/include/kparts/historyprovider.h
-debian/tmp/opt/trinity/include/kparts/mainwindow.h
-debian/tmp/opt/trinity/include/kparts/part.h
-debian/tmp/opt/trinity/include/kparts/partmanager.h
-debian/tmp/opt/trinity/include/kparts/plugin.h
-debian/tmp/opt/trinity/include/kparts/statusbarextension.h
+debian/tmp/opt/trinity/include/tdeparts/browserextension.h
+debian/tmp/opt/trinity/include/tdeparts/browserinterface.h
+debian/tmp/opt/trinity/include/tdeparts/browserrun.h
+debian/tmp/opt/trinity/include/tdeparts/componentfactory.h
+debian/tmp/opt/trinity/include/tdeparts/dockmainwindow.h
+debian/tmp/opt/trinity/include/tdeparts/event.h
+debian/tmp/opt/trinity/include/tdeparts/factory.h
+debian/tmp/opt/trinity/include/tdeparts/genericfactory.h
+debian/tmp/opt/trinity/include/tdeparts/historyprovider.h
+debian/tmp/opt/trinity/include/tdeparts/mainwindow.h
+debian/tmp/opt/trinity/include/tdeparts/part.h
+debian/tmp/opt/trinity/include/tdeparts/partmanager.h
+debian/tmp/opt/trinity/include/tdeparts/plugin.h
+debian/tmp/opt/trinity/include/tdeparts/statusbarextension.h
 debian/tmp/opt/trinity/include/kpassdlg.h
 debian/tmp/opt/trinity/include/kpassivepopup.h
 debian/tmp/opt/trinity/include/kpixmapeffect.h
@@ -490,15 +490,15 @@ debian/tmp/opt/trinity/include/kremoteencoding.h
 debian/tmp/opt/trinity/include/kreplacedialog.h
 debian/tmp/opt/trinity/include/kreplace.h
 debian/tmp/opt/trinity/include/kresolver.h
-debian/tmp/opt/trinity/include/kresources/configdialog.h
-debian/tmp/opt/trinity/include/kresources/configpage.h
-debian/tmp/opt/trinity/include/kresources/configwidget.h
-debian/tmp/opt/trinity/include/kresources/factory.h
-debian/tmp/opt/trinity/include/kresources/manager.h
-debian/tmp/opt/trinity/include/kresources/manageriface.h
-debian/tmp/opt/trinity/include/kresources/managerimpl.h
-debian/tmp/opt/trinity/include/kresources/resource.h
-debian/tmp/opt/trinity/include/kresources/selectdialog.h
+debian/tmp/opt/trinity/include/tderesources/configdialog.h
+debian/tmp/opt/trinity/include/tderesources/configpage.h
+debian/tmp/opt/trinity/include/tderesources/configwidget.h
+debian/tmp/opt/trinity/include/tderesources/factory.h
+debian/tmp/opt/trinity/include/tderesources/manager.h
+debian/tmp/opt/trinity/include/tderesources/manageriface.h
+debian/tmp/opt/trinity/include/tderesources/managerimpl.h
+debian/tmp/opt/trinity/include/tderesources/resource.h
+debian/tmp/opt/trinity/include/tderesources/selectdialog.h
 debian/tmp/opt/trinity/include/krestrictedline.h
 debian/tmp/opt/trinity/include/kreverseresolver.h
 debian/tmp/opt/trinity/include/krfcdate.h
@@ -510,8 +510,8 @@ debian/tmp/opt/trinity/include/ksambashare.h
 debian/tmp/opt/trinity/include/ksavefile.h
 debian/tmp/opt/trinity/include/kscan.h
 debian/tmp/opt/trinity/include/ksconfig.h
-debian/tmp/opt/trinity/include/kscreensaver.h
-debian/tmp/opt/trinity/include/kscreensaver_vroot.h
+debian/tmp/opt/trinity/include/tdescreensaver.h
+debian/tmp/opt/trinity/include/tdescreensaver_vroot.h
 debian/tmp/opt/trinity/include/kscrollview.h
 debian/tmp/opt/trinity/include/kselect.h
 debian/tmp/opt/trinity/include/kseparator.h
@@ -543,18 +543,18 @@ debian/tmp/opt/trinity/include/ksockssocketdevice.h
 debian/tmp/opt/trinity/include/ksortablevaluelist.h
 debian/tmp/opt/trinity/include/kspeech.h
 debian/tmp/opt/trinity/include/kspeechsink.h
-debian/tmp/opt/trinity/include/kspell2/backgroundchecker.h
-debian/tmp/opt/trinity/include/kspell2/broker.h
-debian/tmp/opt/trinity/include/kspell2/configdialog.h
-debian/tmp/opt/trinity/include/kspell2/configwidget.h
-debian/tmp/opt/trinity/include/kspell2/defaultdictionary.h
-debian/tmp/opt/trinity/include/kspell2/dialog.h
-debian/tmp/opt/trinity/include/kspell2/dictionary.h
-debian/tmp/opt/trinity/include/kspell2/filter.h
-debian/tmp/opt/trinity/include/kspell2/highlighter.h
-debian/tmp/opt/trinity/include/kspell2/settings.h
-debian/tmp/opt/trinity/include/kspelldlg.h
-debian/tmp/opt/trinity/include/kspell.h
+debian/tmp/opt/trinity/include/tdespell2/backgroundchecker.h
+debian/tmp/opt/trinity/include/tdespell2/broker.h
+debian/tmp/opt/trinity/include/tdespell2/configdialog.h
+debian/tmp/opt/trinity/include/tdespell2/configwidget.h
+debian/tmp/opt/trinity/include/tdespell2/defaultdictionary.h
+debian/tmp/opt/trinity/include/tdespell2/dialog.h
+debian/tmp/opt/trinity/include/tdespell2/dictionary.h
+debian/tmp/opt/trinity/include/tdespell2/filter.h
+debian/tmp/opt/trinity/include/tdespell2/highlighter.h
+debian/tmp/opt/trinity/include/tdespell2/settings.h
+debian/tmp/opt/trinity/include/tdespelldlg.h
+debian/tmp/opt/trinity/include/tdespell.h
 debian/tmp/opt/trinity/include/ksplashscreen.h
 debian/tmp/opt/trinity/include/ksqueezedtextlabel.h
 debian/tmp/opt/trinity/include/ksslall.h
@@ -593,9 +593,9 @@ debian/tmp/opt/trinity/include/kstringvalidator.h
 debian/tmp/opt/trinity/include/kstyle.h
 debian/tmp/opt/trinity/include/ksvgiconengine.h
 debian/tmp/opt/trinity/include/kswitchlanguagedialog.h
-debian/tmp/opt/trinity/include/ksycocaentry.h
-debian/tmp/opt/trinity/include/ksycoca.h
-debian/tmp/opt/trinity/include/ksycocatype.h
+debian/tmp/opt/trinity/include/tdesycocaentry.h
+debian/tmp/opt/trinity/include/tdesycoca.h
+debian/tmp/opt/trinity/include/tdesycocatype.h
 debian/tmp/opt/trinity/include/ksyntaxhighlighter.h
 debian/tmp/opt/trinity/include/ksystemtray.h
 debian/tmp/opt/trinity/include/ktabbar.h
@@ -606,39 +606,39 @@ debian/tmp/opt/trinity/include/ktempdir.h
 debian/tmp/opt/trinity/include/ktempfile.h
 debian/tmp/opt/trinity/include/ktextbrowser.h
 debian/tmp/opt/trinity/include/ktextedit.h
-debian/tmp/opt/trinity/include/ktexteditor/blockselectioninterface.h
-debian/tmp/opt/trinity/include/ktexteditor/clipboardinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/codecompletioninterface.h
-debian/tmp/opt/trinity/include/ktexteditor/configinterfaceextension.h
-debian/tmp/opt/trinity/include/ktexteditor/configinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/cursorinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/document.h
-debian/tmp/opt/trinity/include/ktexteditor/documentinfo.h
-debian/tmp/opt/trinity/include/ktexteditor/dynwordwrapinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/editinterfaceext.h
-debian/tmp/opt/trinity/include/ktexteditor/editinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/editorchooser.h
-debian/tmp/opt/trinity/include/ktexteditor/editor.h
-debian/tmp/opt/trinity/include/ktexteditor/encodinginterface.h
-debian/tmp/opt/trinity/include/ktexteditor/highlightinginterface.h
-debian/tmp/opt/trinity/include/ktexteditor/markinterfaceextension.h
-debian/tmp/opt/trinity/include/ktexteditor/markinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/plugin.h
-debian/tmp/opt/trinity/include/ktexteditor/popupmenuinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/printinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/searchinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/selectionextdcopinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/selectioninterfaceext.h
-debian/tmp/opt/trinity/include/ktexteditor/selectioninterface.h
-debian/tmp/opt/trinity/include/ktexteditor/sessionconfiginterface.h
-debian/tmp/opt/trinity/include/ktexteditor/templateinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/texthintinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/undointerface.h
-debian/tmp/opt/trinity/include/ktexteditor/variableinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/viewcursorinterface.h
-debian/tmp/opt/trinity/include/ktexteditor/view.h
-debian/tmp/opt/trinity/include/ktexteditor/viewstatusmsginterface.h
-debian/tmp/opt/trinity/include/ktexteditor/wordwrapinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/clipboardinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/codecompletioninterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/configinterfaceextension.h
+debian/tmp/opt/trinity/include/tdetexteditor/configinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/cursorinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/document.h
+debian/tmp/opt/trinity/include/tdetexteditor/documentinfo.h
+debian/tmp/opt/trinity/include/tdetexteditor/dynwordwrapinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/editinterfaceext.h
+debian/tmp/opt/trinity/include/tdetexteditor/editinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/editorchooser.h
+debian/tmp/opt/trinity/include/tdetexteditor/editor.h
+debian/tmp/opt/trinity/include/tdetexteditor/encodinginterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/highlightinginterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/markinterfaceextension.h
+debian/tmp/opt/trinity/include/tdetexteditor/markinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/plugin.h
+debian/tmp/opt/trinity/include/tdetexteditor/popupmenuinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/printinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/searchinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/selectionextdcopinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/selectioninterfaceext.h
+debian/tmp/opt/trinity/include/tdetexteditor/selectioninterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/sessionconfiginterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/templateinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/texthintinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/undointerface.h
+debian/tmp/opt/trinity/include/tdetexteditor/variableinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/viewcursorinterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/view.h
+debian/tmp/opt/trinity/include/tdetexteditor/viewstatusmsginterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/wordwrapinterface.h
 debian/tmp/opt/trinity/include/ktimewidget.h
 debian/tmp/opt/trinity/include/ktimezones.h
 debian/tmp/opt/trinity/include/ktimezonewidget.h
@@ -651,9 +651,9 @@ debian/tmp/opt/trinity/include/ktrader.h
 debian/tmp/opt/trinity/include/ktypelist.h
 debian/tmp/opt/trinity/include/kuniqueapp.h
 debian/tmp/opt/trinity/include/kuniqueapplication.h
-debian/tmp/opt/trinity/include/kunittest/module.h
-debian/tmp/opt/trinity/include/kunittest/runner.h
-debian/tmp/opt/trinity/include/kunittest/tester.h
+debian/tmp/opt/trinity/include/tdeunittest/module.h
+debian/tmp/opt/trinity/include/tdeunittest/runner.h
+debian/tmp/opt/trinity/include/tdeunittest/tester.h
 debian/tmp/opt/trinity/include/kunload.h
 debian/tmp/opt/trinity/include/kurifilter.h
 debian/tmp/opt/trinity/include/kurlbar.h
@@ -668,8 +668,8 @@ debian/tmp/opt/trinity/include/kurlrequester.h
 debian/tmp/opt/trinity/include/kuser.h
 debian/tmp/opt/trinity/include/kuserprofile.h
 debian/tmp/opt/trinity/include/kvmallocator.h
-debian/tmp/opt/trinity/include/kwallet.h
-debian/tmp/opt/trinity/include/kwallettypes.h
+debian/tmp/opt/trinity/include/tdewallet.h
+debian/tmp/opt/trinity/include/tdewallettypes.h
 debian/tmp/opt/trinity/include/twindowinfo.h
 debian/tmp/opt/trinity/include/twindowlistmenu.h
 debian/tmp/opt/trinity/include/twin.h
@@ -683,28 +683,28 @@ debian/tmp/opt/trinity/include/kxmlguiclient.h
 debian/tmp/opt/trinity/include/kxmlguifactory.h
 debian/tmp/opt/trinity/include/kxmlgui.h
 debian/tmp/opt/trinity/include/kzip.h
-debian/tmp/opt/trinity/include/libkrandr/ktimerdialog.h
-debian/tmp/opt/trinity/include/libkrandr/libkrandr.h
-debian/tmp/opt/trinity/include/libkrandr/lowlevel_randr.h
-debian/tmp/opt/trinity/include/libkrandr/randr.h
-debian/tmp/opt/trinity/include/libkrsync/krsync.h
-debian/tmp/opt/trinity/include/libkmid/alsaout.h
-debian/tmp/opt/trinity/include/libkmid/dattypes.h
-debian/tmp/opt/trinity/include/libkmid/deviceman.h
-debian/tmp/opt/trinity/include/libkmid/fmout.h
-debian/tmp/opt/trinity/include/libkmid/gusout.h
-debian/tmp/opt/trinity/include/libkmid/libkmid.h
-debian/tmp/opt/trinity/include/libkmid/midfile.h
-debian/tmp/opt/trinity/include/libkmid/midimapper.h
-debian/tmp/opt/trinity/include/libkmid/midiout.h
-debian/tmp/opt/trinity/include/libkmid/midispec.h
-debian/tmp/opt/trinity/include/libkmid/midistat.h
-debian/tmp/opt/trinity/include/libkmid/mt32togm.h
-debian/tmp/opt/trinity/include/libkmid/notearray.h
-debian/tmp/opt/trinity/include/libkmid/player.h
-debian/tmp/opt/trinity/include/libkmid/synthout.h
-debian/tmp/opt/trinity/include/libkmid/track.h
-debian/tmp/opt/trinity/include/libkmid/voiceman.h
+debian/tmp/opt/trinity/include/libtderandr/ktimerdialog.h
+debian/tmp/opt/trinity/include/libtderandr/libtderandr.h
+debian/tmp/opt/trinity/include/libtderandr/lowlevel_randr.h
+debian/tmp/opt/trinity/include/libtderandr/randr.h
+debian/tmp/opt/trinity/include/libtdersync/tdersync.h
+debian/tmp/opt/trinity/include/libtdemid/alsaout.h
+debian/tmp/opt/trinity/include/libtdemid/dattypes.h
+debian/tmp/opt/trinity/include/libtdemid/deviceman.h
+debian/tmp/opt/trinity/include/libtdemid/fmout.h
+debian/tmp/opt/trinity/include/libtdemid/gusout.h
+debian/tmp/opt/trinity/include/libtdemid/libtdemid.h
+debian/tmp/opt/trinity/include/libtdemid/midfile.h
+debian/tmp/opt/trinity/include/libtdemid/midimapper.h
+debian/tmp/opt/trinity/include/libtdemid/midiout.h
+debian/tmp/opt/trinity/include/libtdemid/midispec.h
+debian/tmp/opt/trinity/include/libtdemid/midistat.h
+debian/tmp/opt/trinity/include/libtdemid/mt32togm.h
+debian/tmp/opt/trinity/include/libtdemid/notearray.h
+debian/tmp/opt/trinity/include/libtdemid/player.h
+debian/tmp/opt/trinity/include/libtdemid/synthout.h
+debian/tmp/opt/trinity/include/libtdemid/track.h
+debian/tmp/opt/trinity/include/libtdemid/voiceman.h
 debian/tmp/opt/trinity/include/netwm_def.h
 debian/tmp/opt/trinity/include/netwm.h
 debian/tmp/opt/trinity/include/qxembed.h
@@ -774,56 +774,56 @@ 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
-debian/tmp/opt/trinity/lib/libkhtml.so
-debian/tmp/opt/trinity/lib/libkimproxy.la
-debian/tmp/opt/trinity/lib/libkimproxy.so
+debian/tmp/opt/trinity/lib/libtdednssd.la
+debian/tmp/opt/trinity/lib/libtdednssd.so
+debian/tmp/opt/trinity/lib/libtdehtml.la
+debian/tmp/opt/trinity/lib/libtdehtml.so
+debian/tmp/opt/trinity/lib/libtdeimproxy.la
+debian/tmp/opt/trinity/lib/libtdeimproxy.so
 debian/tmp/opt/trinity/lib/libkio.la
 debian/tmp/opt/trinity/lib/libkio.so
 debian/tmp/opt/trinity/lib/libkjava.la
 debian/tmp/opt/trinity/lib/libkjava.so
 debian/tmp/opt/trinity/lib/libkjs.la
 debian/tmp/opt/trinity/lib/libkjs.so
-debian/tmp/opt/trinity/lib/libkmdi2.la
-debian/tmp/opt/trinity/lib/libkmdi2.so
-debian/tmp/opt/trinity/lib/libkmdi.la
-debian/tmp/opt/trinity/lib/libkmdi.so
-debian/tmp/opt/trinity/lib/libkmediaplayer.la
-debian/tmp/opt/trinity/lib/libkmediaplayer.so
-debian/tmp/opt/trinity/lib/libkmid.la
-debian/tmp/opt/trinity/lib/libkmid.so
+debian/tmp/opt/trinity/lib/libtdemdi2.la
+debian/tmp/opt/trinity/lib/libtdemdi2.so
+debian/tmp/opt/trinity/lib/libtdemdi.la
+debian/tmp/opt/trinity/lib/libtdemdi.so
+debian/tmp/opt/trinity/lib/libtdemediaplayer.la
+debian/tmp/opt/trinity/lib/libtdemediaplayer.so
+debian/tmp/opt/trinity/lib/libtdemid.la
+debian/tmp/opt/trinity/lib/libtdemid.so
 debian/tmp/opt/trinity/lib/libknewstuff.la
 debian/tmp/opt/trinity/lib/libknewstuff.so
-debian/tmp/opt/trinity/lib/libkntlm.la
-debian/tmp/opt/trinity/lib/libkntlm.so
-debian/tmp/opt/trinity/lib/libkparts.la
-debian/tmp/opt/trinity/lib/libkparts.so
-debian/tmp/opt/trinity/lib/libkrandr.la
-debian/tmp/opt/trinity/lib/libkrandr.so
-debian/tmp/opt/trinity/lib/libkrsync.la
-debian/tmp/opt/trinity/lib/libkrsync.so
-debian/tmp/opt/trinity/lib/libkresources.la
-debian/tmp/opt/trinity/lib/libkresources.so
-debian/tmp/opt/trinity/lib/libkscreensaver.la
-debian/tmp/opt/trinity/lib/libkscreensaver.so
-debian/tmp/opt/trinity/lib/libkscript.la
-debian/tmp/opt/trinity/lib/libkscript.so
-debian/tmp/opt/trinity/lib/libkspell2.la
-debian/tmp/opt/trinity/lib/libkspell2.so
-debian/tmp/opt/trinity/lib/libkspell.la
-debian/tmp/opt/trinity/lib/libkspell.so
-debian/tmp/opt/trinity/lib/libktexteditor.la
-debian/tmp/opt/trinity/lib/libktexteditor.so
-debian/tmp/opt/trinity/lib/libkunittest.la
-debian/tmp/opt/trinity/lib/libkunittest.so
-debian/tmp/opt/trinity/lib/libkutils.la
-debian/tmp/opt/trinity/lib/libkutils.so
-debian/tmp/opt/trinity/lib/libkwalletbackend.la
-debian/tmp/opt/trinity/lib/libkwalletbackend.so
-debian/tmp/opt/trinity/lib/libkwalletclient.la
-debian/tmp/opt/trinity/lib/libkwalletclient.so
+debian/tmp/opt/trinity/lib/libtdentlm.la
+debian/tmp/opt/trinity/lib/libtdentlm.so
+debian/tmp/opt/trinity/lib/libtdeparts.la
+debian/tmp/opt/trinity/lib/libtdeparts.so
+debian/tmp/opt/trinity/lib/libtderandr.la
+debian/tmp/opt/trinity/lib/libtderandr.so
+debian/tmp/opt/trinity/lib/libtdersync.la
+debian/tmp/opt/trinity/lib/libtdersync.so
+debian/tmp/opt/trinity/lib/libtderesources.la
+debian/tmp/opt/trinity/lib/libtderesources.so
+debian/tmp/opt/trinity/lib/libtdescreensaver.la
+debian/tmp/opt/trinity/lib/libtdescreensaver.so
+debian/tmp/opt/trinity/lib/libtdescript.la
+debian/tmp/opt/trinity/lib/libtdescript.so
+debian/tmp/opt/trinity/lib/libtdespell2.la
+debian/tmp/opt/trinity/lib/libtdespell2.so
+debian/tmp/opt/trinity/lib/libtdespell.la
+debian/tmp/opt/trinity/lib/libtdespell.so
+debian/tmp/opt/trinity/lib/libtdetexteditor.la
+debian/tmp/opt/trinity/lib/libtdetexteditor.so
+debian/tmp/opt/trinity/lib/libtdeunittest.la
+debian/tmp/opt/trinity/lib/libtdeunittest.so
+debian/tmp/opt/trinity/lib/libtdeutils.la
+debian/tmp/opt/trinity/lib/libtdeutils.so
+debian/tmp/opt/trinity/lib/libtdewalletbackend.la
+debian/tmp/opt/trinity/lib/libtdewalletbackend.so
+debian/tmp/opt/trinity/lib/libtdewalletclient.la
+debian/tmp/opt/trinity/lib/libtdewalletclient.so
 debian/tmp/opt/trinity/lib/libvcard.la
 debian/tmp/opt/trinity/lib/libvcard.so
 
diff --git a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.manpages b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.manpages
index af14a7e71..e5756a2db 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.manpages
+++ b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.manpages
@@ -1,5 +1,5 @@
 ./debian/man/kconfig_compiler-trinity.1
 ./debian/man/ksvgtopng-trinity.1
-./debian/man/kunittestmodrunner-trinity.1
+./debian/man/tdeunittestmodrunner-trinity.1
 ./debian/man/makekdewidgets-trinity.1
 ./debian/man/preparetips-trinity.1
diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install
index 80a4b789c..4d1bb325b 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -75,8 +75,8 @@ debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.la
 debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.so
 debian/tmp/opt/trinity/lib/trinity/kbzip2filter.la
 debian/tmp/opt/trinity/lib/trinity/kbzip2filter.so
-debian/tmp/opt/trinity/lib/trinity/kcm_kresources.la
-debian/tmp/opt/trinity/lib/trinity/kcm_kresources.so
+debian/tmp/opt/trinity/lib/trinity/kcm_tderesources.la
+debian/tmp/opt/trinity/lib/trinity/kcm_tderesources.so
 debian/tmp/opt/trinity/lib/trinity/kcmshell.la
 debian/tmp/opt/trinity/lib/trinity/kcmshell.so
 debian/tmp/opt/trinity/lib/trinity/kconf_update.la
@@ -93,8 +93,8 @@ debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.la
 debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.so
 debian/tmp/opt/trinity/lib/trinity/kded_kssld.la
 debian/tmp/opt/trinity/lib/trinity/kded_kssld.so
-debian/tmp/opt/trinity/lib/trinity/kded_kwalletd.la
-debian/tmp/opt/trinity/lib/trinity/kded_kwalletd.so
+debian/tmp/opt/trinity/lib/trinity/kded_tdewalletd.la
+debian/tmp/opt/trinity/lib/trinity/kded_tdewalletd.so
 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
@@ -115,8 +115,8 @@ debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.la
 debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.so
 debian/tmp/opt/trinity/lib/trinity/kgzipfilter.la
 debian/tmp/opt/trinity/lib/trinity/kgzipfilter.so
-debian/tmp/opt/trinity/lib/trinity/khtmlimagepart.la
-debian/tmp/opt/trinity/lib/trinity/khtmlimagepart.so
+debian/tmp/opt/trinity/lib/trinity/tdehtmlimagepart.la
+debian/tmp/opt/trinity/lib/trinity/tdehtmlimagepart.so
 debian/tmp/opt/trinity/lib/trinity/kimg_dds.la
 debian/tmp/opt/trinity/lib/trinity/kimg_dds.so
 debian/tmp/opt/trinity/lib/trinity/kimg_eps.la
@@ -167,34 +167,34 @@ debian/tmp/opt/trinity/lib/trinity/klauncher.la
 debian/tmp/opt/trinity/lib/trinity/klauncher.so
 debian/tmp/opt/trinity/lib/trinity/knotify.la
 debian/tmp/opt/trinity/lib/trinity/knotify.so
-debian/tmp/opt/trinity/lib/trinity/kspell_aspell.la
-debian/tmp/opt/trinity/lib/trinity/kspell_aspell.so
-debian/tmp/opt/trinity/lib/trinity/kspell_hspell.la
-debian/tmp/opt/trinity/lib/trinity/kspell_hspell.so
-debian/tmp/opt/trinity/lib/trinity/kspell_ispell.la
-debian/tmp/opt/trinity/lib/trinity/kspell_ispell.so
+debian/tmp/opt/trinity/lib/trinity/tdespell_aspell.la
+debian/tmp/opt/trinity/lib/trinity/tdespell_aspell.so
+debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.la
+debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.so
+debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.la
+debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.so
 debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.la
 debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.so
 debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.la
 debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.so
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_docwordcompletion.la
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_docwordcompletion.so
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_insertfile.la
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_insertfile.so
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.la
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.so
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.la
-debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.so
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.la
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.so
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.la
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.so
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_isearch.la
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_isearch.so
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kdatatool.la
+debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kdatatool.so
 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/libtdecertpart.la
+debian/tmp/opt/trinity/lib/trinity/libtdecertpart.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
-debian/tmp/opt/trinity/lib/trinity/libkmultipart.so
+debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.la
+debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.so
+debian/tmp/opt/trinity/lib/trinity/libtdemultipart.la
+debian/tmp/opt/trinity/lib/trinity/libtdemultipart.so
 debian/tmp/opt/trinity/lib/trinity/libshellscript.la
 debian/tmp/opt/trinity/lib/trinity/libshellscript.so
 debian/tmp/opt/trinity/lib/trinity/plugins/designer/kdewidgets.la
@@ -264,56 +264,56 @@ 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
-debian/tmp/opt/trinity/lib/libkhtml.so.4.2.0
-debian/tmp/opt/trinity/lib/libkimproxy.so.0
-debian/tmp/opt/trinity/lib/libkimproxy.so.0.0.0
+debian/tmp/opt/trinity/lib/libtdednssd.so.1
+debian/tmp/opt/trinity/lib/libtdednssd.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdehtml.so.4
+debian/tmp/opt/trinity/lib/libtdehtml.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeimproxy.so.0
+debian/tmp/opt/trinity/lib/libtdeimproxy.so.0.0.0
 debian/tmp/opt/trinity/lib/libkio.so.4
 debian/tmp/opt/trinity/lib/libkio.so.4.2.0
 debian/tmp/opt/trinity/lib/libkjava.so.1
 debian/tmp/opt/trinity/lib/libkjava.so.1.0.0
 debian/tmp/opt/trinity/lib/libkjs.so.1
 debian/tmp/opt/trinity/lib/libkjs.so.1.2.0
-debian/tmp/opt/trinity/lib/libkmdi2.so.1
-debian/tmp/opt/trinity/lib/libkmdi2.so.1.0.0
-debian/tmp/opt/trinity/lib/libkmdi.so.1
-debian/tmp/opt/trinity/lib/libkmdi.so.1.0.0
-debian/tmp/opt/trinity/lib/libkmediaplayer.so.0
-debian/tmp/opt/trinity/lib/libkmediaplayer.so.0.0.0
-debian/tmp/opt/trinity/lib/libkmid.so.0
-debian/tmp/opt/trinity/lib/libkmid.so.0.0.95
+debian/tmp/opt/trinity/lib/libtdemdi2.so.1
+debian/tmp/opt/trinity/lib/libtdemdi2.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdemdi.so.1
+debian/tmp/opt/trinity/lib/libtdemdi.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0
+debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0.0.0
+debian/tmp/opt/trinity/lib/libtdemid.so.0
+debian/tmp/opt/trinity/lib/libtdemid.so.0.0.95
 debian/tmp/opt/trinity/lib/libknewstuff.so.1
 debian/tmp/opt/trinity/lib/libknewstuff.so.1.0.0
-debian/tmp/opt/trinity/lib/libkntlm.so.0
-debian/tmp/opt/trinity/lib/libkntlm.so.0.0.0
-debian/tmp/opt/trinity/lib/libkparts.so.2
-debian/tmp/opt/trinity/lib/libkparts.so.2.1.0
-debian/tmp/opt/trinity/lib/libkrandr.so.0
-debian/tmp/opt/trinity/lib/libkrandr.so.0.0.95
-debian/tmp/opt/trinity/lib/libkrsync.so.0
-debian/tmp/opt/trinity/lib/libkrsync.so.0.0.1
-debian/tmp/opt/trinity/lib/libkresources.so.1
-debian/tmp/opt/trinity/lib/libkresources.so.1.2.0
-debian/tmp/opt/trinity/lib/libkscreensaver.so.4
-debian/tmp/opt/trinity/lib/libkscreensaver.so.4.2.0
-debian/tmp/opt/trinity/lib/libkscript.so.0
-debian/tmp/opt/trinity/lib/libkscript.so.0.0.0
-debian/tmp/opt/trinity/lib/libkspell2.so.1
-debian/tmp/opt/trinity/lib/libkspell2.so.1.0.0
-debian/tmp/opt/trinity/lib/libkspell.so.4
-debian/tmp/opt/trinity/lib/libkspell.so.4.2.0
-debian/tmp/opt/trinity/lib/libktexteditor.so.0
-debian/tmp/opt/trinity/lib/libktexteditor.so.0.0.0
-debian/tmp/opt/trinity/lib/libkunittest.so.1
-debian/tmp/opt/trinity/lib/libkunittest.so.1.0.0
-debian/tmp/opt/trinity/lib/libkutils.so.1
-debian/tmp/opt/trinity/lib/libkutils.so.1.2.0
-debian/tmp/opt/trinity/lib/libkwalletbackend.so.1
-debian/tmp/opt/trinity/lib/libkwalletbackend.so.1.0.0
-debian/tmp/opt/trinity/lib/libkwalletclient.so.1
-debian/tmp/opt/trinity/lib/libkwalletclient.so.1.0.1
+debian/tmp/opt/trinity/lib/libtdentlm.so.0
+debian/tmp/opt/trinity/lib/libtdentlm.so.0.0.0
+debian/tmp/opt/trinity/lib/libtdeparts.so.2
+debian/tmp/opt/trinity/lib/libtdeparts.so.2.1.0
+debian/tmp/opt/trinity/lib/libtderandr.so.0
+debian/tmp/opt/trinity/lib/libtderandr.so.0.0.95
+debian/tmp/opt/trinity/lib/libtdersync.so.0
+debian/tmp/opt/trinity/lib/libtdersync.so.0.0.1
+debian/tmp/opt/trinity/lib/libtderesources.so.1
+debian/tmp/opt/trinity/lib/libtderesources.so.1.2.0
+debian/tmp/opt/trinity/lib/libtdescreensaver.so.4
+debian/tmp/opt/trinity/lib/libtdescreensaver.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdescript.so.0
+debian/tmp/opt/trinity/lib/libtdescript.so.0.0.0
+debian/tmp/opt/trinity/lib/libtdespell2.so.1
+debian/tmp/opt/trinity/lib/libtdespell2.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdespell.so.4
+debian/tmp/opt/trinity/lib/libtdespell.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdetexteditor.so.0
+debian/tmp/opt/trinity/lib/libtdetexteditor.so.0.0.0
+debian/tmp/opt/trinity/lib/libtdeunittest.so.1
+debian/tmp/opt/trinity/lib/libtdeunittest.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdeutils.so.1
+debian/tmp/opt/trinity/lib/libtdeutils.so.1.2.0
+debian/tmp/opt/trinity/lib/libtdewalletbackend.so.1
+debian/tmp/opt/trinity/lib/libtdewalletbackend.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdewalletclient.so.1
+debian/tmp/opt/trinity/lib/libtdewalletclient.so.1.0.1
 debian/tmp/opt/trinity/lib/libvcard.so.0
 debian/tmp/opt/trinity/lib/libvcard.so.0.0.0
 debian/tmp/opt/trinity/share/services/kfile_elf.desktop