[SCM] KDE metapackages branch, kde4.11, updated. debian/82-10-g8a7e169

[Maximiliano Curia]

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

The following commit has been merged in the kde4.11 branch:
commit 82818baf93c572d24606c57088d32d67c7dccadf
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jan 18 13:04:19 2014 +0100

    add kde-workspace:Version for kde-workspace packages
    
    set it as 4:4.11.3
---
 debian/changelog |  2 ++
 debian/control   | 10 ++++++----
 debian/rules     |  2 ++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be5c48a..b182a7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ meta-kde (5:83) UNRELEASED; urgency=medium
   * Remove the "4" from the short description of kdenetwork.
   * Bump devPrev:Version to 4:4.11.3.
   * Bump the Calligra version to 1:2.7.5.
+  * Add kde-workspace:Version for kde-workspace packages, and set it as
+    4:4.11.3.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 14 Dec 2013 19:51:16 +0100
 
diff --git a/debian/control b/debian/control
index 5d6895f..5167d27 100644
--- a/debian/control
+++ b/debian/control
@@ -17,11 +17,12 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/meta-kde.git
 Package: kde-plasma-desktop
 Architecture: any
 Depends: ${misc:Depends}, kde-runtime (>= ${kde:Version}),
- plasma-desktop (>= ${kde:Version}), kde-workspace (>= ${kde:Version}),
+ plasma-desktop (>= ${kde-workspace:Version}),
+ kde-workspace (>= ${kde-workspace:Version}),
  kde-baseapps (>= ${kde:Version}),
  udisks2 [linux-any], upower [linux-any]
 Breaks: kde-minimal (<< 5:57)
-Recommends: kdm (>= ${kde:Version}), xserver-xorg
+Recommends: kdm (>= ${kde-workspace:Version}), 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,10 +36,11 @@ Description: KDE Plasma Desktop and minimal set of applications
 Package: kde-plasma-netbook
 Architecture: any
 Depends: ${misc:Depends}, kde-runtime (>= ${kde:Version}),
- plasma-netbook (>= ${kde:Version}), kde-workspace (>= ${kde:Version}),
+ plasma-netbook (>= ${kde-workspace:Version}),
+ kde-workspace (>= ${kde-workspace:Version}),
  kde-baseapps (>= ${kde:Version}),
  udisks2 [linux-any], upower [linux-any]
-Recommends: kdm (>= ${kde:Version}), xserver-xorg
+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
diff --git a/debian/rules b/debian/rules
index 722fed2..2515b80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 
 MINIMUM_KDE_VERSION := 4:4.11.3
 MINIMUM_KDEPIM_VERSION := $(MINIMUM_KDE_VERSION)
+MINIMUM_KDE_WORKSPACE_VERSION := 4:4.11.3
 CALLIGRA_VERSION := 1:2.7.5
 DEV_LATEST_VERSION := 4:4.11.3
 DEV_PREV_VERSION := 4:4.11.3
@@ -27,6 +28,7 @@ ifneq (,$(KDE_VERSION_METAPKGS_DFSG))
 	    -Vkde:Version='$(MINIMUM_KDE_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