[SCM] plasma-desktop packaging branch, kubuntu_unstable, updated. ubuntu/4%5.4.3-0ubuntu1-17-g66b6edf

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=66b6edf

The following commit has been merged in the kubuntu_unstable branch:
commit 66b6edf6158920327d5f331dfb16ffdc0f3ece4f
Author: Rohan Garg <rohan at garg.io>
Date:   Tue Jan 12 20:54:50 2016 +0100

    Break/Replace kimpanel
    
    plasma-widget-kimpanel is no more, it's been moved into plasma-desktop
---
 debian/control | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index c525d49..3306139 100644
--- a/debian/control
+++ b/debian/control
@@ -144,12 +144,14 @@ Breaks: baloo-kf5 (<< 5.5),
         kde-config-touchpad (<< ${source:Version}),
         kde-touchpad (<< ${source:Version}),
         plasma-desktop-data (<< 4:5.3.2-0ubuntu1~),
-        plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
+        plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
+        plasma-widget-kimpanel
 Replaces: baloo-kf5 (<< 5.5),
           kde-config-touchpad (<< ${source:Version}),
           kde-touchpad (<< ${source:Version}),
           plasma-desktop-data (<< 4:5.3.2-0ubuntu1~),
-          plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
+          plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
+          plasma-widget-kimpanel
 Conflicts: kde-workspace-bin
 Description: Tools and widgets for the desktop
  Plasma Desktop offers a beautiful looking desktop

-- 
plasma-desktop packaging