[SCM] kdeplasma-addons packaging branch, master, updated. 9ce4cfe6eda588e57ef86845312e93862cf2a2d9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kdeplasma-addons.git;a=commitdiff;h=5cf3f7d

The following commit has been merged in the master branch:
commit 5cf3f7d1dade53c88cc420ecb9e23186bd8079a3
Merge: 57beac0540305e3d7cba3f4851e1e3c9a383841d 74592c1be81fb36540a21cf77b4fbb3481396a63
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Jun 30 17:29:53 2015 +0200

    Merge remote-tracking branch 'origin/kubuntu_unstable'
    
    Conflicts:
    	debian/plasma-dataengines-addons.install
    	debian/plasma-widgets-addons.install

 debian/changelog | 27 +++++++++++++++++++++++++++
 debian/control   |  1 +
 2 files changed, 28 insertions(+)

diff --cc debian/changelog
index 02b0197,6c8bb01..4e93a52
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,30 +1,51 @@@
 +kdeplasma-addons (4:5.3.2-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.3.2).
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 12:25:23 +0200
 +
+ kdeplasma-addons (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:25:15 +0200
+ 
 +kdeplasma-addons (4:5.3.1-1) unstable; urgency=medium
 +
 +  * New upstream release (5.3.0).
 +  * New upstream release (5.3.1).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 23:44:54 +0200
 +
+ kdeplasma-addons (4:5.3.1-0ubuntu1) wily; urgency=medium
+ 
+   [ Jonathan Riddell ]
+   * Plasma 5.3 beta
+   * new upstream release
+ 
+   [ Scarlett Clark ]
+   * Vivid backport
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:27:29 +0200
+ 
 +kdeplasma-addons (4:5.2.2-1) experimental; urgency=medium
 +
 +  * New upstream release (5.2.1).
 +  * New upstream release (5.2.2).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 23:17:49 +0100
 +
+ kdeplasma-addons (4:5.2.2-0ubuntu3) vivid; urgency=medium
+ 
+   * Add depends on qml-module-qtwebkit LP: #1431610
+     Web Browser plasmoid missing dependency to QtWebKit
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 15 Apr 2015 12:34:59 +0200
+ 
  kdeplasma-addons (4:5.2.2-0ubuntu2) vivid; urgency=medium
  
    * Fix .install files

-- 
kdeplasma-addons packaging