[SCM] kunitconversion packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-gaf51979

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 378e5b415fa7a32538b584c45292bb2aebbd1d1d
Merge: 1e5527a84a682408fbd45a86b25bcc34ea1f21a7 6737fa312f0bf6910cf83e7d90edb2cd71c7d052
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 13:31:16 2015 +0200

    Merge commit '6737fa312f0bf6910cf83e7d90edb2cd71c7d052'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index 398fb6d,13cc611..e449e40
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,15 +1,33 @@@
 +kunitconversion (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:24:54 +0200
 +
+ kunitconversion (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:27:03 +0200
+ 
 +kunitconversion (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 20 Mar 2015 14:13:21 +0100
 +
+ kunitconversion (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:36:51 +0100
+ 
 +kunitconversion (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:20 +0100
 +
  kunitconversion (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kunitconversion packaging