[SCM] kjobwidgets packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g169af92

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 8daee71b7f4d32f4c860cad0ee5f37e053c2acac
Merge: e540f91ee4c92afbeb2bdf0b4522a08a2665f22f c302f95463ea8bcab7f91791eb8c5a00ae2f57d3
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 12:39:22 2015 +0200

    Merge commit 'c302f95463ea8bcab7f91791eb8c5a00ae2f57d3'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index 6de5a16,c81d4b4..22f9574
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,15 +1,35 @@@
 +kjobwidgets (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:25:27 +0200
 +
+ kjobwidgets (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:31:05 +0200
+ 
 +kjobwidgets (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 20 Mar 2015 14:13:23 +0100
 +
+ kjobwidgets (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:41:21 +0100
+ 
 +kjobwidgets (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +  * Update build dependencies.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 05 Mar 2015 22:52:22 +0100
 +
  kjobwidgets (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kjobwidgets packaging