[SCM] KDE metapackages branch, master, updated. debian/90-20-gcd5dc57

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit b2f6af825d058499f16a0ef3de67cc072bc921ac
Author: Pino Toscano <pino at debian.org>
Date:   Sun Aug 14 09:15:00 2016 +0200

    decouple version of metapackages from kde-sc-dev-latest
    
    their version is 15.08 now
---
 debian/changelog | 2 ++
 debian/rules     | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 626228f..ac5feb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ meta-kde (5:91~) UNRELEASED; urgency=medium
   * Drop +dfsg handling for the kdesdk metapackage, since the version bump
     obsoletes the issue altogether.
   * Drop old kdegraphics-libs-data transitional package.
+  * Decouple version of metapackages from kde-sc-dev-latest one, so their
+    version is 15.08 now.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 11 Nov 2015 10:31:54 +0100
 
diff --git a/debian/rules b/debian/rules
index 6f4d525..05a2fcc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,7 @@ KDE_VERSION_METAPKGS := kdeaccessibility kdeadmin kdeedu kdegames kdegraphics kd
 
 BINARY_VERSION_NO_EPOCH := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(\([[:digit:]]\+\):\)\?/./')
 DEV_LATEST_PACKAGE_VERSION := $(DEV_LATEST_VERSION)+$(BINARY_VERSION_NO_EPOCH)
+METAPKGS_PACKAGE_VERSION := $(MINIMUM_KDE_VERSION)+$(BINARY_VERSION_NO_EPOCH)
 
 override_dh_gencontrol:
 	dh_gencontrol -pkde-sc-dev-latest  -- \
@@ -24,7 +25,7 @@ override_dh_gencontrol:
 	    -V'devWorkspace:Version=$(DEV_WORKSPACE_VERSION)' \
 	    -V'devPrev:Version=$(DEV_PREV_VERSION)'
 	dh_gencontrol $(addprefix -p,$(KDE_VERSION_METAPKGS)) -- \
-	    '-v$(DEV_LATEST_PACKAGE_VERSION)' \
+	    '-v$(METAPKGS_PACKAGE_VERSION)' \
 	    -Vkde:Version='$(MINIMUM_KDE_VERSION)' \
 	    -Vkde:VersionNoEpoch='$(MINIMUM_KDE_VERSION_NO_EPOCH)' \
 	    -Vplasma:Version='$(MINIMUM_PLASMA_VERSION)' \

-- 
KDE metapackages