[SCM] plasma-framework packaging branch, kubuntu_vivid_archive, updated. d9be2bb8ba2a0081fd4cf5593a1a7e4098d26cc8

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 4ccaf4adc20acf41468df21b67d78a50a54b29cb
Merge: 0f205a6646d1274fbc6ac4d039faa3f0b49d0c25 dce8f2507c7bae334e47b67ed658989646fbf71b
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Nov 13 10:01:10 2014 +0100

    Merge remote-tracking branch 'origin/master' into kubuntu_unstable
    
    Conflicts:
    	debian/libkf5plasma5.symbols

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

diff --cc debian/changelog
index 6b9fa9a,0efd142..8637069
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,16 +1,26 @@@
 +plasma-framework (5.4.0-0ubuntu1) vivid; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * Fix symbols
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 03 Nov 2014 18:40:15 +0100
 +
+ plasma-framework (5.4.0-0ubuntu1~ubuntu15.04~ppa2) vivid; urgency=medium
+ 
+   * Batchpatch symbols. Removed Plasma::Applet::destroyedChanged(bool)
+     which was inserted by the CI system and should not be in this release.
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 05 Nov 2014 23:37:27 +0000
+ 
+ plasma-framework (5.4.0-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 03 Nov 2014 18:40:15 +0100
+ 
  plasma-framework (5.3.0-0ubuntu1) utopic; urgency=medium
  
    * New upstream release

-- 
plasma-framework packaging