[SCM] ki18n packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g40469d4

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit b2c407597297a2fcaca1219ab45d8621c5b58906
Merge: efc6c18190e909897987b59cfb0b48f66234f8ea ea60f88ed0b267725f3c1e9e40881fc3dbeecabf
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 12:23:38 2015 +0200

    Merge commit 'ea60f88ed0b267725f3c1e9e40881fc3dbeecabf'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index e9973a5,117d1cc..797dff3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,15 +1,35 @@@
 +ki18n (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:19:45 +0200
 +
+ ki18n (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:28:42 +0200
+ 
 +ki18n (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 14 Mar 2015 22:26:49 +0100
 +
+ ki18n (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:38:35 +0100
+ 
 +ki18n (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +  * Update build dependencies.
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 02 Mar 2015 15:48:20 +0100
 +
  ki18n (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
ki18n packaging