[SCM] KDE metapackages branch, master, updated. debian/90-2-g1079030

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 107903092de4c20d9223c5f0f0d03c313b73061f
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Nov 11 10:38:32 2015 +0100

    Move kwin-x11 recommends from kde-standard to kde-plasma-desktop.
    
    A further review of the plasma dependencies is still needed to avoid
    depending on the kde4 plasma parts (that is still not clear if they are
    going to be deprecated). Hopefully this should be a bit clearer after the
    15.12 release.
---
 debian/changelog |  3 ++-
 debian/control   | 17 +++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61ceda3..7a6760a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 meta-kde (5:91~) UNRELEASED; urgency=medium
 
-  * 
+  * Move kwin-x11 recommends from kde-standard to kde-plasma-desktop.
+    (Closes: #804636)
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 11 Nov 2015 10:31:54 +0100
 
diff --git a/debian/control b/debian/control
index a0bed3c..6b0cef9 100644
--- a/debian/control
+++ b/debian/control
@@ -15,13 +15,13 @@ Package: kde-plasma-desktop
 Architecture: any
 Depends: kde-baseapps (>= ${kde:Version}),
          kde-runtime (>= ${kde:Version}),
-         plasma-workspace (>= ${plasma:Version}),
          plasma-desktop (>= ${plasma:Version}),
+         plasma-workspace (>= ${plasma:Version}),
          udisks2 [linux-any],
          upower [linux-any],
          ${misc:Depends}
 Breaks: kde-minimal (<< 5:57)
-Recommends: sddm (>= 0.11), xserver-xorg
+Recommends: kwin-x11 (>= ${plasma:Version}), sddm (>= 0.11), xserver-xorg
 Suggests: kde-l10n (>= ${kde:Version})
 Description: KDE Plasma Desktop and minimal set of applications
  KDE is the powerful, integrated, and easy-to-use Free Software desktop
@@ -45,7 +45,6 @@ Depends: akregator (>= ${kdepim:Version}),
          kde-plasma-desktop (>= ${source:Version}),
          khelpcenter (>= ${plasma:Version}),
          kmail (>= ${kdepim:Version}),
-         plasma-pa (>= ${plasma:VersionNoEpoch}) | kmix (>= ${kde:Version}),
          knotes (>= ${kdepim:Version}),
          kopete (>= ${kde:Version}),
          korganizer (>= ${kdepim:Version}),
@@ -53,6 +52,7 @@ Depends: akregator (>= ${kdepim:Version}),
          kwalletmanager (>= ${kde:Version}),
          okular (>= ${kde:Version}),
          plasma-dataengines-addons (>= ${plasma:Version}),
+         plasma-pa (>= ${plasma:VersionNoEpoch}) | kmix (>= ${kde:Version}),
          plasma-runners-addons (>= ${plasma:Version}),
          plasma-wallpapers-addons (>= ${plasma:Version}),
          plasma-widgets-addons (>= ${plasma:Version}),
@@ -61,10 +61,8 @@ Depends: akregator (>= ${kdepim:Version}),
          ${misc:Depends}
 Recommends: freespacenotifier (>= ${kde:Version}),
             konq-plugins (>= ${kde:Version}),
-            plasma-nm (>= ${plasma:Version}),
-            kwin-x11 (>= ${plasma:Version})
-Suggests: kde-l10n (>= ${kde:Version}),
-          skanlite
+            plasma-nm (>= ${plasma:Version})
+Suggests: kde-l10n (>= ${kde:Version}), skanlite
 Breaks: kde-minimal (<< 5:57)
 Description: KDE Plasma Desktop and standard set of applications
  The KDE Software Compilation is the powerful, integrated, and easy-to-use Free
@@ -263,8 +261,8 @@ Depends: dragonplayer (>= ${kde:Version}),
          juk (>= ${kde:Version}),
          kde-config-cddb (>= ${kde:Version}),
          kio-audiocd (>= ${kde:Version}),
-         plasma-pa (>= ${plasma:VersionNoEpoch}) | kmix (>= ${kde:Version}),
          kscd (>= ${kde:Version}),
+         plasma-pa (>= ${plasma:VersionNoEpoch}) | kmix (>= ${kde:Version}),
          ${misc:Depends}
 Recommends: mplayerthumbs (>= ${kde:Version}) | ffmpegthumbs (>= ${kde:Version})
 Description: multimedia applications from the official KDE release
@@ -334,8 +332,7 @@ Description: Software Development Kit from the official KDE release
 
 Package: kdetoys
 Architecture: all
-Depends: kteatime (>= ${kde:Version}),
-         ${misc:Depends}
+Depends: kteatime (>= ${kde:Version}), ${misc:Depends}
 Description: desktop toys from the official KDE release
  KDE is produced by an international technology team that creates free and open
  source software for desktop and portable computing. Among KDE's products are a

-- 
KDE metapackages