[SCM] plasma-desktop packaging branch, kubuntu_xenial_archive, updated. debian/5.4.3-1-45-g38161d4

[Clive Johnston]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 38161d4af8b336062e0b4312b3414dfdf0dd0939
Author: Clive Johnston <clivejo at aol.com>
Date:   Wed Jan 27 21:05:29 2016 +0000

    Removing patch created from upstream
    
    - Removing patch upstream_fix_panel_shrinking.diff
    - Updating series file
    - Updating changelog
---
 debian/changelog                                 |  4 +-
 debian/patches/series                            |  1 -
 debian/patches/upstream_fix_panel_shrinking.diff | 49 ------------------------
 3 files changed, 1 insertion(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 944830f..8d23a28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,6 @@ plasma-desktop (4:5.5.4-0ubuntu1) UNRELEASED; urgency=medium
   [ Scarlett Clark ]
   * New upstream release Xenial
 
-  [ Clive Johnston ]
-  * new upstream release
-
   [ Philip Muškovac ]
   * plasma-desktop-data breaks/replaces kde-l10n:all << 4:15.08.3-0ubuntu2~
   * Build-depend on pkg-kde-tools >= 0.15.18 for l10n-packages.mk support
@@ -21,6 +18,7 @@ plasma-desktop (4:5.5.4-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Clive Johnston ]
   * New upstream release
+  * Removing patch upstream_fix_panel_shrinking.diff as it is now fixed in 5.5.4
 
  -- Clive Johnston <clivejo at aol.com>  Wed, 27 Jan 2016 20:16:04 +0000
 
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
diff --git a/debian/patches/upstream_fix_panel_shrinking.diff b/debian/patches/upstream_fix_panel_shrinking.diff
deleted file mode 100644
index 7cc1d8b..0000000
--- a/debian/patches/upstream_fix_panel_shrinking.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-From 2f07fdd5d34673f856b8f8401ab8447000254aaa Mon Sep 17 00:00:00 2001
-From: David Rosca <nowrep at gmail.com>
-Date: Thu, 14 Jan 2016 18:54:57 +0100
-Subject: [PATCH] Fix shrinking panel on top/left/right edge
-
-Use the new computed value for configDialog position.
-Fix regression from 8ba3633227
-
-REVIEW: 126743
-BUG: 357835
-FIXED-IN: 5.5.4
----
- .../contents/configuration/panelconfiguration/SizeHandle.qml        | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/desktoppackage/contents/configuration/panelconfiguration/SizeHandle.qml b/desktoppackage/contents/configuration/panelconfiguration/SizeHandle.qml
-index 5e6185c..753b6f4 100644
---- a/desktoppackage/contents/configuration/panelconfiguration/SizeHandle.qml
-+++ b/desktoppackage/contents/configuration/panelconfiguration/SizeHandle.qml
-@@ -45,7 +45,7 @@ PlasmaComponents.Button {
-             switch (panel.location) {
-             case PlasmaCore.Types.TopEdge:
-                 var y = Math.min(panel.screen.geometry.y + panel.screen.geometry.height/2, mouse.screenY - mapToItem(dialogRoot, 0, startMouseY).y);
--                var thickness = Math.max(units.gridUnit, configDialog.y - panel.y);
-+                var thickness = Math.max(units.gridUnit, y - panel.y);
- 
-                 if (thickness % 2 != 0) {
-                     if (mouse.y > startMouseY) {
-@@ -62,7 +62,7 @@ PlasmaComponents.Button {
-                 break;
-             case PlasmaCore.Types.LeftEdge:
-                 var x = Math.min(panel.screen.geometry.x + panel.screen.geometry.width/2, mouse.screenX - mapToItem(dialogRoot, startMouseX, 0).x);
--                var thickness = Math.max(units.gridUnit, configDialog.x - panel.x);
-+                var thickness = Math.max(units.gridUnit, x - panel.x);
- 
-                 if (thickness % 2 != 0) {
-                     if (mouse.x > startMouseX) {
-@@ -79,7 +79,7 @@ PlasmaComponents.Button {
-                 break;
-             case PlasmaCore.Types.RightEdge:
-                 var x = Math.max(panel.screen.geometry.x + panel.screen.geometry.width/2, mouse.screenX - mapToItem(dialogRoot, startMouseX, 0).x);
--                var thickness = Math.max(units.gridUnit, panel.screen.geometry.x + panel.screen.geometry.width - (configDialog.x + configDialog.width));
-+                var thickness = Math.max(units.gridUnit, panel.screen.geometry.x + panel.screen.geometry.width - (x + configDialog.width));
- 
-                 if (thickness % 2 != 0) {
-                     if (mouse.x > startMouseX) {
--- 
-2.7.0.rc3
-

-- 
plasma-desktop packaging