diff -Nru upower-0.99.7/debian/changelog upower-0.99.7/debian/changelog --- upower-0.99.7/debian/changelog 2018-01-30 14:31:02.000000000 +0000 +++ upower-0.99.7/debian/changelog 2019-01-25 16:38:41.000000000 +0000 @@ -1,3 +1,17 @@ +upower (0.99.7-2ubuntu0.18.04.1) bionic; urgency=medium + + [ Marco Trevisan (Treviño) ] + * debian/control: update mantainer to ubuntu + * debian/gbp.conf: update branch to ubuntu/bionic + * d/p/daemon-Consider-pending-charge-when-calculating-the-displ.patch: + - Detect AC state on pending state (LP: #1745032) + + [ Iain Lane ] + * debian/control: Update Vcs-* for Launchpad + * gbp.conf: Set debian-tag to create ubuntu/xxx tags + + -- Iain Lane Fri, 25 Jan 2019 16:38:41 +0000 + upower (0.99.7-2) unstable; urgency=medium * debian/tests/control: Add a test-dep on python3-dbus, needed for diff -Nru upower-0.99.7/debian/control upower-0.99.7/debian/control --- upower-0.99.7/debian/control 2018-01-30 14:31:02.000000000 +0000 +++ upower-0.99.7/debian/control 2019-01-25 16:38:41.000000000 +0000 @@ -1,7 +1,8 @@ Source: upower Section: admin Priority: optional -Maintainer: Utopia Maintenance Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Utopia Maintenance Team Uploaders: Michael Biebl , Martin Pitt , Build-Depends: debhelper (>= 10), @@ -20,8 +21,8 @@ udev [linux-any], xsltproc, Standards-Version: 4.1.2 -Vcs-Git: https://salsa.debian.org/utopia-team/upower.git -Vcs-Browser: https://salsa.debian.org/utopia-team/upower/ +Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/upower -b ubuntu/bionic +Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/ubuntu/+source/upower/+git/upower Homepage: https://upower.freedesktop.org/ Package: upower diff -Nru upower-0.99.7/debian/gbp.conf upower-0.99.7/debian/gbp.conf --- upower-0.99.7/debian/gbp.conf 2018-01-30 14:31:02.000000000 +0000 +++ upower-0.99.7/debian/gbp.conf 2019-01-25 16:38:41.000000000 +0000 @@ -1,3 +1,4 @@ [DEFAULT] pristine-tar = True -debian-branch = master +debian-branch = ubuntu/bionic +debian-tag = ubuntu/%(version)s diff -Nru upower-0.99.7/debian/patches/daemon-Consider-pending-charge-when-calculating-the-displ.patch upower-0.99.7/debian/patches/daemon-Consider-pending-charge-when-calculating-the-displ.patch --- upower-0.99.7/debian/patches/daemon-Consider-pending-charge-when-calculating-the-displ.patch 1970-01-01 00:00:00.000000000 +0000 +++ upower-0.99.7/debian/patches/daemon-Consider-pending-charge-when-calculating-the-displ.patch 2019-01-25 16:38:41.000000000 +0000 @@ -0,0 +1,36 @@ +From: =?utf-8?q?Jo=C3=A3o_Paulo_Rechi_Vita?= +Date: Mon, 15 Oct 2018 17:05:27 -0700 +Subject: daemon: Consider pending-charge when calculating the display state + +Without this change if all batteries in the system are in the +pending-charge state, the display device state is set to unknown, and +its icon to battery-missing-symbolic. + +This change makes the pending-charge state be considered when +calculating the DisplayDevice state, setting it to pending-charge if at +least one battery in the system is pending-charge and no other is +charging or discharging. + +Closes: #81 +Closes: #19 + +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/upower/+bug/1745032 +Origin: https://gitlab.freedesktop.org/upower/upower/commit/a074631c0b174 +--- + src/up-daemon.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/up-daemon.c b/src/up-daemon.c +index 1a5dddc..542477a 100644 +--- a/src/up-daemon.c ++++ b/src/up-daemon.c +@@ -218,6 +218,9 @@ up_daemon_update_display_battery (UpDaemon *daemon) + else if (state == UP_DEVICE_STATE_DISCHARGING && + state_total != UP_DEVICE_STATE_CHARGING) + state_total = UP_DEVICE_STATE_DISCHARGING; ++ else if (state == UP_DEVICE_STATE_PENDING_CHARGE && ++ (state_total == UP_DEVICE_STATE_UNKNOWN || state_total == UP_DEVICE_STATE_PENDING_CHARGE)) ++ state_total = UP_DEVICE_STATE_PENDING_CHARGE; + else if (state == UP_DEVICE_STATE_FULLY_CHARGED && + state_total == UP_DEVICE_STATE_UNKNOWN) + state_total = UP_DEVICE_STATE_FULLY_CHARGED; diff -Nru upower-0.99.7/debian/patches/series upower-0.99.7/debian/patches/series --- upower-0.99.7/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ upower-0.99.7/debian/patches/series 2019-01-25 16:38:41.000000000 +0000 @@ -0,0 +1 @@ +daemon-Consider-pending-charge-when-calculating-the-displ.patch