[SCM] kpty packaging branch, master, updated. debian/5.9.0-1-16-ga16f4fa

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 099bef4dae32e01bbe36c8b9a2638c1ba1c7c6a0
Merge: 1cfe72f775613d962d38f9f90d2b68304f8a1bc9 1479c8d51cb0e25a116baea0cfe2794bd6eb984b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Jun 30 22:18:11 2015 +0200

    Merge remote-tracking branch 'origin/kubuntu_unstable'
    
    Conflicts:
    	debian/control

 debian/changelog | 10 ++++++++++
 debian/control   |  1 +
 2 files changed, 11 insertions(+)

diff --cc debian/changelog
index 0f3065c,856d8e7..c55c4a5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,13 +1,20 @@@
 +kpty (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>  Sat, 27 Jun 2015 12:59:39 +0200
 +
+ kpty (5.10.0-0ubuntu1) wily; urgency=medium
+ 
+   [ Maximiliano Curia ]
+   * New upstream release (5.10.0).
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:05:41 +0200
+ 
  kpty (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).
diff --cc debian/control
index 0398162,71a0e1f..589ca41
--- a/debian/control
+++ b/debian/control
@@@ -5,9 -5,10 +5,10 @@@ 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),
 -               libkf5coreaddons-dev (>= 5.10.0),
 -               libkf5i18n-dev (>= 5.10.0),
 +               extra-cmake-modules (>= 5.11.0~),
 +               libkf5coreaddons-dev (>= 5.11.0~),
 +               libkf5i18n-dev (>= 5.11.0~),
+                libutempter-dev,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4)
  Standards-Version: 3.9.6

-- 
kpty packaging