[SCM] KDE metapackages branch, master, updated. debian/89-4-g583def6

[Martin Steigerwald]

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

The following commit has been merged in the master branch:
commit 583def6028f165e90b35239a30b8a2090e383f9b
Author: Martin Steigerwald <martin at lichtvoll.de>
Date:   Thu Sep 10 17:39:59 2015 +0200

    Introduce a substvar for Plasma version without epoch for kgamma5, adapt changelog, close bug.
---
 debian/changelog | 8 ++++++--
 debian/control   | 2 +-
 debian/rules     | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4355d7d..4a6a83b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +6,14 @@ meta-kde (5:90~) UNRELEASED; urgency=medium
   * Replace Depends on khelpcenter4 by khelpcenter.
 
   [Martin Steigerwald]
+  * debian/rules:
+    * Introduce substvar for minimum version of Plasma without epoch.
+    * Make this substvar available to kdegraphics for kgamma5 package.
   * kdegraphics:
     * Change depends on kgamma to kgamma5 to adapt for name change
-      and change minimum version to plasma scheme as it seems to be
-      part of Plasma now.
+      (Closes: #798496).
+    * Change minimum version to plasma without epoch as it is part of
+      Plasma now.
 
  -- Jeremy Lainé <jeremy.laine at m4x.org>  Thu, 10 Sep 2015 10:16:53 +0200
 
diff --git a/debian/control b/debian/control
index 5ce649c..4bba172 100644
--- a/debian/control
+++ b/debian/control
@@ -235,7 +235,7 @@ Architecture: all
 Depends: gwenview (>= ${kde:Version}),
          kamera (>= ${kde:Version}),
          kcolorchooser (>= ${kde:Version}),
-         kgamma5 (>= ${plasma:Version}),
+         kgamma5 (>= ${plasma:VersionNoEpoch}),
          kolourpaint4 (>= ${kde:Version}),
          kruler (>= ${kde:Version}),
          ksnapshot (>= ${kde:Version}),
diff --git a/debian/rules b/debian/rules
index db6eb40..de3698f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 MINIMUM_KDE_VERSION := 4:4.11.3
 MINIMUM_KDEPIM_VERSION := $(MINIMUM_KDE_VERSION)
 MINIMUM_PLASMA_VERSION := 4:5.0.0
+MINIMUM_PLASMA_VERSION_NO_EPOCH :=  $(lastword $(subst :, ,$(MINIMUM_PLASMA_VERSION)))
 
 CALLIGRA_VERSION := 1:2.7.5
 DEV_LATEST_VERSION := 4:4.12
@@ -24,7 +25,8 @@ override_dh_gencontrol:
 	    -V'devPrev:Version=$(DEV_PREV_VERSION)'
 	dh_gencontrol $(addprefix -p,$(KDE_VERSION_METAPKGS)) -- \
 	    '-v$(DEV_LATEST_PACKAGE_VERSION)' \
-	    -Vkde:Version='$(MINIMUM_KDE_VERSION)'
+	    -Vkde:Version='$(MINIMUM_KDE_VERSION)' \
+	    -Vplasma:VersionNoEpoch='$(MINIMUM_PLASMA_VERSION_NO_EPOCH)'
 ifneq (,$(KDE_VERSION_METAPKGS_DFSG))
 	dh_gencontrol $(addprefix -p,$(KDE_VERSION_METAPKGS_DFSG)) -- \
 	    '-v$(DEV_LATEST_PACKAGE_VERSION_DFSG)' \

-- 
KDE metapackages