[SCM] plasma-workspace packaging branch, kubuntu_stable, updated. ad8198c8017b4fdbd834c01cf2122241d2a20073

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-workspace.git;a=commitdiff;h=55cc9cc

The following commit has been merged in the kubuntu_stable branch:
commit 55cc9cc5f59a7f9d9cd6192fed4339a36eee1feb
Merge: 4216bd85986f550cd11064ace4221764fc2c0b56 35e6ac84027b394809d87651b251100232796943
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Mar 25 17:00:03 2015 +0100

    Merge branch 'kubuntu_stable' into kubuntu_unstable
    
    Conflicts:
    	debian/patches/series

 debian/changelog                                   |  7 ++++
 debian/patches/series                              |  1 +
 ...the-lockscreen-password-field-focus-issue.patch | 37 ++++++++++++++++++++++
 3 files changed, 45 insertions(+)

diff --cc debian/patches/series
index 59f4624,f84ee17..b764ee8
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,5 +1,3 @@@
  kubuntu_startkde-qtpath.diff
  upstream_gdb-7.8-fix.diff
 -upstream_prison.diff
 -kubuntu_default-systray-applets.diff
+ upstream_Workaround-the-lockscreen-password-field-focus-issue.patch

-- 
plasma-workspace packaging