Rename a bunch of kde names to tde

11 files changed, 176 insertions, 176 deletions

diff --git a/ubuntu/maverick/tdeartwork/debian/changelog b/ubuntu/maverick/tdeartwork/debian/changelog
index 39c479ae0..f0bfe7054 100644
--- a/ubuntu/maverick/tdeartwork/debian/changelog
+++ b/ubuntu/maverick/tdeartwork/debian/changelog
@@ -1,63 +1,63 @@
-kdeartwork-trinity (4:3.5.10-0ubuntu1) karmic; urgency=low
+tdeartwork-trinity (4:3.5.10-0ubuntu1) karmic; urgency=low
 
   * Karmic rebuild
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
 
-kdeartwork-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
+tdeartwork-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
   * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 28 Feb 2009 14:52:00 -0600
 
-kdeartwork-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
+tdeartwork-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
   * Intrepid -trinity packaging update
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 24 Nov 2008 16:53:00 -0600
 
-kdeartwork (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
+tdeartwork (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low
 
   * New upstream bugfix release (LP: #261366)
-    - Bump build-dep version of kdelibs4-dev and kdebase-dev to 3.5.10
+    - Bump build-dep version of tdelibs4-dev and tdebase-dev to 3.5.10
     - Add xscreensaver-data-extra to build-dep
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 26 Aug 2008 00:41:02 -0400
 
-kdeartwork (4:3.5.9-0ubuntu1) hardy; urgency=low
+tdeartwork (4:3.5.9-0ubuntu1) hardy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:06 +0000
 
-kdeartwork (4:3.5.8-1ubuntu4) hardy; urgency=low
+tdeartwork (4:3.5.8-1ubuntu4) hardy; urgency=low
 
   * Fix kscreensaver-xsavers-webcollage.install
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 10 Dec 2007 16:06:47 +0000
 
-kdeartwork (4:3.5.8-1ubuntu3) hardy; urgency=low
+tdeartwork (4:3.5.8-1ubuntu3) hardy; urgency=low
 
   * Edit kscreensaver-xsaver-webcollage.install to use the file
     from sources, since it does not get installed during build.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 23:36:57 +0000
 
-kdeartwork (4:3.5.8-1ubuntu2) hardy; urgency=low
+tdeartwork (4:3.5.8-1ubuntu2) hardy; urgency=low
 
   * Run buildprep before upload
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 10:51:47 +0000
 
-kdeartwork (4:3.5.8-1ubuntu1) hardy; urgency=low
+tdeartwork (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining change:
    - Add package kscreensaver-xsavers-extra
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:44 +0000
 
-kdeartwork (4:3.5.8-1) unstable; urgency=low
+tdeartwork (4:3.5.8-1) unstable; urgency=low
  
   * New upstream release. 
 
@@ -68,13 +68,13 @@ kdeartwork (4:3.5.8-1) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
-  * Only make kdeartwork recommend kscreensaver-xsavers, not depend. It pulls
+  * Only make tdeartwork recommend kscreensaver-xsavers, not depend. It pulls
     all sorts of weird gtk-stuff in.
   * Fix spelling error in control file.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 11 Oct 2007 00:25:56 +0200
 
-kdeartwork (4:3.5.7-2) unstable; urgency=low
+tdeartwork (4:3.5.7-2) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -89,13 +89,13 @@ kdeartwork (4:3.5.7-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 07 Aug 2007 19:00:51 +0200
 
-kdeartwork (4:3.5.8-0ubuntu1) gutsy; urgency=low
+tdeartwork (4:3.5.8-0ubuntu1) gutsy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:25 +0100
 
-kdeartwork (4:3.5.7-1ubuntu3) gutsy; urgency=low
+tdeartwork (4:3.5.7-1ubuntu3) gutsy; urgency=low
 
   * Added kubuntu_01_dont_use_xscreensaver_by_default.diff which is the
     last upload, in patch form, as opposed to directly patching the
@@ -103,7 +103,7 @@ kdeartwork (4:3.5.7-1ubuntu3) gutsy; urgency=low
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Mon, 02 Jul 2007 19:14:40 +1000
 
-kdeartwork (4:3.5.7-1ubuntu2) gutsy; urgency=low
+tdeartwork (4:3.5.7-1ubuntu2) gutsy; urgency=low
  .
    * Removed TryExec=xscreensaver from all the
      kscreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be
@@ -111,37 +111,37 @@ kdeartwork (4:3.5.7-1ubuntu2) gutsy; urgency=low
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Mon, 02 Jul 2007 17:13:01 +1000
 
-kdeartwork (4:3.5.7-1ubuntu1) gutsy; urgency=low
+tdeartwork (4:3.5.7-1ubuntu1) gutsy; urgency=low
 
   * Merge with Debian for new upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 23 May 2007 16:01:05 +0100
 
-kdeartwork (4:3.5.7-1) unstable; urgency=low
+tdeartwork (4:3.5.7-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 15 May 2007 22:30:44 +0100
 
-kdeartwork (4:3.5.6-4ubuntu1) gutsy; urgency=low
+tdeartwork (4:3.5.6-4ubuntu1) gutsy; urgency=low
 
   * Merge with Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 20:32:55 +0100
 
-kdeartwork (4:3.5.6-4) unstable; urgency=low
+tdeartwork (4:3.5.6-4) unstable; urgency=low
 
   * Really upload to unstable after Etch release.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Fri, 20 Apr 2007 13:57:49 +0100
 
-kdeartwork (4:3.5.6-3) experimental; urgency=low
+tdeartwork (4:3.5.6-3) experimental; urgency=low
 
   * Upload to unstable after Etch release.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Fri, 20 Apr 2007 12:48:34 +0100
 
-kdeartwork (4:3.5.6-2) experimental; urgency=low
+tdeartwork (4:3.5.6-2) experimental; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -154,34 +154,34 @@ kdeartwork (4:3.5.6-2) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 31 Jan 2007 06:01:40 +0100
 
-kdeartwork (4:3.5.6-1) experimental; urgency=low
+tdeartwork (4:3.5.6-1) experimental; urgency=low
 
   * New upstream release.
-  * Make kdeartwork-dbg depend on kdelibs-dbg to get useful backtraces when
+  * Make tdeartwork-dbg depend on tdelibs-dbg to get useful backtraces when
     debugging.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 16 Jan 2007 19:21:21 +0100
 
-kdeartwork (4:3.5.6-0ubuntu1) feisty; urgency=low
+tdeartwork (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:30 +0000
 
-kdeartwork (4:3.5.5-1ubuntu1) feisty; urgency=low
+tdeartwork (4:3.5.5-1ubuntu1) feisty; urgency=low
 
   * Merge with Debian
   * Compile with --enable-gcc-hidden-visibility
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 20:30:07 +0000
 
-kdeartwork (4:3.5.5-1) unstable; urgency=low
+tdeartwork (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  4 Oct 2006 20:38:54 -0400
 
-kdeartwork (4:3.5.4-1) unstable; urgency=low
+tdeartwork (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -189,40 +189,40 @@ kdeartwork (4:3.5.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 29 Jul 2006 21:11:16 -0400
 
-kdeartwork (4:3.5.5-0ubuntu1) edgy; urgency=low
+tdeartwork (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:05 +0000
 
-kdeartwork (4:3.5.4-0ubuntu2) edgy; urgency=low
+tdeartwork (4:3.5.4-0ubuntu2) edgy; urgency=low
 
   * Rebuild with latest cdbs to add gettext domain to .desktop files for
     langpacks-desktopfiles-kde, no source changes
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Sep 2006 22:53:12 +0000
 
-kdeartwork (4:3.5.4-0ubuntu1) edgy; urgency=low
+tdeartwork (4:3.5.4-0ubuntu1) edgy; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:18 +0000
 
-kdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low
+tdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low
 
   * Removed kpartsaver.desktop from debian/kscreensavers-xsaver.install.  
     Closes bug #53065
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Fri, 21 Jul 2006 23:10:26 +1000
 
-kdeartwork (4:3.5.3-1ubuntu1) edgy; urgency=low
+tdeartwork (4:3.5.3-1ubuntu1) edgy; urgency=low
 
   * Sync with Debian
   * Create kscreensaver-xsavers-extra with the universe xscreensavers
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Jul 2006 12:39:40 +0000
 
-kdeartwork (4:3.5.3-1) unstable; urgency=low
+tdeartwork (4:3.5.3-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -234,7 +234,7 @@ kdeartwork (4:3.5.3-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun,  4 Jun 2006 18:27:48 -0400
 
-kdeartwork (4:3.5.2-1) unstable; urgency=low
+tdeartwork (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -242,18 +242,18 @@ kdeartwork (4:3.5.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 29 Mar 2006 20:29:56 -0500
 
-kdeartwork (4:3.5.1-2) unstable; urgency=low
+tdeartwork (4:3.5.1-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Add a missing kdeartwork-theme-icon Replaces for old versions of
-    kdelibs-data. (Closes: #350868)
+  * Add a missing tdeartwork-theme-icon Replaces for old versions of
+    tdelibs-data. (Closes: #350868)
 
   * Upload to unstable.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  1 Feb 2006 11:05:29 -0500
 
-kdeartwork (4:3.5.1-1) unstable; urgency=low
+tdeartwork (4:3.5.1-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -263,7 +263,7 @@ kdeartwork (4:3.5.1-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 29 Jan 2006 10:45:34 -0500
 
-kdeartwork (4:3.5.0.dfsg.1-2) unstable; urgency=low
+tdeartwork (4:3.5.0.dfsg.1-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -273,7 +273,7 @@ kdeartwork (4:3.5.0.dfsg.1-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  7 Jan 2006 17:24:48 -0500
 
-kdeartwork (4:3.5.0.dfsg.1-1) experimental; urgency=low
+tdeartwork (4:3.5.0.dfsg.1-1) experimental; urgency=low
 
   * Upload to experimental.
 
@@ -281,14 +281,14 @@ kdeartwork (4:3.5.0.dfsg.1-1) experimental; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * kdeartwork shipped with the YazooSmileys emoticons, which were not under a
+  * tdeartwork shipped with the YazooSmileys emoticons, which were not under a
     Free license. This revision of the orig.tar.gz removes the problem files.
     Upstream has followed suit, and so KDE 3.5.1 will not need special
     handling. (Closes: #342163)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 18 Dec 2005 18:44:19 -0500
 
-kdeartwork (4:3.5.0-1) alioth; urgency=low
+tdeartwork (4:3.5.0-1) alioth; urgency=low
 
   * New upstream release.
 
@@ -296,20 +296,20 @@ kdeartwork (4:3.5.0-1) alioth; urgency=low
 
   * Bump DH_COMPAT to 5. No changes.
 
-  * Add kdeartwork-dbg, to help track down problems.
+  * Add tdeartwork-dbg, to help track down problems.
    
   +++ Changes by Josh Metzler:
 
   * Remove obsolete conflicts/replaces relationships against packages/versions
     not in Sarge.
   
-  * Add kdewallpapers replaces against kdebase-data due to fulmine.jpg.desktop
+  * Add kdewallpapers replaces against tdebase-data due to fulmine.jpg.desktop
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 30 Nov 2005 13:09:32 -0500
 
-kdeartwork (4:3.4.3-2) unstable; urgency=low
+tdeartwork (4:3.4.3-2) unstable; urgency=low
 
-  * Upload to unstable, rebuilding against kdelibs4c2a.
+  * Upload to unstable, rebuilding against tdelibs4c2a.
 
   * KDE_3_4_BRANCH update (up to r484707).
 
@@ -320,13 +320,13 @@ kdeartwork (4:3.4.3-2) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  1 Dec 2005 15:58:30 +0100
 
-kdeartwork (4:3.5.2-0ubuntu4) dapper; urgency=low
+tdeartwork (4:3.5.2-0ubuntu4) dapper; urgency=low
 
   * Edit debian/cdbs/kde.mk to mark .po files as UTF-8
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Apr 2006 19:14:28 +0100
 
-kdeartwork (4:3.5.2-0ubuntu3) dapper; urgency=low
+tdeartwork (4:3.5.2-0ubuntu3) dapper; urgency=low
 
   * Reverse previous change and list screensavers explicity, can't use
     wildcard as some .desktop files should go into kscreensavers 
@@ -334,7 +334,7 @@ kdeartwork (4:3.5.2-0ubuntu3) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 30 Mar 2006 16:54:24 +0100
 
-kdeartwork (4:3.5.2-0ubuntu2) dapper; urgency=low
+tdeartwork (4:3.5.2-0ubuntu2) dapper; urgency=low
 
   * The upstream makefile cleverly detects the presense of screensavers
     in /usr/lib/xscreensaver/ and only installs .desktop files for those
@@ -343,7 +343,7 @@ kdeartwork (4:3.5.2-0ubuntu2) dapper; urgency=low
 
  -- Adam Conrad <adconrad@ubuntu.com>  Wed, 29 Mar 2006 16:37:23 +1100
 
-kdeartwork (4:3.5.2-0ubuntu1) dapper; urgency=low
+tdeartwork (4:3.5.2-0ubuntu1) dapper; urgency=low
 
   * New upstream release
   * Add kubuntu_01_xscreensaver_detect.diff, flame is no longer in the
@@ -351,33 +351,33 @@ kdeartwork (4:3.5.2-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:30 +0000
 
-kdeartwork (4:3.5.1-0ubuntu1) dapper; urgency=low
+tdeartwork (4:3.5.1-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:06 +0000
 
-kdeartwork (4:3.5.0-0ubuntu2) dapper; urgency=low
+tdeartwork (4:3.5.0-0ubuntu2) dapper; urgency=low
 
   * Do not install ant.desktop, xscreensaver no longer 
     includes it
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  7 Dec 2005 18:46:44 +0000
 
-kdeartwork (4:3.5.0-0ubuntu1) dapper; urgency=low
+tdeartwork (4:3.5.0-0ubuntu1) dapper; urgency=low
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Dec 2005 12:27:12 +0000
 
-kdeartwork (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+tdeartwork (4:3.5-rc2-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Generate .pot files
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 22:06:39 +0000
 
-kdeartwork (4:3.5-rc1-0ubuntu1) dapper; urgency=low
+tdeartwork (4:3.5-rc1-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
   * Sync with Debian
@@ -385,13 +385,13 @@ kdeartwork (4:3.5-rc1-0ubuntu1) dapper; urgency=low
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 13 Nov 2005 20:02:30 +0000
 
-kdeartwork (4:3.4.3-1) experimental; urgency=low
+tdeartwork (4:3.4.3-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 16 Oct 2005 13:56:19 -0400
 
-kdeartwork (4:3.4.2-1) unstable; urgency=low
+tdeartwork (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -402,7 +402,7 @@ kdeartwork (4:3.4.2-1) unstable; urgency=low
   * Replace the build-dep on xlibmesa-glu-dev with libglu1-xorg-dev for the
     X.Org transition.
 
-  * Remove the dummy transitional package kdeartwork-theme-desktop, as Sarge
+  * Remove the dummy transitional package tdeartwork-theme-desktop, as Sarge
     was released and Woody --> Sarge upgrades are no longer a concern.
     (Closes: #322008)
 
@@ -420,20 +420,20 @@ kdeartwork (4:3.4.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  1 Sep 2005 18:52:58 +0200
 
-kdeartwork (4:3.4.1-1) experimental; urgency=low
+tdeartwork (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
 
-kdeartwork (4:3.4.0-0pre2) alioth; urgency=low
+tdeartwork (4:3.4.0-0pre2) alioth; urgency=low
 
   * New upstream release.
 
   +++ Changes by Christopher Martin:
 
   * Converted packaging to CDBS.
-  * Added a new package, kdeartwork-emoticons (containing the former
+  * Added a new package, tdeartwork-emoticons (containing the former
     Kopete emoticons, now usable by everyone).
   * Forward port a patch from KDE 3.3 that fixes the building of the
     KFireSaver screensaver.
@@ -442,13 +442,13 @@ kdeartwork (4:3.4.0-0pre2) alioth; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 25 Mar 2005 08:48:21 -0500
 
-kdeartwork (4:3.3.2-1) unstable; urgency=low
+tdeartwork (4:3.3.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
 
  -- Ben Burton <bab@debian.org>  Sat, 22 Jan 2005 06:53:59 +1100
 
-kdeartwork (4:3.3.1-1) unstable; urgency=medium
+tdeartwork (4:3.3.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.
   * Added kdeclassic/locolor icon license to debian/copyright, which has been
@@ -463,11 +463,11 @@ kdeartwork (4:3.3.1-1) unstable; urgency=medium
 
  -- Ben Burton <bab@debian.org>  Sun, 31 Oct 2004 15:17:56 +1100
 
-kdeartwork (4:3.3.0-1) unstable; urgency=low
+tdeartwork (4:3.3.0-1) unstable; urgency=low
 
   * New upstream release (closes: #267571).
   * The previous versioned libqt3-mt-dev build-depends is no longer
-    necessary, since kdelibs4-dev already forces Qt 3.3.
+    necessary, since tdelibs4-dev already forces Qt 3.3.
   * Split xscreensaver hooks into a separate package kscreensaver-xsavers,
     along with kxsconfig and kxsrun (closes: #208769, #244538).  Two years
     of confusion is enough.
@@ -480,97 +480,97 @@ kdeartwork (4:3.3.0-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Thu, 14 Oct 2004 08:30:34 +1000
 
-kdeartwork (4:3.2.3-1) unstable; urgency=low
+tdeartwork (4:3.2.3-1) unstable; urgency=low
 
   * New upstream bugfix release.
-  * Rebuilt against STL-enabled Qt and corresponding kdelibs (closes: #254021).
+  * Rebuilt against STL-enabled Qt and corresponding tdelibs (closes: #254021).
   * Patched the autoconf tests for kxsconfig so that xscreensaver
     configuration works again (closes: #238180, #243150).
   * Suggests (kwin | x-window-manager) for kdewallpapers instead of just
     x-window-manager.
-  * Removed recommends: kwin from kdeartwork-theme-window since this is
+  * Removed recommends: kwin from tdeartwork-theme-window since this is
     already coming in as a depends from the kwin shlibs file.
 
  -- Ben Burton <bab@debian.org>  Tue, 15 Jun 2004 08:38:18 +1000
 
-kdeartwork (4:3.2.2-1) unstable; urgency=low
+tdeartwork (4:3.2.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
   * Don't use Conflicts/Replaces where we should just use Replaces.
 
  -- Ben Burton <bab@debian.org>  Mon, 26 Apr 2004 09:25:01 +1000
 
-kdeartwork (4:3.2.1-1) unstable; urgency=low
+tdeartwork (4:3.2.1-1) unstable; urgency=low
 
   * First KDE 3.2 upload to sid.
 
  -- Ben Burton <bab@debian.org>  Sun,  7 Mar 2004 17:42:59 +1100
 
-kdeartwork (4:3.2.0.1-1) experimental; urgency=low
+tdeartwork (4:3.2.0.1-1) experimental; urgency=low
 
   * First KDE 3.2 upload to experimental.
   * Sync from KDE_3_2_BRANCH for recent bugfixes (this requires an upstream
     version change since some binary files have been updated).
-  * Using versioned dependencies for the kdeartwork metapackage.
+  * Using versioned dependencies for the tdeartwork metapackage.
 
  -- Ben Burton <bab@debian.org>  Mon, 23 Feb 2004 08:14:22 +1100
 
-kdeartwork (4:3.2.0-1) unstable; urgency=low
+tdeartwork (4:3.2.0-1) unstable; urgency=low
 
   * New upstream release.
   * Many thanks to Ralf Nolden for all his help with packaging KDE 3.2.
 
  -- Ben Burton <bab@debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
 
-kdeartwork (4:3.1.5-2) unstable; urgency=low
+tdeartwork (4:3.1.5-2) unstable; urgency=low
 
-  * Made kscreensaver depend on kdebase-bin (closes: #203185).
+  * Made kscreensaver depend on tdebase-bin (closes: #203185).
 
  -- Ben Burton <bab@debian.org>  Mon, 19 Jan 2004 11:08:45 +1100
 
-kdeartwork (4:3.1.5-1) unstable; urgency=low
+tdeartwork (4:3.1.5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <bab@debian.org>  Sun, 18 Jan 2004 12:55:12 +1100
 
-kdeartwork (4:3.1.4-2) unstable; urgency=low
+tdeartwork (4:3.1.4-2) unstable; urgency=low
 
   * Fixed paths to xscreensaver XML files in kxsconfig (closes: #221974).
 
  -- Ben Burton <bab@debian.org>  Sat, 13 Dec 2003 09:34:11 +1100
 
-kdeartwork (4:3.1.4-1) unstable; urgency=low
+tdeartwork (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
   * Bumped standards-version to 3.6.1.
 
  -- Ben Burton <bab@debian.org>  Sun, 12 Oct 2003 19:52:13 +1000
 
-kdeartwork (4:3.1.3-1) unstable; urgency=low
+tdeartwork (4:3.1.3-1) unstable; urgency=low
 
   * New upstream release.
-  * Added dummy kdeartwork-theme-desktop upgrade package.
+  * Added dummy tdeartwork-theme-desktop upgrade package.
   * Bumped standards-version to 3.6.0.
 
  -- Ben Burton <bab@debian.org>  Wed, 13 Aug 2003 11:02:26 +1000
 
-kdeartwork (4:3.1.2-2) unstable; urgency=low
+tdeartwork (4:3.1.2-2) unstable; urgency=low
 
-  * Split kdeartwork-theme-desktop into kdeartwork-theme-icon and
+  * Split tdeartwork-theme-desktop into tdeartwork-theme-icon and
     kdewallpapers (closes: #189804)
   * Bumped standards-version to 3.5.10.0.
 
  -- Ben Burton <bab@debian.org>  Mon,  9 Jun 2003 13:13:35 +1000
 
-kdeartwork (4:3.1.2-1) unstable; urgency=low
+tdeartwork (4:3.1.2-1) unstable; urgency=low
 
   * New upstream release.
   * Man page overhaul.
 
  -- Ben Burton <bab@debian.org>  Sun,  1 Jun 2003 14:15:47 +1000
 
-kdeartwork (4:3.1.1-1) unstable; urgency=low
+tdeartwork (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release.
   * Package kscreensaver recommends xscreensaver-gl.
@@ -578,29 +578,29 @@ kdeartwork (4:3.1.1-1) unstable; urgency=low
 
  -- Ben Burton <bab@debian.org>  Sun, 23 Mar 2003 15:23:23 +1100
 
-kdeartwork (4:3.1.0-3) unstable; urgency=low
+tdeartwork (4:3.1.0-3) unstable; urgency=low
 
-  * Made kdeartwork-theme-desktop conflict with kdewallpapers
+  * Made tdeartwork-theme-desktop conflict with kdewallpapers
     (closes: #180209).
 
  -- Ben Burton <bab@debian.org>  Tue, 11 Feb 2003 14:45:59 +1100
 
-kdeartwork (4:3.1.0-2) unstable; urgency=low
+tdeartwork (4:3.1.0-2) unstable; urgency=low
 
   * First Trinity upload to debian!
   * Build-depends on xlibmesa-gl-dev and xlibmesa-glu-dev.
 
  -- Ben Burton <bab@debian.org>  Mon,  3 Feb 2003 08:53:03 +1100
 
-kdeartwork (4:3.1.0-1) unstable; urgency=low
+tdeartwork (4:3.1.0-1) unstable; urgency=low
 
   * New upstream release.
-  * Renamed kdeartwork-screensaver to kscreensaver.
-  * Shifted epoch to 4: since kdebase used to provide kscreensaver 4:3.0.x.
+  * Renamed tdeartwork-screensaver to kscreensaver.
+  * Shifted epoch to 4: since tdebase used to provide kscreensaver 4:3.0.x.
 
  -- Ben Burton <bab@debian.org>  Sat,  4 Jan 2003 20:06:44 +1100
 
-kdeartwork (3.0.9-1) unstable; urgency=low
+tdeartwork (3.0.9-1) unstable; urgency=low
 
   * New upstream release.
   * Built with g++-3.2.
@@ -608,7 +608,7 @@ kdeartwork (3.0.9-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Tue, 22 Oct 2002 11:57:39 +1000
 
-kdeartwork (3.0.8-1) unstable; urgency=low
+tdeartwork (3.0.8-1) unstable; urgency=low
 
   * New upstream release.
   * Moved to Chris Cheney's style of debian/rules.
@@ -616,75 +616,75 @@ kdeartwork (3.0.8-1) unstable; urgency=low
 
  -- Ben Burton <benb@acm.org>  Sun, 22 Sep 2002 17:57:55 +1000
 
-kdeartwork (3.0.3-1) unstable; urgency=low
+tdeartwork (3.0.3-1) unstable; urgency=low
 
   * New upstream release.
   * Build-depends on automake1.5.
 
  -- Ben Burton <benb@acm.org>  Thu, 15 Aug 2002 13:22:22 +1000
 
-kdeartwork (3.0.2-1) unstable; urgency=low
+tdeartwork (3.0.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Thu,  4 Jul 2002 19:36:49 +1000
 
-kdeartwork (3.0.1-1) unstable; urgency=low
+tdeartwork (3.0.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Mon, 13 May 2002 15:29:23 +1000
 
-kdeartwork (2.2.2-1) unstable; urgency=low
+tdeartwork (2.2.2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Wed,  7 Nov 2001 10:49:53 -0600
 
-kdeartwork (2.2.1-5) unstable; urgency=low
+tdeartwork (2.2.1-5) unstable; urgency=low
 
   * Uses automake again to solve new alpha problems.
 
  -- Ben Burton <benb@acm.org>  Tue,  6 Nov 2001 23:51:27 -0600
 
-kdeartwork (2.2.1-4) unstable; urgency=low
+tdeartwork (2.2.1-4) unstable; urgency=low
 
   * Cleaned up automake-related material.
 
  -- Ben Burton <benb@acm.org>  Sun, 28 Oct 2001 13:48:04 -0600
 
-kdeartwork (2.2.1-3) unstable; urgency=low
+tdeartwork (2.2.1-3) unstable; urgency=low
 
   * Builds with automake 1.5.
 
  -- Ben Burton <benb@acm.org>  Thu, 11 Oct 2001 15:31:32 -0500
 
-kdeartwork (2.2.1-2) unstable; urgency=low
+tdeartwork (2.2.1-2) unstable; urgency=low
 
   * Updated parameters for alpha build (closes: Bug#113125).
 
  -- Ben Burton <benb@acm.org>  Sat, 22 Sep 2001 12:00:37 -0500
 
-kdeartwork (2.2.1-1) unstable; urgency=low
+tdeartwork (2.2.1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Ben Burton <benb@acm.org>  Fri, 31 Aug 2001 21:08:56 -0500
 
-kdeartwork (2.2.0-final-1) unstable; urgency=low
+tdeartwork (2.2.0-final-1) unstable; urgency=low
 
   * New upstream release.
   * Bumped standards-version to 3.5.6.
 
  -- Ben Burton <benb@acm.org>  Sun, 29 Jul 2001 17:48:59 +1000
 
-kdeartwork (2.2-beta1-2) unstable; urgency=low
+tdeartwork (2.2-beta1-2) unstable; urgency=low
 
   * Builds on alpha.
 
  -- Ben Burton <benb@acm.org>  Sun, 29 Jul 2001 00:20:23 +1000
 
-kdeartwork (2.2-beta1-1) unstable; urgency=low
+tdeartwork (2.2-beta1-1) unstable; urgency=low
 
   * Initial Release (closes: Bug#101244).
 
diff --git a/ubuntu/maverick/tdeartwork/debian/control b/ubuntu/maverick/tdeartwork/debian/control
index 391ca8986..34956beb8 100644
--- a/ubuntu/maverick/tdeartwork/debian/control
+++ b/ubuntu/maverick/tdeartwork/debian/control
@@ -1,19 +1,19 @@
-Source: kdeartwork-trinity
+Source: tdeartwork-trinity
 Section: kde
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, kdelibs4-trinity-dev, gawk, gettext, sharutils, kdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev
 Build-Conflicts: autoconf2.13, nvidia-glx
 Standards-Version: 3.8.4
 
-Package: kdeartwork-trinity
+Package: tdeartwork-trinity
 Architecture: all
 Section: kde
-Replaces: kdeartwork-kde3 (<< 4:3.5.13)
-Breaks: kdeartwork-kde3 (<< 4:3.5.13)
-Depends: kdeartwork-misc-trinity (>= ${Source-Version}), kdeartwork-emoticons-trinity (>= ${Source-Version}), kdeartwork-style-trinity (>= ${Source-Version}), kdeartwork-theme-icon-trinity (>= ${Source-Version}), kdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), kscreensaver-trinity (>= ${Source-Version})
+Replaces: tdeartwork-kde3 (<< 4:3.5.13)
+Breaks: tdeartwork-kde3 (<< 4:3.5.13)
+Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), kscreensaver-trinity (>= ${Source-Version})
 Recommends: kscreensaver-xsavers-trinity
 Description: themes, styles and more from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -27,37 +27,37 @@ Description: themes, styles and more from the official Trinity release
  .
  Homepage: http://artist.kde.org 
 
-Package: kdeartwork-emoticons-trinity
+Package: tdeartwork-emoticons-trinity
 Architecture: all
 Section: kde
-Replaces: kdeartwork-emoticons-kde3 (<< 4:3.5.13)
-Breaks: kdeartwork-emoticons-kde3 (<< 4:3.5.13)
+Replaces: tdeartwork-emoticons-kde3 (<< 4:3.5.13)
+Breaks: tdeartwork-emoticons-kde3 (<< 4:3.5.13)
 Enhances: kopete-trinity
 Description: emoticon collections for KDE chat clients
  This package contains several collections of emoticons used by official
  and unofficial KDE chat clients, such as Kopete and Konversation.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kdeartwork-misc-trinity
+Package: tdeartwork-misc-trinity
 Architecture: all
 Section: kde
-Replaces: kdeartwork-misc-kde3 (<< 4:3.5.13)
-Breaks: kdeartwork-misc-kde3 (<< 4:3.5.13)
+Replaces: tdeartwork-misc-kde3 (<< 4:3.5.13)
+Breaks: tdeartwork-misc-kde3 (<< 4:3.5.13)
 Suggests: kworldclock
 Description: various multimedia goodies released with KDE
  This package contains miscellaneous multimedia goodies for KDE.
  Included are additional KDE sounds and kworldclock themes.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kdeartwork-style-trinity
+Package: tdeartwork-style-trinity
 Architecture: any
 Section: kde
-Replaces: kdeartwork-style-kde3 (<< 4:3.5.13)
-Breaks: kdeartwork-style-kde3 (<< 4:3.5.13)
+Replaces: tdeartwork-style-kde3 (<< 4:3.5.13)
+Breaks: tdeartwork-style-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Description: widget styles released with Trinity
  This package contains additional widget styles for Trinity. Widget styles
@@ -66,13 +66,13 @@ Description: widget styles released with Trinity
  manager in the KDE Control Centre.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kdeartwork-theme-icon-trinity
+Package: tdeartwork-theme-icon-trinity
 Architecture: all
 Section: kde
-Replaces: kdeartwork-theme-icon-kde3 (<< 4:3.5.13)
-Breaks: kdeartwork-theme-icon-kde3 (<< 4:3.5.13)
+Replaces: tdeartwork-theme-icon-kde3 (<< 4:3.5.13)
+Breaks: tdeartwork-theme-icon-kde3 (<< 4:3.5.13)
 Recommends: kdesktop-trinity, kicker-trinity
 Description: icon themes released with Trinity
  This package contains additional icon themes for Trinity. Icon themes can be
@@ -80,13 +80,13 @@ Description: icon themes released with Trinity
  can be applied using the icon manager in the Trinity Control Centre.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kdeartwork-theme-window-trinity
+Package: tdeartwork-theme-window-trinity
 Architecture: any
 Section: kde
-Replaces: kdeartwork-theme-window-kde3 (<< 4:3.5.13)
-Breaks: kdeartwork-theme-window-kde3 (<< 4:3.5.13)
+Replaces: tdeartwork-theme-window-kde3 (<< 4:3.5.13)
+Breaks: tdeartwork-theme-window-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
 Description: window decoration themes released with Trinity
  This package contains additional window decoration themes for Trinity. Window
@@ -95,7 +95,7 @@ Description: window decoration themes released with Trinity
  Control Center.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: kdewallpapers-trinity
 Architecture: all
@@ -108,14 +108,14 @@ Description: wallpapers released with Trinity
  applied using the background manager in the KDE Control Centre.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: kscreensaver-trinity
 Architecture: any
 Section: kde
 Replaces: kscreensaver-kde3 (<< 4:3.5.13)
 Breaks: kscreensaver-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdebase-trinity-bin
+Depends: ${shlibs:Depends}, tdebase-trinity-bin
 Recommends: kwin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version})
 Description: additional screen savers released with Trinity
  This package contains the screen savers for Trinity. They can be tested and
@@ -127,14 +127,14 @@ Description: additional screen savers released with Trinity
  the KDE Control Center, install the separate package kscreensaver-xsavers.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: kscreensaver-xsavers-trinity
 Architecture: any
 Section: kde
 Replaces: kscreensaver-xsavers-kde3 (<< 4:3.5.13)
 Breaks: kscreensaver-xsavers-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdebase-trinity-bin, xscreensaver-data
+Depends: ${shlibs:Depends}, tdebase-trinity-bin, xscreensaver-data
 Recommends: kwin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl
 Suggests: kscreensaver-xsavers-webcollage-trinity
 Description: Trinity hooks for standard xscreensavers
@@ -150,7 +150,7 @@ Description: Trinity hooks for standard xscreensavers
  files to integrate these packages into Trinity.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: kscreensaver-xsavers-webcollage-trinity
 Architecture: all
@@ -175,7 +175,7 @@ Description: webcollage screensaver Trinity hook
  installation.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
 Package: kscreensaver-xsavers-extra-trinity
 Architecture: all
@@ -195,16 +195,16 @@ Description: Trinity hooks for standard xscreensavers
  kscreensaver.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
- See the 'kde-trinity' and 'kdeartwork-trinity' packages for more information.
+ See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kdeartwork-trinity-dbg
+Package: tdeartwork-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: kdeartwork-kde3-dbg (<< 4:3.5.13)
-Breaks: kdeartwork-kde3-dbg (<< 4:3.5.13)
-Depends: kdelibs-trinity-dbg
+Replaces: tdeartwork-kde3-dbg (<< 4:3.5.13)
+Breaks: tdeartwork-kde3-dbg (<< 4:3.5.13)
+Depends: tdelibs-trinity-dbg
 Priority: extra
-Description: debugging symbols for kdeartwork-trinity
- This package contains the debugging symbols associated with kdeartwork.
- They will automatically be used by gdb for debugging kdeartwork-related
+Description: debugging symbols for tdeartwork-trinity
+ This package contains the debugging symbols associated with tdeartwork.
+ They will automatically be used by gdb for debugging tdeartwork-related
  issues.
diff --git a/ubuntu/maverick/tdeartwork/debian/control.in b/ubuntu/maverick/tdeartwork/debian/control.in
index c12a75d6d..e2d1102a3 100644
--- a/ubuntu/maverick/tdeartwork/debian/control.in
+++ b/ubuntu/maverick/tdeartwork/debian/control.in
@@ -1,17 +1,17 @@
-Source: kdeartwork
+Source: tdeartwork
 Section: kde
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, kdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils, kdebase-dev (>= 4:3.5.7), kwin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils, tdebase-dev (>= 4:3.5.7), kwin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl
 Build-Conflicts: autoconf2.13, nvidia-glx
 Standards-Version: 3.7.2
 
-Package: kdeartwork
+Package: tdeartwork
 Architecture: all
 Section: kde
-Depends: kdeartwork-misc (>= ${Source-Version}), kdeartwork-emoticons (>= ${Source-Version}), kdeartwork-style (>= ${Source-Version}), kdeartwork-theme-icon (>= ${Source-Version}), kdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), kscreensaver (>= ${Source-Version})
+Depends: tdeartwork-misc (>= ${Source-Version}), tdeartwork-emoticons (>= ${Source-Version}), tdeartwork-style (>= ${Source-Version}), tdeartwork-theme-icon (>= ${Source-Version}), tdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), kscreensaver (>= ${Source-Version})
 Recommends: kscreensaver-xsavers
 Description: themes, styles and more from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -25,7 +25,7 @@ Description: themes, styles and more from the official KDE release
  .
  Homepage: http://artist.kde.org 
 
-Package: kdeartwork-emoticons
+Package: tdeartwork-emoticons
 Architecture: all
 Section: kde
 Enhances: kopete
@@ -34,9 +34,9 @@ Description: emoticon collections for KDE chat clients
  and unofficial KDE chat clients, such as Kopete and Konversation.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
-Package: kdeartwork-misc
+Package: tdeartwork-misc
 Architecture: all
 Section: kde
 Suggests: kworldclock
@@ -45,9 +45,9 @@ Description: various multimedia goodies released with KDE
  Included are additional KDE sounds and kworldclock themes.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
-Package: kdeartwork-style
+Package: tdeartwork-style
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
@@ -58,22 +58,22 @@ Description: widget styles released with KDE
  manager in the KDE Control Centre.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
-Package: kdeartwork-theme-icon
+Package: tdeartwork-theme-icon
 Architecture: all
 Section: kde
 Recommends: kdesktop, kicker
-Replaces: kdelibs-data (<< 4:3.5)
+Replaces: tdelibs-data (<< 4:3.5)
 Description: icon themes released with KDE
  This package contains additional icon themes for KDE. Icon themes can be
  used to customise the appearance of standard icons throughout KDE. They
  can be applied using the icon manager in the KDE Control Centre.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
-Package: kdeartwork-theme-window
+Package: tdeartwork-theme-window
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
@@ -84,24 +84,24 @@ Description: window decoration themes released with KDE
  Control Center.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
 Package: kdewallpapers
 Architecture: all
 Section: kde
 Suggests: kwin | x-window-manager
-Replaces: kdebase-data (<< 4:3.5)
+Replaces: tdebase-data (<< 4:3.5)
 Description: wallpapers released with KDE
  This package contains additional wallpapers for KDE. Wallpapers can be
  applied using the background manager in the KDE Control Centre.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
 Package: kscreensaver
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdebase-bin
+Depends: ${shlibs:Depends}, tdebase-bin
 Recommends: kwin, kscreensaver-xsavers (= ${Source-Version})
 Description: additional screen savers released with KDE
  This package contains the screen savers for KDE. They can be tested and
@@ -113,12 +113,12 @@ Description: additional screen savers released with KDE
  the KDE Control Center, install the separate package kscreensaver-xsavers.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
 Package: kscreensaver-xsavers
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, kdebase-bin, xscreensaver
+Depends: ${shlibs:Depends}, tdebase-bin, xscreensaver
 Recommends: kwin, kscreensaver (= ${Source-Version}), xscreensaver-gl
 Suggests: kscreensaver-xsavers-webcollage
 Description: KDE hooks for standard xscreensavers
@@ -134,7 +134,7 @@ Description: KDE hooks for standard xscreensavers
  files to integrate these packages into KDE.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
 Package: kscreensaver-xsavers-webcollage
 Architecture: all
@@ -157,14 +157,14 @@ Description: webcollage screensaver KDE hook
  installation.
  .
  This package is part of KDE, and a component of the KDE artwork module.
- See the 'kde' and 'kdeartwork' packages for more information.
+ See the 'kde' and 'tdeartwork' packages for more information.
 
-Package: kdeartwork-dbg
+Package: tdeartwork-dbg
 Section: libdevel
 Architecture: any
-Depends: kdelibs-dbg
+Depends: tdelibs-dbg
 Priority: extra
-Description: debugging symbols for kdeartwork
- This package contains the debugging symbols associated with kdeartwork.
- They will automatically be used by gdb for debugging kdeartwork-related
+Description: debugging symbols for tdeartwork
+ This package contains the debugging symbols associated with tdeartwork.
+ They will automatically be used by gdb for debugging tdeartwork-related
  issues.
diff --git a/ubuntu/maverick/tdeartwork/debian/copyright b/ubuntu/maverick/tdeartwork/debian/copyright
index ae0c0cb2d..f98e0b7f5 100644
--- a/ubuntu/maverick/tdeartwork/debian/copyright
+++ b/ubuntu/maverick/tdeartwork/debian/copyright
@@ -5,7 +5,7 @@ It was downloaded from: http://www.kde.org/download
 
 Upstream Authors:
 
-  Note that kdeartwork has many contributers beyond those listed below.
+  Note that tdeartwork has many contributers beyond those listed below.
 
   Icon Themes:
     iKons: Kristof Borrey <kborrey@skynet.be>
@@ -193,7 +193,7 @@ Copyright:
 
   Since this change is generally though retroactive, the incompatibility
   is resolved, and we can ship the Virtual Machine screen saver with
-  kdeartwork.
+  tdeartwork.
 
   --------------------
 
diff --git a/ubuntu/maverick/tdeartwork/debian/rules b/ubuntu/maverick/tdeartwork/debian/rules
index 1a593022d..3e16d1ff2 100755
--- a/ubuntu/maverick/tdeartwork/debian/rules
+++ b/ubuntu/maverick/tdeartwork/debian/rules
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
-DEB_DH_STRIP_ARGS  := --dbg-package=kdeartwork-trinity-dbg
+DEB_DH_STRIP_ARGS  := --dbg-package=tdeartwork-trinity-dbg
 
 clean::
 	rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png
diff --git a/ubuntu/maverick/tdeartwork/debian/kdeartwork-emoticons-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdeartwork-emoticons-trinity.install
index 0fea42334..0fea42334 100644
--- a/ubuntu/maverick/tdeartwork/debian/kdeartwork-emoticons-trinity.install
+++ b/ubuntu/maverick/tdeartwork/debian/tdeartwork-emoticons-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/kdeartwork-misc-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdeartwork-misc-trinity.install
index 0285201e7..0285201e7 100644
--- a/ubuntu/maverick/tdeartwork/debian/kdeartwork-misc-trinity.install
+++ b/ubuntu/maverick/tdeartwork/debian/tdeartwork-misc-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/kdeartwork-style-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdeartwork-style-trinity.install
index 8fab1bcbf..8fab1bcbf 100644
--- a/ubuntu/maverick/tdeartwork/debian/kdeartwork-style-trinity.install
+++ b/ubuntu/maverick/tdeartwork/debian/tdeartwork-style-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/kdeartwork-theme-icon-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-icon-trinity.install
index 8a1dc19a0..8a1dc19a0 100644
--- a/ubuntu/maverick/tdeartwork/debian/kdeartwork-theme-icon-trinity.install
+++ b/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-icon-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/kdeartwork-theme-window-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-window-trinity.install
index 7f688e236..7f688e236 100644
--- a/ubuntu/maverick/tdeartwork/debian/kdeartwork-theme-window-trinity.install
+++ b/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-window-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/kdeartwork.README.Debian b/ubuntu/maverick/tdeartwork/debian/tdeartwork.README.Debian
index 1b9dfa1a7..079d4ba40 100644
--- a/ubuntu/maverick/tdeartwork/debian/kdeartwork.README.Debian
+++ b/ubuntu/maverick/tdeartwork/debian/tdeartwork.README.Debian
@@ -1,7 +1,7 @@
 KDE Artwork for Debian
 ----------------------
 
-Package kdeartwork is a metapackage that depends on the full set of
+Package tdeartwork is a metapackage that depends on the full set of
 themes, widget styles, screen savers and other artistic goodies provided
 with the official release of KDE.