[SCM] KDE metapackages branch, master, updated. debian/64-5-ga92e456

[Modestas Vainius]

The following commit has been merged in the master branch:
commit a982729f53d0be4bcc89d9b9df5e36ac8913c0db
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Jan 13 22:08:33 2011 +0200

    Remove hal from kdebase Depends.
    
    Extra dependencies are not appropriate for the transitional package. Also
    remove hal from kde-standard as it became superflouos there.
---
 debian/changelog |    4 ++++
 debian/control   |    9 ++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 920e613..3a2c57f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ meta-kde (5:65) UNRELEASED; urgency=low
 
   * Do not use strict dependency for kde-standard in kdebase Recommends.
     This is not appropriate for transitional package.
+  * Remove hal from kdebase Depends. Extra dependencies are not appropriate for
+    the transitional package which is supposed to be installed forever.
+  * Add hal to kde-plasma-{desktop,netbook} Depends instead. Remove it from
+    kde-standard as it became superfluous there.
 
  -- Modestas Vainius <modax at debian.org>  Thu, 13 Jan 2011 21:58:24 +0200
 
diff --git a/debian/control b/debian/control
index e702b42..84bdccc 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Homepage: http://www.kde.org
 
 Package: kdebase
 Architecture: all
-Depends: ${misc:Depends}, kde-plasma-desktop (>= ${source:Version}), hal
+Depends: ${misc:Depends}, kde-plasma-desktop (>= ${source:Version})
 Recommends: kde-standard (>= ${source:Version})
 Suggests: kde-l10n (>= ${kde:Version})
 Breaks: kde-minimal (<< 5:57)
@@ -24,7 +24,7 @@ Package: kde-plasma-desktop
 Architecture: all
 Depends: ${misc:Depends}, kdebase-runtime (>= ${kde:Version}),
  plasma-desktop (>= ${kde:Version}), kdebase-workspace (>= ${kde:Version}),
- kdebase-apps (>= ${kde:Version})
+ kdebase-apps (>= ${kde:Version}), hal
 Breaks: kde-minimal (<< 5:57)
 Recommends: kdm  (>= ${kde:Version}), xserver-xorg
 Suggests: kde-l10n (>= ${kde:Version})
@@ -41,7 +41,7 @@ Package: kde-plasma-netbook
 Architecture: all
 Depends: ${misc:Depends}, kdebase-runtime (>= ${kde:Version}),
  plasma-netbook (>= ${kde:Version}), kdebase-workspace (>= ${kde:Version}),
- kdebase-apps (>= ${kde:Version})
+ kdebase-apps (>= ${kde:Version}), hal
 Recommends: kdm  (>= ${kde:Version}), xserver-xorg
 Suggests: kde-l10n (>= ${kde:Version})
 Breaks: kde-minimal (<< 5:57)
@@ -64,8 +64,7 @@ Depends: ${misc:Depends}, kde-plasma-desktop (>= ${source:Version}) | kde-plasma
  kwalletmanager (>= ${kde:Version}), korganizer (>= ${kde:Version}), kopete (>= ${kde:Version}),
  kmix (>= ${kde:Version}), ksnapshot (>= ${kde:Version}), kscreensaver (>= ${kde:Version}),
  okular (>= ${kde:Version}), plasma-desktopthemes-artwork (>= ${kde:Version}), sweeper (>= ${kde:Version}),
- khelpcenter4 (>= ${kde:Version}),
- hal
+ khelpcenter4 (>= ${kde:Version})
 Recommends: konq-plugins (>= ${konqPlugins:Version}), plasma-widget-networkmanagement, freespacenotifier,
  update-notifier-kde
 Suggests: kde-l10n (>= ${kde:Version}), kde-plasma-desktop (>= ${source:Version}),

-- 
KDE metapackages