[SCM] kemoticons packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g9b74b0b

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 09fd228e1d12dd9f43d9636432ea5caade5f8b39
Merge: f1f7df9c19c55394b377fe533e7e201332c1bab6 947f0810c084794cd0e704d193241dea0075e2dc
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 12:14:40 2015 +0200

    Merge commit '947f0810c084794cd0e704d193241dea0075e2dc'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index 09b6dad,3aff492..2fbdfc0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,15 +1,33 @@@
 +kemoticons (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:13 +0200
 +
+ kemoticons (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:29:24 +0200
+ 
 +kemoticons (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:38:45 +0100
 +
+ kemoticons (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:39:22 +0100
+ 
 +kemoticons (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:44 +0100
 +
  kemoticons (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kemoticons packaging