[SCM] plasma-desktop packaging branch, kubuntu_unstable, updated. debian/5.4.3-1-40-gc0ab544

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_unstable branch:
commit c0ab54475d4d38058623ab1b79414f627540261c
Author: Philip Muškovac <yofel at gmx.net>
Date:   Fri Jan 15 00:31:43 2016 +0100

    Revert "Put the file back in"
    
    This reverts commit 0fdd0525152285b3e011cdd7ab6b57b6fcae4512.
---
 debian/changelog      | 1 -
 debian/patches/series | 1 -
 2 files changed, 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b3ade24..3f1f921 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,6 @@ plasma-desktop (4:5.5.3-0ubuntu1) UNRELEASED; urgency=medium
   * Build-depend on pkg-kde-tools >= 0.15.18 for l10n-packages.mk support
   * Rename the pam-kwallet recommends to libpam-kwallet as the packages were
     renamed
-  * Cherry pick upstream_fix_panel_shrinking.diff from git
 
   [ Scarlett Clark ]
   * Debian merge, No remaining changes. 
diff --git a/debian/patches/series b/debian/patches/series
index 357a0dc..830bdcc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 allow_uxterm_overrides.diff
-upstream_fix_panel_shrinking.diff

-- 
plasma-desktop packaging