[SCM] KDE metapackages branch, master, updated. debian/66-7-ged03fdb

[Pino Toscano]

The following commit has been merged in the master branch:
commit ed03fdb0f6b7ab30a33e6b179d05616d5a6fb46f
Author: Pino Toscano <pino at kde.org>
Date:   Wed Feb 2 00:35:08 2011 +0100

    Update dependencies of kde-plasma-{desktop,netbook} on "hardware daemons"
    
    - on Linux archs, depend on udisks and upower
    - on non-Linux archs, depend on hal
---
 debian/changelog |    4 ++++
 debian/control   |    6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7fdb3dd..502281c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ meta-kde (5:67~pre2) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Make kde-plasma-desktop and kde-plasma-netbook as arch:any, so they can
     have arch-specific package relations.
+  * Update dependencies of kde-plasma-desktop and kde-plasma-netbook on
+    "hardware daemons":
+    - on Linux archs, depend on udisks and upower
+    - on non-Linux archs, depend on hal
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Wed, 26 Jan 2011 18:44:01 +0100
 
diff --git a/debian/control b/debian/control
index 56e49dc..a72a451 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Package: kde-plasma-desktop
 Architecture: any
 Depends: ${misc:Depends}, kdebase-runtime (>= ${kde:Version}),
  plasma-desktop (>= ${kde:Version}), kdebase-workspace (>= ${kde:Version}),
- kdebase-apps (>= ${kde:Version}), hal
+ kdebase-apps (>= ${kde:Version}),
+ udisks [linux-any], upower [linux-any], hal [!linux-any]
 Breaks: kde-minimal (<< 5:57)
 Recommends: kdm  (>= ${kde:Version}), xserver-xorg
 Suggests: kde-l10n (>= ${kde:Version})
@@ -28,7 +29,8 @@ Package: kde-plasma-netbook
 Architecture: any
 Depends: ${misc:Depends}, kdebase-runtime (>= ${kde:Version}),
  plasma-netbook (>= ${kde:Version}), kdebase-workspace (>= ${kde:Version}),
- kdebase-apps (>= ${kde:Version}), hal
+ kdebase-apps (>= ${kde:Version}),
+ udisks [linux-any], upower [linux-any], hal [!linux-any]
 Recommends: kdm  (>= ${kde:Version}), xserver-xorg
 Suggests: kde-l10n (>= ${kde:Version})
 Breaks: kde-minimal (<< 5:57)

-- 
KDE metapackages