[SCM] KDE metapackages branch, master, updated. debian/5%93-4-g07bb24f

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit a92786df82896d89b008e711a5023bc62968e4f1
Author: Pino Toscano <pino at debian.org>
Date:   Wed Dec 20 19:02:53 2017 +0100

    add infra for adopting metapackages
---
 debian/changelog | 4 ++++
 debian/rules     | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 61041eb..0678efc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 meta-kde (5:94) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Add a couple of variables in rules to deal with "adopted" metapackages from
+    other sources, making sure their version is higher than what already in
+    unstable; this is temporary until the next bump of the KDE version.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 20 Dec 2017 18:39:17 +0100
 
diff --git a/debian/rules b/debian/rules
index 0301e41..215637a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,9 @@ DEV_PREV_VERSION := 4:4.11.3
 
 KDE_VERSION_METAPKGS := kdeaccessibility kdeadmin kdeedu kdegames kdegraphics kdemultimedia kdenetwork kdesdk kdetoys kdeutils
 
+KDE_VERSION_METAPKGS_ADOPTED :=
+MINIMUM_KDE_VERSION_ADOPTED := 4:16.04.3
+
 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)
@@ -29,6 +32,11 @@ override_dh_gencontrol:
 	    -Vkde:VersionNoEpoch='$(MINIMUM_KDE_VERSION_NO_EPOCH)' \
 	    -Vplasma:Version='$(MINIMUM_PLASMA_VERSION)' \
 	    -Vplasma:VersionNoEpoch='$(MINIMUM_PLASMA_VERSION_NO_EPOCH)'
+	dh_gencontrol $(addprefix -p,$(KDE_VERSION_METAPKGS_ADOPTED)) -- \
+	    '-v$(METAPKGS_PACKAGE_VERSION_ADOPTED)' \
+	    -Vkdepim:Version='$(MINIMUM_KDEPIM_VERSION)' \
+	    -Vkde:Version='$(MINIMUM_KDE_VERSION)' \
+	    -Vkde:VersionNoEpoch='$(MINIMUM_KDE_VERSION_NO_EPOCH)'
 	dh_gencontrol --remaining-packages -- \
 	    -Vkdepim:Version='$(MINIMUM_KDEPIM_VERSION)' \
 	    -Vcalligra:Version='$(CALLIGRA_VERSION)' \

-- 
KDE metapackages