[SCM] kdeplasma-addons packaging branch, kubuntu_unstable, updated. debian/5.4.3-1-52-g8106958

[Clive Johnston]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 810695886e94a39f518d46a49605d7f36704ab20
Merge: c08008abf9b37c0f5074c41bc83bdb65445d24ea ce58335c40056a957a2cb55083708f4fe14bd06a
Author: Clive Johnston <clivejo at aol.com>
Date:   Thu Feb 4 11:29:52 2016 +0000

    Fixing automerge conflicts

 debian/changelog                     | 38 ++++++++++++------------------------
 debian/control                       |  6 +++---
 debian/plasma-widgets-addons.install |  2 ++
 3 files changed, 18 insertions(+), 28 deletions(-)

diff --cc debian/changelog
index d4ce7eb,c222f98..fc701bc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -38,7 -15,8 +15,15 @@@ kdeplasma-addons (4:5.5.4-0ubuntu1) UNR
    * Removing plasma_applet_showdashboard.mo from install file
    * Wildcarding /usr/share/locale/*/*/*.mo in install file
    * Adding missing activitypager files
+   * New upstream release
+ 
++  [ Scarlett Clark ]
++  * Remove another kimpanel from install file.
++  * Add new build dep for SCIM
++  * Auto Merging in archive is breaking unstable... master is different than
++    archive tar.
++  * Fix merge.
 +
    [ Bhushan Shah ]
    * Add build-dep to plasma-workspace-dev
  

-- 
kdeplasma-addons packaging