[SCM] kitemviews packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-gfd21fca

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 1b4b3e8dd94c28ade00da7dac10bcb7ca1d895f2
Merge: 6aa5df2d0055542ebb001619d7b66146ebbefd32 e2db77557ff709b3530c2a7774c796b52f6343e9
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 12:37:46 2015 +0200

    Merge commit 'e2db77557ff709b3530c2a7774c796b52f6343e9'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index 8bebc30,7334d3e..a162d2c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +kitemviews (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:28 +0200
 +
+ kitemviews (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:33:50 +0200
+ 
 +kitemviews (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:01 +0100
 +
+ kitemviews (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:44:22 +0100
+ 
 +kitemviews (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 12:33:34 +0100
 +
  kitemviews (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kitemviews packaging