[SCM] ki18n packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-12-gd5b390e

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/ki18n.git;a=commitdiff;h=ee55239

The following commit has been merged in the kubuntu_unstable branch:
commit ee55239aeb0cf1b9c53aa65f30a8754ab2063a78
Merge: 175c7af5c0ea29621fc0188328c87fcdc948211a 570cba95b2dec4bb75b326b0ba219a772b0ed2cc
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 10:58:29 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_vivid_backports' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog

 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 4378a4d,e9a3770..8c9305a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ ki18n (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:19:25 -0700
+ 
 +ki18n (5.11.0-1) unstable; urgency=medium
 +
 +  * New upstream release (5.10.0).
 +  * New upstream release (5.11.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 26 Jun 2015 10:48:38 +0200
 +
  ki18n (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
diff --cc debian/control
index 343a415,615d85a..099ec9c
--- a/debian/control
+++ b/debian/control
@@@ -5,9 -5,9 +5,9 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
-                extra-cmake-modules (>= 5.10.0),
+                extra-cmake-modules (>= 5.11.0),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
 -               python,
 +               python-all,
                 qtbase5-dev (>= 5.4),
                 qtscript5-dev (>= 5.4)
  Standards-Version: 3.9.6

-- 
ki18n packaging