[SCM] kpty packaging branch, master, updated. debian/5.37.0-2-96-g6d8962f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit cb07a53a92df76fb19949286033bee39700bd864
Merge: 7420da092e129526a5e7d1d79b23e816d413e392 a16f4fad63e7a7bcb581404048fce264a294a7d0
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 21:18:04 2015 -0700

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

 debian/changelog | 14 ++++++++++++++
 debian/control   | 10 +++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 5909408,1fa4427..649ad68
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
 +kpty (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Fix merge.
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:21:52 -0700
 +
+ kpty (5.11.0-2) unstable; urgency=medium
+ 
+   * Rebuild with libutempter.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 22:30:53 +0200
+ 
+ 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 ]
diff --cc debian/control
index 7b812b5,589ca41..681dff8
--- 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),
-                libkf5coreaddons-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
 -               libkf5i18n-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
                 libutempter-dev,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4)
@@@ -20,8 -20,8 +20,8 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5pty-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5coreaddons-dev (>= 5.12.0),
-          libkf5i18n-dev (>= 5.12.0),
 -Depends: libkf5coreaddons-dev (>= 5.11.0~),
 -         libkf5i18n-dev (>= 5.11.0~),
++Depends: libkf5coreaddons-dev (>= 5.12.0~),
++         libkf5i18n-dev (>= 5.12.0~),
           libkf5pty5 (= ${binary:Version}),
           ${misc:Depends}
  Description: development files for kpty

-- 
kpty packaging