[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=68f0d9f

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

    Revert "Add new kapps:Version subst."
    
    Add another variable instead.
    
    This reverts commit a15060516ab389fbeaccad3bd538b77dc9f1b54c.
---
 debian/changelog |  2 +-
 debian/control   |  4 ++--
 debian/rules     | 14 ++++++--------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d1daf08..02f7642 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,6 @@ meta-kde (5:91~) UNRELEASED; urgency=medium
     (Closes: #804636)
   * Drop freespacenotifier recommedation (Closes: #824915) Thanks to Stefan
     Björnelund for the report.
-  * Add new kapps:Version subst.
   * Replace ksnapshot dependencies with kde-spectacle.
 
   [ Pino Toscano ]
@@ -13,6 +12,7 @@ meta-kde (5:91~) UNRELEASED; urgency=medium
   * Update Vcs-* fields.
   * 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.
 
  -- 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 a9a50ea..35bb01f 100644
--- a/debian/control
+++ b/debian/control
@@ -48,7 +48,7 @@ Depends: akregator (>= ${kdepim:Version}),
          knotes (>= ${kdepim:Version}),
          kopete (>= ${kde:Version}),
          korganizer (>= ${kdepim:Version}),
-         kde-spectacle (>= ${kapps:VersionNoEpoch}),
+         kde-spectacle (>= ${kde:VersionNoEpoch}),
          kwalletmanager (>= ${kde:Version}),
          okular (>= ${kde:Version}),
          plasma-dataengines-addons (>= ${plasma:Version}),
@@ -234,7 +234,7 @@ Depends: gwenview (>= ${kde:Version}),
          kgamma5 (>= ${plasma:VersionNoEpoch}),
          kolourpaint4 (>= ${kde:Version}),
          kruler (>= ${kde:Version}),
-         kde-spectacle (>= ${kapps:VersionNoEpoch}),
+         kde-spectacle (>= ${kde:VersionNoEpoch}),
          okular (>= ${kde:Version}),
          ${misc:Depends}
 Recommends: kdegraphics-mobipocket (>= ${kde:Version}),
diff --git a/debian/rules b/debian/rules
index f93be5b..9d1154b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
 
 MINIMUM_KDE_VERSION := 4:4.11.3
+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_KAPPS_VERSION := 4:15.08.0
-MINIMUM_KAPPS_VERSION_NO_EPOCH :=  $(lastword $(subst :, ,$(MINIMUM_KAPPS_VERSION)))
 
 CALLIGRA_VERSION := 1:2.7.5
 DEV_LATEST_VERSION := 4:4.12
@@ -28,25 +27,24 @@ override_dh_gencontrol:
 	dh_gencontrol $(addprefix -p,$(KDE_VERSION_METAPKGS)) -- \
 	    '-v$(DEV_LATEST_PACKAGE_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)'
 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)' \
-	    -Vkapps:Version='$(MINIMUM_KAPPS_VERSION)' \
-	    -Vkapps:VersionNoEpoch='$(MINIMUM_KAPPS_VERSION_NO_EPOCH)'
+	    -Vplasma:VersionNoEpoch='$(MINIMUM_PLASMA_VERSION_NO_EPOCH)'
 endif
 	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)' \
-	    -Vkapps:Version='$(MINIMUM_KAPPS_VERSION)' \
-	    -Vkapps:VersionNoEpoch='$(MINIMUM_KAPPS_VERSION_NO_EPOCH)'
+	    -Vplasma:VersionNoEpoch='$(MINIMUM_PLASMA_VERSION_NO_EPOCH)'
 
 %:
 	dh $@

-- 
KDE metapackages