[SCM] kiconthemes packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-gae8ba0c

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 8471b51209e3f3a7ad98eb7b1a0e39d92a5b460e
Merge: 3f031391881f96878ebda3b4348af6ed8dc11af3 98cb5bf944ddca35542b3ac6e45c7a98cdafc273
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 12:24:33 2015 +0200

    Merge commit '98cb5bf944ddca35542b3ac6e45c7a98cdafc273'
    
    Conflicts:
    	debian/control

 debian/changelog                 | 17 +++++++++++++++++
 debian/libkf5iconthemes5.symbols |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index e6f9fb0,cd0abf8..b6b59a0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,20 +1,38 @@@
 +kiconthemes (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:41 +0200
 +
+ kiconthemes (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:32:48 +0200
+ 
 +kiconthemes (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:52 +0100
 +
+ kiconthemes (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+   [ Scarlett Clark ]
+   * batchpatch symbols. Removed KIconDialog::eventFilter(QObject*, QEvent*)
+     auto generated by ci.
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:43:18 +0100
+ 
 +kiconthemes (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:47 +0100
 +
  kiconthemes (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kiconthemes packaging