Upload to Plucky

Summary:
Packaged new upstream release 0.17.1 of lxqt-powermanagement
Updated changelog, copyright, control
Renamed tag for lintian override

Test Plan:
1. Wait for D124
2. Successfully built on https://launchpad.net/~apt-ghetto/+archive/ubuntu/ludev

Reviewers: kc2bez, rikmills

Reviewed By: kc2bez

Differential Revision: https://phab.lubuntu.me/D127

debian/changelog

@@ -1,3 +1,173 @@
+lxqt-powermanagement (2.1.0-0ubuntu1) plucky; urgency=medium
+
+  * New upstream release.
+    - Bump build dependencies.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:33:02 -0600
+
+lxqt-powermanagement (2.0.0-0ubuntu1) oracular; urgency=medium
+
+  * New upstream release.
+  * Fix DPMS-related patch.
+  * Update copyright file.
+  * Adjusted build dependencies.
+  * Fix battery notification patch.
+  * Bump Standards-Version to 4.7.0, no changes necessary.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:29:08 -0500
+
+lxqt-powermanagement (1.4.0-0ubuntu2) noble; urgency=medium
+
+  * Patched out DPMS-related code (it was causing constant crashes)
+  * Renamed the "Repository-Browser" field to "Repository-Browse" in upstream
+    metadata.
+
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Tue, 14 Nov 2023 19:00:33 -0600
+
+lxqt-powermanagement (1.4.0-0ubuntu1) noble; urgency=medium
+
+  * New upstream release.
+  * Bump build dependencies.
+  * Show a notification when the battery is present, not absent.
+  * Wraaaaaaaaaaaaaaaaaaaaap.
+  * Add some missing build dependencies.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 13 Nov 2023 11:48:51 -0600
+
+lxqt-powermanagement (1.3.0-0ubuntu1) mantic; urgency=medium
+
+  * New upstream release.
+  * Bump build dependencies.
+  * Remove redundant hardening rule.
+  * Bump Standards-Version to 4.6.2, no changes needed.
+  * I guess we don't require root to build, do we?
+  * Update copyright years.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 12:50:06 -0500
+
+lxqt-powermanagement (1.2.0-0ubuntu1) lunar; urgency=medium
+
+  * New upstream release.
+  * Fix the watch file, for real this time.
+  * Bump build dependencies in debian/control.
+  * Bump Standards-version to 4.6.1, no changes needed.
+  * Lubuntuify the package slightly, to make debhelper happy.
+  * Add some missing brackets in the Lintian overrides.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 18 Nov 2022 21:55:31 -0600
+
+lxqt-powermanagement (1.1.0-0ubuntu1) kinetic; urgency=medium
+
+  * New upstream release.
+  * Bumped build dependencies.
+  * Drop old Breaks/Replaces since we're past the LTS. Update the
+    runtime dependencies too.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 02 Jun 2022 12:43:41 -0500
+
+lxqt-powermanagement (0.17.1-0ubuntu1) impish; urgency=medium
+
+  * New upstream release 0.17.1
+  * Update debian/control
+    - Bump Standards-Version to 4.5.1
+    - Use liblxqt0-dev 0.17.0
+    - Use libglobalkeys0-dev 0.17.0
+    - Use libglobalkeys-ui0-dev 0.17.0
+    - Extend lxqt-powermanagement-l10n package description
+  * Rename tag for lintian override
+  * Update debian/copyright
+
+ -- apt-ghetto <apt-ghetto@protonmail.com>  Fri, 13 Aug 2021 15:31:53 +0200
+
+lxqt-powermanagement (0.16.0-1ubuntu1) hirsute; urgency=medium
+
+  * New upstream version. Merge from debian unstable.
+  * Bump debhelper-compat requirement to 13.
+  * Update dependencies.
+
+ -- Raman Sarda <theloudspeaker@disroot.org>  Mon, 22 Feb 2021 02:55:40 +0530
+
+lxqt-powermanagement (0.16.0-1) unstable; urgency=medium
+
+  [ Alf Gaida ]
+  * Switched to gbp
+  * Bumped Standards-Version to 4.4.0, no changes needed
+
+  [ Andrew Lee (李健秋) ]
+  * New upstream release.
+  * debian/control: update build-deps.
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Wed, 06 Jan 2021 17:58:35 +0800
+
+lxqt-powermanagement (0.15.0-0ubuntu1) groovy; urgency=medium
+
+  * New upstream release.
+    - Update upstream signing key.
+    - Update LXQt build dependencies.
+  * Bump Standards-version to 4.5.0, no changes needed.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 04 Jun 2020 14:34:24 -0500
+
+lxqt-powermanagement (0.14.1-1ubuntu2) focal; urgency=medium
+
+  * Updated rules to be consistent with debian unstable.
+
+ -- Raman Sarda <theloudspeaker@lubuntu.me>  Sun, 16 Feb 2020 00:11:05 +0530
+
+lxqt-powermanagement (0.14.1-1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Using debhelper-compat
+    - Keeping ubuntu-side tweaks of writing depends in one line.
+    - Updated build deps according to new minimum requirements.
+    - Added upstream metadata
+
+ -- Raman Sarda <theloudspeaker@lubuntu.me>  Wed, 12 Feb 2020 11:13:49 +0530
+
+lxqt-powermanagement (0.14.1-1) unstable; urgency=medium
+
+  * Cherry-picking new upstream version 0.14.1.
+  * Bumped minimum version liblxqt0-dev (>= 0.14.1~)
+
+ -- Alf Gaida <agaida@siduction.org>  Tue, 26 Feb 2019 02:47:54 +0100
+
+lxqt-powermanagement (0.14.1-0ubuntu1) disco; urgency=medium
+
+  * New upstream release.
+  * Run wrap-and-sort.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 09 Mar 2019 13:15:31 -0600
+
+lxqt-powermanagement (0.14.0-1) unstable; urgency=medium
+
+  * Cherry-picking new upstream version 0.14.0.
+  * Bumped Standards to 4.3.0, no changes needed
+  * Dropped d/compat, use debhelper-compat = 12, no changes needed
+  * Fixed years in d/copyright
+  * Bumped minimum version liblxqt0-dev (>= 0.14.0~)
+  * Removed obsolete PULL_TRANSLATIONS= OFF from dh_auto_configure
+  * Added l10n-package, moved from lxqt-l10n
+  * Added d/upstream/metadata
+
+ -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 18:03:45 +0100
+
+lxqt-powermanagement (0.14.0-0ubuntu1) disco; urgency=medium
+
+  * New upstream release.
+    - Bump build dependencies.
+  * Bump Standards-version to 4.3.0, no changes needed.
+  * Bump debhelper compat to 12, no changes needed.
+  * Add a lxqt-powermanagement-l10n package.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 26 Jan 2019 00:39:28 -0600
+
+lxqt-powermanagement (0.13.0-1) unstable; urgency=medium
+
+  * Cherry-picking new upstream version 0.13.0.
+  * Bumped build dependency liblxqt0-dev to >= 0.13.0~
+
+ -- Alf Gaida <agaida@siduction.org>  Thu, 24 May 2018 22:46:32 +0200
+
 lxqt-powermanagement (0.13.0-0ubuntu1) cosmic; urgency=medium
 
   * New upstream release.

debian/compat

@@ -1 +0,0 @@
-11

debian/control

@@ -1,39 +1,46 @@
 Source: lxqt-powermanagement
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Alf Gaida <agaida@siduction.org>,
            ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
            Andrew Lee (李健秋) <ajqlee@debian.org>
 Section: x11
 Priority: optional
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper-compat (= 13),
-               libkf5idletime-dev,
+               libkf6idletime-dev,
-               libkf5solid-dev,
+               libkf6solid-dev,
-               libkf5windowsystem-dev,
+               libkf6windowsystem-dev,
-               liblxqt0-dev (>= 0.13.0),
+               liblxqt-globalkeys-ui2-dev (>= 2.1.0),
-               libqt5svg5-dev,
+               liblxqt-globalkeys2-dev (>= 2.1.0),
-               libqt5x11extras5-dev,
+               liblxqt2-dev (>= 2.1.0),
                libx11-dev,
-               qtbase5-private-dev
+               libxcb-dpms0-dev,
-Standards-Version: 4.1.4
+               libxcb-screensaver0-dev,
-Vcs-Browser: https://phab.lubuntu.me/source/lxqt-policykit/
+               qt6-base-private-dev (>= 6.6.0),
-Vcs-Git: https://phab.lubuntu.me/source/lxqt-policykit.git
+               qt6-svg-dev (>= 6.6.0)
-XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-powermanagement
+Standards-Version: 4.7.0
-XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-powermanagement.git
+Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-powermanagement-packaging
+Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-powermanagement-packaging.git
+Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-powermanagement
+Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-powermanagement.git
+Rules-Requires-Root: no
 Homepage: https://github.com/lxqt/lxqt-powermanagement
 
 Package: lxqt-powermanagement
 Architecture: any
-Depends: ${misc:Depends},
+Depends: lxqt-policykit, upower, ${misc:Depends}, ${shlibs:Depends}
-         ${shlibs:Depends},
+Recommends: lxqt-powermanagement-l10n, lxqt-qtplugin, lxqt-session
-         lxqt-policykit,
-         upower
-Recommends: lxqt-powermanagement-l10n,
-            lxqt-qtplugin,
-            lxqt-session
-Breaks: lxqt-common (<< 0.12.0)
-Replaces: lxqt-common (<< 0.12.0)
 Description: power management module for LXQt
  The Power management module for LXQt.
  .
  This package contain power management module for LXQt.
+
+Package: lxqt-powermanagement-l10n
+Architecture: all
+Multi-Arch: foreign
+Section: localization
+Depends: qt6-translations-l10n, ${misc:Depends}
+Description: Language package for lxqt-powermanagement
+ The l10n files for lxqt-powermanagement
+ .
+ This package contains the l10n files needed by lxqt-powermanagement.

debian/copyright

@@ -3,12 +3,30 @@ Upstream-Name: lxqt-powermanagement
 Source: https://github.com/lxqt/lxqt-powermanagement
 
 Files: *
-Copyright: 2013-2018 LXQt team
+Copyright: 2013-2024, LXQt team
+           2011-2012, Razor team
+License: LGPL-2.1+
+
+Files: config/helpers.h
+       src/batteryinfodialog.cpp
+       src/batteryinfodialog.h
+       src/iconproducer.cpp
+       src/iconproducer.h
+       src/powermanagementd.h
+       src/watcher.h
+Copyright: 2014-2015, Christian Surlykke <christian@surlykke.dk>
+           2014-2015, Paulo Lieuthier
+License: LGPL-2.1+
+
+Files: src/idlenesswatcher.cpp
+       src/idlenesswatcher.h
+Copyright: 2013, Alec Moskvin <alecm@gmx.com>
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2014-2018 Alf Gaida <agaida@siduction.org>
+Copyright: 2021-2024, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-           2015      Andrew Lee (李健秋) <ajqlee@debian.org>
+           2014-2019, Alf Gaida <agaida@siduction.org>
+           2015,      Andrew Lee (李健秋) <ajqlee@debian.org>
 License: LGPL-2.1+
 
 License: LGPL-2.1+

debian/gbp.conf

@@ -0,0 +1,6 @@
+[DEFAULT]
+debian-branch = debian/sid
+upstream-branch = upstream/latest
+pristine-tar = True
+compression = xz
+

debian/lintian-overrides

@@ -1,6 +1,6 @@
 # there will be no manpages in a foreseable future
-lxqt-powermanagement: binary-without-manpage usr/bin/lxqt-config-powermanagement
+lxqt-powermanagement: no-manual-page [usr/bin/lxqt-config-powermanagement]
-lxqt-powermanagement: binary-without-manpage usr/bin/lxqt-powermanagement
+lxqt-powermanagement: no-manual-page [usr/bin/lxqt-powermanagement]
 
 # category LXQt in not yet in freedesktop specs - no bug
-lxqt-powermanagement: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-powermanagement.desktop
+lxqt-powermanagement: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-powermanagement.desktop]

debian/lxqt-powermanagement-l10n.install

@@ -0,0 +1,2 @@
+usr/share/lxqt/translations/lxqt-config-powermanagement
+usr/share/lxqt/translations/lxqt-powermanagement

debian/lxqt-powermanagement.install

@@ -0,0 +1,5 @@
+etc/xdg/autostart/lxqt-powermanagement.desktop
+usr/bin/lxqt-config-powermanagement
+usr/bin/lxqt-powermanagement
+usr/share/applications/lxqt-config-powermanagement.desktop
+usr/share/icons/hicolor/scalable/devices/laptop-lid.svg

debian/lxqt-powermanagement.lintian-overrides

@@ -0,0 +1,4 @@
+# This is expected
+lxqt-powermanagement: desktop-entry-lacks-keywords-entry [usr/share/applications/lxqt-config-powermanagement.desktop]
+lxqt-powermanagement: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-powermanagement.desktop]
+lxqt-powermanagement: no-manual-page *

debian/patches/battery-ux.patch

@@ -0,0 +1,114 @@
+Description: Show a notification when the battery is present, not absent
+ In virtual machines especially, it is odd to see a message about the battery not being present. This commit moves that message to only display when there is a battery present.
+Author: Simon Quigley <tsimonq2@lubuntu.me>
+Origin: upstream
+Forwarded: https://github.com/lxqt/lxqt-powermanagement/pull/382
+Last-Update: 2023-10-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/batterywatcher.cpp
++++ b/src/batterywatcher.cpp
+@@ -43,13 +43,6 @@ BatteryWatcher::BatteryWatcher(QObject *
+ {
+     const QList<Solid::Device> devices = Solid::Device::listFromType(Solid::DeviceInterface::Battery, QString());
+ 
+-    if (devices.isEmpty())
+-    {
+-        LXQt::Notification::notify(tr("No battery!"),
+-                tr("LXQt could not find data about any battery - monitoring disabled"),
+-                QSL("lxqt-powermanagement"));
+-    }
+-
+     for (Solid::Device device : devices)
+     {
+         Solid::Battery *battery = device.as<Solid::Battery>();
+@@ -57,11 +50,24 @@ BatteryWatcher::BatteryWatcher(QObject *
+         {
+             continue;
+         }
++
+         mBatteries << battery;
+         connect(battery, &Solid::Battery::energyChanged, this, &BatteryWatcher::batteryChanged);
+         connect(battery, &Solid::Battery::chargeStateChanged, this, &BatteryWatcher::batteryChanged);
+     }
+ 
++    bool discharging;
++    double chargeLevel;
++    chargeLevelAndStatus(discharging, chargeLevel);
++
++    if (!devices.isEmpty()) {
++        QString status = discharging ? QStringLiteral("Discharging") : QStringLiteral("Charging");
++        QString message = tr("%1 (%2%)").arg(status).arg(chargeLevel);
++        LXQt::Notification::notify(tr("Battery Present"),
++                message,
++                QSL("lxqt-powermanagement"));
++    }
++
+     mBatteryInfoDialog = new BatteryInfoDialog(mBatteries);
+ 
+     connect(&mSettings, &PowerManagementSettings::settingsChanged, this, &BatteryWatcher::settingsChanged);
+@@ -85,19 +91,10 @@ void BatteryWatcher::batteryChanged()
+     static QTime actionTime;
+     static LXQt::Notification *notification = nullptr;
+ 
+-    double totalEnergyFull = 0;
+-    double totalEnergyNow = 0;
+-    bool discharging = true;
++    bool discharging;
+     double chargeLevel;
+ 
+-    for (const Solid::Battery *battery : std::as_const(mBatteries))
+-    {
+-        totalEnergyFull += battery->energyFull();
+-        totalEnergyNow += battery->energy();
+-        discharging &= (battery->chargeState() == Solid::Battery::Discharging);
+-    }
+-
+-    chargeLevel = 100 * totalEnergyNow / totalEnergyFull;
++    chargeLevelAndStatus(discharging, chargeLevel);
+ 
+     qDebug() <<  "BatteryChanged"
+              <<  "discharging:" << discharging
+@@ -160,6 +157,31 @@ void BatteryWatcher::batteryChanged()
+     }
+ }
+ 
++void BatteryWatcher::chargeLevelAndStatus(bool &discharging, double &chargeLevel)
++{
++    double totalEnergyFull = 0;
++    double totalEnergyNow = 0;
++    bool batteries = false;
++    discharging = true;
++
++    for (const Solid::Battery *battery : std::as_const(mBatteries))
++    {
++        batteries = true;
++
++        totalEnergyFull += battery->energyFull();
++        totalEnergyNow += battery->energy();
++        discharging &= (battery->chargeState() == Solid::Battery::Discharging);
++    }
++
++    if (!batteries) {
++        discharging = false;
++        chargeLevel = 0;
++    }
++    else {
++        chargeLevel = 100 * totalEnergyNow / totalEnergyFull;
++    }
++}
++
+ void BatteryWatcher::settingsChanged()
+ {
+     if (!mSettings.isShowIcon())
+--- a/src/batterywatcher.h
++++ b/src/batterywatcher.h
+@@ -51,6 +51,8 @@ private slots:
+     void setPause(TrayIcon::PAUSE duration);
+ 
+ private:
++    void chargeLevelAndStatus(bool &discharging, double &chargeLevel);
++
+     QList<Solid::Battery*> mBatteries;
+     QList<TrayIcon*> mTrayIcons;
+     QTimer mPauseTimer;

debian/patches/revert-dpms-changes.patch

@@ -0,0 +1,115 @@
+Description: Remove DPMS-related and screensaver-suspending-related code
+ lxqt-powermanagement added some code that allows the power manager to mess
+ with DPMS stuff. However it appears that DPMS is oftentimes not available in
+ Lubuntu, making lxqt-powermanagement crash over and over until it finally
+ gets disabled by LXQt until the next login. Some screensaver-related stuff
+ was also thrown in which seems unrelated but is in with a function that
+ sets DPMS timeouts. This patch removes all of that code, fixing the crashes.
+Author: Aaron Rainbolt
+Origin: ubuntu
+Last-Update: 2024-06-26
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- lxqt-powermanagement-2.0.0.orig/CMakeLists.txt
++++ lxqt-powermanagement-2.0.0/CMakeLists.txt
+@@ -29,7 +29,6 @@ find_package(KF6IdleTime ${KF6_MINIMUM_V
+ find_package(KF6Solid ${KF6_MINIMUM_VERSION} REQUIRED)
+ find_package(lxqt ${LXQT_MINIMUM_VERSION} REQUIRED)
+ find_package(lxqt-globalkeys-ui ${LXQT_GLOBALKEYS_MINIMUM_VERSION} REQUIRED)
+-find_package(XCB REQUIRED COMPONENTS xcb-dpms xcb-screensaver)
+ 
+ message(STATUS "Building with Qt${Qt6Core_VERSION}")
+ 
+--- lxqt-powermanagement-2.0.0.orig/src/idlenesswatcher.cpp
++++ lxqt-powermanagement-2.0.0/src/idlenesswatcher.cpp
+@@ -35,8 +35,6 @@
+ #include <QDebug>
+ #include <LXQt/lxqtnotification.h>
+ #include <QObject>
+-#include <xcb/dpms.h>
+-#include <xcb/screensaver.h>
+ 
+ IdlenessWatcher::IdlenessWatcher(QObject* parent):
+     Watcher(parent)
+@@ -70,47 +68,14 @@ IdlenessWatcher::IdlenessWatcher(QObject
+ 
+     connect(&mPSettings, &LXQt::Settings::settingsChanged, this, &IdlenessWatcher::onSettingsChanged);
+ 
+-    // retrieve DPMS timeouts
+-    mDpmsStandby = mDpmsSuspend = mDpmsOff = 0;
+-    if (QGuiApplication::platformName() == QStringLiteral("xcb")) {
+-        if (auto x11NativeInterface = qGuiApp->nativeInterface<QNativeInterface::QX11Application>()) {
+-            xcb_connection_t* c = x11NativeInterface->connection();
+-            xcb_dpms_get_timeouts_cookie_t cookie = xcb_dpms_get_timeouts(c);
+-            xcb_dpms_get_timeouts_reply_t* reply = xcb_dpms_get_timeouts_reply(c, cookie, nullptr);
+-            if (reply) {
+-                mDpmsStandby = reply->standby_timeout;
+-                mDpmsSuspend = reply->suspend_timeout;
+-                mDpmsOff = reply->off_timeout;
+-                free(reply);
+-            }
+-        }
+-    }
+-
+     setup();
+ }
+ 
+ IdlenessWatcher::~IdlenessWatcher()
+ {
+-    setDpmsTimeouts(true);
+     KIdleTime::instance()->removeAllIdleTimeouts();
+ }
+ 
+-void IdlenessWatcher::setDpmsTimeouts(bool restore) {
+-    if (QGuiApplication::platformName() == QStringLiteral("xcb")) {
+-        if (auto x11NativeInterface = qGuiApp->nativeInterface<QNativeInterface::QX11Application>()) {
+-            xcb_connection_t* c = x11NativeInterface->connection();
+-            if (restore) {
+-                xcb_dpms_set_timeouts(c, mDpmsStandby, mDpmsSuspend, mDpmsOff);
+-                xcb_screensaver_suspend(c, 0); // WARNING: This is not documented but works.
+-            }
+-            else {
+-                xcb_dpms_set_timeouts(c, 0, 0, 0);
+-                xcb_screensaver_suspend(c, XCB_SCREENSAVER_SUSPEND);
+-            }
+-        }
+-    }
+-}
+-
+ void IdlenessWatcher::setup()
+ {
+     if(mPSettings.isIdlenessWatcherEnabled()) {
+@@ -144,13 +109,6 @@ void IdlenessWatcher::setup()
+                 milliseconds = 1000;
+             mIdleBacklightWatcher = KIdleTime::instance()->addIdleTimeout(milliseconds);
+         }
+-
+-        // override DPMS settings
+-        setDpmsTimeouts(false);
+-    }
+-    else {
+-        // restore DPMS settings
+-        setDpmsTimeouts(true);
+     }
+ }
+ 
+--- lxqt-powermanagement-2.0.0.orig/src/idlenesswatcher.h
++++ lxqt-powermanagement-2.0.0/src/idlenesswatcher.h
+@@ -45,8 +45,6 @@ private Q_SLOTS:
+     void onSettingsChanged();
+ 
+ private:
+-    void setDpmsTimeouts(bool restore);
+-
+     PowerManagementSettings mPSettings;
+     int mIdleACWatcher;
+     int mIdleBatteryWatcher;
+@@ -54,7 +52,6 @@ private:
+     LXQt::Backlight *mBacklight;
+     int mBacklightActualValue;
+     bool mDischarging;
+-    quint16 mDpmsStandby, mDpmsSuspend, mDpmsOff;
+ };
+ 
+ #endif // IDLENESSWATCHER_H

debian/patches/series

@@ -0,0 +1,2 @@
+battery-ux.patch
+revert-dpms-changes.patch

debian/rules

@@ -2,12 +2,14 @@
 # export DH_VERBOSE=1
 
 export LC_ALL=C.UTF-8
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh ${@} --buildsystem cmake
 
+override_dh_missing:
+	dh_missing --fail-missing
+
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DPULL_TRANSLATIONS=OFF\

debian/source/lintian-overrides

@@ -0,0 +1,2 @@
+# We won't be forwarding this patch upstream
+lxqt-powermanagement source: patch-not-forwarded-upstream [debian/patches/revert-dpms-changes.patch]

debian/upstream/metadata

@@ -0,0 +1,6 @@
+Name: lxqt-powermanagement
+Bug-Database: https://github.com/lxqt/lxqt-powermanagement/issues
+Bug-Submit: https://github.com/lxqt/lxqt-powermanagement/issues/new
+Changelog: https://github.com/lxqt/lxqt-powermanagement/blob/master/CHANGELOG
+Repository: https://github.com/lxqt/lxqt-powermanagement
+Repository-Browse: https://github.com/lxqt/lxqt-powermanagement

debian/upstream/signing-key.asc

@@ -1,50 +1,52 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
-
+
-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
+mQINBF6cxrwBEADfl3ydxNfLBbWGPesXty2baQgixZ3D6aCxadI2kX+aikmT8rd0
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-Bqgt8MjwUkXjU5IB7YulUBvFU2l0MJZWDBuNy0oNtCe1cU3JyIqLKjvzQQQ9eD5L
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-Ag+8b6nF3xg03UmgsuSO8H78HGv9kKzF9aHmLt+SXq3jUX+LnIkFHErZWjFAKdJr
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-Q2IBnhyP92lEknSK9ystUJXmY69tQKBFqJxScwaS+7a/rfLKssQjSWxqk+SX4QeW
+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
-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
+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
-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
+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
-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
+7tGpgFapgvjdxnMxJfV6wuwOBUUFLR7DrXlV8EVFAYc5qTIeSQXvJsWw6gQ3+f0D
-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
+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
-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
+tTzcKMkdQizLLa+WNbqUSxg6I/P5k/smUDY9gKW7RtI5t/PupA3WTnsVD6CYWa3Q
-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
+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
-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
+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
-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
+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
-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
+Mi/Vauge6wSfw7I5AfSiwrSDNHmKVsu39koWV6JGxEeFr2MffF+CuaoJCNOr/ZII
-Yllm0f98yGNg5lnJg4bLOYu3IkpogUKNA3qkZ+6vRtwH70/bJGp7qdx/3G4W5dMX
+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
-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
+kILLhE5FW+9/O0/9bpx4joJUDLV4d3hFZy7GSHKiZUs1QW6BV75JQKqoi+cVt+/L
-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
++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
-CgkQQsnI069epeMt0g/+JrwLhULD6NOxaLgxboh/KZkh/7ViU4cB+QPT8JIcWxkZ
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-ntUcBjXKuLCj8OZrZtexjq7edWWbN57/3ikyS2Z7y0i3O30qk5jmccSaS6kA7xTY
+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
-WCDFzbN2v2y+vGu9KYn+2HtrP2BtNa8JTh3waNeLUTpn4GV4mMrsZjOy6vhhHb91
+Oa86l8pqli+B7rpTbsAE9Ut8qUaWjm87oUNSJbaKgqNnMaE+b/8VJaEeWHgQJwsD
-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
+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
-=h7ww
+NLJtd3SsRjc7ICtGdCvej59IvCDTjxtkhx5okF03APi1aXpHQrE18/arFD7BpoGO
+sw==
+=gSIv
 -----END PGP PUBLIC KEY BLOCK-----

debian/watch

@@ -1,3 +1,5 @@
 version=4
-opts="pgpsigurlmangle=s/$/.asc/" \
+opts="searchmode=plain, \
-https://github.com/lxqt/lxqt-powermanagement/releases .*/lxqt-powermanagement-([\d\.]+).tar.xz
+pgpsigurlmangle=s/$/.asc/, \
+uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \
+  https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz