[SCM] ktextwidgets packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g9f4eaf6

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 0f34d1c3ea5f773a15e46b8d658610483146c90d
Merge: d2a759987ebca8bf433d13e6b79c7acfafa844c0 67870f0280256234988ec29ebb325c0b0ee3063e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 13:30:02 2015 +0200

    Merge commit '67870f0280256234988ec29ebb325c0b0ee3063e'
    
    Conflicts:
    	debian/control

 debian/changelog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --cc debian/changelog
index d8e5af9,32995f9..88fcf68
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +ktextwidgets (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:21:47 +0200
 +
+ ktextwidgets (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:31:34 +0200
+ 
 +ktextwidgets (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:38:39 +0100
 +
+ ktextwidgets (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:41:51 +0100
+ 
 +ktextwidgets (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Mar 2015 22:57:42 +0100
 +
  ktextwidgets (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
ktextwidgets packaging