Update Debian and Ubuntu packaging with the latest renaming in GIT

22 files changed, 119 insertions, 119 deletions

diff --git a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
index 2fbbb9969..042ffdb21 100644
--- a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
@@ -36,7 +36,7 @@ in konsole.README.Debian s/fontconfig/fontconfig-config
 
 in tdm.postinst install at s/99/13/
 
-from tdebase-kio-plugins.install remove debian/tmp/usr/share/services/kfile_trash.desktop (that's to remove the trash from the "system applet")
+from tdebase-kio-plugins.install remove debian/tmp/usr/share/services/tdefile_trash.desktop (that's to remove the trash from the "system applet")
 
 add debian/ubuntu.xmodmap  debian/80ubuntu-xmodmap and add install rules to binary-install/tdebase-bin::
 
diff --git a/ubuntu/maverick/tdebase/debian/changelog b/ubuntu/maverick/tdebase/debian/changelog
index 450f25f23..1a4cbbd7d 100644
--- a/ubuntu/maverick/tdebase/debian/changelog
+++ b/ubuntu/maverick/tdebase/debian/changelog
@@ -228,7 +228,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid8) intrepid; urgency=low
 
 tdebase-trinity (4:3.5.10-0ubuntu3~intrepid5) intrepid; urgency=low
 
-  * Fixed kioslave fish
+  * Fixed tdeioslave fish
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 07 Dec 2008 21:58:00 -0600
 
@@ -1340,7 +1340,7 @@ tdebase (4:3.5.5a.dfsg.1-1ubuntu8) feisty; urgency=low
 
 tdebase (4:3.5.5a.dfsg.1-1ubuntu7) feisty; urgency=low
 
-  * Removed debian/tmp/usr/share/services/kfile_trash.desktop
+  * Removed debian/tmp/usr/share/services/tdefile_trash.desktop
     from tdebase-kio-plugins.install
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 21 Nov 2006 00:01:43 +0200
@@ -3052,7 +3052,7 @@ tdebase (4:3.4.0-0pre4) alioth; urgency=low
 
   * Added README.Debian files for kcontrol and tdebase-kio-plugins, explaining
     how to setup Logitech mouse advanced configuration, and the media
-    kioslave.
+    tdeioslave.
 
   * New tdebase-doc-html package, containing doc-base registered HTML versions
     of application handbooks, for users without Konqueror or KHelpCenter.
@@ -4264,7 +4264,7 @@ tdebase (4:2.1-final-1) unstable; urgency=low
   * Fixes for khelpcenter hangs (Closes: #81683)
   * konq provides ftp-client as well
   * Update /usr/bin/kde2 script
-  * Compile ldap kioslave
+  * Compile ldap tdeioslave
   * Updated tdm init.d script
   * Fix these rendering issues (Closes: #87183)
  
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control
index f91722b8f..a1b152959 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/tdebase/debian/control
@@ -190,12 +190,12 @@ Recommends: hal-trinity, pmount, kamera-trinity, tdemultimedia-kio-plugins-trini
 Suggests: khelpcenter-trinity, mtools
 Conflicts: tdebase-libs-trinity (<< 4:3.0.0), mediamanager
 Description: core I/O slaves for KDE
- This package includes the base kioslaves. They include, amongst many
+ This package includes the base tdeioslaves. They include, amongst many
  others, file, http, ftp, smtp, pop and imap.
  .
- It also includes the media kioslave, which handles removable devices,
+ It also includes the media tdeioslave, which handles removable devices,
  and which works best with hal (and therefore udev) and pmount. Media
- also extends the functionality of many other kioslaves. To use this
+ also extends the functionality of many other tdeioslaves. To use this
  service, please make sure that your user is a member of the plugdev
  group.
  .
diff --git a/ubuntu/maverick/tdebase/debian/control.in b/ubuntu/maverick/tdebase/debian/control.in
index 136828a50..387728c4e 100644
--- a/ubuntu/maverick/tdebase/debian/control.in
+++ b/ubuntu/maverick/tdebase/debian/control.in
@@ -167,12 +167,12 @@ Suggests: khelpcenter, mtools
 Conflicts: tdebase-libs (<< 4:3.0.0)
 Replaces: tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0), tdebase-bin (<< 4:3.5.5a.dfsg.1-1ubuntu18)
 Description: core I/O slaves for KDE
- This package includes the base kioslaves. They include, amongst many
+ This package includes the base tdeioslaves. They include, amongst many
  others, file, http, ftp, smtp, pop and imap.
  .
- It also includes the media kioslave, which handles removable devices,
+ It also includes the media tdeioslave, which handles removable devices,
  and which works best with hal (and therefore udev) and pmount. Media
- also extends the functionality of many other kioslaves. To use this
+ also extends the functionality of many other tdeioslaves. To use this
  service, please make sure that your user is a member of the plugdev
  group.
  .
diff --git a/ubuntu/maverick/tdebase/debian/kate-trinity.install b/ubuntu/maverick/tdebase/debian/kate-trinity.install
index 74c56bca5..a49c50f54 100644
--- a/ubuntu/maverick/tdebase/debian/kate-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kate-trinity.install
@@ -33,7 +33,7 @@ debian/tmp/opt/trinity/share/apps/kate/icons/locolor/22x22/actions/unindent.png
 debian/tmp/opt/trinity/share/apps/kate/kateui.rc
 debian/tmp/opt/trinity/share/apps/kate/pics/sessionchooser.png
 debian/tmp/opt/trinity/share/apps/kate/tips
-debian/tmp/opt/trinity/share/apps/kconf_update/kate-2.4.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kate-2.4.upd
 debian/tmp/opt/trinity/share/apps/kwrite/kwriteui.rc
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/advanced.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/common
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
index f18eaea23..80f1c2f68 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
@@ -110,8 +110,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_xinerama.la
 debian/tmp/opt/trinity/lib/trinity/kcm_xinerama.so
 debian/tmp/opt/trinity/lib/trinity/kcontrol.la
 debian/tmp/opt/trinity/lib/trinity/kcontrol.so
-debian/tmp/opt/trinity/lib/trinity/kfile_font.la
-debian/tmp/opt/trinity/lib/trinity/kfile_font.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_font.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_font.so
 debian/tmp/opt/trinity/lib/trinity/kio_fonts.la
 debian/tmp/opt/trinity/lib/trinity/kio_fonts.so
 debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.la
@@ -233,7 +233,7 @@ debian/tmp/opt/trinity/share/mimelnk/fonts/system-folder.desktop
 debian/tmp/opt/trinity/share/services/fonts.protocol
 debian/tmp/opt/trinity/share/services/fontthumbnail.desktop
 debian/tmp/opt/trinity/share/services/kaccess.desktop
-debian/tmp/opt/trinity/share/services/kfile_font.desktop
+debian/tmp/opt/trinity/share/services/tdefile_font.desktop
 debian/tmp/opt/trinity/share/services/kfontviewpart.desktop
 debian/tmp/opt/trinity/share/services/kshorturifilter.desktop
 debian/tmp/opt/trinity/share/services/kuriikwsfilter.desktop
diff --git a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
index 85c02dbd0..163430379 100644
--- a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
@@ -19,7 +19,7 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/contact.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/faq.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/info.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/kcontrolmodules.desktop
-debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/kioslaves.desktop
+debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/tdeioslaves.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/konqplugins.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/links.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/Manpages/.directory
diff --git a/ubuntu/maverick/tdebase/debian/kicker-trinity.install b/ubuntu/maverick/tdebase/debian/kicker-trinity.install
index 65f0e8861..8e17b2639 100644
--- a/ubuntu/maverick/tdebase/debian/kicker-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kicker-trinity.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/appletproxy
 debian/tmp/opt/trinity/bin/extensionproxy
 debian/tmp/opt/trinity/bin/kasbar
 debian/tmp/opt/trinity/bin/kicker
-debian/tmp/opt/trinity/lib/kconf_update_bin/kicker-3.4-reverseLayout
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/kicker-3.4-reverseLayout
 debian/tmp/opt/trinity/lib/trinity/appletproxy.la
 debian/tmp/opt/trinity/lib/trinity/appletproxy.so
 debian/tmp/opt/trinity/lib/trinity/clock_panelapplet.la
@@ -75,17 +75,17 @@ debian/tmp/opt/trinity/share/applnk/.hidden/kicker_config_arrangement.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kicker_config_hiding.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kicker_config_menus.desktop
 debian/tmp/opt/trinity/share/apps/clockapplet/pics/lcd.png
-debian/tmp/opt/trinity/share/apps/kconf_update/kicker-3.1-properSizeSetting.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/kicker-3.5-kconfigXTize.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/kicker-3.5-taskbarEnums.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/kickerrc.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kicker-3.1-properSizeSetting.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kicker-3.5-tdeconfigXTize.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kicker-3.5-taskbarEnums.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kickerrc.upd
 debian/tmp/opt/trinity/share/apps/kicker/applets/clockapplet.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/lockout.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/mediaapplet.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/menuapplet.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/minipagerapplet.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/naughtyapplet.desktop
-debian/tmp/opt/trinity/share/apps/kicker/applets/quicklauncher.desktop
+debian/tmp/opt/trinity/share/apps/kicker/applets/quictdelauncher.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/runapplet.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/systemtrayapplet.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/taskbarapplet.desktop
diff --git a/ubuntu/maverick/tdebase/debian/klipper-trinity.install b/ubuntu/maverick/tdebase/debian/klipper-trinity.install
index 67026d9b2..862d1d49b 100644
--- a/ubuntu/maverick/tdebase/debian/klipper-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/klipper-trinity.install
@@ -6,10 +6,10 @@ debian/tmp/opt/trinity/lib/trinity/klipper_panelapplet.so
 debian/tmp/opt/trinity/lib/trinity/klipper.so
 debian/tmp/opt/trinity/lib/libtdeinit_klipper.so
 debian/tmp/opt/trinity/share/applications/tde/klipper.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/klipper-1-2.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/klipper-trinity1.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/klipperrc.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/klippershortcuts.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/klipper-1-2.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/klipper-trinity1.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/klipperrc.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/klippershortcuts.upd
 debian/tmp/opt/trinity/share/apps/kicker/applets/klipper.desktop
 debian/tmp/opt/trinity/share/autostart/klipper.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/klipper/common
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.install b/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
index 029f25bb6..72260cdb6 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
@@ -54,10 +54,10 @@ debian/tmp/opt/trinity/share/applications/tde/konquerorsu.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/konqfilemgr.desktop
 debian/tmp/opt/trinity/share/applnk/Internet/keditbookmarks.desktop
 debian/tmp/opt/trinity/share/applnk/konqueror.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/kfmclient_3_2.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kfmclient_3_2_update.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/konqsidebartng.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/move_konqsidebartng_entries.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kfmclient_3_2.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kfmclient_3_2_update.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/konqsidebartng.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/move_konqsidebartng_entries.sh
 debian/tmp/opt/trinity/share/apps/keditbookmarks/keditbookmarks-genui.rc
 debian/tmp/opt/trinity/share/apps/keditbookmarks/keditbookmarksui.rc
 debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.desktop
diff --git a/ubuntu/maverick/tdebase/debian/konsole-trinity.install b/ubuntu/maverick/tdebase/debian/konsole-trinity.install
index 410f512c3..44838760c 100644
--- a/ubuntu/maverick/tdebase/debian/konsole-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/konsole-trinity.install
@@ -11,8 +11,8 @@ debian/tmp/opt/trinity/lib/libtdeinit_konsole.so
 debian/tmp/opt/trinity/share/applications/tde/konsole.desktop
 debian/tmp/opt/trinity/share/applications/tde/konsolesu.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kcmkonsole.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/konsole.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/schemaStrip.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/konsole.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/schemaStrip.pl
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/konsolehere.desktop
 debian/tmp/opt/trinity/share/apps/konsole/BlackOnLightColor.schema
 debian/tmp/opt/trinity/share/apps/konsole/BlackOnLightYellow.schema
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install
index f8c0aa867..de918ea69 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install
@@ -3,6 +3,6 @@ debian/tmp/opt/trinity/bin/starttde
 debian/tmp/opt/trinity/lib/trinity/ksmserver.la
 debian/tmp/opt/trinity/lib/trinity/ksmserver.so
 debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.so
-debian/tmp/opt/trinity/share/apps/kconf_update/ksmserver.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/move_session_config.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/ksmserver.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/move_session_config.sh
 debian/tmp/opt/trinity/share/apps/ksmserver/pics/shutdownkonq.png
diff --git a/ubuntu/maverick/tdebase/debian/libkonq4-trinity-dev.install b/ubuntu/maverick/tdebase/debian/libkonq4-trinity-dev.install
index 7eb2c120e..499963483 100644
--- a/ubuntu/maverick/tdebase/debian/libkonq4-trinity-dev.install
+++ b/ubuntu/maverick/tdebase/debian/libkonq4-trinity-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include//kfileivi.h
+debian/tmp/opt/trinity/include//tdefileivi.h
 debian/tmp/opt/trinity/include//kivdirectoryoverlay.h
 debian/tmp/opt/trinity/include//knewmenu.h
 debian/tmp/opt/trinity/include//konqbookmarkmanager.h
diff --git a/ubuntu/maverick/tdebase/debian/libkonq4-trinity.install b/ubuntu/maverick/tdebase/debian/libkonq4-trinity.install
index 77ea07f1a..15ee2a8d3 100644
--- a/ubuntu/maverick/tdebase/debian/libkonq4-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/libkonq4-trinity.install
@@ -5,8 +5,8 @@ debian/tmp/opt/trinity/lib/trinity/konq_sound.so
 debian/tmp/opt/trinity/lib/libkonq.so.4
 debian/tmp/opt/trinity/lib/libkonq.so.4.2.0
 debian/tmp/opt/trinity/share/apps/kbookmark/directory_bookmarkbar.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/favicons.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/move_favicons.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/favicons.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/move_favicons.sh
 debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_bottomleft.png
 debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_bottomright.png
 debian/tmp/opt/trinity/share/apps/konqueror/pics/arrow_topleft.png
diff --git a/ubuntu/maverick/tdebase/debian/man/kxkb-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kxkb-trinity.1
index 38a1a2a08..e06426a1b 100644
--- a/ubuntu/maverick/tdebase/debian/man/kxkb-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/kxkb-trinity.1
@@ -12,7 +12,7 @@ kxkb
 .sp 1
 When \fBKxkb\fP is running you can change layouts clicking on its tray icon with the mouse or pressing its keyboard shortcut. Keyboard shortcut or mouse click will switch to next layout or alternatively you can right mouse button click the \fBKxkb\fP icon and select layout from the list.
 .sp 1
-Right mouse button clicking on the \fBKxkb\fP icon you can start its configuration by selecting Configure... or by opening \fBControl Center\fP and selecting Localization/Keyboard Layout. Alternatively, you can start it by typing \fBkcmshell keyboard_layout\fP in a terminal.
+Right mouse button clicking on the \fBKxkb\fP icon you can start its configuration by selecting Configure... or by opening \fBControl Center\fP and selecting Localization/Keyboard Layout. Alternatively, you can start it by typing \fBtdecmshell keyboard_layout\fP in a terminal.
 .SH OPTIONS
 .SS Generic options:
 .TP
diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules
index 93596b397..374542a38 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/maverick/tdebase/debian/rules
@@ -37,7 +37,7 @@ DEB_DH_STRIP_ARGS  := --dbg-package=tdebase-trinity-dbg
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach kioslave kxkb kdebugdialog kdcop
+DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb kdebugdialog kdcop
 
 PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
 			ksysguard-trinity twin-trinity libkonq4-trinity
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
index 7f06b6d76..ae518054b 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
@@ -27,12 +27,12 @@ debian/tmp/opt/trinity/share/apps/kcmkeys/win3.kksrc
 debian/tmp/opt/trinity/share/apps/kcmkeys/win4.kksrc
 debian/tmp/opt/trinity/share/apps/kcmkeys/wm3.kksrc
 debian/tmp/opt/trinity/share/apps/kcmlocale/pics/background.png
-debian/tmp/opt/trinity/share/apps/kconf_update/convertShortcuts.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/kaccel.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kcmdisplayrc.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kuriikwsfilter.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/mouse_cursor_theme.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/socks.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/convertShortcuts.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kaccel.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kcmdisplayrc.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/kuriikwsfilter.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/mouse_cursor_theme.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/socks.upd
 debian/tmp/opt/trinity/share/apps/kcontrol/about/kcontrol.css
 debian/tmp/opt/trinity/share/apps/kcontrol/about/main.html
 debian/tmp/opt/trinity/share/apps/kcontrol/about/top-right-kcontrol.png
@@ -174,8 +174,8 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/kfileman1.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/kfileman2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/tdefileman1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/tdefileman2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filetypes/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filetypes/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filetypes/index.docbook
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian b/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian
index 711a00289..404b60f67 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian
+++ b/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.README.Debian
@@ -1,13 +1,13 @@
-KDE and media kioslave support
+KDE and media tdeioslave support
 ==============================
 
-The media kioslave, new in KDE 3.4, supports the automatic mounting of
+The media tdeioslave, new in KDE 3.4, supports the automatic mounting of
 removable devices, such as CD-ROM and DVD drives, USB pen drives, digital
 cameras, and many other types of equipment.
 
 While some functionality is available without the use of HAL, media works
 best with HAL (and therefore udev), in combination with pmount. Media
-also extends the functionality of many other kioslaves. Check which
+also extends the functionality of many other tdeioslaves. Check which
 packages are recommended by the tdebase-kio-plugins package, and install
 accordingly.
 
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.install
index f2b452126..d374eb0bc 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.install
@@ -24,10 +24,10 @@ debian/tmp/opt/trinity/lib/trinity/kded_remotedirnotify.la
 debian/tmp/opt/trinity/lib/trinity/kded_remotedirnotify.so
 debian/tmp/opt/trinity/lib/trinity/kded_systemdirnotify.la
 debian/tmp/opt/trinity/lib/trinity/kded_systemdirnotify.so
-debian/tmp/opt/trinity/lib/trinity/kfile_media.la
-debian/tmp/opt/trinity/lib/trinity/kfile_media.so
-debian/tmp/opt/trinity/lib/trinity/kfile_trash.la
-debian/tmp/opt/trinity/lib/trinity/kfile_trash.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_media.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_media.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_trash.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_trash.so
 debian/tmp/opt/trinity/lib/trinity/kio_about.la
 debian/tmp/opt/trinity/lib/trinity/kio_about.so
 debian/tmp/opt/trinity/lib/trinity/kio_cgi.la
@@ -96,48 +96,48 @@ debian/tmp/opt/trinity/share/apps/systemview/media.desktop
 debian/tmp/opt/trinity/share/apps/systemview/remote.desktop
 debian/tmp/opt/trinity/share/apps/systemview/users.desktop
 debian/tmp/opt/trinity/share/config.kcfg/mediamanagersettings.kcfg
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/bzip.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/bzip2.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/cgi.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/data.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/file.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/finger.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/fish.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/floppy.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/ftp.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/gopher.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/gzip.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/help.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/http.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/https.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/imap.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/imaps.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/info.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/lan.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/ldap.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/mac.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/mailto.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/man.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/mrml.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/news.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/nfs.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/nntp.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/pop3.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/pop3s.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/print.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/rlan.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/rlogin.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/sftp.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/smb.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/smtp.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/tar.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/telnet.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/thumbnail.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/webdav.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/webdavs.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/bzip.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/bzip2.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/cgi.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/data.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/file.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/finger.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/fish.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/floppy.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/ftp.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/gopher.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/gzip.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/help.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/http.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/https.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/imap.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/imaps.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/info.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/lan.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/ldap.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/mac.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/mailto.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/man.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/mrml.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/news.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/nfs.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/nntp.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/pop3.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/pop3s.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/print.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/rlan.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/rlogin.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/sftp.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/smb.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/smtp.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/tar.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/telnet.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/thumbnail.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/webdav.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/webdavs.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/compact_flash_mount_decrypt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/compact_flash_unmount_decrypt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/compact_flash_unmount_encrypt.png
@@ -359,8 +359,8 @@ debian/tmp/opt/trinity/share/services/kded/mediamanager.desktop
 debian/tmp/opt/trinity/share/services/kded/medianotifier.desktop
 debian/tmp/opt/trinity/share/services/kded/remotedirnotify.desktop
 debian/tmp/opt/trinity/share/services/kded/systemdirnotify.desktop
-debian/tmp/opt/trinity/share/services/kfile_media.desktop
-debian/tmp/opt/trinity/share/services/kfile_trash_system.desktop
+debian/tmp/opt/trinity/share/services/tdefile_media.desktop
+debian/tmp/opt/trinity/share/services/tdefile_trash_system.desktop
 debian/tmp/opt/trinity/share/services/kmanpart.desktop
 debian/tmp/opt/trinity/share/services/ldap.protocol
 debian/tmp/opt/trinity/share/services/ldaps.protocol
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
index 78e1c95fb..85d0e5a33 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
@@ -25,7 +25,7 @@ debian/tmp/opt/trinity/bin/knetattach
 debian/tmp/opt/trinity/bin/krandom.kss
 debian/tmp/opt/trinity/bin/ksystraycmd
 debian/tmp/opt/trinity/bin/kxkb
-debian/tmp/opt/trinity/lib/kconf_update_bin/khotkeys_update
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/khotkeys_update
 debian/tmp/opt/trinity/lib/trinity/kcminit.la
 debian/tmp/opt/trinity/lib/trinity/kcminit.so
 debian/tmp/opt/trinity/lib/trinity/kcminit_startup.la
@@ -65,9 +65,9 @@ debian/tmp/opt/trinity/share/apps/drkonqi/debuggers/gdbrc
 debian/tmp/opt/trinity/share/apps/drkonqi/pics/konqi.png
 debian/tmp/opt/trinity/share/apps/drkonqi/presets/developerrc
 debian/tmp/opt/trinity/share/apps/drkonqi/presets/enduserrc
-debian/tmp/opt/trinity/share/apps/kconf_update/khotkeys_32b1_update.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/khotkeys_printscreen.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/konqueror_gestures_trinity21_update.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/khotkeys_32b1_update.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/khotkeys_printscreen.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/konqueror_gestures_trinity21_update.upd
 debian/tmp/opt/trinity/share/apps/kdcop/kdcopui.rc
 debian/tmp/opt/trinity/share/apps/khotkeys/trinity2b1.khotkeys
 debian/tmp/opt/trinity/share/apps/khotkeys/konqueror_gestures_trinity21.khotkeys
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian b/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian
index f3189b2c5..e7a871ce9 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian
@@ -4,16 +4,16 @@ Kdm
 For notes on tdm, read: /opt/trinity/share/doc/tdm/README.Debian
 
 
-KDE and media kioslave support
+KDE and media tdeioslave support
 ==============================
 
-The media kioslave, new in KDE 3.4, supports the automatic mounting of
+The media tdeioslave, new in KDE 3.4, supports the automatic mounting of
 removable devices, such as CD-ROM and DVD drives, USB pen drives, digital
 cameras, and many other types of equipment.
 
 While some functionality is available without the use of HAL, media works
 best with HAL (and therefore udev), in combination with pmount. Media
-also extends the functionality of many other kioslaves. Check which
+also extends the functionality of many other tdeioslaves. Check which
 packages are recommended by the tdebase-kio-plugins package, and install
 accordingly.
 
diff --git a/ubuntu/maverick/tdebase/debian/twin-trinity.install b/ubuntu/maverick/tdebase/debian/twin-trinity.install
index 2bf0dec5a..93fedda6f 100644
--- a/ubuntu/maverick/tdebase/debian/twin-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/twin-trinity.install
@@ -3,8 +3,8 @@ debian/tmp/opt/trinity/bin/twin
 debian/tmp/opt/trinity/bin/twin_killer_helper
 debian/tmp/opt/trinity/bin/twin_resumer_helper
 debian/tmp/opt/trinity/bin/twin_rules_dialog
-debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_default_rules
-debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_window_settings
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/twin_update_default_rules
+debian/tmp/opt/trinity/lib/tdeconf_update_bin/twin_update_window_settings
 debian/tmp/opt/trinity/lib/trinity/kcm_twindecoration.la
 debian/tmp/opt/trinity/lib/trinity/kcm_twindecoration.so
 debian/tmp/opt/trinity/lib/trinity/kcm_twinoptions.la
@@ -58,18 +58,18 @@ debian/tmp/opt/trinity/share/applnk/.hidden/twinadvanced.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/twinfocus.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/twinmoving.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/twintranslucency.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/twin3_plugin.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/twin3_plugin.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus1.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus1.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus2.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus2.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/twin_fsp_workarounds_1.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/twiniconify.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/twinsticky.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/twin.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/twinupdatewindowsettings.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/pluginlibFix.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twin3_plugin.pl
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twin3_plugin.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus1.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus1.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus2.sh
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus2.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_fsp_workarounds_1.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twiniconify.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twinsticky.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twin.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/twinupdatewindowsettings.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/pluginlibFix.pl
 debian/tmp/opt/trinity/share/apps/twin/b2.desktop
 debian/tmp/opt/trinity/share/apps/twin/eventsrc
 debian/tmp/opt/trinity/share/apps/twin/keramik.desktop