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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit deebb00b6086f2bc2456b543e79222a382c132b8
Merge: d3c3a2faf322e5432bb4aa1891b63babddfeacf7 1b55995b6758598f0b3a88a8be713014fe282b30
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Dec 10 21:18:14 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_unstable'

 debian/changelog                     | 28 ++++++++++++++++++++++++++++
 debian/control                       |  6 ++++++
 debian/kdeplasma-addons-data.install |  7 +++++--
 debian/plasma-widgets-addons.install | 22 +++++++++++++++++-----
 4 files changed, 56 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index a99f13e,faa16c5..cb26292
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,25 +1,31 @@@
 +kdeplasma-addons (4:5.5.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.5.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 10 Dec 2015 14:07:40 +0100
 +
+ kdeplasma-addons (4:5.4.3-0ubuntu2) UNRELEASED; urgency=medium
+ 
+   * Debian merge: No remaining changes. 
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 04 Dec 2015 19:07:15 -0800
+ 
+ kdeplasma-addons (4:5.4.3-0ubuntu1) xenial; urgency=medium
+ 
+   [ Scarlett Clark ]
+   * New upstream bugfix release
+ 
+   [ Philip Muškovac ]
+   * New upstream bugfix release (LP: #1518598)
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 22 Nov 2015 16:29:09 +0100
+ 
+ kdeplasma-addons (4:5.4.2-0ubuntu1) wily; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 02 Oct 2015 15:52:40 +0100
+ 
  kdeplasma-addons (4:5.4.3-1) unstable; urgency=medium
  
    * New upstream release (5.4.3).
diff --cc debian/control
index 9ec57bf,fefe6a7..9ebffc5
--- a/debian/control
+++ b/debian/control
@@@ -10,9 -10,10 +10,10 @@@ Build-Depends: cmake (>= 2.8.12)
                 kio-dev (>= 5.8.0~),
                 kross-dev (>= 5.8.0~),
                 libboost-dev,
+                libgee-dev | libgee-0.8-dev,
                 libglib2.0-dev,
                 libibus-1.0-dev,
 -               libkf5activities-dev (>= 5.15.0~),
 +               libkf5activities-dev (>= 5.8.0~),
                 libkf5config-dev (>= 5.8.0~),
                 libkf5configwidgets-dev (>= 5.8.0~),
                 libkf5coreaddons-dev (>= 5.8.0~),
diff --cc debian/kdeplasma-addons-data.install
index e845856,e845856..607b275
--- a/debian/kdeplasma-addons-data.install
+++ b/debian/kdeplasma-addons-data.install
@@@ -13,7 -13,7 +13,6 @@@ usr/share/locale/*/*/plasma_applet_fram
  usr/share/locale/*/*/plasma_applet_groupingpanel.mo
  usr/share/locale/*/*/plasma_applet_incomingmsg.mo
  usr/share/locale/*/*/plasma_applet_knowledgebase.mo
--usr/share/locale/*/*/plasma_applet_kolourpicker.mo
  usr/share/locale/*/*/plasma_applet_leavenote.mo
  usr/share/locale/*/*/plasma_applet_life.mo
  usr/share/locale/*/*/plasma_applet_luna.mo
@@@ -21,21 -21,21 +20,25 @@@ usr/share/locale/*/*/plasma_applet_magn
  usr/share/locale/*/*/plasma_applet_microblog.mo
  usr/share/locale/*/*/plasma_applet_news.mo
  usr/share/locale/*/*/plasma_applet_org.kde.kimpanel.mo
++usr/share/locale/*/*/plasma_applet_org.kde.plasma.activitypager.mo
  usr/share/locale/*/*/plasma_applet_org.kde.plasma.calculator.mo
++usr/share/locale/*/*/plasma_applet_org.kde.plasma.colorpicker.mo
  usr/share/locale/*/*/plasma_applet_org.kde.plasma.comic.mo
++usr/share/locale/*/*/plasma_applet_org.kde.plasma.diskquota.mo
  usr/share/locale/*/*/plasma_applet_org.kde.plasma.fifteenpuzzle.mo
  usr/share/locale/*/*/plasma_applet_org.kde.plasma.fuzzyclock.mo
  usr/share/locale/*/*/plasma_applet_org.kde.plasma.notes.mo
++usr/share/locale/*/*/plasma_applet_org.kde.plasma.quicklaunch.mo
  usr/share/locale/*/*/plasma_applet_org.kde.plasma.quickshare.mo
  usr/share/locale/*/*/plasma_applet_org.kde.plasma.showdesktop.mo
  usr/share/locale/*/*/plasma_applet_org.kde.plasma.systemloadviewer.mo
  usr/share/locale/*/*/plasma_applet_org.kde.plasma.timer.mo
++usr/share/locale/*/*/plasma_applet_org.kde.plasma.userswitcher.mo
  usr/share/locale/*/*/plasma_applet_plasmaboard.mo
  usr/share/locale/*/*/plasma_applet_previewer.mo
  usr/share/locale/*/*/plasma_applet_qalculate.mo
  usr/share/locale/*/*/plasma_applet_qstardict.mo
  usr/share/locale/*/*/plasma_applet_rssnow.mo
--usr/share/locale/*/*/plasma_applet_showdashboard.mo
  usr/share/locale/*/*/plasma_applet_spellcheck.mo
  usr/share/locale/*/*/plasma_applet_unitconverter.mo
  usr/share/locale/*/*/plasma_applet_weather.mo

-- 
kdeplasma-addons packaging