[SCM] kpty packaging branch, master, updated. 70a5fdd537e38370b865492932f670e568567391

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit de5dc05e7a10281a644642633c38cb966372b8d9
Merge: 22db0c11dd3d36327772dfae78783a019d77b7b3 0e14420ac4f3e9fa5788d1ae414b8db3359c26b3
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 5 09:56:51 2015 +0100

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

 debian/changelog | 6 ++++++
 debian/control   | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index e09c86d,119c81f..c43d99b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,9 +1,28 @@@
 +kpty (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:35:14 +0100
 +
+ kpty (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:34:12 +0100
+ 
 +kpty (5.6.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update install files.
 +  * Update watch file.
 +  * Update copyright information.
 +  * Add basic autopkgtests support.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 26 Jan 2015 14:12:54 +0100
 +
  kpty (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 47e945a,f76222f..4a04676
--- a/debian/control
+++ b/debian/control
@@@ -3,15 -3,15 +3,15 @@@ Section: lib
  Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Maximiliano Curia <maxy at debian.org>
 -Build-Depends: cmake,
 -               debhelper (>= 9.0.0),
 +Build-Depends: cmake (>= 2.8.12),
 +               debhelper (>= 9),
-                extra-cmake-modules (>= 1.6.0),
-                libkf5coreaddons-dev (>= 5.6.0),
-                libkf5i18n-dev (>= 5.6.0),
+                extra-cmake-modules (>= 1.7.0),
+                libkf5coreaddons-dev (>= 5.7.0),
+                libkf5i18n-dev (>= 5.7.0),
 -               libkf5kjs-dev (>= 5.7.0),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
 -               qtbase5-dev
 -Standards-Version: 3.9.5
 +               qtbase5-dev (>= 5.2)
 +Standards-Version: 3.9.6
 +XS-Testsuite: autopkgtest
  Homepage: https://projects.kde.org/projects/frameworks/kpty
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/kpty.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kpty.git

-- 
kpty packaging