Remove HAL dependency from metapackages and default settings

9 files changed, 1 insertions, 9 deletions

diff --git a/ubuntu/raring/metapackages/kubuntu-meta/debian/control b/ubuntu/raring/metapackages/kubuntu-meta/debian/control
index 6b0fdaaac..7a60e7c00 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/control
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/control
@@ -7,7 +7,7 @@ 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-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, kdepasswd-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, pnm2ppa, powermanagement-interface, readahead, screen, ttf-bitstream-vera, ttf-dejavu-core, 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, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine
+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, kdepasswd-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, pnm2ppa, powermanagement-interface, readahead, screen, ttf-bitstream-vera, ttf-dejavu-core, 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, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine
 Recommends: tdeio-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-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, 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
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop b/ubuntu/raring/metapackages/kubuntu-meta/desktop
index 755f63c4f..b1016a157 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop
+++ b/ubuntu/raring/metapackages/kubuntu-meta/desktop
@@ -210,7 +210,6 @@ We've chosen KDE as our desktop user interface of choice
  * (amarok-trinity) 		# audio multimediaplayer
  * (kaffeine-xine-trinity)	# video multimediaplayer
  * (keep-trinity) 		# kde backuptool
- * hal			# it's not very polished but it's the future
  * (adept-trinity)		# better package manager
  * konq-plugins-trinity
  * kde-systemsettings-trinity   # kcontrol replacement
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-amd64 b/ubuntu/raring/metapackages/kubuntu-meta/desktop-amd64
index 075456c57..3e5fba0d9 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-amd64
+++ b/ubuntu/raring/metapackages/kubuntu-meta/desktop-amd64
@@ -20,7 +20,6 @@ foomatic-db-engine
 foomatic-filters
 genisoimage
 ghostscript-x
-hal
 hotkey-setup
 kcontrol-trinity
 kcron-trinity
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-hppa b/ubuntu/raring/metapackages/kubuntu-meta/desktop-hppa
index f74576e0b..030d93618 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-hppa
+++ b/ubuntu/raring/metapackages/kubuntu-meta/desktop-hppa
@@ -17,7 +17,6 @@ foomatic-db-engine
 foomatic-filters
 genisoimage
 ghostscript-x
-hal
 kcontrol
 kcron
 kde-guidance
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-i386 b/ubuntu/raring/metapackages/kubuntu-meta/desktop-i386
index 26b607a93..52cd6a70e 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-i386
+++ b/ubuntu/raring/metapackages/kubuntu-meta/desktop-i386
@@ -21,7 +21,6 @@ foomatic-db-engine
 foomatic-filters
 genisoimage
 ghostscript-x
-hal
 hotkey-setup
 kcontrol-trinity
 kcron-trinity
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-ia64 b/ubuntu/raring/metapackages/kubuntu-meta/desktop-ia64
index 350177bcb..f24d7e4cf 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-ia64
+++ b/ubuntu/raring/metapackages/kubuntu-meta/desktop-ia64
@@ -20,7 +20,6 @@ foomatic-db-engine
 foomatic-filters
 genisoimage
 ghostscript-x
-hal
 kcontrol
 kcron
 kde-guidance
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-lpia b/ubuntu/raring/metapackages/kubuntu-meta/desktop-lpia
index ecdfae95f..7c8954570 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-lpia
+++ b/ubuntu/raring/metapackages/kubuntu-meta/desktop-lpia
@@ -20,7 +20,6 @@ foomatic-db-engine
 foomatic-filters
 genisoimage
 ghostscript-x
-hal
 hotkey-setup
 kcontrol-trinity
 kcron-trinity
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-powerpc b/ubuntu/raring/metapackages/kubuntu-meta/desktop-powerpc
index 9747b97e9..1314826f1 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-powerpc
+++ b/ubuntu/raring/metapackages/kubuntu-meta/desktop-powerpc
@@ -17,7 +17,6 @@ foomatic-db-engine
 foomatic-filters
 genisoimage
 ghostscript-x
-hal
 kcontrol
 kcron
 kde-guidance
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-sparc b/ubuntu/raring/metapackages/kubuntu-meta/desktop-sparc
index f74576e0b..030d93618 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-sparc
+++ b/ubuntu/raring/metapackages/kubuntu-meta/desktop-sparc
@@ -17,7 +17,6 @@ foomatic-db-engine
 foomatic-filters
 genisoimage
 ghostscript-x
-hal
 kcontrol
 kcron
 kde-guidance