[SCM] plasma-workspace packaging branch, master, updated. debian/5.8.4-1-6-g932a9aa

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7e81c22d9c01b580cf50f017670236a0ea870b62
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Dec 29 17:10:49 2016 +0100

    Drop upstream applied patch: Fix-Unable-to-assign-undefined-to-int-log.patch
---
 debian/changelog                                   |  2 ++
 ...Fix-Unable-to-assign-undefined-to-int-log.patch | 41 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c340f7f..3d099cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 plasma-workspace (4:5.8.5-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.8.5).
+  * Drop upstream applied patch: Fix-Unable-to-assign-undefined-to-int-
+    log.patch
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 28 Dec 2016 15:24:52 +0100
 
diff --git a/debian/patches/Fix-Unable-to-assign-undefined-to-int-log.patch b/debian/patches/Fix-Unable-to-assign-undefined-to-int-log.patch
deleted file mode 100644
index 1273ad0..0000000
--- a/debian/patches/Fix-Unable-to-assign-undefined-to-int-log.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Maximiliano Curia <maxy at gnuservers.com.ar>
-Date: Thu, 17 Nov 2016 10:01:49 +0100
-Subject: Fix "Unable to assign [undefined] to int" log
-
-The sddm breeze theme battery icon is trying to access the battery
-percent. In a batteryless system it produces the syslog message:
-Nov 14 22:28:23 samd sddm-greeter[3210]: file:///usr/share/sddm/themes/breeze/components/Battery.qml:39:18: Unable to assign [undefined] to int
-
-Based on https://gist.github.com/Zren/4e5709d842965227088f6e1d3fd42016
-
-Debian-Bug: https://bugs.debian.org/844194
----
- lookandfeel/contents/components/Battery.qml | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/lookandfeel/contents/components/Battery.qml b/lookandfeel/contents/components/Battery.qml
-index c4a94eb..c1bbf73 100644
---- a/lookandfeel/contents/components/Battery.qml
-+++ b/lookandfeel/contents/components/Battery.qml
-@@ -33,10 +33,19 @@ Row {
-         connectedSources: ["Battery", "AC Adapter"]
-     }
- 
-+    function getBatteryData(key, def) {
-+        var value = pmSource.data.Battery[key]
-+        if (typeof value === "undefined") {
-+            return def;
-+        } else {
-+            return value;
-+        }
-+    }
-+
-     PW.BatteryIcon {
-         id: battery
--        hasBattery: true
--        percent: pmSource.data["Battery"]["Percent"]
-+        hasBattery: getBatteryData("Has Battery", false)
-+        percent: getBatteryData("Percent", 100)
-         pluggedIn: pmSource.data["AC Adapter"] ? pmSource.data["AC Adapter"]["Plugged in"] : false
- 
-         height: batteryLabel.height
diff --git a/debian/patches/series b/debian/patches/series
index f72e68d..8b5dcef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 kubuntu_startkde-qtpath.diff
 disable_incompatible_tests
-Fix-Unable-to-assign-undefined-to-int-log.patch
 add_sddm_debian_breeze.patch

-- 
plasma-workspace packaging