merge

12 files changed, 129 insertions, 129 deletions

diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
index 988561335..f28c22b74 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
@@ -11,7 +11,7 @@ Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity,
 Recommends: tdeio-apt-trinity, tdepowersave-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, printer-driver-foo2zjs | foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gtk3-tqt-engine-trinity, 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-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-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, printer-driver-min12xxw | min12xxw, networkstatus-trinity, libreoffice-calc | openoffice.org-calc, libreoffice-impress | openoffice.org-impress, libreoffice-trinity | openoffice.org-trinity, libreoffice-writer | openoffice.org-writer, pinentry-qt, powernowd, printer-driver-pxljr | pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity, printer-driver-c2esp, printer-driver-ptouch, printer-driver-sag-gdi, printer-driver-splix
 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
+ This package depends on all of the packages in the Kubuntu Trinity desktop system
  .
  It is safe to remove this package if some of the desktop system packages are
  not desired.
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop
index 851e3545a..5fed3b250 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop
@@ -120,18 +120,18 @@ Input methods:
  * (scim-qtimm)
 # * (scim-tables-additional) [i386] # input support for language packs that we ship
 
-= Desktop KDE Apps =
+= Desktop TDE Apps =
 
-We've chosen KDE as our desktop user interface of choice
+We've chosen TDE as our desktop user interface of choice
 
  * arts-trinity
 
-== kdebase-trinity ==
+== tdebase-trinity ==
 
  * (kate-trinity)
  * kcontrol-trinity
- * kdepasswd-trinity
- * kdeprint-trinity
+ * tdepasswd-trinity
+ * tdeprint-trinity
  * kdesktop-trinity
  * (kfind-trinity)
  * khelpcenter-trinity
@@ -147,43 +147,43 @@ We've chosen KDE as our desktop user interface of choice
  * kwin-trinity
  * kdm-trinity 			# we want trinity as loginmanager
 
-== kdeadmin-trinity ==
+== tdeadmin-trinity ==
 
  * kcron-trinity
- * kdeadmin-kfile-plugins-trinity
+ * tdeadmin-tdefile-plugins-trinity
  * knetworkconf-trinity
 
-== kdegraphics-trinity ==
+== tdegraphics-trinity ==
 
  * (gwenview-trinity)
  * (kipi-plugins-trinity) [i386 amd64]		# set of plugins for digikam and gwenview
  * (kamera-trinity)
- * kdegraphics-kfile-plugins-trinity
+ * tdegraphics-tdefile-plugins-trinity
  * (kooka-trinity)
  * kpdf-trinity
  * ksnapshot-trinity
  * ksvg-trinity
  * kghostview-trinity 		# For print preview
 
-== kdemultimedia-trinity ==
+== tdemultimedia-trinity ==
 
  * libarts1-akode-trinity
- * kdemultimedia-kfile-plugins-trinity
- * kdemultimedia-kio-plugins-trinity
+ * tdemultimedia-tdefile-plugins-trinity
+ * tdemultimedia-tdeio-plugins-trinity
  * kmix-trinity
 
-== kdenetwork-trinity ==
+== tdenetwork-trinity ==
 
- * kdenetwork-filesharing-trinity
+ * tdenetwork-filesharing-trinity
  * tdednssd-trinity
  * (kopete-trinity)
  * (kpf-trinity)
  * (kppp-trinity)
  * (krdc-trinity)
  * (krfb-trinity)
- * kdenetwork-kfile-plugins-trinity
+ * tdenetwork-tdefile-plugins-trinity
 
-== kdepim-trinity ==
+== tdepim-trinity ==
 
  * (kontact-trinity)
  * (kmail-trinity)
@@ -192,9 +192,9 @@ We've chosen KDE as our desktop user interface of choice
  * (kaddressbook-trinity)
  * (knotes-trinity)
  * (karm-trinity)
- * (kdepim-wizards-trinity)
+ * (tdepim-wizards-trinity)
 
-== kdeutils-trinity ==
+== tdeutils-trinity ==
 
  * ark-trinity
  * (speedcrunch-trinity)
@@ -206,30 +206,30 @@ We've chosen KDE as our desktop user interface of choice
 # * (krita-trinity)
 # * (kexi-trinity)                 # instead of libreoffice-base|openoffice.org-base
 
-== everything else KDE ==
+== everything else TDE ==
 
- * (k3b-trinity)			# kde CD burning
- * (konversation-trinity)		# kde irc-client
+ * (k3b-trinity)			# tde CD burning
+ * (konversation-trinity)		# tde irc-client
  * vorbis-tools	         # for kaudiocreator
  * (amarok-trinity) 		# audio multimediaplayer
  * (kaffeine-xine-trinity)	# video multimediaplayer
- * (keep-trinity) 		# kde backuptool
+ * (keep-trinity) 		# tde backuptool
  * (adept-trinity)		# better package manager
  * konq-plugins-trinity
- * kde-systemsettings-trinity   # kcontrol replacement
+ * tde-systemsettings-trinity   # kcontrol replacement
  * dbus 		# for session dbus, #895.  Previously dbus-1-utils which brought in gtk, dbus-launch moved to dbus
  * (kubuntu-default-settings-trinity)
  * tdeio-locate-trinity           # file searching
  * (katapult-trinity)             # program launcher
  * (kubuntu-konqueror-shortcuts-trinity)
  * qca-tls		# used by Kopete Jabber plugin
- * (kdebluetooth-trinity)
+ * (tdebluetooth-trinity)
  * ksystemlog-trinity
- * (kdepim-kio-plugins-trinity)   # Make sure we have both of these for KMail
- * kdebase-kio-plugins-trinity
+ * (tdepim-tdeio-plugins-trinity)   # Make sure we have both of these for KMail
+ * tdebase-tdeio-plugins-trinity
  * (gtk-qt-engine-trinity)
- * kde-guidance-trinity		# configuration tools
- * (kde-guidance-powermanager-trinity)
+ * tde-guidance-trinity		# configuration tools
+ * (tde-guidance-powermanager-trinity)
  * tdeio-apt-trinity
  * ksplash-engine-moodin-trinity
  * (ktorrent-trinity)
@@ -237,18 +237,18 @@ We've chosen KDE as our desktop user interface of choice
  * language-selector-qt
  * (kmailcvt-trinity)
  * (bogofilter)           # spam filter for KMail
- * hwdb-client-kde
+ * hwdb-client-tde
  * libqt-perl           # for debconf
  * (digikam-trinity) [i386 amd64]
- * kde-style-polyester
+ * tde-style-polyester
  * (networkstatus-trinity)
- * software-properties-kde
+ * software-properties-tde
  * (apport-qt)
  * (strigi-trinity)
  * (strigi-applet-trinity)
  * (pinentry-qt) # for SMIME e-mail support
  * (gpg-agent) # for SMIME e-mail support
- * (gdebi-kde-trinity)
+ * (gdebi-tde-trinity)
 
 Don't use gstreamer for dapper, 0.8 is unsupported upstream and amarok/kaffeine are not yet ported to 0.10
 #The gstreamer0.10 packages we want to install:
@@ -260,7 +260,7 @@ Don't use gstreamer for dapper, 0.8 is unsupported upstream and amarok/kaffeine
 Accessibility tools:
 
  * (kmag-trinity-trinity)
- * (kde-icons-mono-trinity)
+ * (tde-icons-mono-trinity)
  * (kbstate-trinity)
  * (kmousetool-trinity)
  * (xcursor-themes-trinity)
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64
index 1d34836e0..31cce55f7 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64
@@ -32,7 +32,7 @@ tdemultimedia-tdefile-plugins-trinity
 tdemultimedia-tdeio-plugins-trinity
 tdenetwork-filesharing-trinity
 tdenetwork-tdefile-plugins-trinity
-kdepasswd-trinity
+tdepasswd-trinity
 tdeprint-trinity
 kdesktop-trinity
 tdm-trinity
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa
index edea66233..7c628303e 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa
@@ -19,18 +19,18 @@ genisoimage
 ghostscript-x
 kcontrol
 kcron
-kde-guidance
-kde-style-qtcurve
-kde-systemsettings
-kdeadmin-kfile-plugins
-kdebase-kio-plugins
-kdegraphics-kfile-plugins
-kdemultimedia-kfile-plugins
-kdemultimedia-kio-plugins
-kdenetwork-filesharing
-kdenetwork-kfile-plugins
-kdepasswd
-kdeprint
+tde-guidance
+tde-style-qtcurve
+tde-systemsettings
+tdeadmin-tdefile-plugins
+tdebase-tdeio-plugins
+tdegraphics-tdefile-plugins
+tdemultimedia-tdefile-plugins
+tdemultimedia-tdeio-plugins
+tdenetwork-filesharing
+tdenetwork-tdefile-plugins
+tdepasswd
+tdeprint
 kdesktop
 kdm
 tdednssd
@@ -66,7 +66,7 @@ qca-tls
 readahead
 screen
 smbclient
-software-properties-kde
+software-properties-tde
 ttf-bitstream-vera
 ttf-dejavu-core
 ttf-freefont
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386
index 4ca42d5a7..79359f7ac 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386
@@ -33,7 +33,7 @@ tdemultimedia-tdefile-plugins-trinity
 tdemultimedia-tdeio-plugins-trinity
 tdenetwork-filesharing-trinity
 tdenetwork-tdefile-plugins-trinity
-kdepasswd-trinity
+tdepasswd-trinity
 tdeprint-trinity
 kdesktop-trinity
 tdm-trinity
@@ -70,7 +70,7 @@ qca-tls
 readahead
 screen
 smbclient
-software-properties-kde
+software-properties-tde
 ttf-bitstream-vera
 ttf-dejavu-core
 ttf-freefont
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64
index a1cd10879..ad9e8ebf4 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64
@@ -22,18 +22,18 @@ genisoimage
 ghostscript-x
 kcontrol
 kcron
-kde-guidance
-kde-style-qtcurve
-kde-systemsettings
-kdeadmin-kfile-plugins
-kdebase-kio-plugins
-kdegraphics-kfile-plugins
-kdemultimedia-kfile-plugins
-kdemultimedia-kio-plugins
-kdenetwork-filesharing
-kdenetwork-kfile-plugins
-kdepasswd
-kdeprint
+tde-guidance
+tde-style-qtcurve
+tde-systemsettings
+tdeadmin-tdefile-plugins
+tdebase-tdeio-plugins
+tdegraphics-tdefile-plugins
+tdemultimedia-tdefile-plugins
+tdemultimedia-tdeio-plugins
+tdenetwork-filesharing
+tdenetwork-tdefile-plugins
+tdepasswd
+tdeprint
 kdesktop
 kdm
 tdednssd
@@ -70,7 +70,7 @@ qca-tls
 readahead
 screen
 smbclient
-software-properties-kde
+software-properties-tde
 ttf-bitstream-vera
 ttf-dejavu-core
 ttf-freefont
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc
index 52678746d..b32483ef9 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc
@@ -19,18 +19,18 @@ genisoimage
 ghostscript-x
 kcontrol
 kcron
-kde-guidance
-kde-style-qtcurve
-kde-systemsettings
-kdeadmin-kfile-plugins
-kdebase-kio-plugins
-kdegraphics-kfile-plugins
-kdemultimedia-kfile-plugins
-kdemultimedia-kio-plugins
-kdenetwork-filesharing
-kdenetwork-kfile-plugins
-kdepasswd
-kdeprint
+tde-guidance
+tde-style-qtcurve
+tde-systemsettings
+tdeadmin-tdefile-plugins
+tdebase-tdeio-plugins
+tdegraphics-tdefile-plugins
+tdemultimedia-tdefile-plugins
+tdemultimedia-tdeio-plugins
+tdenetwork-filesharing
+tdenetwork-tdefile-plugins
+tdepasswd
+tdeprint
 kdesktop
 kdm
 tdednssd
@@ -68,7 +68,7 @@ qca-tls
 readahead
 screen
 smbclient
-software-properties-kde
+software-properties-tde
 ttf-bitstream-vera
 ttf-dejavu-core
 ttf-freefont
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa
index 689d7878e..54b7fdab1 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa
@@ -10,7 +10,7 @@ brltty
 cdparanoia
 cdrdao
 cups-pdf
-desktop-effects-kde
+desktop-effects-tde
 dmz-cursor-theme
 dolphin
 dvd+rw-tools
@@ -18,14 +18,14 @@ foomatic-db-gutenprint
 foomatic-db-hpijs
 fortune-mod
 gcc
-gdebi-kde
+gdebi-tde
 gtk-qt-engine
 gwenview
 hpijs-ppds
 hplip
 hplip-gui
 ijsgutenprint
-jockey-kde
+jockey-tde
 k3b
 kaddressbook
 kaffeine
@@ -34,11 +34,11 @@ karm
 katapult
 kate
 kbstate
-kde-guidance-powermanager
-kdebluetooth
-kdepim-kio-plugins
-kdepim-wizards
-kdesudo
+tde-guidance-powermanager
+tdebluetooth
+tdepim-tdeio-plugins
+tdepim-wizards
+tdesudo
 keep
 kfind
 kio-umountwrapper
@@ -76,7 +76,7 @@ libnss-mdns
 linux-headers-hppa32
 linux-headers-hppa64
 make
-network-manager-kde
+network-manager-tde
 networkstatus
 pinentry-qt
 powernowd
@@ -96,7 +96,7 @@ speedcrunch
 splix
 strigi-applet
 strigi-daemon
-system-config-printer-kde
+system-config-printer-tde
 ttf-arabeyes
 ttf-arphic-ukai
 ttf-arphic-uming
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64
index 198ea3d95..9bc7890f5 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64
@@ -10,7 +10,7 @@ brltty
 cdparanoia
 cdrdao
 cups-pdf
-desktop-effects-kde
+desktop-effects-tde
 dmz-cursor-theme
 dolphin
 dvd+rw-tools
@@ -18,14 +18,14 @@ foomatic-db-gutenprint
 foomatic-db-hpijs
 fortune-mod
 gcc
-gdebi-kde
+gdebi-tde
 gtk-qt-engine
 gwenview
 hpijs-ppds
 hplip
 hplip-gui
 ijsgutenprint
-jockey-kde
+jockey-tde
 k3b
 kaddressbook
 kaffeine
@@ -34,11 +34,11 @@ karm
 katapult
 kate
 kbstate
-kde-guidance-powermanager
-kdebluetooth
-kdepim-kio-plugins
-kdepim-wizards
-kdesudo
+tde-guidance-powermanager
+tdebluetooth
+tdepim-tdeio-plugins
+tdepim-wizards
+tdesudo
 keep
 kfind
 kio-umountwrapper
@@ -76,7 +76,7 @@ libnss-mdns
 linux-headers-itanium
 linux-headers-mckinley
 make
-network-manager-kde
+network-manager-tde
 networkstatus
 pinentry-qt
 powernowd
@@ -96,7 +96,7 @@ speedcrunch
 splix
 strigi-applet
 strigi-daemon
-system-config-printer-kde
+system-config-printer-tde
 ttf-arabeyes
 ttf-arphic-ukai
 ttf-arphic-uming
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc
index 66ae309a4..5c4c6f360 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc
@@ -10,7 +10,7 @@ brltty
 cdparanoia
 cdrdao
 cups-pdf
-desktop-effects-kde
+desktop-effects-tde
 dmz-cursor-theme
 dolphin
 dvd+rw-tools
@@ -18,14 +18,14 @@ foomatic-db-gutenprint
 foomatic-db-hpijs
 fortune-mod
 gcc
-gdebi-kde
+gdebi-tde
 gtk-qt-engine
 gwenview
 hpijs-ppds
 hplip
 hplip-gui
 ijsgutenprint
-jockey-kde
+jockey-tde
 k3b
 kaddressbook
 kaffeine
@@ -34,11 +34,11 @@ karm
 katapult
 kate
 kbstate
-kde-guidance-powermanager
-kdebluetooth
-kdepim-kio-plugins
-kdepim-wizards
-kdesudo
+tde-guidance-powermanager
+tdebluetooth
+tdepim-tdeio-plugins
+tdepim-wizards
+tdesudo
 keep
 kfind
 kio-umountwrapper
@@ -76,7 +76,7 @@ libnss-mdns
 linux-headers-powerpc
 linux-headers-powerpc64-smp
 make
-network-manager-kde
+network-manager-tde
 networkstatus
 pinentry-qt
 powernowd
@@ -96,7 +96,7 @@ speedcrunch
 splix
 strigi-applet
 strigi-daemon
-system-config-printer-kde
+system-config-printer-tde
 ttf-arabeyes
 ttf-arphic-ukai
 ttf-arphic-uming
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc
index fbbf95f9f..bd2aad332 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc
@@ -10,7 +10,7 @@ brltty
 cdparanoia
 cdrdao
 cups-pdf
-desktop-effects-kde
+desktop-effects-tde
 dmz-cursor-theme
 dolphin
 dvd+rw-tools
@@ -18,14 +18,14 @@ foomatic-db-gutenprint
 foomatic-db-hpijs
 fortune-mod
 gcc
-gdebi-kde
+gdebi-tde
 gtk-qt-engine
 gwenview
 hpijs-ppds
 hplip
 hplip-gui
 ijsgutenprint
-jockey-kde
+jockey-tde
 k3b
 kaddressbook
 kaffeine
@@ -34,11 +34,11 @@ karm
 katapult
 kate
 kbstate
-kde-guidance-powermanager
-kdebluetooth
-kdepim-kio-plugins
-kdepim-wizards
-kdesudo
+tde-guidance-powermanager
+tdebluetooth
+tdepim-tdeio-plugins
+tdepim-wizards
+tdesudo
 keep
 kfind
 kio-umountwrapper
@@ -75,7 +75,7 @@ libgl1-mesa-dri
 libnss-mdns
 linux-headers-sparc64
 make
-network-manager-kde
+network-manager-tde
 networkstatus
 pinentry-qt
 powernowd
@@ -95,7 +95,7 @@ speedcrunch
 splix
 strigi-applet
 strigi-daemon
-system-config-printer-kde
+system-config-printer-tde
 ttf-arabeyes
 ttf-arphic-ukai
 ttf-arphic-uming
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc
index edea66233..7c628303e 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc
@@ -19,18 +19,18 @@ genisoimage
 ghostscript-x
 kcontrol
 kcron
-kde-guidance
-kde-style-qtcurve
-kde-systemsettings
-kdeadmin-kfile-plugins
-kdebase-kio-plugins
-kdegraphics-kfile-plugins
-kdemultimedia-kfile-plugins
-kdemultimedia-kio-plugins
-kdenetwork-filesharing
-kdenetwork-kfile-plugins
-kdepasswd
-kdeprint
+tde-guidance
+tde-style-qtcurve
+tde-systemsettings
+tdeadmin-tdefile-plugins
+tdebase-tdeio-plugins
+tdegraphics-tdefile-plugins
+tdemultimedia-tdefile-plugins
+tdemultimedia-tdeio-plugins
+tdenetwork-filesharing
+tdenetwork-tdefile-plugins
+tdepasswd
+tdeprint
 kdesktop
 kdm
 tdednssd
@@ -66,7 +66,7 @@ qca-tls
 readahead
 screen
 smbclient
-software-properties-kde
+software-properties-tde
 ttf-bitstream-vera
 ttf-dejavu-core
 ttf-freefont