[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=41ddf02

The following commit has been merged in the master branch:
commit 41ddf02d103d6853f56e5b83ca8361421fdda0f2
Author: Pino Toscano <pino at debian.org>
Date:   Sun Aug 14 08:48:23 2016 +0200

    drop +dfsg handling for kdesdk
    
    the version bump obsoletes the issue altogether
---
 debian/changelog |  2 ++
 debian/rules     | 13 +------------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f265fe..508fb5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ meta-kde (5:91~) UNRELEASED; urgency=medium
   * Bump the minimum KDE version to 4:15.08.0, should be satisfied by all the
     packages not at 4.12.x.
   * Bump the minimum Plasma version to 4:5.6.0.
+  * Drop +dfsg handling for the kdesdk metapackage, since the version bump
+    obsoletes the issue altogether.
 
  -- 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 20d1b3f..6d18997 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,12 +12,10 @@ 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 kdegraphics-libs-data kdemultimedia kdenetwork kdetoys kdeutils
-KDE_VERSION_METAPKGS_DFSG := kdesdk
+KDE_VERSION_METAPKGS := kdeaccessibility kdeadmin kdeedu kdegames kdegraphics kdegraphics-libs-data kdemultimedia kdenetwork kdesdk kdetoys kdeutils
 
 BINARY_VERSION_NO_EPOCH := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(\([[:digit:]]\+\):\)\?/./')
 DEV_LATEST_PACKAGE_VERSION := $(DEV_LATEST_VERSION)+$(BINARY_VERSION_NO_EPOCH)
-DEV_LATEST_PACKAGE_VERSION_DFSG := $(DEV_LATEST_VERSION)+dfsg+$(BINARY_VERSION_NO_EPOCH)
 
 override_dh_gencontrol:
 	dh_gencontrol -pkde-sc-dev-latest  -- \
@@ -32,15 +30,6 @@ override_dh_gencontrol:
 	    -Vplasma:Version='$(MINIMUM_PLASMA_VERSION)' \
 	    -Vplasma:VersionNoEpoch='$(MINIMUM_PLASMA_VERSION_NO_EPOCH)' \
 	    -Vkde4:Version='$(MINIMUM_KDE4_VERSION)'
-ifneq (,$(KDE_VERSION_METAPKGS_DFSG))
-	dh_gencontrol $(addprefix -p,$(KDE_VERSION_METAPKGS_DFSG)) -- \
-	    '-v$(DEV_LATEST_PACKAGE_VERSION_DFSG)' \
-	    -Vkde:Version='$(MINIMUM_KDE_VERSION)' \
-	    -Vkde:VersionNoEpoch='$(MINIMUM_KDE_VERSION_NO_EPOCH)' \
-	    -Vplasma:Version='$(MINIMUM_PLASMA_VERSION)' \
-	    -Vplasma:VersionNoEpoch='$(MINIMUM_PLASMA_VERSION_NO_EPOCH)' \
-	    -Vkde4:Version='$(MINIMUM_KDE4_VERSION)'
-endif
 	dh_gencontrol --remaining-packages -- \
 	    -Vkdepim:Version='$(MINIMUM_KDEPIM_VERSION)' \
 	    -Vcalligra:Version='$(CALLIGRA_VERSION)' \

-- 
KDE metapackages