[SCM] KDE metapackages branch, master, updated. debian/89-8-g6ecf7df

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/meta-kde.git;a=commitdiff;h=3626263

The following commit has been merged in the master branch:
commit 362626352cc84a5252cc3d54764b7069d28cad5c
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Sep 11 21:44:24 2015 +0200

    Add plasma-pa as an alternative to kmix.
---
 debian/changelog | 3 +++
 debian/control   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c8a648a..15a99aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ meta-kde (5:90~) UNRELEASED; urgency=medium
     * Change minimum version to plasma without epoch as it is part of
       Plasma now.
 
+  [ Maximiliano Curia ]
+  * Add plasma-pa as an alternative to kmix.
+
  -- Jeremy Lainé <jeremy.laine at m4x.org>  Thu, 10 Sep 2015 10:16:53 +0200
 
 meta-kde (5:89) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 4bba172..a0bed3c 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Depends: akregator (>= ${kdepim:Version}),
          kde-plasma-desktop (>= ${source:Version}),
          khelpcenter (>= ${plasma:Version}),
          kmail (>= ${kdepim:Version}),
-         kmix (>= ${kde:Version}),
+         plasma-pa (>= ${plasma:VersionNoEpoch}) | kmix (>= ${kde:Version}),
          knotes (>= ${kdepim:Version}),
          kopete (>= ${kde:Version}),
          korganizer (>= ${kdepim:Version}),
@@ -263,7 +263,7 @@ Depends: dragonplayer (>= ${kde:Version}),
          juk (>= ${kde:Version}),
          kde-config-cddb (>= ${kde:Version}),
          kio-audiocd (>= ${kde:Version}),
-         kmix (>= ${kde:Version}),
+         plasma-pa (>= ${plasma:VersionNoEpoch}) | kmix (>= ${kde:Version}),
          kscd (>= ${kde:Version}),
          ${misc:Depends}
 Recommends: mplayerthumbs (>= ${kde:Version}) | ffmpegthumbs (>= ${kde:Version})

-- 
KDE metapackages