Update Debian and Ubuntu packaging to match recent renaming

17 files changed, 72 insertions, 72 deletions

diff --git a/debian/wheezy/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/wheezy/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 6208667e9..7d7396e71 100644
--- a/debian/wheezy/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/wheezy/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -1,7 +1,7 @@
-kscreensaver-xsavers depends on xscreensaver-data not xscreensaver
+tdescreensaver-xsavers depends on xscreensaver-data not xscreensaver
 build-dep on xscreensaver-data
-add package kscreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra
+add package tdescreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra
 -webcollage depends on -extra not just xsavers
-  * Edit kscreensaver-xsaver-webcollage.install to use the file
+  * Edit tdescreensaver-xsaver-webcollage.install to use the file
     from sources, since it does not get installed during build.
 
diff --git a/debian/wheezy/tdeartwork/debian/changelog b/debian/wheezy/tdeartwork/debian/changelog
index a3043310e..ddf857174 100644
--- a/debian/wheezy/tdeartwork/debian/changelog
+++ b/debian/wheezy/tdeartwork/debian/changelog
@@ -33,13 +33,13 @@ tdeartwork (4:3.5.9-0ubuntu1) hardy; urgency=low
 
 tdeartwork (4:3.5.8-1ubuntu4) hardy; urgency=low
 
-  * Fix kscreensaver-xsavers-webcollage.install
+  * Fix tdescreensaver-xsavers-webcollage.install
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 10 Dec 2007 16:06:47 +0000
 
 tdeartwork (4:3.5.8-1ubuntu3) hardy; urgency=low
 
-  * Edit kscreensaver-xsaver-webcollage.install to use the file
+  * Edit tdescreensaver-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
@@ -53,7 +53,7 @@ tdeartwork (4:3.5.8-1ubuntu2) hardy; urgency=low
 tdeartwork (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining change:
-   - Add package kscreensaver-xsavers-extra
+   - Add package tdescreensaver-xsavers-extra
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:44 +0000
 
@@ -68,7 +68,7 @@ tdeartwork (4:3.5.8-1) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
-  * Only make tdeartwork recommend kscreensaver-xsavers, not depend. It pulls
+  * Only make tdeartwork recommend tdescreensaver-xsavers, not depend. It pulls
     all sorts of weird gtk-stuff in.
   * Fix spelling error in control file.
 
@@ -106,7 +106,7 @@ tdeartwork (4:3.5.7-1ubuntu3) 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
+     tdescreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be
      controlled in the KDE screensavers control panel.  Closes LP: #49228
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Mon, 02 Jul 2007 17:13:01 +1000
@@ -149,7 +149,7 @@ tdeartwork (4:3.5.6-2) experimental; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
   
-  * Add kscreensaver-xsavers-webcollage.README.Debian.
+  * Add tdescreensaver-xsavers-webcollage.README.Debian.
   * Remade screensaver-xsavers-webcollage description in debian/control.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 31 Jan 2007 06:01:40 +0100
@@ -210,7 +210,7 @@ tdeartwork (4:3.5.4-0ubuntu1) edgy; urgency=low
 
 tdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low
 
-  * Removed kpartsaver.desktop from debian/kscreensavers-xsaver.install.  
+  * Removed tdepartsaver.desktop from debian/tdescreensavers-xsaver.install.  
     Closes bug #53065
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Fri, 21 Jul 2006 23:10:26 +1000
@@ -218,7 +218,7 @@ tdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low
 tdeartwork (4:3.5.3-1ubuntu1) edgy; urgency=low
 
   * Sync with Debian
-  * Create kscreensaver-xsavers-extra with the universe xscreensavers
+  * Create tdescreensaver-xsavers-extra with the universe xscreensavers
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Jul 2006 12:39:40 +0000
 
@@ -315,7 +315,7 @@ tdeartwork (4:3.4.3-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Remove ant.desktop from kscreensaver-xsavers, as the xscreensaver package
+  * Remove ant.desktop from tdescreensaver-xsavers, as the xscreensaver package
     has itself dropped this 'saver. (Closes: #338011)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  1 Dec 2005 15:58:30 +0100
@@ -329,8 +329,8 @@ tdeartwork (4:3.5.2-0ubuntu4) 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 
-    and not kscreensavers-xsaver
+    wildcard as some .desktop files should go into tdescreensavers 
+    and not tdescreensavers-xsaver
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 30 Mar 2006 16:54:24 +0100
 
@@ -437,7 +437,7 @@ tdeartwork (4:3.4.0-0pre2) alioth; urgency=low
     Kopete emoticons, now usable by everyone).
   * Forward port a patch from KDE 3.3 that fixes the building of the
     KFireSaver screensaver.
-  * Lower kscreensaver-xsavers's dependency on xscreensaver-gl to a Recommends.
+  * Lower tdescreensaver-xsavers's dependency on xscreensaver-gl to a Recommends.
     (Closes: #278263)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 25 Mar 2005 08:48:21 -0500
@@ -468,7 +468,7 @@ 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 tdelibs4-dev already forces Qt 3.3.
-  * Split xscreensaver hooks into a separate package kscreensaver-xsavers,
+  * Split xscreensaver hooks into a separate package tdescreensaver-xsavers,
     along with kxsconfig and kxsrun (closes: #208769, #244538).  Two years
     of confusion is enough.
   * Build-depends on both xscreensaver and xscreensaver-gl, which are
@@ -524,7 +524,7 @@ tdeartwork (4:3.2.0-1) unstable; urgency=low
 
 tdeartwork (4:3.1.5-2) unstable; urgency=low
 
-  * Made kscreensaver depend on tdebase-bin (closes: #203185).
+  * Made tdescreensaver depend on tdebase-bin (closes: #203185).
 
  -- Ben Burton <bab@debian.org>  Mon, 19 Jan 2004 11:08:45 +1100
 
@@ -573,7 +573,7 @@ tdeartwork (4:3.1.2-1) unstable; urgency=low
 tdeartwork (4:3.1.1-1) unstable; urgency=low
 
   * New upstream release.
-  * Package kscreensaver recommends xscreensaver-gl.
+  * Package tdescreensaver recommends xscreensaver-gl.
   * Removed alpha compile flags.
 
  -- Ben Burton <bab@debian.org>  Sun, 23 Mar 2003 15:23:23 +1100
@@ -595,8 +595,8 @@ tdeartwork (4:3.1.0-2) unstable; urgency=low
 tdeartwork (4:3.1.0-1) unstable; urgency=low
 
   * New upstream release.
-  * Renamed tdeartwork-screensaver to kscreensaver.
-  * Shifted epoch to 4: since tdebase used to provide kscreensaver 4:3.0.x.
+  * Renamed tdeartwork-screensaver to tdescreensaver.
+  * Shifted epoch to 4: since tdebase used to provide tdescreensaver 4:3.0.x.
 
  -- Ben Burton <bab@debian.org>  Sat,  4 Jan 2003 20:06:44 +1100
 
diff --git a/debian/wheezy/tdeartwork/debian/control b/debian/wheezy/tdeartwork/debian/control
index ee0ae9ba5..b0100a04c 100644
--- a/debian/wheezy/tdeartwork/debian/control
+++ b/debian/wheezy/tdeartwork/debian/control
@@ -13,8 +13,8 @@ Architecture: all
 Section: tde
 Replaces: kdeartwork-trinity (<< 4:14.0.0)
 Breaks: kdeartwork-trinity (<< 4:14.0.0)
-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
+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}), tdescreensaver-trinity (>= ${Source-Version})
+Recommends: tdescreensaver-xsavers-trinity
 Description: themes, styles and more from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -110,13 +110,13 @@ Description: wallpapers released with Trinity
  This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kscreensaver-trinity
+Package: tdescreensaver-trinity
 Architecture: any
 Section: tde
-Replaces: kscreensaver-trinity (<< 4:14.0.0)
-Breaks: kscreensaver-trinity (<< 4:14.0.0)
+Replaces: tdescreensaver-trinity (<< 4:14.0.0)
+Breaks: tdescreensaver-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, tdebase-trinity-bin
-Recommends: twin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version})
+Recommends: twin-trinity, tdescreensaver-xsavers-trinity (= ${Source-Version})
 Description: additional screen savers released with Trinity
  This package contains the screen savers for Trinity. They can be tested and
  selected within the Appearance and Themes section of the Trinity Control
@@ -124,19 +124,19 @@ Description: additional screen savers released with Trinity
  .
  The hooks for the standard xscreensavers are no longer part of this
  package. To select and/or configure the standard xscreensavers through
- the KDE Control Center, install the separate package kscreensaver-xsavers.
+ the KDE Control Center, install the separate package tdescreensaver-xsavers.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kscreensaver-xsavers-trinity
+Package: tdescreensaver-xsavers-trinity
 Architecture: any
 Section: tde
-Replaces: kscreensaver-xsavers-trinity (<< 4:14.0.0)
-Breaks: kscreensaver-xsavers-trinity (<< 4:14.0.0)
+Replaces: tdescreensaver-xsavers-trinity (<< 4:14.0.0)
+Breaks: tdescreensaver-xsavers-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, tdebase-trinity-bin, xscreensaver-data
-Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl
-Suggests: kscreensaver-xsavers-webcollage-trinity
+Recommends: twin-trinity, tdescreensaver-trinity (= ${Source-Version}), xscreensaver-gl
+Suggests: tdescreensaver-xsavers-webcollage-trinity
 Description: Trinity hooks for standard xscreensavers
  This package allows a smooth integration of the standard xscreensavers
  into Trinity. With this package installed you can select and/or configure
@@ -145,19 +145,19 @@ Description: Trinity hooks for standard xscreensavers
  .
  Note that this package does not actually contain any screensavers itself.
  For the additional screensavers shipped with Trinity, see the separate package
- kscreensaver-trinity. This package does depend on the xscreensaver package, and
+ tdescreensaver-trinity. This package does depend on the xscreensaver package, and
  recommend the xscreensaver-gl package, as well as contain the necessary
  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 'tdeartwork-trinity' packages for more information.
 
-Package: kscreensaver-xsavers-webcollage-trinity
+Package: tdescreensaver-xsavers-webcollage-trinity
 Architecture: all
 Section: tde
-Replaces: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0)
-Breaks: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0)
-Depends: kscreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm
+Replaces: tdescreensaver-xsavers-webcollage-trinity (<< 4:14.0.0)
+Breaks: tdescreensaver-xsavers-webcollage-trinity (<< 4:14.0.0)
+Depends: tdescreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm
 Description: webcollage screensaver Trinity hook
  This package give access to the webcollage screensaver through the Trinity
  screensaver configuration.
@@ -171,19 +171,19 @@ Description: webcollage screensaver Trinity hook
  your computer in a working environment or in an environment with children.
  .
  If you still want to install this package, please read the file
- /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the 
+ /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the 
  installation.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
 
-Package: kscreensaver-xsavers-extra-trinity
+Package: tdescreensaver-xsavers-extra-trinity
 Architecture: all
 Section: tde
-Replaces: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0)
-Breaks: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, kscreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies
-Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version})
+Replaces: tdescreensaver-xsavers-extra-trinity (<< 4:14.0.0)
+Breaks: tdescreensaver-xsavers-extra-trinity (<< 4:14.0.0)
+Depends: ${shlibs:Depends}, tdescreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies
+Recommends: twin-trinity, tdescreensaver-trinity (= ${Source-Version})
 Description: Trinity hooks for standard xscreensavers
  This package allows a smooth integration of the universe xscreensavers
  into Trinity. With this package installed you can select and/or configure
@@ -192,7 +192,7 @@ Description: Trinity hooks for standard xscreensavers
  .
  Note that this package does not actually contain any screensavers itself.
  For the additional screensavers shipped with KDE, see the separate package
- kscreensaver.
+ tdescreensaver.
  .
  This package is part of Trinity, and a component of the KDE artwork module.
  See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
diff --git a/debian/wheezy/tdeartwork/debian/control.in b/debian/wheezy/tdeartwork/debian/control.in
index 1721be0bf..4b914794e 100644
--- a/debian/wheezy/tdeartwork/debian/control.in
+++ b/debian/wheezy/tdeartwork/debian/control.in
@@ -11,8 +11,8 @@ Standards-Version: 3.7.2
 Package: tdeartwork
 Architecture: all
 Section: tde
-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
+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}), tdescreensaver (>= ${Source-Version})
+Recommends: tdescreensaver-xsavers
 Description: themes, styles and more from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -98,11 +98,11 @@ Description: wallpapers released with KDE
  This package is part of KDE, and a component of the KDE artwork module.
  See the 'kde' and 'tdeartwork' packages for more information.
 
-Package: kscreensaver
+Package: tdescreensaver
 Architecture: any
 Section: tde
 Depends: ${shlibs:Depends}, tdebase-bin
-Recommends: twin, kscreensaver-xsavers (= ${Source-Version})
+Recommends: twin, tdescreensaver-xsavers (= ${Source-Version})
 Description: additional screen savers released with KDE
  This package contains the screen savers for KDE. They can be tested and
  selected within the Appearance and Themes section of the KDE Control
@@ -110,17 +110,17 @@ Description: additional screen savers released with KDE
  .
  The hooks for the standard xscreensavers are no longer part of this
  package. To select and/or configure the standard xscreensavers through
- the KDE Control Center, install the separate package kscreensaver-xsavers.
+ the KDE Control Center, install the separate package tdescreensaver-xsavers.
  .
  This package is part of KDE, and a component of the KDE artwork module.
  See the 'kde' and 'tdeartwork' packages for more information.
 
-Package: kscreensaver-xsavers
+Package: tdescreensaver-xsavers
 Architecture: any
 Section: tde
 Depends: ${shlibs:Depends}, tdebase-bin, xscreensaver
-Recommends: twin, kscreensaver (= ${Source-Version}), xscreensaver-gl
-Suggests: kscreensaver-xsavers-webcollage
+Recommends: twin, tdescreensaver (= ${Source-Version}), xscreensaver-gl
+Suggests: tdescreensaver-xsavers-webcollage
 Description: KDE hooks for standard xscreensavers
  This package allows a smooth integration of the standard xscreensavers
  into KDE. With this package installed you can select and/or configure
@@ -129,17 +129,17 @@ Description: KDE hooks for standard xscreensavers
  .
  Note that this package does not actually contain any screensavers itself.
  For the additional screensavers shipped with KDE, see the separate package
- kscreensaver. This package does depend on the xscreensaver package, and
+ tdescreensaver. This package does depend on the xscreensaver package, and
  recommend the xscreensaver-gl package, as well as contain the necessary
  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 'tdeartwork' packages for more information.
 
-Package: kscreensaver-xsavers-webcollage
+Package: tdescreensaver-xsavers-webcollage
 Architecture: all
 Section: tde
-Depends: kscreensaver-xsavers, miscfiles | wordlist, netpbm
+Depends: tdescreensaver-xsavers, miscfiles | wordlist, netpbm
 Description: webcollage screensaver KDE hook
  This package give access to the webcollage screensaver through the KDE
  screensaver configuration.
@@ -153,7 +153,7 @@ Description: webcollage screensaver KDE hook
  your computer in a working environment or in an environment with children.
  .
  If you still want to install this package, please read the file
- /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the 
+ /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the 
  installation.
  .
  This package is part of KDE, and a component of the KDE artwork module.
diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install b/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install
deleted file mode 100644
index a3a14e04c..000000000
--- a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-kscreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/
\ No newline at end of file
diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install b/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install
deleted file mode 100644
index f11cf310b..000000000
--- a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/
diff --git a/debian/wheezy/tdeartwork/debian/man/kpartsaver-trinity.kss.1 b/debian/wheezy/tdeartwork/debian/man/tdepartsaver-trinity.kss.1
index 64a0a5c45..73456139b 100644
--- a/debian/wheezy/tdeartwork/debian/man/kpartsaver-trinity.kss.1
+++ b/debian/wheezy/tdeartwork/debian/man/tdepartsaver-trinity.kss.1
@@ -16,9 +16,9 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kpartsaver.kss \- Media screen saver for KDE
+tdepartsaver.kss \- Media screen saver for KDE
 .SH SYNOPSIS
-.B kpartsaver.kss
+.B tdepartsaver.kss
 .RI "[ " generic-options " ]"
 [ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
 \fB\-\-demo\fP ]
@@ -28,7 +28,7 @@ kpartsaver.kss \- Media screen saver for KDE
 This program is part of the official KDE artwork module.
 .SH OPTIONS
 Below are the screen saver-specific options.
-For a full summary of options, run \fIkpartsaver.kss \-\-help\fP.
+For a full summary of options, run \fItdepartsaver.kss \-\-help\fP.
 .TP
 \fB\-\-setup\fP
 Set up the screen saver.
diff --git a/debian/wheezy/tdeartwork/debian/rules b/debian/wheezy/tdeartwork/debian/rules
index 4e236c044..963f996bc 100755
--- a/debian/wheezy/tdeartwork/debian/rules
+++ b/debian/wheezy/tdeartwork/debian/rules
@@ -34,7 +34,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 clean::
 	rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png
 	rm -f IconThemes/kdeclassic/32x32/actions/kde/kde.png
-	cd kscreensaver/kxsconfig/ && ./update_hacks.sh
+	cd tdescreensaver/kxsconfig/ && ./update_hacks.sh
 
-binary-install/kscreensaver-xsavers-extra-trinity::
-	rm -f debian/kscreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop
+binary-install/tdescreensaver-xsavers-extra-trinity::
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop
diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver-trinity.install b/debian/wheezy/tdeartwork/debian/tdescreensaver-trinity.install
index d65c099dc..012466480 100644
--- a/debian/wheezy/tdeartwork/debian/kscreensaver-trinity.install
+++ b/debian/wheezy/tdeartwork/debian/tdescreensaver-trinity.install
@@ -14,7 +14,7 @@ debian/tmp/opt/trinity/bin/kclock.kss
 debian/tmp/opt/trinity/bin/kswarm.kss
 debian/tmp/opt/trinity/bin/kfountain.kss
 debian/tmp/opt/trinity/bin/kgravity.kss
-debian/tmp/opt/trinity/bin/kpartsaver.kss
+debian/tmp/opt/trinity/bin/tdepartsaver.kss
 debian/tmp/opt/trinity/bin/kpendulum.kss
 debian/tmp/opt/trinity/bin/kblob.kss
 debian/tmp/opt/trinity/bin/klines.kss
@@ -39,6 +39,6 @@ debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSpace.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSwarm.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KVm.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KWave.desktop
-debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/kpartsaver.desktop
+debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/tdepartsaver.desktop
 debian/tmp/opt/trinity/share/apps/kfiresaver
-debian/tmp/opt/trinity/share/apps/kscreensaver
+debian/tmp/opt/trinity/share/apps/tdescreensaver
diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver-trinity.manpages b/debian/wheezy/tdeartwork/debian/tdescreensaver-trinity.manpages
index 839491dbc..294e72dd8 100644
--- a/debian/wheezy/tdeartwork/debian/kscreensaver-trinity.manpages
+++ b/debian/wheezy/tdeartwork/debian/tdescreensaver-trinity.manpages
@@ -8,7 +8,7 @@ debian/man/kfountain-trinity.kss.1
 debian/man/kgravity-trinity.kss.1
 debian/man/klines-trinity.kss.1
 debian/man/klorenz-trinity.kss.1
-debian/man/kpartsaver-trinity.kss.1
+debian/man/tdepartsaver-trinity.kss.1
 debian/man/kpendulum-trinity.kss.1
 debian/man/kpolygon-trinity.kss.1
 debian/man/krotation-trinity.kss.1
diff --git a/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
new file mode 100644
index 000000000..e2e812465
--- /dev/null
+++ b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
@@ -0,0 +1 @@
+tdescreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/
\ No newline at end of file
diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-trinity.install b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
index 901f852e1..901f852e1 100644
--- a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-trinity.install
+++ b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-trinity.manpages b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages
index 356af4f32..356af4f32 100644
--- a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-trinity.manpages
+++ b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages
diff --git a/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install
new file mode 100644
index 000000000..74d362927
--- /dev/null
+++ b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install
@@ -0,0 +1 @@
+tdescreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/
diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian
index c3dd2d9d5..c3dd2d9d5 100644
--- a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian
+++ b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian
diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers.README.Debian b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers.README.Debian
index 828861775..a41c9ad57 100644
--- a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers.README.Debian
+++ b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers.README.Debian
@@ -1,11 +1,11 @@
 KDE Screensavers for Debian
 ===========================
 
-This package (kscreensaver-xsavers) only contains hooks for the standard
+This package (tdescreensaver-xsavers) only contains hooks for the standard
 xscreensavers, so that they can be selected and/or configured through
 the KDE Control Centre.
 
 For the additional screensavers that are specifically shipped with KDE,
-see the separate package kscreensaver.
+see the separate package tdescreensaver.
 
  -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000
diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver.README.Debian b/debian/wheezy/tdeartwork/debian/tdescreensaver.README.Debian
index 68584d330..57a145f54 100644
--- a/debian/wheezy/tdeartwork/debian/kscreensaver.README.Debian
+++ b/debian/wheezy/tdeartwork/debian/tdescreensaver.README.Debian
@@ -1,11 +1,11 @@
 KDE Screensavers for Debian
 ===========================
 
-This package (kscreensaver) no longer contains the hooks for the standard
+This package (tdescreensaver) no longer contains the hooks for the standard
 xscreensavers.  It only contains the additional screensavers that are
 specifically shipped with KDE.
 
 To select and/or configure the standard xscreensavers through the KDE Control
-Centre, install the separate package kscreensaver-xsavers.
+Centre, install the separate package tdescreensaver-xsavers.
 
  -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000