Update Debian and Ubuntu packaging to match recent renaming

18 files changed, 36 insertions, 36 deletions

diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog b/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog
index 0a3dc07a4..6c963f3b9 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog
@@ -836,7 +836,7 @@ kubuntu-meta (1.30) feisty; urgency=low
   * Added kubuntu-konqueror-shortcuts to desktop-recommends-i386,
     desktop-recommends-amd64, desktop-recommends-powerpc, desktop-
     recommends-ia64, desktop-recommends-sparc, desktop-recommends-hppa
-  * Added kwalletmanager to desktop-recommends-i386, desktop-recommends-
+  * Added tdewalletmanager to desktop-recommends-i386, desktop-recommends-
     amd64, desktop-recommends-powerpc, desktop-recommends-ia64, desktop-
     recommends-sparc, desktop-recommends-hppa
   * Added landscape-client to desktop-recommends-i386, desktop-
@@ -889,7 +889,7 @@ kubuntu-meta (1.30) feisty; urgency=low
     powerpc, desktop-ia64, desktop-sparc, desktop-hppa
   * Removed kubuntu-konqueror-shortcuts from desktop-i386, desktop-
     amd64, desktop-powerpc, desktop-ia64, desktop-sparc, desktop-hppa
-  * Removed kwalletmanager from desktop-i386, desktop-amd64, desktop-
+  * Removed tdewalletmanager from desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc, desktop-hppa
   * Removed landscape-client from desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc, desktop-hppa
@@ -1212,7 +1212,7 @@ kubuntu-meta (1.10) edgy; urgency=low
     desktop-ia64, desktop-sparc, desktop-hppa
   * Removed kmousetool from desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc, desktop-hppa
-  * Removed kscreensaver from desktop-i386, desktop-amd64, desktop-
+  * Removed tdescreensaver from desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc, desktop-hppa
   * Removed linux-headers-686 from desktop-i386
   * Removed linux-headers-amd64-generic from desktop-amd64
@@ -2162,7 +2162,7 @@ kubuntu-meta (0.63) dapper; urgency=low
   * Added cupsys-driver-gutenprint to desktop-ia64
   * Added ttf-arphic-ukai to desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc, desktop-hppa
-  * Added kdnssd to desktop-ia64, desktop-hppa
+  * Added tdednssd to desktop-ia64, desktop-hppa
   * Added ttf-arphic-uming to desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc, desktop-hppa
   * Removed python-musicbrainz from desktop-i386, desktop-amd64,
@@ -2173,7 +2173,7 @@ kubuntu-meta (0.63) dapper; urgency=low
 kubuntu-meta (0.62) dapper; urgency=low
 
   * Refreshed dependencies
-  * Added kdnssd to desktop-i386, desktop-amd64, desktop-powerpc,
+  * Added tdednssd to desktop-i386, desktop-amd64, desktop-powerpc,
     desktop-sparc
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 13 Jan 2006 01:00:35 +0000
@@ -2285,7 +2285,7 @@ kubuntu-meta (0.56) dapper; urgency=low
   * Refreshed dependencies
   * Added knetworkconf to desktop-hppa
   * Added krita to desktop-hppa
-  * Added kwalletmanager to desktop-hppa
+  * Added tdewalletmanager to desktop-hppa
   * Added knotes to desktop-hppa
   * Added kdepim-kio-plugins to desktop-hppa
   * Added kdepim-wizards to desktop-hppa
@@ -2441,7 +2441,7 @@ kubuntu-meta (0.53) breezy; urgency=low
   * Added gstreamer0.8-musepack to desktop-hppa
   * Added gtk2-engines-gtk-qt to desktop-sparc, desktop-hppa
   * Added gstreamer0.8-theora to desktop-hppa
-  * Added kscreensaver to desktop-hppa
+  * Added tdescreensaver to desktop-hppa
   * Added kdesktop to desktop-hppa
   * Added klipper to desktop-hppa
   * Added konsole to desktop-hppa
@@ -3092,7 +3092,7 @@ kubuntu-meta (0.45) breezy; urgency=low
 kubuntu-meta (0.44) breezy; urgency=low
 
   * Refreshed dependencies
-  * Added kwalletmanager to desktop-i386, desktop-amd64, desktop-
+  * Added tdewalletmanager to desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  9 Jun 2005 23:32:00 +0000
@@ -3282,7 +3282,7 @@ kubuntu-meta (0.39) hoary; urgency=low
 kubuntu-meta (0.38) hoary; urgency=low
 
   * Refreshed dependencies
-  * Added kscreensaver to desktop-i386, desktop-amd64, desktop-powerpc,
+  * Added tdescreensaver to desktop-i386, desktop-amd64, desktop-powerpc,
     desktop-ia64, desktop-sparc
   * Removed python-glade2 from desktop-i386, desktop-amd64, desktop-
     powerpc, desktop-ia64, desktop-sparc
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
index f5f9134d4..b10c8b527 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
@@ -7,8 +7,8 @@ Build-Depends: debhelper (>= 4), germinate (>= 0.38)
 
 Package: kubuntu-desktop-trinity
 Architecture: any
-Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-kfile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-kfile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, kdnssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, x-ttcidfont-conf, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine
-Recommends: kio-apt-trinity, tde-guidance-powermanager-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, desktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepim-kio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, kio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, kscreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, kwalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus-trinity, openoffice.org-calc, openoffice.org-impress, openoffice.org-trinity, openoffice.org-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde-trinity | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity
+Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-kfile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-kfile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, x-ttcidfont-conf, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine
+Recommends: kio-apt-trinity, tde-guidance-powermanager-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, desktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepim-kio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, kio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus-trinity, openoffice.org-calc, openoffice.org-impress, openoffice.org-trinity, openoffice.org-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde-trinity | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity
 Suggests: apport-gtk, hplip-gui
 Description: Kubuntu desktop system, TDE version
  This package depends on all of the packages in the Kubuntu TDE desktop system
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop b/ubuntu/maverick/metapackages/kubuntu-meta/desktop
index bfdaff332..732491954 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop
@@ -172,7 +172,7 @@ We've chosen KDE as our desktop user interface of choice
 == kdenetwork-trinity ==
 
  * kdenetwork-filesharing-trinity
- * kdnssd-trinity
+ * tdednssd-trinity
  * (kopete-trinity)
  * (kpf-trinity)
  * (kppp-trinity)
@@ -196,7 +196,7 @@ We've chosen KDE as our desktop user interface of choice
  * ark-trinity
  * (speedcrunch-trinity)
  * (kmilo-trinity)
- * (kwalletmanager-trinity)
+ * (tdewalletmanager-trinity)
 
 == koffice-trinity ==
 
@@ -273,7 +273,7 @@ Accessibility tools:
  * (openoffice.org-draw) [i386 powerpc amd64]
  * (openoffice.org-math) [i386 powerpc amd64]
  * (openoffice.org-java-common) [i386 powerpc amd64]
- * (kscreensaver-trinity)
+ * (tdescreensaver-trinity)
 
 = Games =
 
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64
index d04f55409..b9a6a4c6e 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64
@@ -37,7 +37,7 @@ kdepasswd-trinity
 tdeprint-trinity
 kdesktop-trinity
 tdm-trinity
-kdnssd-trinity
+tdednssd-trinity
 kghostview-trinity
 khelpcenter-trinity
 kicker-trinity
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa
index aa6d84396..4e0775054 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa
@@ -34,7 +34,7 @@ kdepasswd
 kdeprint
 kdesktop
 kdm
-kdnssd
+tdednssd
 kghostview
 khelpcenter
 kicker
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386
index 9873a7dba..2c8b6b5f3 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386
@@ -38,7 +38,7 @@ kdepasswd-trinity
 tdeprint-trinity
 kdesktop-trinity
 tdm-trinity
-kdnssd-trinity
+tdednssd-trinity
 kghostview-trinity
 khelpcenter-trinity
 kicker-trinity
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64
index c28064c75..b8458e4b6 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64
@@ -37,7 +37,7 @@ kdepasswd
 kdeprint
 kdesktop
 kdm
-kdnssd
+tdednssd
 kghostview
 khelpcenter
 kicker
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia
index a1666b456..0b09fc611 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia
@@ -37,7 +37,7 @@ kdepasswd-trinity
 tdeprint-trinity
 kdesktop-trinity
 tdm-trinity
-kdnssd-trinity
+tdednssd-trinity
 kghostview-trinity
 khelpcenter-trinity
 kicker-trinity
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc
index 4f36cc499..cbaae6a43 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc
@@ -34,7 +34,7 @@ kdepasswd
 kdeprint
 kdesktop
 kdm
-kdnssd
+tdednssd
 kghostview
 khelpcenter
 kicker
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-amd64 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-amd64
index f39f1dabd..6c811d42d 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-amd64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-amd64
@@ -63,14 +63,14 @@ kpf-trinity
 kppp-trinity
 krdc-trinity
 krfb-trinity
-kscreensaver-trinity
+tdescreensaver-trinity
 ksysguard-trinity
 ktorrent-trinity
 kubuntu-default-settings-trinity
 kubuntu-trinity-docs
 kubuntu-konqueror-shortcuts-trinity
 kvkbd-trinity
-kwalletmanager-trinity
+tdewalletmanager-trinity
 landscape-client
 laptop-detect
 libgl1-mesa-dri
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-hppa b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-hppa
index 5a4bea656..a3e27e409 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-hppa
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-hppa
@@ -62,14 +62,14 @@ kpf
 kppp
 krdc
 krfb
-kscreensaver
+tdescreensaver
 ksysguard
 ktorrent
 kubuntu-default-settings
 kubuntu-docs
 kubuntu-konqueror-shortcuts
 kvkbd
-kwalletmanager
+tdewalletmanager
 landscape-client
 laptop-detect
 libgl1-mesa-dri
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-i386 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-i386
index bb1c0df3f..9e1c7797d 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-i386
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-i386
@@ -64,14 +64,14 @@ kpf-trinity
 kppp-trinity
 krdc-trinity
 krfb-trinity
-kscreensaver-trinity
+tdescreensaver-trinity
 ksysguard-trinity
 ktorrent-trinity
 kubuntu-default-settings-trinity
 kubuntu-trinity-docs
 kubuntu-konqueror-shortcuts-trinity
 kvkbd-trinity
-kwalletmanager-trinity
+tdewalletmanager-trinity
 landscape-client
 laptop-detect
 libgl1-mesa-dri
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-ia64 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-ia64
index dda138ee3..7d6e29a60 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-ia64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-ia64
@@ -62,14 +62,14 @@ kpf
 kppp
 krdc
 krfb
-kscreensaver
+tdescreensaver
 ksysguard
 ktorrent
 kubuntu-default-settings
 kubuntu-docs
 kubuntu-konqueror-shortcuts
 kvkbd
-kwalletmanager
+tdewalletmanager
 landscape-client
 laptop-detect
 libgl1-mesa-dri
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-lpia b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-lpia
index e0de83e1b..07a6d8a79 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-lpia
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-lpia
@@ -64,14 +64,14 @@ kpf-trinity
 kppp-trinity
 krdc-trinity
 krfb-trinity
-kscreensaver-trinity
+tdescreensaver-trinity
 ksysguard-trinity
 ktorrent-trinity
 kubuntu-default-settings-trinity
 kubuntu-trinity-docs
 kubuntu-konqueror-shortcuts-trinity
 kvkbd-trinity
-kwalletmanager-trinity
+tdewalletmanager-trinity
 landscape-client
 laptop-detect
 libgl1-mesa-dri
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-powerpc b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-powerpc
index caf564463..14de9515e 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-powerpc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-powerpc
@@ -62,14 +62,14 @@ kpf
 kppp
 krdc
 krfb
-kscreensaver
+tdescreensaver
 ksysguard
 ktorrent
 kubuntu-default-settings
 kubuntu-docs
 kubuntu-konqueror-shortcuts
 kvkbd
-kwalletmanager
+tdewalletmanager
 landscape-client
 laptop-detect
 libgl1-mesa-dri
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-sparc b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-sparc
index 0aa3a1fb1..6d67f9eac 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-sparc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-sparc
@@ -62,14 +62,14 @@ kpf
 kppp
 krdc
 krfb
-kscreensaver
+tdescreensaver
 ksysguard
 ktorrent
 kubuntu-default-settings
 kubuntu-docs
 kubuntu-konqueror-shortcuts
 kvkbd
-kwalletmanager
+tdewalletmanager
 landscape-client
 laptop-detect
 libgl1-mesa-dri
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc
index aa6d84396..4e0775054 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc
@@ -34,7 +34,7 @@ kdepasswd
 kdeprint
 kdesktop
 kdm
-kdnssd
+tdednssd
 kghostview
 khelpcenter
 kicker
diff --git a/ubuntu/maverick/metapackages/trinity-livecd/debian/control b/ubuntu/maverick/metapackages/trinity-livecd/debian/control
index 318c6ee15..2805f756f 100644
--- a/ubuntu/maverick/metapackages/trinity-livecd/debian/control
+++ b/ubuntu/maverick/metapackages/trinity-livecd/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5)
 
 Package: trinity-livecd
 Architecture: all
-Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-kfile-plugins-trinity, tdeadmin-kfile-plugins-trinity, tdegames-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdenetwork-kfile-plugins-trinity, tdepim-kfile-plugins-trinity, tdesdk-kfile-plugins-trinity, kdessh-trinity, tdesudo-trinity, kdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, kscreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, kwalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring
+Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-kfile-plugins-trinity, tdeadmin-kfile-plugins-trinity, tdegames-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdenetwork-kfile-plugins-trinity, tdepim-kfile-plugins-trinity, tdesdk-kfile-plugins-trinity, kdessh-trinity, tdesudo-trinity, kdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring
 Recommends:
  kpresenter-trinity, kspread-trinity, kword-trinity,
  tde-i18n-cs-trinity, tde-i18n-de-trinity, tde-i18n-es-trinity, tde-i18n-fr-trinity, tde-i18n-it-trinity, tde-i18n-ru-trinity,