Update Debian and Ubuntu packaging with the latest renaming in GIT

33 files changed, 57 insertions, 57 deletions

diff --git a/ubuntu/lucid_automake/applications/amarok/debian/control b/ubuntu/lucid_automake/applications/amarok/debian/control
index 1d4ce9d3c..77742d269 100644
--- a/ubuntu/lucid_automake/applications/amarok/debian/control
+++ b/ubuntu/lucid_automake/applications/amarok/debian/control
@@ -29,7 +29,7 @@ Description: versatile and easy to use audio player for KDE3
    - rapid playlist creation, with drag and drop from a directory view
    - nice playlist browser for your existing playlists (PLS or M3U formats)
    - collection-indexing support, for smart browsing and playlist creation
-   - possibility of accessing media via kioslaves, allowing you to play
+   - possibility of accessing media via tdeioslaves, allowing you to play
      via smb:// or fish:// (normal streams are of course supported)
    - inline ID3 tag editing, capable of retrieving tags via MusicBrainz
    - album cover support: automatically displays album covers from the
diff --git a/ubuntu/lucid_automake/applications/amarok/debian/control.in b/ubuntu/lucid_automake/applications/amarok/debian/control.in
index c79b582c2..be93679f3 100644
--- a/ubuntu/lucid_automake/applications/amarok/debian/control.in
+++ b/ubuntu/lucid_automake/applications/amarok/debian/control.in
@@ -28,7 +28,7 @@ Description: versatile and easy to use audio player for KDE3
    - rapid playlist creation, with drag and drop from a directory view
    - nice playlist browser for your existing playlists (PLS or M3U formats)
    - collection-indexing support, for smart browsing and playlist creation
-   - possibility of accessing media via kioslaves, allowing you to play
+   - possibility of accessing media via tdeioslaves, allowing you to play
      via smb:// or fish:// (normal streams are of course supported)
    - inline ID3 tag editing, capable of retrieving tags via MusicBrainz
    - album cover support: automatically displays album covers from the
diff --git a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/cdbs/buildvars.mk b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/cdbs/buildvars.mk
+++ b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/cdbs/buildvars.mk
diff --git a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
index 2be8f97f1..2be8f97f1 100644
--- a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
index 21965ceef..21965ceef 100644
--- a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
+++ b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
diff --git a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/cdbs/team-members b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/cdbs/team-members
+++ b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/cdbs/team-members
diff --git a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/cdbs/uploaders.mk b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/cdbs/uploaders.mk
+++ b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/cdbs/uploaders.mk
diff --git a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl
+++ b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
diff --git a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/changelog b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/changelog
index b4f596513..b660e8971 100644
--- a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/changelog
+++ b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/changelog
@@ -1,41 +1,41 @@
-compizconfig-backend-kconfig-kde3 (0.8.4-0ubuntu1) lucid; urgency=low
+compizconfig-backend-tdeconfig-kde3 (0.8.4-0ubuntu1) lucid; urgency=low
 
   * Lucid rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 05 March 2010 12:31:00 -0600
 
-compizconfig-backend-kconfig-kde3 (0.7.4-0ubuntu5) karmic; urgency=low
+compizconfig-backend-tdeconfig-kde3 (0.7.4-0ubuntu5) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-compizconfig-backend-kconfig-kde3 (0.7.4-0ubuntu3) intrepid; urgency=low
+compizconfig-backend-tdeconfig-kde3 (0.7.4-0ubuntu3) intrepid; urgency=low
 
   * Moved KDE3 to /opt/kde3
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
 
-compizconfig-backend-kconfig-kde3 (0.7.4-0ubuntu2) intrepid; urgency=low
+compizconfig-backend-tdeconfig-kde3 (0.7.4-0ubuntu2) intrepid; urgency=low
 
   * Added -kde3 prefix
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 01 Dec 2008 08:30:00 -0600
 
-compizconfig-backend-kconfig (0.7.4-0ubuntu1) hardy; urgency=low
+compizconfig-backend-tdeconfig (0.7.4-0ubuntu1) hardy; urgency=low
 
   * new upstream release
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Sat, 05 Apr 2008 12:56:08 +0200
 
-compizconfig-backend-kconfig (0.7.2-0ubuntu1) hardy; urgency=low
+compizconfig-backend-tdeconfig (0.7.2-0ubuntu1) hardy; urgency=low
 
   * new upstream release
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 07 Mar 2008 15:06:14 +0100
 
-compizconfig-backend-kconfig (0.6.99+git20071127-0ubuntu1) hardy; urgency=low
+compizconfig-backend-tdeconfig (0.6.99+git20071127-0ubuntu1) hardy; urgency=low
 
   * renamed to match debian name
   * new git HEAD snapshot
@@ -43,13 +43,13 @@ compizconfig-backend-kconfig (0.6.99+git20071127-0ubuntu1) hardy; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 27 Nov 2007 20:03:35 +0100
 
-libcompizconfig-backend-kconfig (0.0+git20070912-0ubuntu1) gutsy; urgency=low
+libcompizconfig-backend-tdeconfig (0.0+git20070912-0ubuntu1) gutsy; urgency=low
 
   * new git snapshot based on 0.6 branch
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 10 Aug 2007 16:25:52 +0200
 
-libcompizconfig-backend-kconfig (0.0+git20070703-0ubuntu1) gutsy; urgency=low
+libcompizconfig-backend-tdeconfig (0.0+git20070703-0ubuntu1) gutsy; urgency=low
 
   * initial git snapshot
 
diff --git a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/compat b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/compat
+++ b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/compat
diff --git a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/control b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/control
index 2b216d8fc..01ac7890d 100644
--- a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/control
+++ b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/control
@@ -1,14 +1,14 @@
-Source: compizconfig-backend-kconfig-kde3
+Source: compizconfig-backend-tdeconfig-kde3
 Section: libs
 Priority: extra
 Maintainer: Timothy Pearosn <kb9vqf@pearsoncomputing.net>
 Build-Depends: cdbs, debhelper (>= 5), compiz-kde3-dev, pkg-config, intltool, kdelibs4-kde3-dev, libcompizconfig0-kde3-dev, automake1.11-kde3, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
-Package: compizconfig-backend-kconfig-kde3
+Package: compizconfig-backend-tdeconfig-kde3
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libcompizconfig-backend-kconfig-kde3
+Conflicts: libcompizconfig-backend-tdeconfig-kde3
 Description: KConfig [KDE3] Settings library for plugins - OpenCompositing Project
  The OpenCompositing Project brings 3D desktop visual effects that improve
  usability of the X Window System and provide increased productivity
diff --git a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/copyright b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/copyright
index 68f70d9c0..61d8f8195 100644
--- a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/copyright
+++ b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Michael Vogt <michael.vogt@ubuntu.com> on
 Mon,  28 Jun 2007 09:53:13 +0200.
 
-It was downloaded from git://anongit.opencompositing.org/fusion/compizconfig/compizconfig-backend-kconfig
+It was downloaded from git://anongit.opencompositing.org/fusion/compizconfig/compizconfig-backend-tdeconfig
 
 Upstream Authors: 
 Dennis Kasprzyk <onestone@beryl-project.org>
diff --git a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/patches/.gitignore b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/patches/.gitignore
+++ b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/patches/.gitignore
diff --git a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/rules b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/rules
index 4aacc890d..4aacc890d 100755
--- a/ubuntu/lucid_automake/applications/compizconfig-backend-kconfig/debian/rules
+++ b/ubuntu/lucid_automake/applications/compizconfig-backend-tdeconfig/debian/rules
diff --git a/ubuntu/lucid_automake/applications/digikam/debian/copyright b/ubuntu/lucid_automake/applications/digikam/debian/copyright
index c4c44e441..5a2d63b3d 100644
--- a/ubuntu/lucid_automake/applications/digikam/debian/copyright
+++ b/ubuntu/lucid_automake/applications/digikam/debian/copyright
@@ -136,7 +136,7 @@ digikam/
 
 	o digikam/digikam_export.h
             © 2005 Laurent Montel <montel@kde.org>
-	o from kfiletip source copies (kdebase, konqueror)
+	o from tdefiletip source copies (kdebase, konqueror)
 	    © 1998, 1999 Torben Weis <weis@kde.org>
 	    © 2000, 2001, 2002 David Faure <david@mandrakesoft.com>
 	o Concept copied from kdelibs/kio/kio/netaccess.h/cpp
@@ -148,7 +148,7 @@ imageplugins/
 	© 2004-2005 by Gilles Caulier <caulier dot gilles at gmail dot com>
 	© 2004-2005 by Renchi Raju
 
-kioslave/
+tdeioslave/
 	© 2003, 2004 by Renchi Raju
 
 libs/
diff --git a/ubuntu/lucid_automake/applications/gwenview/debian/changelog b/ubuntu/lucid_automake/applications/gwenview/debian/changelog
index f1f2dcd42..f148d1f4b 100644
--- a/ubuntu/lucid_automake/applications/gwenview/debian/changelog
+++ b/ubuntu/lucid_automake/applications/gwenview/debian/changelog
@@ -85,7 +85,7 @@ gwenview (1.4.0~debian.1-1) unstable; urgency=low
     + Fixes focus switching. (Closes: #301812)
 
   * Clarify the package description, as displaying EXIF tags don't require
-    kdegaphics-kfile-plugins (but other features still do). (Closes: #368809)
+    kdegaphics-tdefile-plugins (but other features still do). (Closes: #368809)
 
   * This rebuild eliminates all references to obsolete libX*.la files.
     (Closes: #381323)
@@ -95,7 +95,7 @@ gwenview (1.4.0~debian.1-1) unstable; urgency=low
 gwenview (1.3.1-3) unstable; urgency=low
 
   * Clarify the package description, as merely editing EXIF comments doesn't
-    strictly require kdegraphics-kfile-plugins. (Closes: #368809)
+    strictly require kdegraphics-tdefile-plugins. (Closes: #368809)
 
  -- Christopher Martin <chrsmrtn@debian.org>  Sun, 28 May 2006 11:37:27 -0400
 
@@ -198,7 +198,7 @@ gwenview (1.1.4-1) unstable; urgency=low
   * New upstream release.
   * Rebuild against Qt 3.3, fixing the failure to exit properly from
     fullscreen mode.
-  * Added a recommends on kdegraphics-kfile-plugins, which enables the use of
+  * Added a recommends on kdegraphics-tdefile-plugins, which enables the use of
     EXIF comments.
 
  -- Christopher Martin <chrsmrtn@freeshell.org>  Tue, 10 Aug 2004 18:37:33 -0400
diff --git a/ubuntu/lucid_automake/applications/gwenview/debian/control b/ubuntu/lucid_automake/applications/gwenview/debian/control
index d3a09cf1b..42b0be988 100644
--- a/ubuntu/lucid_automake/applications/gwenview/debian/control
+++ b/ubuntu/lucid_automake/applications/gwenview/debian/control
@@ -9,7 +9,7 @@ Homepage: http://gwenview.sourceforge.net
 Package: gwenview-kde3
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: kdegraphics-kfile-plugins-kde3, kipi-plugins-kde3
+Recommends: kdegraphics-tdefile-plugins-kde3, kipi-plugins-kde3
 Suggests: gwenview-i18n
 Description: image viewer for KDE3
  Gwenview is an image viewer for the K Desktop Environment. It features a
@@ -21,7 +21,7 @@ Description: image viewer for KDE3
  Image loading is handled by the Qt library, so Gwenview supports all image
  formats your Qt installation supports. Gwenview correctly displays images
  with an alpha channel. Gwenview supports the displaying and editing of EXIF
- comments, and, if the kdegraphics-kfile-plugins package is installed, other
+ comments, and, if the kdegraphics-tdefile-plugins package is installed, other
  image meta-information as well. Also supported is KIPI, the KDE Image Plugin
  Interface, a collection of helpful tools provided by the kipi-plugins
  package. The ability to perform lossless JPEG transforms is built in.
diff --git a/ubuntu/lucid_automake/applications/k3b/debian/changelog b/ubuntu/lucid_automake/applications/k3b/debian/changelog
index 6f6049c72..a7d53fc10 100644
--- a/ubuntu/lucid_automake/applications/k3b/debian/changelog
+++ b/ubuntu/lucid_automake/applications/k3b/debian/changelog
@@ -85,7 +85,7 @@ k3b (1.0.5-2) unstable; urgency=low
 
   [ Francois Marier ]
   * Sync with Ubuntu
-    - Add kfile_k3b.so to k3b.install
+    - Add tdefile_k3b.so to k3b.install
     - libk3b3-extracodecs replaces libk3b2-extracodecs
   * Bump Standards-Version up to 3.8.0 (no changes)
   * Remove the KUBUNTU difference file
@@ -133,7 +133,7 @@ k3b (1.0.5-1ubuntu1) intrepid; urgency=low
      kubuntu_111_advice_kubuntu_restricted_extras.diff and add "or
      kubuntu-restricted-extras."), -
   * Add libk3bffmpegdecoder.so to libk3b3.install
-  * Add kfile_k3b.so to k3b.install
+  * Add tdefile_k3b.so to k3b.install
   * libk3b3-extracodecs replaces libk3b2-extracodecs
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Jun 2008 17:32:09 +0000
@@ -776,7 +776,7 @@ k3b (0.12.14-0ubuntu2) dapper; urgency=low
 
   * Remove kubuntu_01_hide_k3bsetup.diff patch and replace it with
     kubuntu_06_hide_k3bsetup.diff:
-     - Remove NoDisplay=true to prevent hiding k3bsetup in kcmshell
+     - Remove NoDisplay=true to prevent hiding k3bsetup in tdecmshell
        (Closes: Malone #23007, KDE Bug #117455, Debian #353826)
      - Change the Category field so k3bsetup doesn't appear in the KDE menu
        (Was the goal of the original patch)
diff --git a/ubuntu/lucid_automake/applications/k3b/debian/k3b-kde3.install b/ubuntu/lucid_automake/applications/k3b/debian/k3b-kde3.install
index 37f80ba90..d877457ce 100644
--- a/ubuntu/lucid_automake/applications/k3b/debian/k3b-kde3.install
+++ b/ubuntu/lucid_automake/applications/k3b/debian/k3b-kde3.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/kde3/bin/*
 debian/tmp/opt/kde3/share/applications/*
 debian/k3b.xpm /opt/kde3/share/pixmaps/
-debian/tmp/opt/kde3/lib/kde3/kfile_k3b.so
-debian/tmp/opt/kde3/lib/kde3/kfile_k3b.la
+debian/tmp/opt/kde3/lib/kde3/tdefile_k3b.so
+debian/tmp/opt/kde3/lib/kde3/tdefile_k3b.la
diff --git a/ubuntu/lucid_automake/applications/k3b/debian/k3b.install b/ubuntu/lucid_automake/applications/k3b/debian/k3b.install
index 0b593a2ec..381cf360b 100644
--- a/ubuntu/lucid_automake/applications/k3b/debian/k3b.install
+++ b/ubuntu/lucid_automake/applications/k3b/debian/k3b.install
@@ -1,5 +1,5 @@
 debian/tmp/usr/bin/*
 debian/tmp/usr/share/applications/*
 debian/k3b.xpm usr/share/pixmaps/
-debian/tmp/usr/lib/kde3/kfile_k3b.so
-debian/tmp/usr/lib/kde3/kfile_k3b.la
+debian/tmp/usr/lib/kde3/tdefile_k3b.so
+debian/tmp/usr/lib/kde3/tdefile_k3b.la
diff --git a/ubuntu/lucid_automake/applications/kde-style-lipstik/debian/changelog b/ubuntu/lucid_automake/applications/kde-style-lipstik/debian/changelog
index 6579d855c..ecb402761 100644
--- a/ubuntu/lucid_automake/applications/kde-style-lipstik/debian/changelog
+++ b/ubuntu/lucid_automake/applications/kde-style-lipstik/debian/changelog
@@ -28,7 +28,7 @@ kde-style-lipstik (2.2.2-1) unstable; urgency=low
 
   * New upstream version
     - Added new automake1.9 dependency
-    - Created style/lipstik.moc and style/config/listikconf.moc 
+    - Created style/lipstik.moc and style/config/listitdeconf.moc 
 
  -- Bastian Venthur <venthur@debian.org>  Thu, 24 May 2007 23:32:09 +0200
 
diff --git a/ubuntu/lucid_automake/applications/kde-systemsettings/debian/changelog b/ubuntu/lucid_automake/applications/kde-systemsettings/debian/changelog
index b0dbcac01..808aaf927 100644
--- a/ubuntu/lucid_automake/applications/kde-systemsettings/debian/changelog
+++ b/ubuntu/lucid_automake/applications/kde-systemsettings/debian/changelog
@@ -191,7 +191,7 @@ kde-systemsettings (0.0svn20060314-0ubuntu3) dapper; urgency=low
 
 kde-systemsettings (0.0svn20060314-0ubuntu2) dapper; urgency=low
 
-  * Add kubuntu_03_no_kbuildsycoca.diff, stop it running kbuildsycocoa 
+  * Add kubuntu_03_no_tdebuildsycoca.diff, stop it running kbuildsycocoa 
     during 'make install'
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Mar 2006 01:12:43 +0000
diff --git a/ubuntu/lucid_automake/applications/kdesvn/debian/changelog b/ubuntu/lucid_automake/applications/kdesvn/debian/changelog
index a307b2140..7697e03f9 100644
--- a/ubuntu/lucid_automake/applications/kdesvn/debian/changelog
+++ b/ubuntu/lucid_automake/applications/kdesvn/debian/changelog
@@ -54,7 +54,7 @@ kdesvn (1.0.2-1) unstable; urgency=low
 kdesvn (1.0.1-1) experimental; urgency=low
 
   * New upstream release.
-  * debian/patches/01-bashisms_kconf_update.patch
+  * debian/patches/01-bashisms_tdeconf_update.patch
     - Removed, merged upstream. 
   * debian/patches/02-docimages.patch
     - Removed, fixed upstream. 
@@ -138,14 +138,14 @@ kdesvn (0.14.0-1) unstable; urgency=low
   * debian/kdesvn.menu
     - Change section to "Applications/Programming" to comply with the new menu
       spec.
-  * debian/patches/01-bashisms_kconf_update.patch
-    - Fix a bashism in the kconf_update script.
+  * debian/patches/01-bashisms_tdeconf_update.patch
+    - Fix a bashism in the tdeconf_update script.
   * debian/control
     - Use the new "Homepage:" field to specify the upstream URL.
     - SONAME bump, rename the libsvnqt3 package to libsvnqt4.
   * Rename libsvnqt3.install to libsvnqt4.install.
   * debian/kdesvn.install
-    - Install the kconf_update files.
+    - Install the tdeconf_update files.
   * debian/libsvnqt-dev.install
     - No longer install the libtool *.la files for libsvnqt.
 
diff --git a/ubuntu/lucid_automake/applications/kdesvn/debian/kdesvn-kde3.install b/ubuntu/lucid_automake/applications/kdesvn/debian/kdesvn-kde3.install
index 9e0107c08..30d0670cb 100644
--- a/ubuntu/lucid_automake/applications/kdesvn/debian/kdesvn-kde3.install
+++ b/ubuntu/lucid_automake/applications/kdesvn/debian/kdesvn-kde3.install
@@ -4,7 +4,7 @@ debian/tmp/opt/kde3/lib/libkdesvnpart.*
 debian/tmp/opt/kde3/share/apps/kdesvn/
 debian/tmp/opt/kde3/share/apps/kdesvnpart/
 debian/tmp/opt/kde3/share/apps/konqueror/servicemenus/
-debian/tmp/opt/kde3/share/apps/kconf_update/
+debian/tmp/opt/kde3/share/apps/tdeconf_update/
 debian/tmp/opt/kde3/share/icons/
 debian/tmp/opt/kde3/share/locale/*/LC_MESSAGES/*.mo
 debian/tmp/opt/kde3/share/config.kcfg/
diff --git a/ubuntu/lucid_automake/applications/kile/debian/kile-kde3.install b/ubuntu/lucid_automake/applications/kile/debian/kile-kde3.install
index 2cdfcf568..1f1398a79 100644
--- a/ubuntu/lucid_automake/applications/kile/debian/kile-kde3.install
+++ b/ubuntu/lucid_automake/applications/kile/debian/kile-kde3.install
@@ -1,6 +1,6 @@
 opt/kde3/bin/kile
 /opt/kde3/share/applications/kde/kile.desktop
-/opt/kde3/share/apps/kconf_update
+/opt/kde3/share/apps/tdeconf_update
 /opt/kde3/share/apps/kile
 /opt/kde3/share/config.kcfg/kile.kcfg
 /opt/kde3/share/doc/kde/HTML/en/kile
diff --git a/ubuntu/lucid_automake/applications/knemo/debian/changelog b/ubuntu/lucid_automake/applications/knemo/debian/changelog
index 0850252ff..3953b779c 100644
--- a/ubuntu/lucid_automake/applications/knemo/debian/changelog
+++ b/ubuntu/lucid_automake/applications/knemo/debian/changelog
@@ -240,7 +240,7 @@ knemo (0.1.9-1) unstable; urgency=low
     for i[fw]config (instead of hardcoded path in *.cpp files)
   * added home page on kde-apps to control
   * Add to depends: kdelibs-bin (contains kded), kicker
-  * Add to recommends: kcontrol  (contains kcmshell, kcontrol)
+  * Add to recommends: kcontrol  (contains tdecmshell, kcontrol)
   * fixed version in VERSION file s/0.1.8/0.1.9/
   * README: s/&lt;/</
 
diff --git a/ubuntu/lucid_automake/applications/koffice/debian/README.MimeType b/ubuntu/lucid_automake/applications/koffice/debian/README.MimeType
index 7d9888658..2e1b8cc4c 100644
--- a/ubuntu/lucid_automake/applications/koffice/debian/README.MimeType
+++ b/ubuntu/lucid_automake/applications/koffice/debian/README.MimeType
@@ -8,10 +8,10 @@ similar to the following:
   kword's desktop file. Check your installation !
 
 This is often caused by an out-of-date KDE system configuration cache.
-If you experience this error, try running "kbuildsycoca" and see if it
+If you experience this error, try running "tdebuildsycoca" and see if it
 fixes the problem.
 
-Note that you can run "kbuildsycoca" as an ordinary user; there is no
+Note that you can run "tdebuildsycoca" as an ordinary user; there is no
 need to become root.
 
  -- Ben Burton <bab@debian.org>, Mon, 17 Jan 2005 20:57:22 +1100
diff --git a/ubuntu/lucid_automake/applications/koffice/debian/changelog b/ubuntu/lucid_automake/applications/koffice/debian/changelog
index 6db9031af..526122138 100644
--- a/ubuntu/lucid_automake/applications/koffice/debian/changelog
+++ b/ubuntu/lucid_automake/applications/koffice/debian/changelog
@@ -228,7 +228,7 @@ koffice (1:1.6.3-3) unstable; urgency=high
     (Closes: #443673)
   * Add not-installed.list file to keep track of not installed files.
   * Add a missing dependency on kcontrol to kformula, in order to provide the
-    fonts kioslave. Thanks to Eike Hein for reporting.
+    fonts tdeioslave. Thanks to Eike Hein for reporting.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 26 Sep 2007 23:29:24 +0200
 
@@ -748,7 +748,7 @@ koffice (1:1.3.5-1) unstable; urgency=high
     - http://kde.org/info/security/advisory-20041223-1.txt
     References: CAN-2004-1125, DSA-619
   * Added README.MimeType to most binary packages to explain how to fix
-    the missing MimeType error by running kbuildsycoca (closes: #288950).
+    the missing MimeType error by running tdebuildsycoca (closes: #288950).
 
  -- Ben Burton <bab@debian.org>  Mon, 17 Jan 2005 20:57:22 +1100
 
diff --git a/ubuntu/lucid_automake/applications/koffice/debian/koffice-data-kde3.install b/ubuntu/lucid_automake/applications/koffice/debian/koffice-data-kde3.install
index 0b50877b6..010064f1f 100644
--- a/ubuntu/lucid_automake/applications/koffice/debian/koffice-data-kde3.install
+++ b/ubuntu/lucid_automake/applications/koffice/debian/koffice-data-kde3.install
@@ -69,10 +69,10 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/actions/sqrt.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/actions/sum.png
 debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/actions/under.png
 debian/tmp/opt/kde3/share/services/clipartthumbnail.desktop
-debian/tmp/opt/kde3/share/services/kfile_abiword.desktop
-debian/tmp/opt/kde3/share/services/kfile_gnumeric.desktop
-debian/tmp/opt/kde3/share/services/kfile_koffice.desktop
-debian/tmp/opt/kde3/share/services/kfile_ooo.desktop
+debian/tmp/opt/kde3/share/services/tdefile_abiword.desktop
+debian/tmp/opt/kde3/share/services/tdefile_gnumeric.desktop
+debian/tmp/opt/kde3/share/services/tdefile_koffice.desktop
+debian/tmp/opt/kde3/share/services/tdefile_ooo.desktop
 debian/tmp/opt/kde3/share/services/kformula_latex_export.desktop
 debian/tmp/opt/kde3/share/services/kformula_mathml_export.desktop
 debian/tmp/opt/kde3/share/services/kformula_mathml_import.desktop
diff --git a/ubuntu/lucid_automake/applications/koffice/debian/koffice-libs-kde3.install b/ubuntu/lucid_automake/applications/koffice/debian/koffice-libs-kde3.install
index 5b21d49e2..259974883 100644
--- a/ubuntu/lucid_automake/applications/koffice/debian/koffice-libs-kde3.install
+++ b/ubuntu/lucid_automake/applications/koffice/debian/koffice-libs-kde3.install
@@ -2,14 +2,14 @@ debian/tmp/opt/kde3/bin/koconverter
 debian/tmp/opt/kde3/bin/krossrunner
 debian/tmp/opt/kde3/lib/kde3/clipartthumbnail.la
 debian/tmp/opt/kde3/lib/kde3/clipartthumbnail.so
-debian/tmp/opt/kde3/lib/kde3/kfile_abiword.la
-debian/tmp/opt/kde3/lib/kde3/kfile_abiword.so
-debian/tmp/opt/kde3/lib/kde3/kfile_gnumeric.la
-debian/tmp/opt/kde3/lib/kde3/kfile_gnumeric.so
-debian/tmp/opt/kde3/lib/kde3/kfile_koffice.la
-debian/tmp/opt/kde3/lib/kde3/kfile_koffice.so
-debian/tmp/opt/kde3/lib/kde3/kfile_ooo.la
-debian/tmp/opt/kde3/lib/kde3/kfile_ooo.so
+debian/tmp/opt/kde3/lib/kde3/tdefile_abiword.la
+debian/tmp/opt/kde3/lib/kde3/tdefile_abiword.so
+debian/tmp/opt/kde3/lib/kde3/tdefile_gnumeric.la
+debian/tmp/opt/kde3/lib/kde3/tdefile_gnumeric.so
+debian/tmp/opt/kde3/lib/kde3/tdefile_koffice.la
+debian/tmp/opt/kde3/lib/kde3/tdefile_koffice.so
+debian/tmp/opt/kde3/lib/kde3/tdefile_ooo.la
+debian/tmp/opt/kde3/lib/kde3/tdefile_ooo.so
 debian/tmp/opt/kde3/lib/kde3/kodocinfopropspage.la
 debian/tmp/opt/kde3/lib/kde3/kodocinfopropspage.so
 debian/tmp/opt/kde3/lib/kde3/kofficescan.la
diff --git a/ubuntu/lucid_automake/applications/konversation/debian/changelog b/ubuntu/lucid_automake/applications/konversation/debian/changelog
index c53104f11..6e382f4f2 100644
--- a/ubuntu/lucid_automake/applications/konversation/debian/changelog
+++ b/ubuntu/lucid_automake/applications/konversation/debian/changelog
@@ -1079,7 +1079,7 @@ konversation (0.13+20031123-1) experimental; urgency=low
   * debian/rules:
     + install examples/dcop-away.sh executable, as linda does not like it
       otherwise, and some other packages also do this (exim4, autotools, ...)
-    + make usr/share/apps/kconf_update/*.pl executable as well, for a similar
+    + make usr/share/apps/tdeconf_update/*.pl executable as well, for a similar
       reason (quiets lintian, and there is precedent for either way)
 
  -- Nathaniel W. Turner <nate@houseofnate.net>  Sun, 23 Nov 2003 18:22:31 -0500
diff --git a/ubuntu/lucid_automake/applications/konversation/debian/konversation-kde3.install b/ubuntu/lucid_automake/applications/konversation/debian/konversation-kde3.install
index d5212b6a1..b52d07453 100644
--- a/ubuntu/lucid_automake/applications/konversation/debian/konversation-kde3.install
+++ b/ubuntu/lucid_automake/applications/konversation/debian/konversation-kde3.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/kde3/bin/konversation
 debian/tmp/opt/kde3/share/applications/kde/konversation.desktop
-debian/tmp/opt/kde3/share/apps/kconf_update/*
+debian/tmp/opt/kde3/share/apps/tdeconf_update/*
 debian/tmp/opt/kde3/share/apps/konversation/eventsrc
 debian/tmp/opt/kde3/share/apps/konversation/konversationui.rc
 debian/tmp/opt/kde3/share/apps/konversation/scripts/*
diff --git a/ubuntu/lucid_automake/applications/tdmtheme/debian/tdmtheme.lintian-overrides b/ubuntu/lucid_automake/applications/tdmtheme/debian/tdmtheme.lintian-overrides
index d27349d54..2f92e8da6 100644
--- a/ubuntu/lucid_automake/applications/tdmtheme/debian/tdmtheme.lintian-overrides
+++ b/ubuntu/lucid_automake/applications/tdmtheme/debian/tdmtheme.lintian-overrides
@@ -1,5 +1,5 @@
 # provided by kdelibs
-tdmtheme: desktop-command-not-in-package ./usr/share/applications/kde/tdmtheme.desktop kcmshell
+tdmtheme: desktop-command-not-in-package ./usr/share/applications/kde/tdmtheme.desktop tdecmshell
 # kcontrol module
 tdmtheme: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/applications/kde/tdmtheme.desktop
 tdmtheme: desktop-entry-lacks-main-category ./usr/share/applications/kde/tdmtheme.desktop