[SCM] KDE metapackages branch, master, updated. debian/84-7-g3af3487

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 3af348713df6c4f0634cef670d62b90f78e8b1f1
Merge: c820c56b0735774fff77f56b461139b065708d9f 8a7e16904b9060b89305325c4788bf71d51c1127
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Apr 29 15:44:14 2014 +0200

    Merge branch 'master' of git://git.debian.org/pkg-kde/meta-kde
    
    Conflicts:
    	debian/control
    	debian/rules

 debian/changelog |  7 +++++++
 debian/control   | 16 +++++++++-------
 debian/copyright |  6 +++---
 debian/rules     | 14 ++++++++------
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --cc debian/changelog
index 556e481,75af5aa..19cc412
--- a/debian/changelog
+++ b/debian/changelog
@@@ -10,14 -4,15 +10,21 @@@ meta-kde (5:83) experimental; urgency=m
    * Bump the minimum KDE SC version to 4:4.11.3.
    * Make the minimum kdepim version the same as the minimum KDE SC version.
    * Remove the "4" from the short description of kdenetwork.
+   * Bump devPrev:Version to 4:4.11.3.
+   * Bump the Calligra version to 1:2.7.5.
+   * Add kde-workspace:Version for kde-workspace packages, and set it as
+     4:4.11.3.
+   * Add devWorkspace:Version, and set it as 4:4.11.3.
+   * Bump Standards-Version to 3.9.5, no changes required.
+   * Update copyright.
  
 - -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 14 Dec 2013 19:51:16 +0100
 +  [ Maximiliano Curia ]
 +  * Replace kbattleship with knavalbattle.
 +  * Bump devLatest:Version to 4:4.12.
 +  * Add devLatestWorkspace:Version subst var.
 +  * Add devLatestNepomukWidgets:Version subst var.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 10 Feb 2014 14:12:33 +0100
  
  meta-kde (5:82) unstable; urgency=low
  
diff --cc debian/control
index 8fa98de,9ad3827..b8f1bc2
--- a/debian/control
+++ b/debian/control
@@@ -375,8 -377,8 +377,8 @@@ Depends: ${misc:Depends}, debhelper (>
  Breaks: kdelibs5-dev (<< ${devLatest:Version}),
   nepomuk-core-dev (<< ${devLatest:Version}),
   kdepimlibs5-dev (<< ${devLatest:Version}),
-  kde-workspace-dev (<< ${devLatestWorkspace:Version}),
-  libnepomukwidgets-dev (<< ${devLatestNepomukWidgets:Version}),
+  kde-workspace-dev (<< ${devWorkspace:Version}),
 - libnepomukwidgets-dev (<< ${devLatest:Version}),
++ libnepomukwidgets-dev (<< ${devNepomukWidgets:Version}),
   libkactivities-dev (<< ${devLatest:Version}),
   libkexiv2-dev (<< ${devPrev:Version}), libkdcraw-dev (<< ${devPrev:Version}),
   libkipi-dev (<< ${devPrev:Version}), libmarble-dev (<< ${devPrev:Version}),
diff --cc debian/rules
index f83844c,999f454..fd85e13
--- a/debian/rules
+++ b/debian/rules
@@@ -2,11 -2,11 +2,12 @@@
  
  MINIMUM_KDE_VERSION := 4:4.11.3
  MINIMUM_KDEPIM_VERSION := $(MINIMUM_KDE_VERSION)
- CALLIGRA_VERSION := 1:2.6.4
+ MINIMUM_KDE_WORKSPACE_VERSION := 4:4.11.3
+ CALLIGRA_VERSION := 1:2.7.5
 -DEV_LATEST_VERSION := 4:4.11.3
 -DEV_WORKSPACE_VERSION := 4:4.11.3
 +DEV_LATEST_VERSION := 4:4.12
- DEV_LATEST_WORKSPACE_VERSION := 4:4.11.6
- DEV_LATEST_NEPOMUK_WIDGETS_VERSION := 4:4.11.5
- DEV_PREV_VERSION := 4:4.7.4
++DEV_NEPOMUK_WIDGETS_VERSION := 4:4.11.5
++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 kdegraphics-strigi-plugins kdemultimedia kdenetwork kdetoys kdeutils
  KDE_VERSION_METAPKGS_DFSG := kdesdk
@@@ -19,8 -19,7 +20,8 @@@ override_dh_gencontrol
  	dh_gencontrol -pkde-sc-dev-latest  -- \
  	    '-v$(DEV_LATEST_PACKAGE_VERSION)' \
  	    -V'devLatest:Version=$(DEV_LATEST_VERSION)' \
- 	    -V'devLatestWorkspace:Version=$(DEV_LATEST_WORKSPACE_VERSION)' \
- 	    -V'devLatestNepomukWidgets:Version=$(DEV_LATEST_NEPOMUK_WIDGETS_VERSION)' \
++	    -V'devNepomukWidgets:Version=$(DEV_NEPOMUK_WIDGETS_VERSION)' \
+ 	    -V'devWorkspace:Version=$(DEV_WORKSPACE_VERSION)' \
  	    -V'devPrev:Version=$(DEV_PREV_VERSION)'
  	dh_gencontrol $(addprefix -p,$(KDE_VERSION_METAPKGS)) -- \
  	    '-v$(DEV_LATEST_PACKAGE_VERSION)' \

-- 
KDE metapackages