Update Debian and Ubuntu packaging with the latest renaming in GIT

29 files changed, 163 insertions, 163 deletions

diff --git a/debian/squeeze/tdelibs/debian/changelog b/debian/squeeze/tdelibs/debian/changelog
index 6a9f72874..1cffd2663 100644
--- a/debian/squeeze/tdelibs/debian/changelog
+++ b/debian/squeeze/tdelibs/debian/changelog
@@ -73,13 +73,13 @@ tdelibs-trinity (4:3.5.10-0ubuntu3~intrepid5) intrepid; urgency=low
 
 tdelibs-trinity (4:3.5.10-0ubuntu3~intrepid4) intrepid; urgency=low
 
-  * Repaired kcmshell root environment default data directory
+  * Repaired tdecmshell root environment default data directory
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 20 Mar 2009 11:56:00 -0600
 
 tdelibs-trinity (4:3.5.10-0ubuntu3~intrepid1) intrepid; urgency=low
 
-  * Repaired kcmshell root environment
+  * Repaired tdecmshell root environment
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 09 Mar 2009 13:21:00 -0600
 
@@ -116,7 +116,7 @@ tdelibs-trinity (4:3.5.10-0ubuntu1~intrepid9) intrepid; urgency=low
 
 tdelibs-trinity (4:3.5.10-0ubuntu1~intrepid7) intrepid; urgency=low
 
-  * Changed kstartupconfig default HOME of /.kde to /.trinity
+  * Changed tdestartupconfig default HOME of /.kde to /.trinity
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 25 Nov 2008 09:45:00 -0600
 
@@ -372,7 +372,7 @@ tdelibs (4:3.5.7.dfsg.1-7) unstable; urgency=low
 
 tdelibs (4:3.5.7.dfsg.1-6) unstable; urgency=low
 
-  * Move back kstartupconfig to tdelibs4c2a. (Closes: #439411)
+  * Move back tdestartupconfig to tdelibs4c2a. (Closes: #439411)
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 25 Aug 2007 03:09:34 +0200
 
@@ -387,7 +387,7 @@ tdelibs (4:3.5.7.dfsg.1-5) unstable; urgency=low
   
   +++ Changes by Fathi Boudra:
 
-  * Move binaries to tdelibs4-dev: kconfig_compiler, ksvgtopng,
+  * Move binaries to tdelibs4-dev: tdeconfig_compiler, ksvgtopng,
     tdeunittestmodrunner, makekdewidgets, preparetips.
     Allow tdelibs5-dev co-installable alongside tdelibs4c2a.
 
@@ -419,7 +419,7 @@ tdelibs (4:3.5.7.dfsg.1-2) unstable; urgency=low
   * Add patch to fix issue with saving after redo in kate. (Closes: #431920)
   * 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)
+  * Don't refer to help:/tdecmshell in tdecmshell manpage. (Closes: #408470)
   * 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
@@ -479,7 +479,7 @@ tdelibs (4:3.5.7-1ubuntu13) gutsy; urgency=low
     causes building issues. We'll have to take care with the next
     version of the patch.
   * Droped kubuntu_57_nomediaioslave_fileio.diff and
-    kubuntu_59_nomediaioslave_kfile_speedbar.diff:
+    kubuntu_59_nomediaioslave_tdefile_speedbar.diff:
     -  it's been decided to switch back to the standard media:/
        protocol, as /media create as many problems as it resolves...
 
@@ -594,7 +594,7 @@ tdelibs (4:3.5.7-1ubuntu1) gutsy; urgency=low
 tdelibs (4:3.5.7.dfsg.1-1) unstable; urgency=low
 
   * New upstream release.
-    - Ability to have addressbook on remote kioslaves is disabled.
+    - Ability to have addressbook on remote tdeioslaves is disabled.
       It is quite broken. (Closes: #416366)
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
@@ -1126,7 +1126,7 @@ tdelibs (4:3.5.4-0ubuntu11) edgy; urgency=low
 tdelibs (4:3.5.4-0ubuntu10) edgy; urgency=low
 
   * Update kubuntu_52_xinerama.diff with improved patch by Lubos Lunak
-  * Add kubuntu_59_nomediaioslave_kfile_speedbar.diff from Simon Edwards
+  * Add kubuntu_59_nomediaioslave_tdefile_speedbar.diff from Simon Edwards
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  1 Sep 2006 17:20:58 +0000
 
@@ -1692,7 +1692,7 @@ tdelibs (4:3.5.0-0ubuntu10) dapper; urgency=low
   * Add kubuntu_28_fix_sudo.diff to set home directory when 
     run as root via sudo, stops KDE apps settings wrong permissions on 
     files in users home directory
-  * Add kubuntu_29_quiet_kbuildsycoca.diff stop kbuildsycoca complaining
+  * Add kubuntu_29_quiet_tdebuildsycoca.diff stop tdebuildsycoca complaining
     about unknown mimetypes
   * SECURITY UPDATE: kjs encodeuri/decodeuri heap overflow vulnerability
   * Add kubuntu_20_post_3.4.3_tdelibs_kjs.diff
@@ -1817,7 +1817,7 @@ tdelibs (4:3.5-rc1-0ubuntu1) dapper; urgency=low
   * Sync with Debian
   * Remove 16_default_fonts.diff, merged upstream
   * Remove 22_htmltokenizer_cpp_from_3_5.diff, already upstream
-  * Remove 23_kfiledialog.diff, merged upstream
+  * Remove 23_tdefiledialog.diff, merged upstream
   * tdelibs-data replaces old kttsd
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 10 Nov 2005 17:24:33 +0000
@@ -1965,7 +1965,7 @@ tdelibs (4:3.4.91-0ubuntu1) breezy; urgency=low
 
 tdelibs (4:3.4.2-0ubuntu4) breezy; urgency=low
 
-  * Add replaces on old knetworkconf for tdelibs-data
+  * Add replaces on old knetwortdeconf for tdelibs-data
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  3 Aug 2005 12:44:18 +0000
 
diff --git a/debian/squeeze/tdelibs/debian/copyright b/debian/squeeze/tdelibs/debian/copyright
index 945a09ca9..cd5bbe13c 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, tdecert, kconf_update, tdecore, kded, tdefx,
-tdeprint, tdesu, tdeui, kdewidgets, tdehtml, kimgio, kinit, kio, kioslave, kjs,
+libartskde, interfaces, kabc, kate, tdecert, tdeconf_update, tdecore, kded, tdefx,
+tdeprint, tdesu, tdeui, kdewidgets, tdehtml, kimgio, kinit, kio, tdeioslave, kjs,
 tdeparts, ksmartcard, tdespell, kstyles, libtdemid, libtdescreensaver
 ------------------------------------------------------------------------------
 LGPL
diff --git a/debian/squeeze/tdelibs/debian/kcmshell b/debian/squeeze/tdelibs/debian/kcmshell
deleted file mode 100755
index f5b01f8f1..000000000
--- a/debian/squeeze/tdelibs/debian/kcmshell
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-export TDEDIRS=/usr/:/opt/trinity/
-/opt/trinity/bin/kcmshell.real $1 $2 $3 $4 $5 $6 $7 $8
diff --git a/debian/squeeze/tdelibs/debian/man/kde-menu-trinity.1 b/debian/squeeze/tdelibs/debian/man/tde-menu-trinity.1
index 29d6191f4..29d6191f4 100644
--- a/debian/squeeze/tdelibs/debian/man/kde-menu-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tde-menu-trinity.1
diff --git a/debian/squeeze/tdelibs/debian/man/kab2kabc-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdeab2tdeabc-trinity.1
index cc7b69e98..91157f14f 100644
--- a/debian/squeeze/tdelibs/debian/man/kab2kabc-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdeab2tdeabc-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KAB2KABC 1 "Jun 2006" "K Desktop Environment" "Kab to Kabc converter"
 .SH NAME
-kab2kabc
+tdeab2tdeabc
 \- KDE address book converter
 .SH SYNOPSIS
-\fBkab2kabc\fP [Qt\-options] [KDE\-options] [options] 
+\fBtdeab2tdeabc\fP [Qt\-options] [KDE\-options] [options] 
 .SH DESCRIPTION
-\fBkab2kabc\fP converts a KDE address book from old Kab format to new Kabc format.
+\fBtdeab2tdeabc\fP converts a KDE address book from old Kab format to new Kabc format.
 .SH OPTIONS
 .SS Options:
 .TP
diff --git a/debian/squeeze/tdelibs/debian/man/kbuildsycoca-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tdebuildsycoca-trinity.sgml
index 92749d8ad..d25422c50 100644
--- a/debian/squeeze/tdelibs/debian/man/kbuildsycoca-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/tdebuildsycoca-trinity.sgml
@@ -27,7 +27,7 @@ manpage.1: manpage.sgml
   <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
   <!ENTITY dhusername  "Chris Cheney">
   <!ENTITY dhucpackage "<refentrytitle>KBUILDSYCOCA</refentrytitle>">
-  <!ENTITY dhpackage   "kbuildsycoca">
+  <!ENTITY dhpackage   "tdebuildsycoca">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
diff --git a/debian/squeeze/tdelibs/debian/man/kcmshell-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdecmshell-trinity.1
index f94a9a670..f2f10a3c0 100644
--- a/debian/squeeze/tdelibs/debian/man/kcmshell-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdecmshell-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KCMSHELL 1 "Jun 2006" "K Desktop Environment" "tool to start single KDE control modules"
 .SH NAME
-kcmshell
+tdecmshell
 \- tool to start single KDE control modules
 .SH SYNOPSIS
-kcmshell [Qt\-options] [KDE\-options] [options] module 
+tdecmshell [Qt\-options] [KDE\-options] [options] module 
 .SH DESCRIPTION
-\fBkcmshell\fP is a tool to start single KDE control modules.
+\fBtdecmshell\fP is a tool to start single KDE control modules.
 .SH OPTIONS
 .SS
 .SS Arguments:
diff --git a/debian/squeeze/tdelibs/debian/man/kconf_update-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tdeconf_update-trinity.sgml
index e7f29733a..a6e913cd2 100644
--- a/debian/squeeze/tdelibs/debian/man/kconf_update-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/tdeconf_update-trinity.sgml
@@ -27,7 +27,7 @@ manpage.1: manpage.sgml
   <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
   <!ENTITY dhusername  "Chris Cheney">
   <!ENTITY dhucpackage "<refentrytitle>KCONF_UPDATE</refentrytitle>">
-  <!ENTITY dhpackage   "kconf_update">
+  <!ENTITY dhpackage   "tdeconf_update">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
diff --git a/debian/squeeze/tdelibs/debian/man/kconfig_compiler-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdeconfig_compiler-trinity.1
index eab4596ed..cf8fa9f5c 100644
--- a/debian/squeeze/tdelibs/debian/man/kconfig_compiler-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdeconfig_compiler-trinity.1
@@ -1,13 +1,13 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KCONFIG_COMPILER 1 "Jun 2006" "K Desktop Environment" "programming tool"
 .SH NAME
-kconfig_compiler
+tdeconfig_compiler
 \- KDE configuration compiler
 .SH SYNOPSIS
-\fBkconfig_compiler\fP [Qt\-options] [KDE\-options] [options]
+\fBtdeconfig_compiler\fP [Qt\-options] [KDE\-options] [options]
 .I file.kcfg file.kcfgc 
 .SH DESCRIPTION
-\fBkconfig_compiler\fP generates C++ source code from two files. The first file (.kcfg) contains information about configuration options and the second file (.kcfgc) provides the code generation options.
+\fBtdeconfig_compiler\fP generates C++ source code from two files. The first file (.kcfg) contains information about configuration options and the second file (.kcfgc) provides the code generation options.
 .br
 The generated source code contains a class based on \fBKConfigSkeleton\fP that provides an API to access the applications configuration data.
 .SH OPTIONS
diff --git a/debian/squeeze/tdelibs/debian/man/kfile-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tdefile-trinity.sgml
index d5239142d..fe0622ccd 100644
--- a/debian/squeeze/tdelibs/debian/man/kfile-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/tdefile-trinity.sgml
@@ -27,7 +27,7 @@ manpage.1: manpage.sgml
   <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
   <!ENTITY dhusername  "Chris Cheney">
   <!ENTITY dhucpackage "<refentrytitle>KFILE</refentrytitle>">
-  <!ENTITY dhpackage   "kfile">
+  <!ENTITY dhpackage   "tdefile">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
diff --git a/debian/squeeze/tdelibs/debian/man/khotnewstuff-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdehotnewstuff-trinity.1
index 68421378d..a31f79e05 100644
--- a/debian/squeeze/tdelibs/debian/man/khotnewstuff-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdehotnewstuff-trinity.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KHOTNEWSTUFF 1 "Jun 2006" "K Desktop Environment" "KDE tool"
 .SH NAME
-khotnewstuff
+tdehotnewstuff
 \- KDE tool to test GHNS repositories
 .SH SYNOPSIS
-\fBkhotnewstuff\fP [Qt\-options] [KDE\-options] [options] [providerlist] 
+\fBtdehotnewstuff\fP [Qt\-options] [KDE\-options] [options] [providerlist] 
 .SH DESCRIPTION
-\fBkhotnewstuff\fP is a tool to test GHNS repositories. It calls the download dialog for arbitrary GHNS repositories and can apply filters given on the command line.
+\fBtdehotnewstuff\fP is a tool to test GHNS repositories. It calls the download dialog for arbitrary GHNS repositories and can apply filters given on the command line.
 .sp 1
 GHNS means "Get Hot New Stuff" and is a data sharing concept. It allows you to install new stuff like applets, plugins, data, sounds and wallpapers for instant use in your KDE applications.
 .sp 1
diff --git a/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1
index 63c5935b6..9c5d49965 100644
--- a/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1
@@ -10,7 +10,7 @@ tdeinit
 .sp 1
 \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 \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 \fBstarttde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
+When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBtdelauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstarttde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
 .sp 1
 The \fBtdeinit\fP master process can be used to start additional KDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
 .sp 1
@@ -29,7 +29,7 @@ Terminate when no KDE applications are left running
 .I /usr/lib/trinity
 directory with KLMs (tdeinit loadable modules)
 .SH SEE ALSO
-.BR dcopserver (1),\  kded (1),\  kcminit (1),\  tdeinit_wrapper (1),\  klauncher (1),\  kshell (1),\  kwrapper (1),\  starttde (1)
+.BR dcopserver (1),\  kded (1),\  kcminit (1),\  tdeinit_wrapper (1),\  tdelauncher (1),\  kshell (1),\  kwrapper (1),\  starttde (1)
 .SH AUTHORS
 .nf
 Waldo Bastian <bastian@kde.org>
diff --git a/debian/squeeze/tdelibs/debian/man/kio_uiserver-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tdeio_uiserver-trinity.sgml
index 753ca4f70..5582febc6 100644
--- a/debian/squeeze/tdelibs/debian/man/kio_uiserver-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/tdeio_uiserver-trinity.sgml
@@ -27,7 +27,7 @@ manpage.1: manpage.sgml
   <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
   <!ENTITY dhusername  "Chris Cheney">
   <!ENTITY dhucpackage "<refentrytitle>KIO_UISERVER</refentrytitle>">
-  <!ENTITY dhpackage   "kio_uiserver">
+  <!ENTITY dhpackage   "tdeio_uiserver">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
diff --git a/debian/squeeze/tdelibs/debian/man/kioexec-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdeioexec-trinity.1
index d4e63ffad..f5c8a587d 100644
--- a/debian/squeeze/tdelibs/debian/man/kioexec-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdeioexec-trinity.1
@@ -1,14 +1,14 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KIOEXEC 1 "Jun 2006" "K Desktop Environment" "network transparency support"
 .SH NAME
-kioexec, kfmexec
+tdeioexec, kfmexec
 \- open remote files, watch modifications, ask for upload
 .SH SYNOPSIS
-\fBkioexec\fP [Qt\-options] [KDE\-options] [options] command [URLs] 
+\fBtdeioexec\fP [Qt\-options] [KDE\-options] [options] command [URLs] 
 .SH DESCRIPTION
-\fBkioexec\fP offers network transparency to applications that only support local files.
+\fBtdeioexec\fP offers network transparency to applications that only support local files.
 .sp 1
-\fBkioexec\fP downloads the remote file to a temporary location and starts a local application with the temporary file as argument. Then it  waits for the application to be exited and offers re\-uploading of the modified temporary file.
+\fBtdeioexec\fP downloads the remote file to a temporary location and starts a local application with the temporary file as argument. Then it  waits for the application to be exited and offers re\-uploading of the modified temporary file.
 .SH OPTIONS
 .SS
 .SS Arguments:
diff --git a/debian/squeeze/tdelibs/debian/man/klauncher-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdelauncher-trinity.1
index 240dab5e3..9029a5ace 100644
--- a/debian/squeeze/tdelibs/debian/man/klauncher-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdelauncher-trinity.1
@@ -1,16 +1,16 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KLAUNCHER 1 "Jun 2006" "K Desktop Environment" "service activation daemon"
 .SH NAME
-klauncher
+tdelauncher
 \- daemon for service activation in KDE
 .SH DESCRIPTION
-!!! \fBklauncher\fP is started automatically by tdeinit. It is not supposed to be started manually. !!!
+!!! \fBtdelauncher\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 tdeinit master process to start new processes. KDE applications communicate with \fBklauncher\fP via DCOP to start new applications or services.
+\fBtdelauncher\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 \fBtdelauncher\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.
+The error message "KLauncher could not be reached via DCOP" either indicates a serious problem with the \fBdcopserver\fP or \fBtdelauncher\fP crashed.
 .sp 1
-Note: \fBklauncher\fP is not the "run command" dialog (Alt+F2)!
+Note: \fBtdelauncher\fP is not the "run command" dialog (Alt+F2)!
 .SH SEE ALSO
 .BR dcopserver (1),\  tdeinit (1)
 .SH AUTHORS
diff --git a/debian/squeeze/tdelibs/debian/man/kmailservice-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tdemailservice-trinity.sgml
index 506038dee..2ca9a311a 100644
--- a/debian/squeeze/tdelibs/debian/man/kmailservice-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/tdemailservice-trinity.sgml
@@ -27,7 +27,7 @@ manpage.1: manpage.sgml
   <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
   <!ENTITY dhusername  "Chris Cheney">
   <!ENTITY dhucpackage "<refentrytitle>KMAILSERVICE</refentrytitle>">
-  <!ENTITY dhpackage   "kmailservice">
+  <!ENTITY dhpackage   "tdemailservice">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
diff --git a/debian/squeeze/tdelibs/debian/man/ksendbugmail-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tdesendbugmail-trinity.sgml
index 8276bf477..8276bf477 100644
--- a/debian/squeeze/tdelibs/debian/man/ksendbugmail-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/tdesendbugmail-trinity.sgml
diff --git a/debian/squeeze/tdelibs/debian/man/kstartupconfig-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdestartupconfig-trinity.1
index 897dae97d..f9d0902f6 100644
--- a/debian/squeeze/tdelibs/debian/man/kstartupconfig-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdestartupconfig-trinity.1
@@ -1,22 +1,22 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KSTARTUPCONFIG 1 "Jun 2006" "K Desktop Environment" "configuration options loader"
 .SH NAME
-kstartupconfig, kdostartupconfig
+tdestartupconfig, tdedostartupconfig
 \- KDE configuration options loader
 .SH SYNOPSIS
-\fBkstartupconfig\fP [$TDEHOME]
+\fBtdestartupconfig\fP [$TDEHOME]
 .sp 1
-\fBkdostartupconfig\fP
+\fBtdedostartupconfig\fP
 .SH DESCRIPTION
-\fBkstartupconfig\fP loads configuration options for use in \fBstarttde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
+\fBtdestartupconfig\fP loads configuration options for use in \fBstarttde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBtdedostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
 .sp 1
 The configuration options to load are stored in \fIstartupconfigkeys\fP as one option per line. They follow the format <file> <group> <key> <default>. A complete group is addressed as <file> [<group>]. The configuration options are processed in the specified order so the missing default values for groups can be specified as single options after the group option.
 .sp 1
-\fBkstartupconfig\fP stores every line from \fIstartupconfigkeys\fP in \fIstartupconfigfiles\fP followed by the paths of all files relevant to the option. Lines with non\-existent files start with '!' in case they are created later. The list of files is terminated by a line starting with '*'.
+\fBtdestartupconfig\fP stores every line from \fIstartupconfigkeys\fP in \fIstartupconfigfiles\fP followed by the paths of all files relevant to the option. Lines with non\-existent files start with '!' in case they are created later. The list of files is terminated by a line starting with '*'.
 .sp 1
-If the timestamps of all relevant files are older than the timestamp of \fIstartupconfigfile\fP there is no need to update anything. Otherwise \fBkdostartupconfig\fP is launched to create or update the necessary files.
+If the timestamps of all relevant files are older than the timestamp of \fIstartupconfigfile\fP there is no need to update anything. Otherwise \fBtdedostartupconfig\fP is launched to create or update the necessary files.
 .sp 1
-\fBkdostartupconfig\fP writes values of the options to \fIstartupconfig\fP. \fIstartupconfig\fP is a shell script that sets the values to shell variables. The variables are named <file>_<group>_<key>.
+\fBtdedostartupconfig\fP writes values of the options to \fIstartupconfig\fP. \fIstartupconfig\fP is a shell script that sets the values to shell variables. The variables are named <file>_<group>_<key>.
 .sp 1
 \fBNotes:\fP
 .IP "     \-"
@@ -24,7 +24,7 @@ the \fIkdeglobals\fP config file is not used as a dependency for other config fi
 .IP "     \-"
 do not use frequently changed config files since the checking is timestamp\-based
 .IP "     \-"
-if \fBkconf_update\fP is used to update an option also touch the matching global config file to allow \fBkstartupconfig\fP to see changes
+if \fBtdeconf_update\fP is used to update an option also touch the matching global config file to allow \fBtdestartupconfig\fP to see changes
 .SH OPTIONS
 .TP
 .B $TDEHOME
@@ -42,7 +42,7 @@ configuration options and files they belong to
 .I $TDEHOME/share/config/startupconfigkeys
 configuration options to load
 .SH SEE ALSO
-.BR kconf_update (1),\  starttde (1)
+.BR tdeconf_update (1),\  starttde (1)
 .SH AUTHORS
 .nf
 Lubos Lunak <l.lunak@kde.org>
diff --git a/debian/squeeze/tdelibs/debian/man/ktelnetservice-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tdetelnetservice-trinity.sgml
index 3f1ceebdc..31c82361f 100644
--- a/debian/squeeze/tdelibs/debian/man/ktelnetservice-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/tdetelnetservice-trinity.sgml
@@ -27,7 +27,7 @@ manpage.1: manpage.sgml
   <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
   <!ENTITY dhusername  "Chris Cheney">
   <!ENTITY dhucpackage "<refentrytitle>KTELNETSERVICE</refentrytitle>">
-  <!ENTITY dhpackage   "ktelnetservice">
+  <!ENTITY dhpackage   "tdetelnetservice">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
diff --git a/debian/squeeze/tdelibs/debian/man/ktradertest-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdetradertest-trinity.1
index 62c5521ad..9311190be 100644
--- a/debian/squeeze/tdelibs/debian/man/ktradertest-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdetradertest-trinity.1
@@ -1,18 +1,18 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
 .TH KTRADERTEST 1 "Jun 2006" "K Desktop Environment" "A KTrader testing tool"
 .SH NAME
-ktradertest
+tdetradertest
 \- A KTrader testing tool
 .SH SYNOPSIS
-\fBktradertest\fP [Qt\-options] [KDE\-options] query [genericServiceType] [constraint] [preference] 
+\fBtdetradertest\fP [Qt\-options] [KDE\-options] query [genericServiceType] [constraint] [preference] 
 .SH DESCRIPTION
-\fBktradertest\fP is a command line tool to run trader queries.
+\fBtdetradertest\fP is a command line tool to run trader queries.
 .sp 1
 KTrader uses .desktop files to store information on Servicetypes and services. It provides a way to query all KDE services (applications and components) that match a specific set of requirements.
 .sp 1
 A query to KTrader results in a list of services.
 .sp 1
-For example, \fBktradertest image/jpeg\fP shows a list of image manipulation programs.
+For example, \fBtdetradertest image/jpeg\fP shows a list of image manipulation programs.
 .SH OPTIONS
 .SS
 .SS Arguments:
diff --git a/debian/squeeze/tdelibs/debian/prune-nonfree b/debian/squeeze/tdelibs/debian/prune-nonfree
index cb24b5db4..c6121e836 100644
--- a/debian/squeeze/tdelibs/debian/prune-nonfree
+++ b/debian/squeeze/tdelibs/debian/prune-nonfree
@@ -9,7 +9,7 @@ if [ "$TOPLEVEL" = "" ]; then
 	echo "Please provide the toplevel directory as the argument."
 	exit 1
 else
-	rm -f $TOPLEVEL/kioslave/http/kcookiejar/rfc*
+	rm -f $TOPLEVEL/tdeioslave/http/kcookiejar/rfc*
 fi
 
 exit 0
diff --git a/debian/squeeze/tdelibs/debian/rules b/debian/squeeze/tdelibs/debian/rules
index 3ceefdc17..73ea34e5a 100755
--- a/debian/squeeze/tdelibs/debian/rules
+++ b/debian/squeeze/tdelibs/debian/rules
@@ -99,6 +99,6 @@ common-install-prehook-impl::
 	fi
 
 binary-install/tdelibs4c2a-trinity::
-	mv debian/tmp/opt/trinity/bin/kcmshell debian/tmp/opt/trinity/bin/kcmshell.real
-	install -p -D -m755 debian/tmp/opt/trinity/bin/kcmshell.real debian/tdelibs4c2a-trinity/opt/trinity/bin/kcmshell.real
-	install -p -D -m755 debian/kcmshell debian/tdelibs4c2a-trinity/opt/trinity/bin/kcmshell
+	mv debian/tmp/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real
+	install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs4c2a-trinity/opt/trinity/bin/tdecmshell.real
+	install -p -D -m755 debian/tdecmshell debian/tdelibs4c2a-trinity/opt/trinity/bin/tdecmshell
diff --git a/debian/squeeze/tdelibs/debian/tdecmshell b/debian/squeeze/tdelibs/debian/tdecmshell
new file mode 100755
index 000000000..4e24cd356
--- /dev/null
+++ b/debian/squeeze/tdelibs/debian/tdecmshell
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+export TDEDIRS=/usr/:/opt/trinity/
+/opt/trinity/bin/tdecmshell.real $1 $2 $3 $4 $5 $6 $7 $8
diff --git a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
index 9bcd52fc7..98ccf5d11 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/etc/trinity/khotnewstuffrc
+debian/tmp/etc/trinity/tdehotnewstuffrc
 debian/tmp/etc/trinity/colors/40.colors
 debian/tmp/etc/trinity/colors/Rainbow.colors
 debian/tmp/etc/trinity/colors/Royal.colors
@@ -38,14 +38,14 @@ debian/tmp/opt/trinity/share/apps/katepart/syntax/*.xml
 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_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
-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/tdeconf_update/kcookiescfg.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kded.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/tdeprintrc.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kio_help.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/tdeioslave.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/move_kio_help_cache.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/proxytype.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/useragent.pl
 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
@@ -245,7 +245,7 @@ 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/tdeio_uiserver/icons/crystalsvg/16x16/apps/tdeio_uiserver.png
 debian/tmp/opt/trinity/share/apps/kjava/icons/crystalsvg/16x16/actions/java.png
 debian/tmp/opt/trinity/share/apps/kjava/kjava.jar
 debian/tmp/opt/trinity/share/apps/kjava/kjava.policy
@@ -1724,7 +1724,7 @@ debian/tmp/opt/trinity/share/apps/LICENSES/GPL_V2
 debian/tmp/opt/trinity/share/apps/LICENSES/LGPL_V2
 debian/tmp/opt/trinity/share/apps/LICENSES/QPL_V1.0
 debian/tmp/opt/trinity/share/apps/proxyscout/eventsrc
-debian/tmp/opt/trinity/share/autostart/kab2kabc.desktop
+debian/tmp/opt/trinity/share/autostart/tdeab2tdeabc.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/10.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/2.png
@@ -3611,9 +3611,9 @@ debian/tmp/opt/trinity/share/services/kded/proxyscout.desktop
 debian/tmp/opt/trinity/share/services/kgzipfilter.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/tdeio_uiserver.desktop
 debian/tmp/opt/trinity/share/services/kjavaappletviewer.desktop
-debian/tmp/opt/trinity/share/services/kmailservice.protocol
+debian/tmp/opt/trinity/share/services/tdemailservice.protocol
 debian/tmp/opt/trinity/share/services/tdemultipart.desktop
 debian/tmp/opt/trinity/share/services/knotify.desktop
 debian/tmp/opt/trinity/share/services/tderesources/kabc/dir.desktop
@@ -3666,7 +3666,7 @@ debian/tmp/opt/trinity/share/servicetypes/tdecmodule.desktop
 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/tdefileplugin.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
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
index 6f7afbc0c..267909be7 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/checkXML
 debian/tmp/opt/trinity/bin/dcopidl
 debian/tmp/opt/trinity/bin/dcopidl2cpp
 debian/tmp/opt/trinity/bin/dcopidlng
-debian/tmp/opt/trinity/bin/kconfig_compiler
+debian/tmp/opt/trinity/bin/tdeconfig_compiler
 debian/tmp/opt/trinity/bin/ksvgtopng
 debian/tmp/opt/trinity/bin/tdeunittestmodrunner
 debian/tmp/opt/trinity/bin/makekdewidgets
@@ -175,13 +175,13 @@ debian/tmp/opt/trinity/include/kcombobox.h
 debian/tmp/opt/trinity/include/kcommand.h
 debian/tmp/opt/trinity/include/kcompletionbox.h
 debian/tmp/opt/trinity/include/kcompletion.h
-debian/tmp/opt/trinity/include/kconfigbackend.h
-debian/tmp/opt/trinity/include/kconfigbase.h
-debian/tmp/opt/trinity/include/kconfigdata.h
-debian/tmp/opt/trinity/include/kconfigdialog.h
-debian/tmp/opt/trinity/include/kconfigdialogmanager.h
-debian/tmp/opt/trinity/include/kconfig.h
-debian/tmp/opt/trinity/include/kconfigskeleton.h
+debian/tmp/opt/trinity/include/tdeconfigbackend.h
+debian/tmp/opt/trinity/include/tdeconfigbase.h
+debian/tmp/opt/trinity/include/tdeconfigdata.h
+debian/tmp/opt/trinity/include/tdeconfigdialog.h
+debian/tmp/opt/trinity/include/tdeconfigdialogmanager.h
+debian/tmp/opt/trinity/include/tdeconfig.h
+debian/tmp/opt/trinity/include/tdeconfigskeleton.h
 debian/tmp/opt/trinity/include/kcpuinfo.h
 debian/tmp/opt/trinity/include/kcrash.h
 debian/tmp/opt/trinity/include/kcursor.h
@@ -257,21 +257,21 @@ debian/tmp/opt/trinity/include/kemailsettings.h
 debian/tmp/opt/trinity/include/kencodingfiledialog.h
 debian/tmp/opt/trinity/include/kextendedsocket.h
 debian/tmp/opt/trinity/include/kextsock.h
-debian/tmp/opt/trinity/include/kfiledetailview.h
-debian/tmp/opt/trinity/include/kfiledialog.h
-debian/tmp/opt/trinity/include/kfilefiltercombo.h
-debian/tmp/opt/trinity/include/kfilefilter.h
-debian/tmp/opt/trinity/include/kfile.h
-debian/tmp/opt/trinity/include/kfileiconview.h
-debian/tmp/opt/trinity/include/kfileitem.h
-debian/tmp/opt/trinity/include/kfilemetainfo.h
-debian/tmp/opt/trinity/include/kfilepreview.h
-debian/tmp/opt/trinity/include/kfilesharedlg.h
-debian/tmp/opt/trinity/include/kfileshare.h
-debian/tmp/opt/trinity/include/kfiletreebranch.h
-debian/tmp/opt/trinity/include/kfiletreeview.h
-debian/tmp/opt/trinity/include/kfiletreeviewitem.h
-debian/tmp/opt/trinity/include/kfileview.h
+debian/tmp/opt/trinity/include/tdefiledetailview.h
+debian/tmp/opt/trinity/include/tdefiledialog.h
+debian/tmp/opt/trinity/include/tdefilefiltercombo.h
+debian/tmp/opt/trinity/include/tdefilefilter.h
+debian/tmp/opt/trinity/include/tdefile.h
+debian/tmp/opt/trinity/include/tdefileiconview.h
+debian/tmp/opt/trinity/include/tdefileitem.h
+debian/tmp/opt/trinity/include/tdefilemetainfo.h
+debian/tmp/opt/trinity/include/tdefilepreview.h
+debian/tmp/opt/trinity/include/tdefilesharedlg.h
+debian/tmp/opt/trinity/include/tdefileshare.h
+debian/tmp/opt/trinity/include/tdefiletreebranch.h
+debian/tmp/opt/trinity/include/tdefiletreeview.h
+debian/tmp/opt/trinity/include/tdefiletreeviewitem.h
+debian/tmp/opt/trinity/include/tdefileview.h
 debian/tmp/opt/trinity/include/kfilterbase.h
 debian/tmp/opt/trinity/include/kfilterdev.h
 debian/tmp/opt/trinity/include/kfinddialog.h
@@ -756,14 +756,14 @@ 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_tdebuildsycoca.la
+debian/tmp/opt/trinity/lib/libtdeinit_tdecmshell.la
+debian/tmp/opt/trinity/lib/libtdeinit_tdeconf_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/libtdeinit_tdeio_uiserver.la
+debian/tmp/opt/trinity/lib/libtdeinit_tdelauncher.la
 debian/tmp/opt/trinity/lib/libtdeprint.la
 debian/tmp/opt/trinity/lib/libtdeprint_management.la
 debian/tmp/opt/trinity/lib/libtdeprint_management.so
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.manpages b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.manpages
index e5756a2db..d85730422 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.manpages
+++ b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.manpages
@@ -1,4 +1,4 @@
-./debian/man/kconfig_compiler-trinity.1
+./debian/man/tdeconfig_compiler-trinity.1
 ./debian/man/ksvgtopng-trinity.1
 ./debian/man/tdeunittestmodrunner-trinity.1
 ./debian/man/makekdewidgets-trinity.1
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install
index 4d1bb325b..182f67f3e 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -13,10 +13,10 @@ debian/tmp/opt/trinity/bin/dcopstart
 debian/tmp/opt/trinity/bin/filesharelist
 debian/tmp/opt/trinity/bin/fileshareset
 debian/tmp/opt/trinity/bin/imagetops
-debian/tmp/opt/trinity/bin/kab2kabc
+debian/tmp/opt/trinity/bin/tdeab2tdeabc
 debian/tmp/opt/trinity/bin/kaddprinterwizard
-debian/tmp/opt/trinity/bin/kbuildsycoca
-debian/tmp/opt/trinity/bin/kconf_update
+debian/tmp/opt/trinity/bin/tdebuildsycoca
+debian/tmp/opt/trinity/bin/tdeconf_update
 debian/tmp/opt/trinity/bin/kcookiejar
 debian/tmp/opt/trinity/bin/tde-config
 debian/tmp/opt/trinity/bin/kded
@@ -25,27 +25,27 @@ debian/tmp/opt/trinity/bin/tdeinit_shutdown
 debian/tmp/opt/trinity/bin/tdeinit_wrapper
 debian/tmp/opt/trinity/bin/tde_dbus_hardwarecontrol
 debian/tmp/opt/trinity/bin/kdetcompmgr
-debian/tmp/opt/trinity/bin/kde-menu
+debian/tmp/opt/trinity/bin/tde-menu
 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
+debian/tmp/opt/trinity/bin/tdedostartupconfig
+debian/tmp/opt/trinity/bin/tdefile
 debian/tmp/opt/trinity/bin/kfmexec
 debian/tmp/opt/trinity/bin/kgrantpty
-debian/tmp/opt/trinity/bin/khotnewstuff
+debian/tmp/opt/trinity/bin/tdehotnewstuff
 debian/tmp/opt/trinity/bin/kinstalltheme
-debian/tmp/opt/trinity/bin/kioexec
+debian/tmp/opt/trinity/bin/tdeioexec
 debian/tmp/opt/trinity/bin/kio_http_cache_cleaner
-debian/tmp/opt/trinity/bin/kioslave
-debian/tmp/opt/trinity/bin/kio_uiserver
-debian/tmp/opt/trinity/bin/klauncher
-debian/tmp/opt/trinity/bin/kmailservice
+debian/tmp/opt/trinity/bin/tdeioslave
+debian/tmp/opt/trinity/bin/tdeio_uiserver
+debian/tmp/opt/trinity/bin/tdelauncher
+debian/tmp/opt/trinity/bin/tdemailservice
 debian/tmp/opt/trinity/bin/kpac_dhcp_helper
-debian/tmp/opt/trinity/bin/ksendbugmail
+debian/tmp/opt/trinity/bin/tdesendbugmail
 debian/tmp/opt/trinity/bin/kshell
-debian/tmp/opt/trinity/bin/kstartupconfig
-debian/tmp/opt/trinity/bin/ktelnetservice
-debian/tmp/opt/trinity/bin/ktradertest
+debian/tmp/opt/trinity/bin/tdestartupconfig
+debian/tmp/opt/trinity/bin/tdetelnetservice
+debian/tmp/opt/trinity/bin/tdetradertest
 debian/tmp/opt/trinity/bin/kwrapper
 debian/tmp/opt/trinity/bin/lnusertemp
 debian/tmp/opt/trinity/bin/make_driver_db_cups
@@ -71,16 +71,16 @@ debian/tmp/opt/trinity/lib/trinity/kabc_ldapkio.so
 
 debian/tmp/opt/trinity/lib/trinity/kaddprinterwizard.la
 debian/tmp/opt/trinity/lib/trinity/kaddprinterwizard.so
-debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.la
-debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.so
+debian/tmp/opt/trinity/lib/trinity/tdebuildsycoca.la
+debian/tmp/opt/trinity/lib/trinity/tdebuildsycoca.so
 debian/tmp/opt/trinity/lib/trinity/kbzip2filter.la
 debian/tmp/opt/trinity/lib/trinity/kbzip2filter.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
-debian/tmp/opt/trinity/lib/trinity/kconf_update.so
+debian/tmp/opt/trinity/lib/trinity/tdecmshell.la
+debian/tmp/opt/trinity/lib/trinity/tdecmshell.so
+debian/tmp/opt/trinity/lib/trinity/tdeconf_update.la
+debian/tmp/opt/trinity/lib/trinity/tdeconf_update.so
 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
@@ -111,8 +111,8 @@ 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/tdefileaudiopreview.la
+debian/tmp/opt/trinity/lib/trinity/tdefileaudiopreview.so
 debian/tmp/opt/trinity/lib/trinity/kgzipfilter.la
 debian/tmp/opt/trinity/lib/trinity/kgzipfilter.so
 debian/tmp/opt/trinity/lib/trinity/tdehtmlimagepart.la
@@ -159,12 +159,12 @@ debian/tmp/opt/trinity/lib/trinity/kio_iso.la
 debian/tmp/opt/trinity/lib/trinity/kio_iso.so
 debian/tmp/opt/trinity/lib/trinity/kio_metainfo.la
 debian/tmp/opt/trinity/lib/trinity/kio_metainfo.so
-debian/tmp/opt/trinity/lib/trinity/kio_uiserver.la
-debian/tmp/opt/trinity/lib/trinity/kio_uiserver.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_uiserver.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_uiserver.so
 debian/tmp/opt/trinity/lib/trinity/kjavaappletviewer.la
 debian/tmp/opt/trinity/lib/trinity/kjavaappletviewer.so
-debian/tmp/opt/trinity/lib/trinity/klauncher.la
-debian/tmp/opt/trinity/lib/trinity/klauncher.so
+debian/tmp/opt/trinity/lib/trinity/tdelauncher.la
+debian/tmp/opt/trinity/lib/trinity/tdelauncher.so
 debian/tmp/opt/trinity/lib/trinity/knotify.la
 debian/tmp/opt/trinity/lib/trinity/knotify.so
 debian/tmp/opt/trinity/lib/trinity/tdespell_aspell.la
@@ -246,14 +246,14 @@ 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_tdebuildsycoca.so
+debian/tmp/opt/trinity/lib/libtdeinit_tdecmshell.so
+debian/tmp/opt/trinity/lib/libtdeinit_tdeconf_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/libtdeinit_tdeio_uiserver.so
+debian/tmp/opt/trinity/lib/libtdeinit_tdelauncher.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
@@ -316,9 +316,9 @@ 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
-debian/tmp/opt/trinity/lib/trinity/kfile_elf.so
-debian/tmp/opt/trinity/lib/trinity/kfile_elf.la
+debian/tmp/opt/trinity/share/services/tdefile_elf.desktop
+debian/tmp/opt/trinity/lib/trinity/tdefile_elf.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_elf.la
 debian/tmp/opt/trinity/share/apps/tdehwlib/deviceclasses/*
 debian/tmp/opt/trinity/share/apps/tdehwlib/pnpdev/*
 
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.lintian b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.lintian
index 593ec30ed..75982e4c1 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.lintian
+++ b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.lintian
@@ -1,14 +1,14 @@
 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_tdecmshell.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_tdebuildsycoca.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: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
+tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_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
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.manpages b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.manpages
index ef5a28c2f..505fcc7c9 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.manpages
+++ b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.manpages
@@ -5,19 +5,19 @@ debian/man/out/dcopfind-trinity.1
 debian/man/out/dcopserver-trinity.1
 debian/man/out/dcopstart-trinity.1
 debian/man/out/kaddprinterwizard-trinity.1
-debian/man/out/kbuildsycoca-trinity.1
-debian/man/out/kconf_update-trinity.1
+debian/man/out/tdebuildsycoca-trinity.1
+debian/man/out/tdeconf_update-trinity.1
 debian/man/out/kcookiejar-trinity.1
 debian/man/out/tde-config-trinity.1
 debian/man/out/kded-trinity.1
 debian/man/out/kdontchangethehostname-trinity.1
-debian/man/out/kfile-trinity.1
+debian/man/out/tdefile-trinity.1
 debian/man/out/kinstalltheme-trinity.1
 debian/man/out/kio_http_cache_cleaner-trinity.1
-debian/man/out/kio_uiserver-trinity.1
-debian/man/out/kmailservice-trinity.1
-debian/man/out/ksendbugmail-trinity.1
-debian/man/out/ktelnetservice-trinity.1
+debian/man/out/tdeio_uiserver-trinity.1
+debian/man/out/tdemailservice-trinity.1
+debian/man/out/tdesendbugmail-trinity.1
+debian/man/out/tdetelnetservice-trinity.1
 debian/man/out/lnusertemp-trinity.1
 debian/man/out/meinproc-trinity.1
 ./debian/man/tdeinit-trinity.1
@@ -29,18 +29,18 @@ debian/man/out/meinproc-trinity.1
 ./debian/man/dcopserver_shutdown-trinity.1
 ./debian/man/fileshareset-trinity.1
 ./debian/man/imagetops-trinity.1
-./debian/man/kab2kabc-trinity.1
-./debian/man/kcmshell-trinity.1
+./debian/man/tdeab2tdeabc-trinity.1
+./debian/man/tdecmshell-trinity.1
 ./debian/man/tdeinit_shutdown-trinity.1
-./debian/man/kde-menu-trinity.1
+./debian/man/tde-menu-trinity.1
 ./debian/man/tdesu_stub-trinity.1
 ./debian/man/kgrantpty-trinity.1
-./debian/man/khotnewstuff-trinity.1
-./debian/man/kioexec-trinity.1
-./debian/man/klauncher-trinity.1
+./debian/man/tdehotnewstuff-trinity.1
+./debian/man/tdeioexec-trinity.1
+./debian/man/tdelauncher-trinity.1
 ./debian/man/kpac_dhcp_helper-trinity.1
 ./debian/man/kshell-trinity.1
-./debian/man/kstartupconfig-trinity.1
-./debian/man/ktradertest-trinity.1
+./debian/man/tdestartupconfig-trinity.1
+./debian/man/tdetradertest-trinity.1
 ./debian/man/make_driver_db_cups-trinity.1
 ./debian/man/make_driver_db_lpr-trinity.1