Sync with archive.

2023-02-19 23:43:32 -06:00
16 changed files with 127 additions and 451 deletions
--- a/debian/.gitignore
+++ b/debian/.gitignore
@ -1,7 +0,0 @@
-/*.debhelper
-/*.log
-/*.substvars
-/debhelper-build-stamp
-/files
-
-/lxqt-powermanagement/
--- a/debian/changelog
+++ b/debian/changelog
@ -1,112 +1,42 @@
-lxqt-powermanagement (2.2.1-0ubuntu1) questing; urgency=medium
+lxqt-powermanagement (1.2.0-1) unstable; urgency=medium

  * New upstream release.
-    - Update build dependencies.
-    - Refresh DPMS revert patch.
-  * Update Standards-Version to 4.7.2, no changes needed.
+  * Bump Standards-Version to 4.6.1.
+  * Bump compat to 13.
+    * Remove unnecessary -Wl,--as-needed in d/rules.
+    * Remove unnecessary --fail-missing in d/rules.
+    * Add Rules-Requires-Root: no.
+  * Update d/watch for GitHub.
+  * Fix d/lintian-overrides.
+  * Fix d/upstream/metadata.

- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Wed, 30 Jul 2025 15:45:36 -0500
+ -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Sat, 17 Dec 2022 01:32:56 +0800

-lxqt-powermanagement (2.1.0-0ubuntu3) plucky; urgency=medium
+lxqt-powermanagement (1.1.0-3) unstable; urgency=medium

-  * Update Standards-Version to 4.7.1, no changes needed.
+  * Merge to unstable.

- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 21 Feb 2025 16:37:50 -0600
+ -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Sun, 20 Nov 2022 19:19:07 +0800

-lxqt-powermanagement (2.1.0-0ubuntu2) plucky; urgency=medium
+lxqt-powermanagement (1.1.0-2) experimental; urgency=medium

-  * No-change rebuild for lxqt-build-tools C++17 -> C++20.
+  * Merge to unstable.

- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 03 Jan 2025 03:58:19 -0600
+ -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Sun, 20 Nov 2022 18:34:30 +0800

-lxqt-powermanagement (2.1.0-0ubuntu1) plucky; urgency=medium
+lxqt-powermanagement (1.1.0-1) experimental; urgency=medium

-  * New upstream release.
-    - Bump build dependencies.
+  * Add debian/salsa-ci.yml file.
+  * Update debian/upstream/signing-key.asc.
+  * New upstream version 1.0.0
+  * New upstream version 1.1.0
+  * Build-deps on liblxqt1-dev (>= 1.1.0~).
+  * Build-deps on liblxqt-globalkeys1-dev (>= 1.1.0~).
+  * Build-deps on liblxqt-globalkeys-ui1-dev (>= 1.1.0~).
+  * Drop obsleted Breaks and Replaces lines.
+  * debian/copyright: update years.

- -- 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
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Fri, 15 Jul 2022 23:15:01 +0800

 lxqt-powermanagement (0.16.0-1) unstable; urgency=medium

@ -120,31 +50,6 @@ lxqt-powermanagement (0.16.0-1) unstable; urgency=medium

 -- 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.
@ -152,13 +57,6 @@ lxqt-powermanagement (0.14.1-1) unstable; urgency=medium

 -- 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.
@ -172,16 +70,6 @@ lxqt-powermanagement (0.14.0-1) unstable; urgency=medium

 -- 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.
@ -189,14 +77,6 @@ lxqt-powermanagement (0.13.0-1) unstable; urgency=medium

 -- 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.
-  * Update Vcs-* and Maintainer to Lubuntu values.
-  * Update build dependencies.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 22 May 2018 23:47:42 -0500
-
 lxqt-powermanagement (0.12.0-5) unstable; urgency=medium

  * Bumped compat to 11
--- a/debian/control
+++ b/debian/control
@ -1,35 +1,36 @@
 Source: lxqt-powermanagement
-Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+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-compat (= 13),
-               libkf6idletime-dev,
-               libkf6solid-dev,
-               libkf6windowsystem-dev,
-               liblxqt-globalkeys-ui2-dev (>= 2.2.0),
-               liblxqt-globalkeys2-dev (>= 2.2.0),
-               liblxqt2-dev (>= 2.2.0),
+               libkf5idletime-dev,
+               libkf5solid-dev,
+               libkf5windowsystem-dev,
+               liblxqt1-dev (>= 1.2.0~),
+               liblxqt-globalkeys1-dev (>= 1.2.0~),
+               liblxqt-globalkeys-ui1-dev (>= 1.2.0~),
+               libqt5svg5-dev,
+               libqt5x11extras5-dev,
               libx11-dev,
-               libxcb-dpms0-dev,
-               libxcb-screensaver0-dev,
-               qt6-base-private-dev (>= 6.6.0),
-               qt6-svg-dev (>= 6.6.0)
-Standards-Version: 4.7.2
-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
+               qtbase5-private-dev
+Standards-Version: 4.6.1
+Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-powermanagement
+Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-powermanagement.git
 Homepage: https://github.com/lxqt/lxqt-powermanagement
+Rules-Requires-Root: no

 Package: lxqt-powermanagement
 Architecture: any
-Depends: lxqt-policykit, upower, ${misc:Depends}, ${shlibs:Depends}
-Recommends: lxqt-powermanagement-l10n, lxqt-qtplugin, lxqt-session
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         lxqt-policykit,
+         upower
+Recommends: lxqt-powermanagement-l10n,
+            lxqt-qtplugin,
+            lxqt-session
 Description: power management module for LXQt
 The Power management module for LXQt.
 .
@ -39,8 +40,7 @@ Package: lxqt-powermanagement-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qt6-translations-l10n, ${misc:Depends}
+Depends: ${misc:Depends},
+         qttranslations5-l10n
 Description: Language package for lxqt-powermanagement
- The l10n files for lxqt-powermanagement
- .
- This package contains the l10n files needed by lxqt-powermanagement.
+ This package contains the l10n files needed by the lxqt-powermangement.
--- a/debian/copyright
+++ b/debian/copyright
@ -3,31 +3,12 @@ Upstream-Name: lxqt-powermanagement
 Source: https://github.com/lxqt/lxqt-powermanagement

 Files: *
-Copyright: 2013-2025, 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>
+Copyright: 2013-2022 LXQt team
 License: LGPL-2.1+

 Files: debian/*
-Copyright: 2021-2025, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-           2014-2019, Alf Gaida <agaida@siduction.org>
-           2015,      Andrew Lee (李健秋) <ajqlee@debian.org>
-           2025,      Aaron Rainbolt <arraybolt3@ubuntu.com>
+Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
+           2015-2022 Andrew Lee (李健秋) <ajqlee@debian.org>
 License: LGPL-2.1+

 License: LGPL-2.1+
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@ -1,6 +1,5 @@
 # there will be no manpages in a foreseable future
-lxqt-powermanagement: no-manual-page [usr/bin/lxqt-config-powermanagement]
-lxqt-powermanagement: no-manual-page [usr/bin/lxqt-powermanagement]
+lxqt-powermanagement: no-manual-page *

 # 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 *
--- a/debian/lxqt-powermanagement-l10n.install
+++ b/debian/lxqt-powermanagement-l10n.install
@ -1,2 +1,3 @@
 usr/share/lxqt/translations/lxqt-config-powermanagement
 usr/share/lxqt/translations/lxqt-powermanagement
+
--- a/debian/lxqt-powermanagement.install
+++ b/debian/lxqt-powermanagement.install
@ -1,5 +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
+usr/bin/lxqt-config-powermanagement
+usr/bin/lxqt-powermanagement
--- a/debian/lxqt-powermanagement.lintian-overrides
+++ b/debian/lxqt-powermanagement.lintian-overrides
@ -1,4 +0,0 @@
-# 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 *
--- a/debian/patches/battery-ux.patch
+++ b/debian/patches/battery-ux.patch
@ -1,114 +0,0 @@
-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;
--- a/debian/patches/revert-dpms-changes.patch
+++ b/debian/patches/revert-dpms-changes.patch
@ -1,115 +0,0 @@
-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/
-
--- a/CMakeLists.txt
-+++ b/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 DPMS SCREENSAVER)
- 
- message(STATUS "Building with Qt${Qt6Core_VERSION}")
- 
--- a/src/idlenesswatcher.cpp
-+++ b/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);
-     }
- }
- 
--- a/src/idlenesswatcher.h
-+++ b/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
--- a/debian/patches/series
+++ b/debian/patches/series
@ -1,2 +0,0 @@
-battery-ux.patch
-revert-dpms-changes.patch
--- a/debian/rules
+++ b/debian/rules
@ -7,11 +7,7 @@ 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\
-		-DUPDATE_TRANSLATIONS=OFF\
+		-DUPDATE_TRANSLATIONS=OFF \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@ -0,0 +1,12 @@
+# For more information on what jobs are run see:
+# https://salsa.debian.org/salsa-ci-team/pipeline
+#
+# To enable the jobs, go to your repository (at salsa.debian.org)
+# and click over Settings > CI/CD > Expand (in General pipelines).
+# In "Custom CI config path" write debian/salsa-ci.yml and click
+# in "Save Changes". The CI tests will run after the next commit.
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@ -1,2 +0,0 @@
-# We won't be forwarding this patch upstream
-lxqt-powermanagement source: patch-not-forwarded-upstream [debian/patches/revert-dpms-changes.patch]
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@ -1,5 +1,55 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----

+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
+=h7ww
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
 mQINBF6cxrwBEADfl3ydxNfLBbWGPesXty2baQgixZ3D6aCxadI2kX+aikmT8rd0
 ttDKN18cXV52Ssxnj0qhgf4hwnu/b0be6BzqSEyGM+UQR3X2CYpxrMakfW32Q18K
 X5ec0RPR2ucBq9G0r9t6FYC8FkJ4uQUU3xxrLW3z302S0Makjgzm8BV9WrFQ7oFF
--- a/debian/watch
+++ b/debian/watch
@ -1,5 +1,6 @@
 version=4
-opts="searchmode=plain, \
-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
+
+# See https://davesteele.github.io/development/2015/05/02/debian-watch-file-format-for-signed-github-source-tars/ for GitHub workaround for releases page.
+
+opts="downloadurlmangle=s/archive\/refs\/tags\/@ANY_VERSION@@ARCHIVE_EXT@/releases\/download\/$1\/@PACKAGE@-$1\.tar\.xz/,filenamemangle=s/@ANY_VERSION@@ARCHIVE_EXT@/@PACKAGE@-$1\.tar\.xz/,pgpsigurlmangle=s/$/.asc/" \
+https://github.com/lxqt/@PACKAGE@/tags .*/@ANY_VERSION@@ARCHIVE_EXT@