[SCM] kdeplasma-addons packaging branch, master, updated. debian/5.4.0-1-33-g5947b0f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 5947b0fe4072bc7653d7f4d9c415887f6ad4deb7
Merge: 196c791827a455e060b3d20a88f8f68fa4f1d54b 6d3d2f3f862290794e5120173a8a2c3b49c8077e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Sep 11 18:48:41 2015 +0200

    Merge branch 'master' of git://git.debian.org/git/pkg-kde/plasma/kdeplasma-addons

 debian/changelog | 2 ++
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index fc3562a,efe8ce2..3870813
--- a/debian/changelog
+++ b/debian/changelog
@@@ -5,14 -5,10 +5,16 @@@ kdeplasma-addons (4:5.4.1-1) unstable; 
  
    [ Scott Kitterman ]
    * Drop unused build-depends on libgee-dev
+   * Add kwin-x11 as a real alternative to the kwin virtual package depends for
 -    kwin-addons to make the package more installable (Closes: #791381)    
++    kwin-addons to make the package more installable (Closes: #791381)
  
 - -- Scott Kitterman <scott at kitterman.com>  Fri, 11 Sep 2015 11:39:46 -0400
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:45:32 +0200
 +
 +kdeplasma-addons (4:5.4.1-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 08 Sep 2015 10:14:40 +0100
  
  kdeplasma-addons (4:5.4.0-1) unstable; urgency=medium
  

-- 
kdeplasma-addons packaging