Fix architecture specific dependencies of kubuntu-meta on Ubuntu

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit cd601107f0ae1365a715d9aa6aaddc75bd3df127)

20 files changed, 142 insertions, 1132 deletions

diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
index 77ff6292d..5fc367b3f 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
@@ -3,13 +3,13 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 4), germinate (>= 0.38)
+Build-Depends: debhelper (>= 4)
 
 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, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-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, printer-driver-pnm2ppa | pnm2ppa, powermanagement-interface, readahead, screen, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine, synaptic-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
+Depends: ${desktop-all:Depends}, ${desktop-arch:Depends}
+Recommends: ${desktop-all:Recommends}, ${desktop-arch:Recommends}
+Suggests: ${desktop-all:Suggests}, ${desktop-arch:Suggests}
 Description: Kubuntu desktop system, TDE version
  This package depends on all of the packages in the Kubuntu Trinity desktop system
  .
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/README b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/README
index 357d51105..8b1378917 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/README
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/README
@@ -1,8 +1 @@
-Run the "update" script to automatically generate new dependency
-lists.  The result will be based on the published seed lists, filtered
-by:
 
-- The Packages files (nonexistent packages will be skipped)
-
-- debootstrap (packages not yet added to debootstrap will not be added
-  to ubuntu-base)
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/debootstrap-version b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/debootstrap-version
deleted file mode 100644
index b0f3d96f8..000000000
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/debootstrap-version
+++ /dev/null
@@ -1 +0,0 @@
-1.0.8
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-all b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-all
new file mode 100644
index 000000000..890340cab
--- /dev/null
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-all
@@ -0,0 +1,80 @@
+acpid
+acpi-support
+alsa-base
+alsa-utils
+anacron
+ark-trinity
+arts-trinity
+avahi-daemon
+bc
+ca-certificates
+cups
+cups-bsd
+cups-client
+cups-driver-gutenprint
+dbus
+dc
+fonts-dejavu-core | ttf-dejavu-core
+fonts-freefont-ttf | ttf-freefont
+foomatic-db
+foomatic-db-engine
+foomatic-filters
+genisoimage
+ghostscript-x
+gtk-qt-engine-trinity
+kcontrol-trinity
+kcron-trinity
+kdbusnotification-trinity
+kdesktop-trinity
+kghostview-trinity
+khelpcenter-trinity
+kicker-trinity
+kmenuedit-trinity
+kmix-trinity
+knetworkconf-trinity
+konq-plugins-trinity
+konsole-trinity
+kpdf-trinity
+ksmserver-trinity
+ksnapshot-trinity
+ksplash-engine-moodin-trinity
+ksvg-trinity
+ksystemlog-trinity
+lftp
+libarts1-akode-trinity
+libgl1-mesa-glx
+libglut3 | freeglut3
+libsasl2-modules
+libtqt-perl
+libxp6
+openprinting-ppds
+powermanagement-interface
+printer-driver-pnm2ppa | pnm2ppa
+qt4-tqt-theme-engine
+readahead
+screen
+sudo-trinity
+synaptic-trinity
+tdeadmin-tdefile-plugins-trinity
+tdebase-tdeio-plugins-trinity
+tdednssd-trinity
+tdegraphics-tdefile-plugins-trinity
+tdeio-locate-trinity
+tdemultimedia-tdefile-plugins-trinity
+tdemultimedia-tdeio-plugins-trinity
+tdenetwork-filesharing-trinity
+tdenetwork-tdefile-plugins-trinity
+tdepasswd-trinity
+tdeprint-trinity
+tde-style-qtcurve-trinity
+tde-systemsettings-trinity
+tdm-trinity
+tqca-tls
+twin-style-crystal-trinity
+twin-trinity
+unzip
+vorbis-tools
+xdg-user-dirs
+xkb-data
+xorg
+zip
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64
index 31cce55f7..bf543b510 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64
@@ -1,82 +1 @@
 acpi
-acpi-support
-acpid
-alsa-base
-alsa-utils
-anacron
-ark
-arts-trinity
-avahi-daemon
-bc
-ca-certificates
-cupsys
-cupsys-bsd
-cupsys-client
-cupsys-driver-gutenprint
-dbus
-dc
-foomatic-db
-foomatic-db-engine
-foomatic-filters
-genisoimage
-ghostscript-x
-hotkey-setup
-kcontrol-trinity
-kcron-trinity
-tde-guidance-trinity
-tde-style-qtcurve-trinity
-tdeadmin-tdefile-plugins-trinity
-tdebase-tdeio-plugins-trinity
-tdegraphics-tdefile-plugins-trinity
-tdemultimedia-tdefile-plugins-trinity
-tdemultimedia-tdeio-plugins-trinity
-tdenetwork-filesharing-trinity
-tdenetwork-tdefile-plugins-trinity
-tdepasswd-trinity
-tdeprint-trinity
-kdesktop-trinity
-tdm-trinity
-tdednssd-trinity
-kghostview-trinity
-khelpcenter-trinity
-kicker-trinity
-tdeio-locate-trinity
-kmenuedit-trinity
-kmix-trinity
-knetworkconf-trinity
-konq-plugins-trinity
-konsole-trinity
-kpdf-trinity
-ksmserver-trinity
-ksnapshot-trinity
-ksvg-trinity
-ksystemlog-trinity
-kubuntu-artwork-usplash
-twin-trinity
-twin-style-crystal-trinity
-language-selector-qt
-lftp
-libarts1-akode-trinity
-libgl1-mesa-glx
-libglut3
-libqt-perl
-libsasl2-modules
-libxp6
-openprinting-ppds
-powermanagement-interface
-printer-driver-pnm2ppa|pnm2ppa
-qca-tls
-readahead
-screen
-smbclient
-software-properties-tde
-ttf-bitstream-vera
-ttf-dejavu-core
-ttf-freefont
-unzip
-usplash
-vorbis-tools
-xdg-user-dirs
-xkb-data
-xorg
-zip
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa
deleted file mode 100644
index 7c628303e..000000000
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa
+++ /dev/null
@@ -1,79 +0,0 @@
-alsa-base
-alsa-utils
-anacron
-ark
-arts
-avahi-daemon
-bc
-ca-certificates
-cupsys
-cupsys-bsd
-cupsys-client
-cupsys-driver-gutenprint
-dbus
-dc
-foomatic-db
-foomatic-db-engine
-foomatic-filters
-genisoimage
-ghostscript-x
-kcontrol
-kcron
-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
-kghostview
-khelpcenter
-kicker
-kio-apt
-kio-locate
-kmenuedit
-kmix
-knetworkconf
-konq-plugins
-konsole
-kpdf
-ksmserver
-ksnapshot
-ksvg
-ksystemlog
-kubuntu-artwork-usplash
-kwin
-kwin-style-crystal
-language-selector-qt
-lftp
-libarts1-akode
-libgl1-mesa-glx
-libglut3
-libqt-perl
-libsasl2-modules
-libxp6
-openprinting-ppds
-printer-driver-pnm2ppa|pnm2ppa
-qca-tls
-readahead
-screen
-smbclient
-software-properties-tde
-ttf-bitstream-vera
-ttf-dejavu-core
-ttf-freefont
-unzip
-usplash
-vorbis-tools
-xdg-user-dirs
-xkb-data
-xorg
-zip
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386
index 79359f7ac..bf543b510 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386
@@ -1,83 +1 @@
 acpi
-acpi-support
-acpid
-alsa-base
-alsa-utils
-anacron
-apmd
-ark
-arts-trinity
-avahi-daemon
-bc
-ca-certificates
-cupsys
-cupsys-bsd
-cupsys-client
-cupsys-driver-gutenprint
-dbus
-dc
-foomatic-db
-foomatic-db-engine
-foomatic-filters
-genisoimage
-ghostscript-x
-hotkey-setup
-kcontrol-trinity
-kcron-trinity
-tde-guidance-trinity
-tde-style-qtcurve-trinity
-tdeadmin-tdefile-plugins-trinity
-tdebase-tdeio-plugins-trinity
-tdegraphics-tdefile-plugins-trinity
-tdemultimedia-tdefile-plugins-trinity
-tdemultimedia-tdeio-plugins-trinity
-tdenetwork-filesharing-trinity
-tdenetwork-tdefile-plugins-trinity
-tdepasswd-trinity
-tdeprint-trinity
-kdesktop-trinity
-tdm-trinity
-tdednssd-trinity
-kghostview-trinity
-khelpcenter-trinity
-kicker-trinity
-tdeio-locate-trinity
-kmenuedit-trinity
-kmix-trinity
-knetworkconf-trinity
-konq-plugins-trinity
-konsole-trinity
-kpdf-trinity
-ksmserver-trinity
-ksnapshot-trinity
-ksvg-trinity
-ksystemlog-trinity
-kubuntu-artwork-usplash
-twin-trinity
-twin-style-crystal-trinity
-language-selector-qt
-lftp
-libarts1-akode-trinity
-libgl1-mesa-glx
-libglut3
-libqt-perl
-libsasl2-modules
-libxp6
-openprinting-ppds
-powermanagement-interface
-printer-driver-pnm2ppa|pnm2ppa
-qca-tls
-readahead
-screen
-smbclient
-software-properties-tde
-ttf-bitstream-vera
-ttf-dejavu-core
-ttf-freefont
-unzip
-usplash
-vorbis-tools
-xdg-user-dirs
-xkb-data
-xorg
-zip
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64
index ad9e8ebf4..bf543b510 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64
@@ -1,83 +1 @@
 acpi
-acpi-support
-acpid
-alsa-base
-alsa-utils
-anacron
-ark
-arts
-avahi-daemon
-bc
-ca-certificates
-cupsys
-cupsys-bsd
-cupsys-client
-cupsys-driver-gutenprint
-dbus
-dc
-foomatic-db
-foomatic-db-engine
-foomatic-filters
-genisoimage
-ghostscript-x
-kcontrol
-kcron
-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
-kghostview
-khelpcenter
-kicker
-kio-apt
-kio-locate
-kmenuedit
-kmix
-knetworkconf
-konq-plugins
-konsole
-kpdf
-ksmserver
-ksnapshot
-ksvg
-ksystemlog
-kubuntu-artwork-usplash
-kwin
-kwin-style-crystal
-language-selector-qt
-lftp
-libarts1-akode
-libgl1-mesa-glx
-libglut3
-libqt-perl
-libsasl2-modules
-libxp6
-openprinting-ppds
-powermanagement-interface
-printer-driver-pnm2ppa|pnm2ppa
-qca-tls
-readahead
-screen
-smbclient
-software-properties-tde
-ttf-bitstream-vera
-ttf-dejavu-core
-ttf-freefont
-unzip
-usplash
-vorbis-tools
-xdg-user-dirs
-xkb-data
-xorg
-zip
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc
index b32483ef9..1f41663e7 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc
@@ -1,81 +1 @@
-alsa-base
-alsa-utils
-anacron
-ark
-arts
-avahi-daemon
-bc
-ca-certificates
-cupsys
-cupsys-bsd
-cupsys-client
-cupsys-driver-gutenprint
-dbus
-dc
-foomatic-db
-foomatic-db-engine
-foomatic-filters
-genisoimage
-ghostscript-x
-kcontrol
-kcron
-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
-kghostview
-khelpcenter
-kicker
-kio-apt
-kio-locate
-kmenuedit
-kmix
-knetworkconf
-konq-plugins
-konsole
-kpdf
-ksmserver
-ksnapshot
-ksvg
-ksystemlog
-kubuntu-artwork-usplash
-kwin
-kwin-style-crystal
-language-selector-qt
-lftp
-libarts1-akode
-libgl1-mesa-glx
-libglut3
-libqt-perl
-libsasl2-modules
-libxp6
-openprinting-ppds
 pbbuttonsd
-powermanagement-interface
-printer-driver-pnm2ppa|pnm2ppa
-qca-tls
-readahead
-screen
-smbclient
-software-properties-tde
-ttf-bitstream-vera
-ttf-dejavu-core
-ttf-freefont
-unzip
-usplash
-vorbis-tools
-xdg-user-dirs
-xkb-data
-xorg
-zip
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all
index 15265d387..11e3f150e 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all
@@ -1,10 +1,9 @@
 adept-trinity
 akregator-trinity
 amarok-trinity
-apport-qt
 avahi-autoipd
+bluetooth | bluez-utils
 bluez-cups
-bluez-utils
 bogofilter
 brltty
 cdparanoia
@@ -14,16 +13,19 @@ desktop-effects-tde-trinity
 digikam-trinity
 dmz-cursor-theme
 dvd+rw-tools
+fonts-arabeyes | ttf-arabeyes
+fonts-arphic-ukai | ttf-arphic-ukai
+fonts-arphic-uming | ttf-arphic-uming
+fonts-lao | ttf-lao
+fonts-thai-tlwg | ttf-thai-tlwg
+fonts-unfonts-core | ttf-unfonts-core
 foomatic-db-gutenprint
-foomatic-db-hpijs
 fortune-mod
 gcc
-gdebi-tde-trinity
-gtk-qt-engine-trinity
+gtk3-tqt-engine-trinity
 gwenview-trinity
 hpijs-ppds
 hplip
-hplip-gui
 ijsgutenprint
 jockey-gtk
 k3b-trinity
@@ -34,26 +36,19 @@ karm-trinity
 katapult-trinity
 kate-trinity
 kbstate-trinity
-tde-icons-mono-trinity
-tdebluetooth-trinity
-tdepim-tdeio-plugins-trinity
-tdepim-wizards-trinity
-tdepowersave-trinity
-tdesudo-trinity
 keep-trinity
 kfind-trinity
-tdeio-umountwrapper-trinity
 kipi-plugins-trinity
 klipper-trinity
 kmag-trinity
-kmail-trinity
 kmailcvt-trinity
+kmail-trinity
 kmilo-trinity
 kmousetool-trinity
 kmplayer-konq-plugins-trinity
 knotes-trinity
-konqueror-trinity
 konqueror-nsplugins-trinity
+konqueror-trinity
 kontact-trinity
 konversation-trinity
 kooka-trinity
@@ -63,32 +58,32 @@ kpf-trinity
 kppp-trinity
 krdc-trinity
 krfb-trinity
-tdescreensaver-trinity
 ksysguard-trinity
 ktorrent-trinity
 kubuntu-default-settings-trinity
-kubuntu-trinity-docs
+kubuntu-docs-trinity
 kubuntu-konqueror-shortcuts-trinity
 kvkbd-trinity
-tdewalletmanager-trinity
 landscape-client
 laptop-detect
 libgl1-mesa-dri
 libnss-mdns
-libreoffice-calc|openoffice.org-calc
-libreoffice-impress|openoffice.org-impress
-libreoffice-tde|openoffice.org-tde
-libreoffice-writer|openoffice.org-writer
+libreoffice-calc | openoffice.org-calc
+libreoffice-impress | openoffice.org-impress
+libreoffice-trinity | openoffice.org-trinity
+libreoffice-writer | openoffice.org-writer
 linux-headers-generic
 make
-networkstatus
+network-manager-tde | network-manager-gnome
+networkstatus-trinity
 pinentry-qt
+plymouth-theme-kubuntu-logo-trinity
 powernowd
 printer-driver-c2esp
-printer-driver-foo2zjs|foo2zjs
-printer-driver-min12xxw|min12xxw
+printer-driver-foo2zjs | foo2zjs
+printer-driver-min12xxw | min12xxw
 printer-driver-ptouch
-printer-driver-pxljr|pxljr
+printer-driver-pxljr | pxljr
 printer-driver-sag-gdi
 printer-driver-splix
 rdesktop
@@ -96,21 +91,23 @@ scim-bridge-agent
 scim-bridge-client-qt
 scim-qtimm
 skim
+smbclient
 speedcrunch
 splix
-strigi-applet
 strigi-daemon
-system-config-printer-tde
-ttf-arabeyes
-ttf-arphic-ukai
-ttf-arphic-uming
+system-config-printer-tde-trinity
+tdeio-apt-trinity
+tdeio-umountwrapper-trinity
+tdepim-tdeio-plugins-trinity
+tdepim-wizards-trinity
+tdepowersave-trinity
+tdescreensaver-trinity
+tdesudo-trinity
+tdewalletmanager-trinity
 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
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64
deleted file mode 100644
index 08fe34f44..000000000
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64
+++ /dev/null
@@ -1,116 +0,0 @@
-adept-trinity
-akregator-trinity
-amarok-trinity
-apport-qt
-avahi-autoipd
-bluez-cups
-bluez-utils
-bogofilter
-brltty
-cdparanoia
-cdrdao
-cups-pdf
-desktop-effects-tde-trinity
-digikam-trinity
-dmz-cursor-theme
-dvd+rw-tools
-foomatic-db-gutenprint
-foomatic-db-hpijs
-fortune-mod
-gcc
-gdebi-tde-trinity
-gtk-qt-engine-trinity
-gwenview-trinity
-hpijs-ppds
-hplip
-hplip-gui
-ijsgutenprint
-jockey-gtk
-k3b-trinity
-kaddressbook-trinity
-kaffeine-trinity
-kamera-trinity
-karm-trinity
-katapult-trinity
-kate-trinity
-kbstate-trinity
-tdebluetooth-trinity
-tdepim-tdeio-plugins-trinity
-tdepim-wizards-trinity
-tdepowersave-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-trinity-docs
-kubuntu-konqueror-shortcuts-trinity
-kvkbd-trinity
-tdewalletmanager-trinity
-landscape-client
-laptop-detect
-libgl1-mesa-dri
-libnss-mdns
-libreoffice-calc|openoffice.org-calc
-libreoffice-impress|openoffice.org-impress
-libreoffice-tde|openoffice.org-tde
-libreoffice-writer|openoffice.org-writer
-linux-headers-generic
-make
-networkstatus
-pinentry-qt
-powernowd
-printer-driver-c2esp
-printer-driver-foo2zjs|foo2zjs
-printer-driver-min12xxw|min12xxw
-printer-driver-ptouch
-printer-driver-pxljr|pxljr
-printer-driver-sag-gdi
-printer-driver-splix
-rdesktop
-scim-bridge-agent
-scim-bridge-client-qt
-scim-qtimm
-skim
-speedcrunch
-splix
-strigi-applet
-strigi-daemon
-system-config-printer-tde
-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
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa
deleted file mode 100644
index 54b7fdab1..000000000
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa
+++ /dev/null
@@ -1,113 +0,0 @@
-adept
-akregator
-amarok
-apport-qt
-avahi-autoipd
-bluez-cups
-bluez-utils
-bogofilter
-brltty
-cdparanoia
-cdrdao
-cups-pdf
-desktop-effects-tde
-dmz-cursor-theme
-dolphin
-dvd+rw-tools
-foomatic-db-gutenprint
-foomatic-db-hpijs
-fortune-mod
-gcc
-gdebi-tde
-gtk-qt-engine
-gwenview
-hpijs-ppds
-hplip
-hplip-gui
-ijsgutenprint
-jockey-tde
-k3b
-kaddressbook
-kaffeine
-kamera
-karm
-katapult
-kate
-kbstate
-tde-guidance-powermanager
-tdebluetooth
-tdepim-tdeio-plugins
-tdepim-wizards
-tdesudo
-keep
-kfind
-kio-umountwrapper
-klipper
-kmag
-kmail
-kmailcvt
-kmilo
-kmousetool
-kmplayer-konq-plugins
-knotes
-konqueror
-konqueror-nsplugins
-kontact
-konversation
-kooka
-kopete
-korganizer
-kpf
-kppp
-krdc
-krfb
-tdescreensaver
-ksysguard
-ktorrent
-kubuntu-default-settings
-kubuntu-docs
-kubuntu-konqueror-shortcuts
-kvkbd
-tdewalletmanager
-landscape-client
-laptop-detect
-libgl1-mesa-dri
-libnss-mdns
-linux-headers-hppa32
-linux-headers-hppa64
-make
-network-manager-tde
-networkstatus
-pinentry-qt
-powernowd
-printer-driver-c2esp
-printer-driver-foo2zjs|foo2zjs
-printer-driver-min12xxw|min12xxw
-printer-driver-ptouch
-printer-driver-pxljr|pxljr
-printer-driver-sag-gdi
-printer-driver-splix
-rdesktop
-scim-bridge-agent
-scim-bridge-client-qt
-scim-qtimm
-skim
-speedcrunch
-splix
-strigi-applet
-strigi-daemon
-system-config-printer-tde
-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
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64
deleted file mode 100644
index 9bc7890f5..000000000
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64
+++ /dev/null
@@ -1,113 +0,0 @@
-adept
-akregator
-amarok
-apport-qt
-avahi-autoipd
-bluez-cups
-bluez-utils
-bogofilter
-brltty
-cdparanoia
-cdrdao
-cups-pdf
-desktop-effects-tde
-dmz-cursor-theme
-dolphin
-dvd+rw-tools
-foomatic-db-gutenprint
-foomatic-db-hpijs
-fortune-mod
-gcc
-gdebi-tde
-gtk-qt-engine
-gwenview
-hpijs-ppds
-hplip
-hplip-gui
-ijsgutenprint
-jockey-tde
-k3b
-kaddressbook
-kaffeine
-kamera
-karm
-katapult
-kate
-kbstate
-tde-guidance-powermanager
-tdebluetooth
-tdepim-tdeio-plugins
-tdepim-wizards
-tdesudo
-keep
-kfind
-kio-umountwrapper
-klipper
-kmag
-kmail
-kmailcvt
-kmilo
-kmousetool
-kmplayer-konq-plugins
-knotes
-konqueror
-konqueror-nsplugins
-kontact
-konversation
-kooka
-kopete
-korganizer
-kpf
-kppp
-krdc
-krfb
-tdescreensaver
-ksysguard
-ktorrent
-kubuntu-default-settings
-kubuntu-docs
-kubuntu-konqueror-shortcuts
-kvkbd
-tdewalletmanager
-landscape-client
-laptop-detect
-libgl1-mesa-dri
-libnss-mdns
-linux-headers-itanium
-linux-headers-mckinley
-make
-network-manager-tde
-networkstatus
-pinentry-qt
-powernowd
-printer-driver-c2esp
-printer-driver-foo2zjs|foo2zjs
-printer-driver-min12xxw|min12xxw
-printer-driver-ptouch
-printer-driver-pxljr|pxljr
-printer-driver-sag-gdi
-printer-driver-splix
-rdesktop
-scim-bridge-agent
-scim-bridge-client-qt
-scim-qtimm
-skim
-speedcrunch
-splix
-strigi-applet
-strigi-daemon
-system-config-printer-tde
-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
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc
deleted file mode 100644
index 5c4c6f360..000000000
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc
+++ /dev/null
@@ -1,113 +0,0 @@
-adept
-akregator
-amarok
-apport-qt
-avahi-autoipd
-bluez-cups
-bluez-utils
-bogofilter
-brltty
-cdparanoia
-cdrdao
-cups-pdf
-desktop-effects-tde
-dmz-cursor-theme
-dolphin
-dvd+rw-tools
-foomatic-db-gutenprint
-foomatic-db-hpijs
-fortune-mod
-gcc
-gdebi-tde
-gtk-qt-engine
-gwenview
-hpijs-ppds
-hplip
-hplip-gui
-ijsgutenprint
-jockey-tde
-k3b
-kaddressbook
-kaffeine
-kamera
-karm
-katapult
-kate
-kbstate
-tde-guidance-powermanager
-tdebluetooth
-tdepim-tdeio-plugins
-tdepim-wizards
-tdesudo
-keep
-kfind
-kio-umountwrapper
-klipper
-kmag
-kmail
-kmailcvt
-kmilo
-kmousetool
-kmplayer-konq-plugins
-knotes
-konqueror
-konqueror-nsplugins
-kontact
-konversation
-kooka
-kopete
-korganizer
-kpf
-kppp
-krdc
-krfb
-tdescreensaver
-ksysguard
-ktorrent
-kubuntu-default-settings
-kubuntu-docs
-kubuntu-konqueror-shortcuts
-kvkbd
-tdewalletmanager
-landscape-client
-laptop-detect
-libgl1-mesa-dri
-libnss-mdns
-linux-headers-powerpc
-linux-headers-powerpc64-smp
-make
-network-manager-tde
-networkstatus
-pinentry-qt
-powernowd
-printer-driver-c2esp
-printer-driver-foo2zjs|foo2zjs
-printer-driver-min12xxw|min12xxw
-printer-driver-ptouch
-printer-driver-pxljr|pxljr
-printer-driver-sag-gdi
-printer-driver-splix
-rdesktop
-scim-bridge-agent
-scim-bridge-client-qt
-scim-qtimm
-skim
-speedcrunch
-splix
-strigi-applet
-strigi-daemon
-system-config-printer-tde
-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
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc
deleted file mode 100644
index bd2aad332..000000000
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc
+++ /dev/null
@@ -1,112 +0,0 @@
-adept
-akregator
-amarok
-apport-qt
-avahi-autoipd
-bluez-cups
-bluez-utils
-bogofilter
-brltty
-cdparanoia
-cdrdao
-cups-pdf
-desktop-effects-tde
-dmz-cursor-theme
-dolphin
-dvd+rw-tools
-foomatic-db-gutenprint
-foomatic-db-hpijs
-fortune-mod
-gcc
-gdebi-tde
-gtk-qt-engine
-gwenview
-hpijs-ppds
-hplip
-hplip-gui
-ijsgutenprint
-jockey-tde
-k3b
-kaddressbook
-kaffeine
-kamera
-karm
-katapult
-kate
-kbstate
-tde-guidance-powermanager
-tdebluetooth
-tdepim-tdeio-plugins
-tdepim-wizards
-tdesudo
-keep
-kfind
-kio-umountwrapper
-klipper
-kmag
-kmail
-kmailcvt
-kmilo
-kmousetool
-kmplayer-konq-plugins
-knotes
-konqueror
-konqueror-nsplugins
-kontact
-konversation
-kooka
-kopete
-korganizer
-kpf
-kppp
-krdc
-krfb
-tdescreensaver
-ksysguard
-ktorrent
-kubuntu-default-settings
-kubuntu-docs
-kubuntu-konqueror-shortcuts
-kvkbd
-tdewalletmanager
-landscape-client
-laptop-detect
-libgl1-mesa-dri
-libnss-mdns
-linux-headers-sparc64
-make
-network-manager-tde
-networkstatus
-pinentry-qt
-powernowd
-printer-driver-c2esp
-printer-driver-foo2zjs|foo2zjs
-printer-driver-min12xxw|min12xxw
-printer-driver-ptouch
-printer-driver-pxljr|pxljr
-printer-driver-sag-gdi
-printer-driver-splix
-rdesktop
-scim-bridge-agent
-scim-bridge-client-qt
-scim-qtimm
-skim
-speedcrunch
-splix
-strigi-applet
-strigi-daemon
-system-config-printer-tde
-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
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc
deleted file mode 100644
index 7c628303e..000000000
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc
+++ /dev/null
@@ -1,79 +0,0 @@
-alsa-base
-alsa-utils
-anacron
-ark
-arts
-avahi-daemon
-bc
-ca-certificates
-cupsys
-cupsys-bsd
-cupsys-client
-cupsys-driver-gutenprint
-dbus
-dc
-foomatic-db
-foomatic-db-engine
-foomatic-filters
-genisoimage
-ghostscript-x
-kcontrol
-kcron
-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
-kghostview
-khelpcenter
-kicker
-kio-apt
-kio-locate
-kmenuedit
-kmix
-knetworkconf
-konq-plugins
-konsole
-kpdf
-ksmserver
-ksnapshot
-ksvg
-ksystemlog
-kubuntu-artwork-usplash
-kwin
-kwin-style-crystal
-language-selector-qt
-lftp
-libarts1-akode
-libgl1-mesa-glx
-libglut3
-libqt-perl
-libsasl2-modules
-libxp6
-openprinting-ppds
-printer-driver-pnm2ppa|pnm2ppa
-qca-tls
-readahead
-screen
-smbclient
-software-properties-tde
-ttf-bitstream-vera
-ttf-dejavu-core
-ttf-freefont
-unzip
-usplash
-vorbis-tools
-xdg-user-dirs
-xkb-data
-xorg
-zip
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-suggests-all b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-suggests-all
new file mode 100644
index 000000000..4b2397ebd
--- /dev/null
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-suggests-all
@@ -0,0 +1,2 @@
+apport-gtk
+hplip-gui
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update
deleted file mode 100755
index 01998e1bc..000000000
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-if ! which dch >/dev/null; then
-	echo >&2 "please install devscripts"
-	exit 1
-fi
-
-if ! which debootstrap >/dev/null; then
-	echo >&2 "please install debootstrap"
-	exit 1
-fi
-
-exec germinate-update-metapackage --bzr
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update.cfg b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update.cfg
deleted file mode 100644
index 0fc860cbe..000000000
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-[DEFAULT]
-dist: hardy
-
-[hardy]
-seeds: desktop
-seed_map/desktop: desktop-common desktop-kubuntu-common desktop
-architectures: i386 amd64 powerpc ia64 sparc hppa
-seed_base: http://people.ubuntu.com/~ubuntu-archive/seeds/
-seed_dist: kubuntu.%(dist)s
-archive_base/default: http://archive.ubuntu.com/ubuntu/
-archive_base/ports: http://ports.ubuntu.com/ubuntu-ports/
-archive_base/hppa: %(archive_base/ports)s
-archive_base/ia64: %(archive_base/ports)s
-archive_base/powerpc: %(archive_base/ports)s
-components: main restricted
-
-[hardy/bzr]
-seed_base: bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/
-seed_dist: kubuntu.%(dist)s
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/rules b/ubuntu/maverick/metapackages/kubuntu-meta/debian/rules
index bd33ed27d..4ab7baa9d 100755
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/rules
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/rules
@@ -24,15 +24,36 @@ clean:
 DEB_BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 build: debian/stamp-distrospecific build-stamp
-build-stamp:	desktop-$(DEB_BUILD_ARCH)
+build-stamp:
 	dh_clean
 
 	for seed in desktop; do \
-		package=kubuntu-$$seed; \
-		(printf "$$package:Depends="; perl -pe 's/\n/, /g'  $$seed-$(DEB_BUILD_ARCH); echo) \
+		package=kubuntu-$$seed-trinity; \
+		echo -n > debian/$$package.substvars; \
+		if [ -f $$seed-all ]; then \
+			(printf "$$seed-all:Depends="; perl -pe 's/\n/, /g'  $$seed-all; echo) \
 			>> debian/$$package.substvars; \
-		(printf "$$package:Recommends="; perl -pe 's/\n/, /g'  $$seed-recommends-$(DEB_BUILD_ARCH); echo) \
+		fi; \
+		if [ -f $$seed-recommends-all ]; then \
+			(printf "$$seed-all:Recommends="; perl -pe 's/\n/, /g'  $$seed-recommends-all; echo) \
 			>> debian/$$package.substvars; \
+		fi; \
+		if [ -f $$seed-suggests-all ]; then \
+			(printf "$$seed-all:Suggests="; perl -pe 's/\n/, /g'  $$seed-suggests-all; echo) \
+			>> debian/$$package.substvars; \
+		fi; \
+		if [ -f $$seed-$(DEB_BUILD_ARCH) ]; then \
+			(printf "$$seed-arch:Depends="; perl -pe 's/\n/, /g'  $$seed-$(DEB_BUILD_ARCH); echo) \
+			>> debian/$$package.substvars; \
+		fi; \
+		if [ -f $$seed-recommends-$(DEB_BUILD_ARCH) ]; then \
+			(printf "$$seed-arch:Recommends="; perl -pe 's/\n/, /g'  $$seed-recommends-$(DEB_BUILD_ARCH); echo) \
+			>> debian/$$package.substvars; \
+		fi; \
+		if [ -f $$seed-suggests-$(DEB_BUILD_ARCH) ]; then \
+			(printf "$$seed-arch:Suggests="; perl -pe 's/\n/, /g'  $$seed-suggests-$(DEB_BUILD_ARCH); echo) \
+			>> debian/$$package.substvars; \
+		fi; \
 	done
 	touch $@