[SCM] kimageformats packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g2e99981

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit f820eb5489fead2bcbd61f2d08f2b04f1a961cdc
Merge: afda7b894f7a41bf36ce3f7b40bad59a212bc30b 19397c2ee66a368a404ec4b897fb91584e8ff906
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 12:29:47 2015 +0200

    Merge commit '19397c2ee66a368a404ec4b897fb91584e8ff906'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index 419c786,dc1cee3..bcf7468
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +kimageformats (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:21 +0200
 +
+ kimageformats (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:25:23 +0200
+ 
 +kimageformats (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 14 Mar 2015 22:27:03 +0100
 +
+ kimageformats (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:34:59 +0100
+ 
 +kimageformats (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 03 Mar 2015 08:39:59 +0100
 +
  kimageformats (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kimageformats packaging