[SCM] KDE metapackages branch, kde4.12, updated. debian/83

[Maximiliano Curia]

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

The following commit has been merged in the kde4.12 branch:
commit 0b1fad43835135b5337772cd2b6da4e1d5a9dfd0
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Feb 8 23:14:48 2014 +0100

    Add devLatestWorkspace:Version subst var.
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a354fcc..eea0ef5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ meta-kde (5:83~) UNRELEASED; urgency=medium
   [ Maximiliano Curia ]
   * Replace kbattleship with knavalbattle.
   * Bump devLatest:Version to 4:4.12.
+  * Add devLatestWorkspace:Version subst var.
 
  -- 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 4f7e118..5318c1f 100644
--- a/debian/control
+++ b/debian/control
@@ -375,7 +375,7 @@ Depends: ${misc:Depends}, debhelper (>= 9), cmake (>= 2.8.6),
 Breaks: kdelibs5-dev (<< ${devLatest:Version}),
  nepomuk-core-dev (<< ${devLatest:Version}),
  kdepimlibs5-dev (<< ${devLatest:Version}),
- kde-workspace-dev (<< ${devLatest:Version}),
+ kde-workspace-dev (<< ${devLatestWorkspace:Version}),
  libnepomukwidgets-dev (<< ${devLatest:Version}),
  libkactivities-dev (<< ${devLatest:Version}),
  libkexiv2-dev (<< ${devPrev:Version}), libkdcraw-dev (<< ${devPrev:Version}),
diff --git a/debian/rules b/debian/rules
index 3ab5d36..d507cf3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@ MINIMUM_KDE_VERSION := 4:4.11.3
 MINIMUM_KDEPIM_VERSION := $(MINIMUM_KDE_VERSION)
 CALLIGRA_VERSION := 1:2.6.4
 DEV_LATEST_VERSION := 4:4.12
+DEV_LATEST_WORKSPACE_VERSION := 4:4.11.6
 DEV_PREV_VERSION := 4:4.7.4
 
 KDE_VERSION_METAPKGS := kdeaccessibility kdeadmin kdeedu kdegames kdegraphics kdegraphics-libs-data kdegraphics-strigi-plugins kdemultimedia kdenetwork kdetoys kdeutils
@@ -17,6 +18,7 @@ override_dh_gencontrol:
 	dh_gencontrol -pkde-sc-dev-latest  -- \
 	    '-v$(DEV_LATEST_PACKAGE_VERSION)' \
 	    -V'devLatest:Version=$(DEV_LATEST_VERSION)' \
+	    -V'devLatestWorkspace:Version=$(DEV_LATEST_WORKSPACE_VERSION)' \
 	    -V'devPrev:Version=$(DEV_PREV_VERSION)'
 	dh_gencontrol $(addprefix -p,$(KDE_VERSION_METAPKGS)) -- \
 	    '-v$(DEV_LATEST_PACKAGE_VERSION)' \

-- 
KDE metapackages