Update Debian and Ubuntu packaging with the latest renaming in GIT

22 files changed, 119 insertions, 119 deletions

diff --git a/ubuntu/maverick_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/maverick_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES
index bad62816c..922dd4968 100644
--- a/ubuntu/maverick_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/maverick_automake/kdebase/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 kdebase-kio-plugins.install remove debian/tmp/usr/share/services/kfile_trash.desktop (that's to remove the trash from the "system applet")
+from kdebase-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/kdebase-bin::
 
diff --git a/ubuntu/maverick_automake/kdebase/debian/changelog b/ubuntu/maverick_automake/kdebase/debian/changelog
index fe73757c3..10e1f4f81 100644
--- a/ubuntu/maverick_automake/kdebase/debian/changelog
+++ b/ubuntu/maverick_automake/kdebase/debian/changelog
@@ -228,7 +228,7 @@ kdebase-kde3 (4:3.5.10-0ubuntu3~intrepid8) intrepid; urgency=low
 
 kdebase-kde3 (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 @@ kdebase (4:3.5.5a.dfsg.1-1ubuntu8) feisty; urgency=low
 
 kdebase (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 kdebase-kio-plugins.install
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 21 Nov 2006 00:01:43 +0200
@@ -3052,7 +3052,7 @@ kdebase (4:3.4.0-0pre4) alioth; urgency=low
 
   * Added README.Debian files for kcontrol and kdebase-kio-plugins, explaining
     how to setup Logitech mouse advanced configuration, and the media
-    kioslave.
+    tdeioslave.
 
   * New kdebase-doc-html package, containing doc-base registered HTML versions
     of application handbooks, for users without Konqueror or KHelpCenter.
@@ -4264,7 +4264,7 @@ kdebase (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_automake/kdebase/debian/control b/ubuntu/maverick_automake/kdebase/debian/control
index 9705d7db1..edefb38be 100644
--- a/ubuntu/maverick_automake/kdebase/debian/control
+++ b/ubuntu/maverick_automake/kdebase/debian/control
@@ -176,12 +176,12 @@ Suggests: khelpcenter-kde3, mtools
 Conflicts: kdebase-libs-kde3 (<< 4:3.0.0), mediamanager
 Replaces: kdebase-kde3 (<< 4:3.0.0), kdebase-kde3-doc (<< 4:3.0.0), kdebase-libs-kde3 (<< 4:3.0.0), konqueror-kde3 (<< 4:3.0.0), kdebase-kde3-bin (<< 4:3.5.5a.dfsg.1-1ubuntu18), kdebase-data-kde3 (<< 4:3.5.8-2ubuntu18)
 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_automake/kdebase/debian/control.in b/ubuntu/maverick_automake/kdebase/debian/control.in
index 8566b8000..c3658f88a 100644
--- a/ubuntu/maverick_automake/kdebase/debian/control.in
+++ b/ubuntu/maverick_automake/kdebase/debian/control.in
@@ -168,12 +168,12 @@ Suggests: khelpcenter, mtools
 Conflicts: kdebase-libs (<< 4:3.0.0)
 Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0), kdebase-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_automake/kdebase/debian/kate-kde3.install b/ubuntu/maverick_automake/kdebase/debian/kate-kde3.install
index 42ff16532..8e030b1cb 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kate-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/kate-kde3.install
@@ -33,7 +33,7 @@ debian/tmp/opt/kde3/share/apps/kate/icons/locolor/22x22/actions/unindent.png
 debian/tmp/opt/kde3/share/apps/kate/kateui.rc
 debian/tmp/opt/kde3/share/apps/kate/pics/sessionchooser.png
 debian/tmp/opt/kde3/share/apps/kate/tips
-debian/tmp/opt/kde3/share/apps/kconf_update/kate-2.4.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kate-2.4.upd
 debian/tmp/opt/kde3/share/apps/kwrite/kwriteui.rc
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kate/advanced.docbook
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kate/common
diff --git a/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install b/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install
index 6e080d0ee..8f1875b7b 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install
@@ -106,8 +106,8 @@ debian/tmp/opt/kde3/lib/kde3/kcm_xinerama.la
 debian/tmp/opt/kde3/lib/kde3/kcm_xinerama.so
 debian/tmp/opt/kde3/lib/kde3/kcontrol.la
 debian/tmp/opt/kde3/lib/kde3/kcontrol.so
-debian/tmp/opt/kde3/lib/kde3/kfile_font.la
-debian/tmp/opt/kde3/lib/kde3/kfile_font.so
+debian/tmp/opt/kde3/lib/kde3/tdefile_font.la
+debian/tmp/opt/kde3/lib/kde3/tdefile_font.so
 debian/tmp/opt/kde3/lib/kde3/kio_fonts.la
 debian/tmp/opt/kde3/lib/kde3/kio_fonts.so
 debian/tmp/opt/kde3/lib/kde3/kstyle_keramik_config.la
@@ -227,7 +227,7 @@ debian/tmp/opt/kde3/share/mimelnk/fonts/system-folder.desktop
 debian/tmp/opt/kde3/share/services/fonts.protocol
 debian/tmp/opt/kde3/share/services/fontthumbnail.desktop
 debian/tmp/opt/kde3/share/services/kaccess.desktop
-debian/tmp/opt/kde3/share/services/kfile_font.desktop
+debian/tmp/opt/kde3/share/services/tdefile_font.desktop
 debian/tmp/opt/kde3/share/services/kfontviewpart.desktop
 debian/tmp/opt/kde3/share/services/kshorturifilter.desktop
 debian/tmp/opt/kde3/share/services/kuriikwsfilter.desktop
diff --git a/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install b/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install
index 1fca22e59..19988ea37 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install
@@ -27,12 +27,12 @@ debian/tmp/opt/kde3/share/apps/kcmkeys/win3.kksrc
 debian/tmp/opt/kde3/share/apps/kcmkeys/win4.kksrc
 debian/tmp/opt/kde3/share/apps/kcmkeys/wm3.kksrc
 debian/tmp/opt/kde3/share/apps/kcmlocale/pics/background.png
-debian/tmp/opt/kde3/share/apps/kconf_update/convertShortcuts.pl
-debian/tmp/opt/kde3/share/apps/kconf_update/kaccel.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/kcmdisplayrc.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/kuriikwsfilter.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/mouse_cursor_theme.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/socks.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/convertShortcuts.pl
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kaccel.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kcmdisplayrc.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kuriikwsfilter.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/mouse_cursor_theme.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/socks.upd
 debian/tmp/opt/kde3/share/apps/kcontrol/about/kcontrol.css
 debian/tmp/opt/kde3/share/apps/kcontrol/about/main.html
 debian/tmp/opt/kde3/share/apps/kcontrol/about/top-right-kcontrol.png
@@ -162,8 +162,8 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/energy/index.docbook
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/filemanager/common
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/filemanager/index.cache.bz2
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/filemanager/index.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/filemanager/kfileman1.png
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/filemanager/kfileman2.png
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/filemanager/tdefileman1.png
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/filemanager/tdefileman2.png
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/filetypes/common
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/filetypes/index.cache.bz2
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/filetypes/index.docbook
diff --git a/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3-bin.install b/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3-bin.install
index c3352868f..56d03daf6 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3-bin.install
+++ b/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3-bin.install
@@ -18,7 +18,7 @@ debian/tmp/opt/kde3/bin/knetattach
 debian/tmp/opt/kde3/bin/krandom.kss
 debian/tmp/opt/kde3/bin/ksystraycmd
 debian/tmp/opt/kde3/bin/kxkb
-debian/tmp/opt/kde3/lib/kconf_update_bin/khotkeys_update
+debian/tmp/opt/kde3/lib/tdeconf_update_bin/khotkeys_update
 debian/tmp/opt/kde3/lib/kde3/kcminit.la
 debian/tmp/opt/kde3/lib/kde3/kcminit.so
 debian/tmp/opt/kde3/lib/kde3/kcminit_startup.la
@@ -58,9 +58,9 @@ debian/tmp/opt/kde3/share/apps/drkonqi/debuggers/gdbrc
 debian/tmp/opt/kde3/share/apps/drkonqi/pics/konqi.png
 debian/tmp/opt/kde3/share/apps/drkonqi/presets/developerrc
 debian/tmp/opt/kde3/share/apps/drkonqi/presets/enduserrc
-debian/tmp/opt/kde3/share/apps/kconf_update/khotkeys_32b1_update.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/khotkeys_printscreen.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/konqueror_gestures_kde321_update.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/khotkeys_32b1_update.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/khotkeys_printscreen.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/konqueror_gestures_kde321_update.upd
 debian/tmp/opt/kde3/share/apps/kdcop/kdcopui.rc
 debian/tmp/opt/kde3/share/apps/khotkeys/kde32b1.khotkeys
 debian/tmp/opt/kde3/share/apps/khotkeys/konqueror_gestures_kde321.khotkeys
diff --git a/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3.README.Debian b/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3.README.Debian
index f8dba94d8..0fc64faa2 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3.README.Debian
+++ b/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3.README.Debian
@@ -4,16 +4,16 @@ Kdm
 For notes on tdm, read: /opt/kde3/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 kdebase-kio-plugins package, and install
 accordingly.
 
diff --git a/ubuntu/maverick_automake/kdebase/debian/kdebase-kio-plugins-kde3.README.Debian b/ubuntu/maverick_automake/kdebase/debian/kdebase-kio-plugins-kde3.README.Debian
index b0b6e7322..2d10b1925 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kdebase-kio-plugins-kde3.README.Debian
+++ b/ubuntu/maverick_automake/kdebase/debian/kdebase-kio-plugins-kde3.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 kdebase-kio-plugins package, and install
 accordingly.
 
diff --git a/ubuntu/maverick_automake/kdebase/debian/kdebase-kio-plugins-kde3.install b/ubuntu/maverick_automake/kdebase/debian/kdebase-kio-plugins-kde3.install
index 935972126..f1048e989 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kdebase-kio-plugins-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/kdebase-kio-plugins-kde3.install
@@ -24,10 +24,10 @@ debian/tmp/opt/kde3/lib/kde3/kded_remotedirnotify.la
 debian/tmp/opt/kde3/lib/kde3/kded_remotedirnotify.so
 debian/tmp/opt/kde3/lib/kde3/kded_systemdirnotify.la
 debian/tmp/opt/kde3/lib/kde3/kded_systemdirnotify.so
-debian/tmp/opt/kde3/lib/kde3/kfile_media.la
-debian/tmp/opt/kde3/lib/kde3/kfile_media.so
-debian/tmp/opt/kde3/lib/kde3/kfile_trash.la
-debian/tmp/opt/kde3/lib/kde3/kfile_trash.so
+debian/tmp/opt/kde3/lib/kde3/tdefile_media.la
+debian/tmp/opt/kde3/lib/kde3/tdefile_media.so
+debian/tmp/opt/kde3/lib/kde3/tdefile_trash.la
+debian/tmp/opt/kde3/lib/kde3/tdefile_trash.so
 debian/tmp/opt/kde3/lib/kde3/kio_about.la
 debian/tmp/opt/kde3/lib/kde3/kio_about.so
 debian/tmp/opt/kde3/lib/kde3/kio_cgi.la
@@ -96,48 +96,48 @@ debian/tmp/opt/kde3/share/apps/systemview/media.desktop
 debian/tmp/opt/kde3/share/apps/systemview/remote.desktop
 debian/tmp/opt/kde3/share/apps/systemview/users.desktop
 debian/tmp/opt/kde3/share/config.kcfg/mediamanagersettings.kcfg
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/bzip.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/bzip2.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/cgi.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/common
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/data.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/file.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/finger.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/fish.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/floppy.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/ftp.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/gopher.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/gzip.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/help.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/http.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/https.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/imap.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/imaps.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/index.cache.bz2
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/index.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/info.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/lan.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/ldap.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/mac.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/mailto.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/man.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/mrml.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/news.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/nfs.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/nntp.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/pop3.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/pop3s.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/print.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/rlan.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/rlogin.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/sftp.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/smb.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/smtp.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/tar.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/telnet.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/thumbnail.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/webdav.docbook
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kioslave/webdavs.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/bzip.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/bzip2.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/cgi.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/common
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/data.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/file.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/finger.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/fish.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/floppy.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/ftp.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/gopher.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/gzip.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/help.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/http.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/https.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/imap.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/imaps.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/index.cache.bz2
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/index.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/info.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/lan.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/ldap.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/mac.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/mailto.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/man.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/mrml.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/news.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/nfs.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/nntp.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/pop3.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/pop3s.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/print.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/rlan.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/rlogin.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/sftp.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/smb.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/smtp.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/tar.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/telnet.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/thumbnail.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/webdav.docbook
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdeioslave/webdavs.docbook
 debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/devices/compact_flash_mount_decrypt.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/devices/compact_flash_unmount_decrypt.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/devices/compact_flash_unmount_encrypt.png
@@ -359,8 +359,8 @@ debian/tmp/opt/kde3/share/services/kded/mediamanager.desktop
 debian/tmp/opt/kde3/share/services/kded/medianotifier.desktop
 debian/tmp/opt/kde3/share/services/kded/remotedirnotify.desktop
 debian/tmp/opt/kde3/share/services/kded/systemdirnotify.desktop
-debian/tmp/opt/kde3/share/services/kfile_media.desktop
-debian/tmp/opt/kde3/share/services/kfile_trash_system.desktop
+debian/tmp/opt/kde3/share/services/tdefile_media.desktop
+debian/tmp/opt/kde3/share/services/tdefile_trash_system.desktop
 debian/tmp/opt/kde3/share/services/kmanpart.desktop
 debian/tmp/opt/kde3/share/services/ldap.protocol
 debian/tmp/opt/kde3/share/services/ldaps.protocol
diff --git a/ubuntu/maverick_automake/kdebase/debian/khelpcenter-kde3.install b/ubuntu/maverick_automake/kdebase/debian/khelpcenter-kde3.install
index 7a5d1dcd7..620b0c012 100644
--- a/ubuntu/maverick_automake/kdebase/debian/khelpcenter-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/khelpcenter-kde3.install
@@ -20,7 +20,7 @@ debian/tmp/opt/kde3/share/apps/khelpcenter/plugins/faq.desktop
 debian/tmp/opt/kde3/share/apps/khelpcenter/plugins/info.desktop
 debian/tmp/opt/kde3/share/apps/khelpcenter/plugins/kcontrolmodules.desktop
 debian/tmp/opt/kde3/share/apps/khelpcenter/plugins/kicmodules.desktop
-debian/tmp/opt/kde3/share/apps/khelpcenter/plugins/kioslaves.desktop
+debian/tmp/opt/kde3/share/apps/khelpcenter/plugins/tdeioslaves.desktop
 debian/tmp/opt/kde3/share/apps/khelpcenter/plugins/konqplugins.desktop
 debian/tmp/opt/kde3/share/apps/khelpcenter/plugins/links.desktop
 debian/tmp/opt/kde3/share/apps/khelpcenter/plugins/Manpages/.directory
diff --git a/ubuntu/maverick_automake/kdebase/debian/kicker-kde3.install b/ubuntu/maverick_automake/kdebase/debian/kicker-kde3.install
index 1c0bd8b0e..315007a6a 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kicker-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/kicker-kde3.install
@@ -2,7 +2,7 @@ debian/tmp/opt/kde3/bin/appletproxy
 debian/tmp/opt/kde3/bin/extensionproxy
 debian/tmp/opt/kde3/bin/kasbar
 debian/tmp/opt/kde3/bin/kicker
-debian/tmp/opt/kde3/lib/kconf_update_bin/kicker-3.4-reverseLayout
+debian/tmp/opt/kde3/lib/tdeconf_update_bin/kicker-3.4-reverseLayout
 debian/tmp/opt/kde3/lib/kde3/appletproxy.la
 debian/tmp/opt/kde3/lib/kde3/appletproxy.so
 debian/tmp/opt/kde3/lib/kde3/clock_panelapplet.la
@@ -75,17 +75,17 @@ debian/tmp/opt/kde3/share/applnk/.hidden/kicker_config_arrangement.desktop
 debian/tmp/opt/kde3/share/applnk/.hidden/kicker_config_hiding.desktop
 debian/tmp/opt/kde3/share/applnk/.hidden/kicker_config_menus.desktop
 debian/tmp/opt/kde3/share/apps/clockapplet/pics/lcd.png
-debian/tmp/opt/kde3/share/apps/kconf_update/kicker-3.1-properSizeSetting.pl
-debian/tmp/opt/kde3/share/apps/kconf_update/kicker-3.5-kconfigXTize.pl
-debian/tmp/opt/kde3/share/apps/kconf_update/kicker-3.5-taskbarEnums.pl
-debian/tmp/opt/kde3/share/apps/kconf_update/kickerrc.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kicker-3.1-properSizeSetting.pl
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kicker-3.5-tdeconfigXTize.pl
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kicker-3.5-taskbarEnums.pl
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kickerrc.upd
 debian/tmp/opt/kde3/share/apps/kicker/applets/clockapplet.desktop
 debian/tmp/opt/kde3/share/apps/kicker/applets/lockout.desktop
 debian/tmp/opt/kde3/share/apps/kicker/applets/mediaapplet.desktop
 debian/tmp/opt/kde3/share/apps/kicker/applets/menuapplet.desktop
 debian/tmp/opt/kde3/share/apps/kicker/applets/minipagerapplet.desktop
 debian/tmp/opt/kde3/share/apps/kicker/applets/naughtyapplet.desktop
-debian/tmp/opt/kde3/share/apps/kicker/applets/quicklauncher.desktop
+debian/tmp/opt/kde3/share/apps/kicker/applets/quictdelauncher.desktop
 debian/tmp/opt/kde3/share/apps/kicker/applets/runapplet.desktop
 debian/tmp/opt/kde3/share/apps/kicker/applets/systemtrayapplet.desktop
 debian/tmp/opt/kde3/share/apps/kicker/applets/taskbarapplet.desktop
diff --git a/ubuntu/maverick_automake/kdebase/debian/klipper-kde3.install b/ubuntu/maverick_automake/kdebase/debian/klipper-kde3.install
index 0c53393bb..1f7f7c869 100644
--- a/ubuntu/maverick_automake/kdebase/debian/klipper-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/klipper-kde3.install
@@ -6,10 +6,10 @@ debian/tmp/opt/kde3/lib/kde3/klipper_panelapplet.so
 debian/tmp/opt/kde3/lib/kde3/klipper.so
 debian/tmp/opt/kde3/lib/libkdeinit_klipper.so
 debian/tmp/opt/kde3/share/applications/kde/klipper.desktop
-debian/tmp/opt/kde3/share/apps/kconf_update/klipper-1-2.pl
-debian/tmp/opt/kde3/share/apps/kconf_update/klipper-kde31.sh
-debian/tmp/opt/kde3/share/apps/kconf_update/klipperrc.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/klippershortcuts.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/klipper-1-2.pl
+debian/tmp/opt/kde3/share/apps/tdeconf_update/klipper-kde31.sh
+debian/tmp/opt/kde3/share/apps/tdeconf_update/klipperrc.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/klippershortcuts.upd
 debian/tmp/opt/kde3/share/apps/kicker/applets/klipper.desktop
 debian/tmp/opt/kde3/share/autostart/klipper.desktop
 debian/tmp/opt/kde3/share/doc/kde/HTML/en/klipper/common
diff --git a/ubuntu/maverick_automake/kdebase/debian/konqueror-kde3.install b/ubuntu/maverick_automake/kdebase/debian/konqueror-kde3.install
index 815c0fb8d..ca73728a9 100644
--- a/ubuntu/maverick_automake/kdebase/debian/konqueror-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/konqueror-kde3.install
@@ -54,10 +54,10 @@ debian/tmp/opt/kde3/share/applications/kde/konquerorsu.desktop
 debian/tmp/opt/kde3/share/applnk/.hidden/konqfilemgr.desktop
 debian/tmp/opt/kde3/share/applnk/Internet/keditbookmarks.desktop
 debian/tmp/opt/kde3/share/applnk/konqueror.desktop
-debian/tmp/opt/kde3/share/apps/kconf_update/kfmclient_3_2.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/kfmclient_3_2_update.sh
-debian/tmp/opt/kde3/share/apps/kconf_update/konqsidebartng.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/move_konqsidebartng_entries.sh
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kfmclient_3_2.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kfmclient_3_2_update.sh
+debian/tmp/opt/kde3/share/apps/tdeconf_update/konqsidebartng.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/move_konqsidebartng_entries.sh
 debian/tmp/opt/kde3/share/apps/keditbookmarks/keditbookmarks-genui.rc
 debian/tmp/opt/kde3/share/apps/keditbookmarks/keditbookmarksui.rc
 debian/tmp/opt/kde3/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.desktop
diff --git a/ubuntu/maverick_automake/kdebase/debian/konsole-kde3.install b/ubuntu/maverick_automake/kdebase/debian/konsole-kde3.install
index 417ab2304..a3247662e 100644
--- a/ubuntu/maverick_automake/kdebase/debian/konsole-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/konsole-kde3.install
@@ -11,8 +11,8 @@ debian/tmp/opt/kde3/lib/libkdeinit_konsole.so
 debian/tmp/opt/kde3/share/applications/kde/konsole.desktop
 debian/tmp/opt/kde3/share/applications/kde/konsolesu.desktop
 debian/tmp/opt/kde3/share/applnk/.hidden/kcmkonsole.desktop
-debian/tmp/opt/kde3/share/apps/kconf_update/konsole.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/schemaStrip.pl
+debian/tmp/opt/kde3/share/apps/tdeconf_update/konsole.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/schemaStrip.pl
 debian/tmp/opt/kde3/share/apps/konqueror/servicemenus/konsolehere.desktop
 debian/tmp/opt/kde3/share/apps/konsole/BlackOnLightColor.schema
 debian/tmp/opt/kde3/share/apps/konsole/BlackOnLightYellow.schema
diff --git a/ubuntu/maverick_automake/kdebase/debian/ksmserver-kde3.install b/ubuntu/maverick_automake/kdebase/debian/ksmserver-kde3.install
index cd3badadd..e4c6e86c7 100644
--- a/ubuntu/maverick_automake/kdebase/debian/ksmserver-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/ksmserver-kde3.install
@@ -3,6 +3,6 @@ debian/tmp/opt/kde3/bin/startkde
 debian/tmp/opt/kde3/lib/kde3/ksmserver.la
 debian/tmp/opt/kde3/lib/kde3/ksmserver.so
 debian/tmp/opt/kde3/lib/libkdeinit_ksmserver.so
-debian/tmp/opt/kde3/share/apps/kconf_update/ksmserver.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/move_session_config.sh
+debian/tmp/opt/kde3/share/apps/tdeconf_update/ksmserver.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/move_session_config.sh
 debian/tmp/opt/kde3/share/apps/ksmserver/pics/shutdownkonq.png
diff --git a/ubuntu/maverick_automake/kdebase/debian/kwin-kde3.install b/ubuntu/maverick_automake/kdebase/debian/kwin-kde3.install
index c2a297bb9..3338c97b4 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kwin-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/kwin-kde3.install
@@ -2,8 +2,8 @@ debian/tmp/opt/kde3/bin/kompmgr
 debian/tmp/opt/kde3/bin/kwin
 debian/tmp/opt/kde3/bin/kwin_killer_helper
 debian/tmp/opt/kde3/bin/kwin_rules_dialog
-debian/tmp/opt/kde3/lib/kconf_update_bin/kwin_update_default_rules
-debian/tmp/opt/kde3/lib/kconf_update_bin/kwin_update_window_settings
+debian/tmp/opt/kde3/lib/tdeconf_update_bin/kwin_update_default_rules
+debian/tmp/opt/kde3/lib/tdeconf_update_bin/kwin_update_window_settings
 debian/tmp/opt/kde3/lib/kde3/kcm_kwindecoration.la
 debian/tmp/opt/kde3/lib/kde3/kcm_kwindecoration.so
 debian/tmp/opt/kde3/lib/kde3/kcm_kwinoptions.la
@@ -57,18 +57,18 @@ debian/tmp/opt/kde3/share/applnk/.hidden/kwinadvanced.desktop
 debian/tmp/opt/kde3/share/applnk/.hidden/kwinfocus.desktop
 debian/tmp/opt/kde3/share/applnk/.hidden/kwinmoving.desktop
 debian/tmp/opt/kde3/share/applnk/.hidden/kwintranslucency.desktop
-debian/tmp/opt/kde3/share/apps/kconf_update/kwin3_plugin.pl
-debian/tmp/opt/kde3/share/apps/kconf_update/kwin3_plugin.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/kwin_focus1.sh
-debian/tmp/opt/kde3/share/apps/kconf_update/kwin_focus1.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/kwin_focus2.sh
-debian/tmp/opt/kde3/share/apps/kconf_update/kwin_focus2.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/kwin_fsp_workarounds_1.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/kwiniconify.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/kwinsticky.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/kwin.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/kwinupdatewindowsettings.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/pluginlibFix.pl
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kwin3_plugin.pl
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kwin3_plugin.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kwin_focus1.sh
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kwin_focus1.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kwin_focus2.sh
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kwin_focus2.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kwin_fsp_workarounds_1.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kwiniconify.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kwinsticky.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kwin.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/kwinupdatewindowsettings.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/pluginlibFix.pl
 debian/tmp/opt/kde3/share/apps/kwin/b2.desktop
 debian/tmp/opt/kde3/share/apps/kwin/eventsrc
 debian/tmp/opt/kde3/share/apps/kwin/keramik.desktop
diff --git a/ubuntu/maverick_automake/kdebase/debian/libkonq4-kde3-dev.install b/ubuntu/maverick_automake/kdebase/debian/libkonq4-kde3-dev.install
index 0a992e7a3..7e6e9e7e6 100644
--- a/ubuntu/maverick_automake/kdebase/debian/libkonq4-kde3-dev.install
+++ b/ubuntu/maverick_automake/kdebase/debian/libkonq4-kde3-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/kde3/include/tde/kfileivi.h
+debian/tmp/opt/kde3/include/tde/tdefileivi.h
 debian/tmp/opt/kde3/include/tde/kivdirectoryoverlay.h
 debian/tmp/opt/kde3/include/tde/knewmenu.h
 debian/tmp/opt/kde3/include/tde/konqbookmarkmanager.h
diff --git a/ubuntu/maverick_automake/kdebase/debian/libkonq4-kde3.install b/ubuntu/maverick_automake/kdebase/debian/libkonq4-kde3.install
index 44a732d96..f3057310c 100644
--- a/ubuntu/maverick_automake/kdebase/debian/libkonq4-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/libkonq4-kde3.install
@@ -5,8 +5,8 @@ debian/tmp/opt/kde3/lib/kde3/konq_sound.so
 debian/tmp/opt/kde3/lib/libkonq.so.4
 debian/tmp/opt/kde3/lib/libkonq.so.4.2.0
 debian/tmp/opt/kde3/share/apps/kbookmark/directory_bookmarkbar.desktop
-debian/tmp/opt/kde3/share/apps/kconf_update/favicons.upd
-debian/tmp/opt/kde3/share/apps/kconf_update/move_favicons.sh
+debian/tmp/opt/kde3/share/apps/tdeconf_update/favicons.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/move_favicons.sh
 debian/tmp/opt/kde3/share/apps/konqueror/pics/arrow_bottomleft.png
 debian/tmp/opt/kde3/share/apps/konqueror/pics/arrow_bottomright.png
 debian/tmp/opt/kde3/share/apps/konqueror/pics/arrow_topleft.png
diff --git a/ubuntu/maverick_automake/kdebase/debian/man/kxkb-kde3.1 b/ubuntu/maverick_automake/kdebase/debian/man/kxkb-kde3.1
index 38a1a2a08..e06426a1b 100644
--- a/ubuntu/maverick_automake/kdebase/debian/man/kxkb-kde3.1
+++ b/ubuntu/maverick_automake/kdebase/debian/man/kxkb-kde3.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_automake/kdebase/debian/rules b/ubuntu/maverick_automake/kdebase/debian/rules
index 814abbacf..0add7816d 100755
--- a/ubuntu/maverick_automake/kdebase/debian/rules
+++ b/ubuntu/maverick_automake/kdebase/debian/rules
@@ -25,7 +25,7 @@ DEB_FIXPERMS_EXCLUDE := usr/bin/kdesud
 
 DEB_DH_STRIP_ARGS  := --dbg-package=kdebase-kde3-dbg
 
-DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter kdesu knetattach kioslave kxkb kdebugdialog kdcop
+DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter kdesu knetattach tdeioslave kxkb kdebugdialog kdcop
 
 PACKAGES_WITH_LIBS := kate-kde3 kcontrol-kde3 kdebase-kde3-bin kicker-kde3 konqueror-kde3 ksplash-kde3 \
 			ksysguard-kde3 kwin-kde3 libkonq4-kde3