[SCM] knotifyconfig packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-gfd70c86

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit d9887b70ed2f25f33500e42aea95c20eda08ecb2
Merge: 75e7fc85fef822808f46d64793b0710de662670b 5d8c19f88dfdd49e0a4e7afaa8476521868dfcab
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 12:55:01 2015 +0200

    Merge commit '5d8c19f88dfdd49e0a4e7afaa8476521868dfcab'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index c1a4815,fddbf41..5f58eae
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +knotifyconfig (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:22:45 +0200
 +
+ knotifyconfig (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:30:05 +0200
+ 
 +knotifyconfig (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:14 +0100
 +
+ knotifyconfig (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:40:12 +0100
+ 
 +knotifyconfig (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:58 +0100
 +
  knotifyconfig (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
knotifyconfig packaging