[SCM] KDE metapackages branch, master, updated. debian/5%96-2-gb6663c1

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit b6663c19b882177a140f9d3978fc89c93cec77f9
Author: Pino Toscano <pino at debian.org>
Date:   Wed Jan 3 19:21:49 2018 +0100

    bump version for kde-baseapps
---
 debian/changelog |  2 ++
 debian/rules     | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 65e963b..eb9d499 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 meta-kde (5:97) UNRELEASED; urgency=medium
 
+  * Make sure the version of kde-baseapps is 16.08.3, as it was in
+    src:kde-baseapps.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 03 Jan 2018 19:17:44 +0100
 
diff --git a/debian/rules b/debian/rules
index 54a94b8..e95a857 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,13 +13,17 @@ DEV_PREV_VERSION := 4:4.11.3
 
 KDE_VERSION_METAPKGS := kdeaccessibility kdeadmin kdeedu kdegames kdegraphics kdemultimedia kdenetwork kdesdk kdetoys kdeutils
 
-KDE_VERSION_METAPKGS_ADOPTED := kde-baseapps kdepim kdewebdev
+KDE_VERSION_METAPKGS_ADOPTED := kdepim kdewebdev
 MINIMUM_KDE_VERSION_ADOPTED := 4:16.04.3
 
+KDE_VERSION_METAPKGS_ADOPTED_2 := kde-baseapps
+MINIMUM_KDE_VERSION_ADOPTED_2 := 4:16.08.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)
 METAPKGS_PACKAGE_VERSION_ADOPTED := $(MINIMUM_KDE_VERSION_ADOPTED)+$(BINARY_VERSION_NO_EPOCH)
+METAPKGS_PACKAGE_VERSION_ADOPTED_2 := $(MINIMUM_KDE_VERSION_ADOPTED_2)+$(BINARY_VERSION_NO_EPOCH)
 
 override_dh_gencontrol:
 	dh_gencontrol -pkde-sc-dev-latest  -- \
@@ -38,6 +42,11 @@ override_dh_gencontrol:
 	    -Vkdepim:Version='$(MINIMUM_KDEPIM_VERSION)' \
 	    -Vkde:Version='$(MINIMUM_KDE_VERSION)' \
 	    -Vkde:VersionNoEpoch='$(MINIMUM_KDE_VERSION_NO_EPOCH)'
+	dh_gencontrol $(addprefix -p,$(KDE_VERSION_METAPKGS_ADOPTED_2)) -- \
+	    '-v$(METAPKGS_PACKAGE_VERSION_ADOPTED_2)' \
+	    -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