[SCM] plasma-framework packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-4-g9f5b73f

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/plasma-framework.git;a=commitdiff;h=7cd85a9

The following commit has been merged in the kubuntu_wily_archive branch:
commit 7cd85a9f9e938976044a2461549b8a9f8625c950
Merge: cfac86f5ca1bbd6be697169a8a72702d82c0c897 94eb200684617edb11ba1b7a53b1bf08e46a8c54
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 13:59:58 2015 +0200

    Merge commit '94eb200684617edb11ba1b7a53b1bf08e46a8c54'
    
    Conflicts:
    	debian/control
    	debian/libkf5plasmaquick5.symbols

 debian/changelog                  | 12 ++++++++++++
 debian/control                    |  6 +++++-
 debian/libkf5plasma5.symbols      |  4 +++-
 debian/libkf5plasmaquick5.symbols |  4 ++--
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 76a3f43,8d66a64..c8bbebd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +plasma-framework (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:50 +0200
 +
+ plasma-framework (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:33:19 +0200
+ 
 +plasma-framework (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +  * Update symbols files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:39:04 +0100
 +
+ plasma-framework (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:43:50 +0100
+ 
 +plasma-framework (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:54 +0100
 +
  plasma-framework (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
plasma-framework packaging