[SCM] KDE metapackages branch, master, updated. debian/85-2-g0d8e190

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 0d8e19036a953ea8a9d4180e7ec1404fb55bd77b
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Jul 15 16:01:33 2015 +0200

    Replace kde-workspace with plasma-workspace. (Closes: #792318)
---
 debian/changelog |  2 +-
 debian/control   | 38 ++++++++++++++------------------------
 debian/rules     |  2 --
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 157e948..362febe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 meta-kde (5:86~) UNRELEASED; urgency=medium
 
-  * 
+  * Replace kde-workspace with plasma-workspace. (Closes: #792318)
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 15 Jul 2015 15:47:49 +0200
 
diff --git a/debian/control b/debian/control
index e2c397a..798684c 100644
--- a/debian/control
+++ b/debian/control
@@ -18,13 +18,13 @@ Package: kde-plasma-desktop
 Architecture: any
 Depends: kde-baseapps (>= ${kde:Version}),
          kde-runtime (>= ${kde:Version}),
-         kde-workspace (>= ${kde-workspace:Version}),
-         plasma-desktop (>= ${kde-workspace:Version}),
+         plasma-workspace (>= ${plasma:Version}),
+         plasma-desktop (>= ${plasma:Version}),
          udisks2 [linux-any],
          upower [linux-any],
          ${misc:Depends}
 Breaks: kde-minimal (<< 5:57)
-Recommends: kdm (>= ${kde-workspace:Version}), xserver-xorg
+Recommends: 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
@@ -35,27 +35,6 @@ Description: KDE Plasma Desktop and minimal set of applications
  applications (browser, file manager, text editor, system settings, panel,
  etc.), important libraries and data.
 
-Package: kde-plasma-netbook
-Architecture: any
-Depends: kde-baseapps (>= ${kde:Version}),
-         kde-runtime (>= ${kde:Version}),
-         kde-workspace (>= ${kde-workspace:Version}),
-         plasma-netbook (>= ${kde-workspace:Version}),
-         udisks2 [linux-any],
-         upower [linux-any],
-         ${misc:Depends}
-Recommends: kdm (>= ${kde-workspace:Version}), xserver-xorg
-Suggests: kde-l10n (>= ${kde:Version})
-Breaks: kde-minimal (<< 5:57)
-Description: KDE Plasma Netbook and minimal set of applications
- KDE is the powerful, integrated, and easy-to-use Free Software desktop
- platform and suite of applications.
- .
- This metapackage pulls in the core modules released with the KDE Software
- Compilation including the basic KDE Plasma Netbook, minimal set of basic
- applications (browser, file manager, text editor, system settings, panel,
- etc.), important libraries and data.
-
 Package: kde-standard
 Architecture: all
 Depends: akregator (>= ${kdepim:Version}),
@@ -437,6 +416,17 @@ Description: ensure that the latest KDE Development Platform is installed
  version of this package with the pkgkde-override-sc-dev-latest command from
  the pkg-kde-tools package.
 
+Package: kde-plasma-netbook
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: kde-plasma-desktop (== ${source:Version})
+Description: transitional package for KDE Plasma Netbook
+ KDE is the powerful, integrated, and easy-to-use Free Software desktop
+ platform and suite of applications.
+ .
+ This transitional package can be safely removed after installation.
+
 Package: kdegraphics-libs-data
 Section: oldlibs
 Priority: extra
diff --git a/debian/rules b/debian/rules
index 7784155..db6eb40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 MINIMUM_KDE_VERSION := 4:4.11.3
 MINIMUM_KDEPIM_VERSION := $(MINIMUM_KDE_VERSION)
-MINIMUM_KDE_WORKSPACE_VERSION := 4:4.11.3
 MINIMUM_PLASMA_VERSION := 4:5.0.0
 
 CALLIGRA_VERSION := 1:2.7.5
@@ -33,7 +32,6 @@ ifneq (,$(KDE_VERSION_METAPKGS_DFSG))
 	    -Vplasma:Version='$(MINIMUM_PLASMA_VERSION)'
 endif
 	dh_gencontrol --remaining-packages -- \
-	    -Vkde-workspace:Version='$(MINIMUM_KDE_WORKSPACE_VERSION)' \
 	    -Vkdepim:Version='$(MINIMUM_KDEPIM_VERSION)' \
 	    -Vcalligra:Version='$(CALLIGRA_VERSION)' \
 	    -Vkde:Version='$(MINIMUM_KDE_VERSION)' \

-- 
KDE metapackages