[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=bb30121

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

    add kde4:Version for packages still at 4.12.x
---
 debian/changelog |  1 +
 debian/control   | 14 +++++++-------
 debian/rules     | 10 +++++++---
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 02f7642..d2253fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ meta-kde (5:91~) UNRELEASED; urgency=medium
   * Bump Standards-Version to 3.9.8, no changes required.
   * Replace transitional kdesdk-dolphin-plugins with dolphin-plugins.
   * Add a kde:VersionNoEpoch variable for epoch-less dependencies.
+  * Add a kde4:Version variable for the few packages still at 4.12.x.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 11 Nov 2015 10:31:54 +0100
 
diff --git a/debian/control b/debian/control
index 35bb01f..76de351 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 (>= ${kde:Version}),
+         sweeper (>= ${kde4:Version}),
          ${misc:Depends}
 Recommends: konq-plugins (>= ${kde:Version}),
             plasma-nm (>= ${plasma:Version})
@@ -105,9 +105,9 @@ Description: complete KDE Software Compilation for end users
 Package: kdeaccessibility
 Architecture: all
 Depends: jovie (>= ${kde:Version}),
-         kaccessible (>= ${kde:Version}),
+         kaccessible (>= ${kde4:Version}),
          kde-icons-mono (>= ${kde:Version}),
-         kmag (>= ${kde:Version}),
+         kmag (>= ${kde4: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 (>= ${kde:Version}),
+         kspaceduel (>= ${kde4:Version}),
          ksquares (>= ${kde:Version}),
          ksudoku (>= ${kde:Version}),
          ktuberling (>= ${kde:Version}),
-         kubrick (>= ${kde:Version}),
+         kubrick (>= ${kde4:Version}),
          lskat (>= ${kde:Version}),
          palapeli (>= ${kde:Version}),
          picmi (>= ${kde:Version}),
@@ -305,7 +305,7 @@ Depends: cervisia (>= ${kde:Version}),
          kdesdk-kio-plugins (>= ${kde:Version}) | kdesvn-kio-plugins,
          kdesdk-misc (>= ${kde:Version}),
          kdesdk-scripts (>= ${kde:Version}),
-         kdesdk-strigi-plugins (>= ${kde:Version}),
+         kdesdk-strigi-plugins (>= ${kde4:Version}),
          kdesdk-thumbnailers (>= ${kde:Version}),
          kmtrace (>= ${kde:Version}),
          kompare (>= ${kde:Version}),
@@ -353,7 +353,7 @@ Depends: ark (>= ${kde:Version}),
          kremotecontrol (>= ${kde:Version}),
          ktimer (>= ${kde:Version}),
          kwalletmanager (>= ${kde:Version}),
-         sweeper (>= ${kde:Version}),
+         sweeper (>= ${kde4:Version}),
          ${misc:Depends}
 Recommends: print-manager (>= ${kde:Version})
 Suggests: kfloppy (>= ${kde:Version})
diff --git a/debian/rules b/debian/rules
index 9d1154b..bc3d0a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ MINIMUM_KDE_VERSION_NO_EPOCH :=  $(lastword $(subst :, ,$(MINIMUM_KDE_VERSION)))
 MINIMUM_KDEPIM_VERSION := $(MINIMUM_KDE_VERSION)
 MINIMUM_PLASMA_VERSION := 4:5.0.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,14 +30,16 @@ 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)'
+	    -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)'
+	    -Vplasma:VersionNoEpoch='$(MINIMUM_PLASMA_VERSION_NO_EPOCH)' \
+	    -Vkde4:Version='$(MINIMUM_KDE4_VERSION)'
 endif
 	dh_gencontrol --remaining-packages -- \
 	    -Vkdepim:Version='$(MINIMUM_KDEPIM_VERSION)' \
@@ -44,7 +47,8 @@ endif
 	    -Vkde:Version='$(MINIMUM_KDE_VERSION)' \
 	    -Vkde:VersionNoEpoch='$(MINIMUM_KDE_VERSION_NO_EPOCH)' \
 	    -Vplasma:Version='$(MINIMUM_PLASMA_VERSION)' \
-	    -Vplasma:VersionNoEpoch='$(MINIMUM_PLASMA_VERSION_NO_EPOCH)'
+	    -Vplasma:VersionNoEpoch='$(MINIMUM_PLASMA_VERSION_NO_EPOCH)' \
+	    -Vkde4:Version='$(MINIMUM_KDE4_VERSION)'
 
 %:
 	dh $@

-- 
KDE metapackages