[SCM] kpty packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-3-g24da060

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit e0ee700cd4d827507813811a457e05556a2822b2
Merge: 5601678d22f57b64b3b21402f0d22721f62f1da1 e812b524b96b3c6c5d33f656ffe32be63ba88e6f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 13:20:12 2015 +0200

    Merge commit 'e812b524b96b3c6c5d33f656ffe32be63ba88e6f'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index f47c337,6d05b96..60e5388
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +kpty (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:20:09 +0200
 +
+ kpty (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 23:20:29 +0200
+ 
 +kpty (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 20 Mar 2015 14:13:22 +0100
 +
+ kpty (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:46:52 +0100
+ 
 +kpty (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 05 Mar 2015 22:52:21 +0100
 +
  kpty (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 8895bea,208237d..ccddd63
--- a/debian/control
+++ b/debian/control
@@@ -32,6 -33,6 +32,7 @@@ Description: development files for kpt
  
  Package: libkf5pty5
  Architecture: any
++Multi-Arch: same
  Depends: libkf5pty-data (= ${source:Version}),
           ${misc:Depends},
           ${shlibs:Depends}
@@@ -39,10 -40,10 +40,10 @@@ Description: Pty abstraction
   Provides primitives for opening & closing a pseudo
   TTY pair, assigning the controlling TTY, utmp
   registration and setting various terminal attributes.
--Multi-Arch: same
  
  Package: libkf5pty-data
  Architecture: all
++Multi-Arch: foreign
  Depends: ${misc:Depends}, ${shlibs:Depends}
  Description: Pty abstraction.
   Provides primitives for opening & closing a pseudo
@@@ -50,11 -51,11 +51,10 @@@
   registration and setting various terminal attributes.
   .
   This package contains the translations
--Multi-Arch: foreign
  
  Package: libkf5pty5-dbg
--Priority: extra
  Section: debug
++Priority: extra
  Architecture: any
  Multi-Arch: same
  Depends: libkf5pty5 (= ${binary:Version}), ${misc:Depends}

-- 
kpty packaging