[SCM] KDE metapackages branch, kde4.11, updated. debian/81-11-gc60ec75

[Maximiliano Curia]

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

The following commit has been merged in the kde4.11 branch:
commit bff66d91cb94d99ac02009dcbf23c3715803108c
Merge: ec72df5c2df5d23fcfd2994aaa9207d69a931c67 7bb37c437f8990c171cfbfd3a8903d3dad737c9d
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Oct 3 11:01:06 2013 +0200

    Merge branch 'master' into kde4.11
    
    Conflicts:
    	debian/rules

 debian/changelog |    7 +++++--
 debian/control   |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/rules     |    7 ++++++-
 3 files changed, 61 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 92d88bc,ae2ced1..fa4ef8f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -11,10 -14,8 +14,10 @@@ meta-kde (5:81) unstable; urgency=lo
    [ Maximiliano Curia ]
    * debian/control: Aesthetic change, remove trailing space.
    * Bump kde-sc-dev-latest depends versions.
 +  * Move kdeadmin metapackage.
 +  * Bump dev:latestVersion to 4:4.11.1.
  
-  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 Aug 2013 01:33:44 +0200
+  -- Pino Toscano <pino at debian.org>  Mon, 09 Sep 2013 11:53:45 +0200
  
  meta-kde (5:80) unstable; urgency=low
  
diff --cc debian/rules
index 04ba568,1414632..1cbcfa6
--- a/debian/rules
+++ b/debian/rules
@@@ -3,10 -3,11 +3,11 @@@
  MINIMUM_KDE_VERSION := 4:4.10.5
  MINIMUM_KDEPIM_VERSION := 4:4.10.5
  CALLIGRA_VERSION := 1:2.6.4
 -DEV_LATEST_VERSION := 4:4.10.5
 +DEV_LATEST_VERSION := 4:4.11.1
  DEV_PREV_VERSION := 4:4.7.4
  
- KDE_VERSION_METAPKGS := kdeaccessibility kdeadmin kdeedu kdegames kdegraphics kdegraphics-libs-data kdegraphics-strigi-plugins kdemultimedia kdeutils
+ KDE_VERSION_METAPKGS := kdeaccessibility kdeadmin kdeedu kdegames kdegraphics kdegraphics-libs-data kdegraphics-strigi-plugins kdemultimedia kdetoys kdeutils
+ KDE_VERSION_METAPKGS_DFSG := kdesdk
  
  BINARY_VERSION_NO_EPOCH := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(\([[:digit:]]\+\):\)\?/./')
  DEV_LATEST_PACKAGE_VERSION := $(DEV_LATEST_VERSION)+$(BINARY_VERSION_NO_EPOCH)

-- 
KDE metapackages