[SCM] KDE metapackages branch, master, updated. debian/91-2-g967d19b

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 967d19b3c94a66e0538bfff82cecd2fb5ec9878e
Author: Pino Toscano <pino at debian.org>
Date:   Wed Aug 24 07:47:48 2016 +0200

    remove kde4:Version variable
    
    ... in favour of standard kde:Version, as the few packages previously
    at 4.12.x are now at 16.08.x
---
 debian/changelog |  3 +++
 debian/control   | 12 ++++++------
 debian/rules     |  7 ++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48f48f9..1ee9d25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 meta-kde (5:92) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Remove the kde4:Version variable in favour of standard kde:Version, as the
+    few packages previously at 4.12.x are now at 16.08.x.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 24 Aug 2016 07:43:14 +0200
 
diff --git a/debian/control b/debian/control
index 1a3ba9e..8c6a49a 100644
--- a/debian/control
+++ b/debian/control
@@ -57,7 +57,7 @@ Depends: akregator (>= ${kdepim:Version}),
          plasma-wallpapers-addons (>= ${plasma:Version}),
          plasma-widgets-addons (>= ${plasma:Version}),
          polkit-kde-agent-1 (>= ${plasma:Version}),
-         sweeper (>= ${kde4:Version}),
+         sweeper (>= ${kde:Version}),
          ${misc:Depends}
 Recommends: konq-plugins (>= ${kde:Version}),
             plasma-nm (>= ${plasma:Version})
@@ -104,9 +104,9 @@ Description: complete KDE Software Compilation for end users
 Package: kdeaccessibility
 Architecture: all
 Depends: jovie (>= ${kde:Version}),
-         kaccessible (>= ${kde4:Version}),
+         kaccessible (>= ${kde:Version}),
          kde-icons-mono (>= ${kde:Version}),
-         kmag (>= ${kde4:Version}),
+         kmag (>= ${kde:Version}),
          kmousetool (>= ${kde:Version}),
          kmouth (>= ${kde:Version}),
          ${misc:Depends}
@@ -205,11 +205,11 @@ Depends: bomber (>= ${kde:Version}),
          kshisen (>= ${kde:Version}),
          ksirk (>= ${kde:Version}),
          ksnakeduel (>= ${kde:Version}),
-         kspaceduel (>= ${kde4:Version}),
+         kspaceduel (>= ${kde:Version}),
          ksquares (>= ${kde:Version}),
          ksudoku (>= ${kde:Version}),
          ktuberling (>= ${kde:Version}),
-         kubrick (>= ${kde4:Version}),
+         kubrick (>= ${kde:Version}),
          lskat (>= ${kde:Version}),
          palapeli (>= ${kde:Version}),
          picmi (>= ${kde:Version}),
@@ -351,7 +351,7 @@ Depends: ark (>= ${kde:Version}),
          kremotecontrol (>= ${kde:Version}),
          ktimer (>= ${kde:Version}),
          kwalletmanager (>= ${kde:Version}),
-         sweeper (>= ${kde4:Version}),
+         sweeper (>= ${kde:Version}),
          ${misc:Depends}
 Recommends: print-manager (>= ${kde:Version})
 Suggests: kfloppy (>= ${kde:Version})
diff --git a/debian/rules b/debian/rules
index 05a2fcc..5150543 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@ MINIMUM_KDE_VERSION_NO_EPOCH :=  $(lastword $(subst :, ,$(MINIMUM_KDE_VERSION)))
 MINIMUM_KDEPIM_VERSION := $(MINIMUM_KDE_VERSION)
 MINIMUM_PLASMA_VERSION := 4:5.6.0
 MINIMUM_PLASMA_VERSION_NO_EPOCH :=  $(lastword $(subst :, ,$(MINIMUM_PLASMA_VERSION)))
-MINIMUM_KDE4_VERSION := 4:4.12
 
 CALLIGRA_VERSION := 1:2.7.5
 DEV_LATEST_VERSION := 4:4.12
@@ -29,16 +28,14 @@ override_dh_gencontrol:
 	    -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)'
+	    -Vplasma:VersionNoEpoch='$(MINIMUM_PLASMA_VERSION_NO_EPOCH)'
 	dh_gencontrol --remaining-packages -- \
 	    -Vkdepim:Version='$(MINIMUM_KDEPIM_VERSION)' \
 	    -Vcalligra:Version='$(CALLIGRA_VERSION)' \
 	    -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)'
+	    -Vplasma:VersionNoEpoch='$(MINIMUM_PLASMA_VERSION_NO_EPOCH)'
 
 %:
 	dh $@

-- 
KDE metapackages