[SCM] KDE metapackages branch, master, updated. debian/5%98-6-g095f66d

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit c7511032fad238129f59e2336fb459acfc7bcb4c
Author: Pino Toscano <pino at debian.org>
Date:   Wed Jan 17 19:41:28 2018 +0100

    simplify version handling for kde-baseapps, kdepim, kdewebdev
---
 debian/changelog |  4 +++-
 debian/rules     | 21 ++-------------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8d6d4f8..365e2d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,9 @@ meta-kde (5:99) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * Use the epoch-less version for the kwave, and k3b suggests.
-  * Bump the minimum KDE Application version to 4:17.08.3.
+  * Bump the minimum KDE Application version to 4:17.08.3
+    - because of this, remove the special version handling for the
+      kde-baseapps, kdepim, and kdewebdev metapackages
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 05 Jan 2018 07:56:05 +0100
 
diff --git a/debian/rules b/debian/rules
index 879ee32..5706255 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,19 +11,11 @@ DEV_LATEST_VERSION := 4:4.12
 DEV_WORKSPACE_VERSION := 4:4.11.6
 DEV_PREV_VERSION := 4:4.11.3
 
-KDE_VERSION_METAPKGS := kdeaccessibility kdeadmin kdeedu kdegames kdegraphics kdemultimedia kdenetwork kdesdk kdetoys kdeutils
-
-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
+KDE_VERSION_METAPKGS := kde-baseapps kdeaccessibility kdeadmin kdeedu kdegames kdegraphics kdemultimedia kdenetwork kdepim kdesdk kdetoys kdeutils kdewebdev
 
 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  -- \
@@ -35,18 +27,9 @@ override_dh_gencontrol:
 	    '-v$(METAPKGS_PACKAGE_VERSION)' \
 	    -Vkde:Version='$(MINIMUM_KDE_VERSION)' \
 	    -Vkde:VersionNoEpoch='$(MINIMUM_KDE_VERSION_NO_EPOCH)' \
+	    -Vkdepim:Version='$(MINIMUM_KDEPIM_VERSION)' \
 	    -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 $(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