[SCM] knewstuff packaging branch, master, updated. fc5ca37a58bbbc34e6ab98908bcc008ebe3e5c43

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit eef38e1701e3166596b5a2f40dc5ab54df00946f
Merge: 922aa28b30a4faba911629f7ecc2eb339cce5335 c81df8643dcf3ee91d39063b66e868e570bbac1f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 12:52:56 2015 +0200

    Merge commit 'c81df8643dcf3ee91d39063b66e868e570bbac1f'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index 0f9a817,a4e1a93..d85c5eb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +knewstuff (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:26:11 +0200
 +
+ knewstuff (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:31:50 +0200
+ 
 +knewstuff (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:39:08 +0100
 +
+ knewstuff (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:42:07 +0100
+ 
 +knewstuff (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Mar 2015 22:57:39 +0100
 +
  knewstuff (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
knewstuff packaging