[SCM] sonnet packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-4-gc3d98a3

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit e4dc62699143faaac095add077a2e8c4b73539b5
Merge: 4be1cb00c6fad666410bd180943f57ae3230f133 91867ffe9f19871ec9bf5bbdeff89fa3a703f0d1
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 15:13:28 2015 +0200

    Merge commit '91867ffe9f19871ec9bf5bbdeff89fa3a703f0d1'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index 69943d4,bac2375..d3a4bf2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +sonnet (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:01 +0200
 +
+ sonnet (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:27:32 +0200
+ 
 +sonnet (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 14 Mar 2015 22:26:50 +0100
 +
+ sonnet (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:37:22 +0100
+ 
 +sonnet (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 04 Mar 2015 17:45:33 +0100
 +
  sonnet (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
sonnet packaging