Merge 0aa1d14288 into 01c1ad4499

debian/changelog

@@ -1,3 +1,19 @@
+lxqt-powermanagement (1.1.0-0ubuntu1~ppa1) jammy; urgency=medium
+
+  * Backport to Jammy.
+  * Updated copyright file.
+  * Removed redundant "Repository-Browser" field from d/upstream/metadata.
+  * Overrode Lintian message about the missing (and needless) keywords entry
+    in a desktop file.
+  * Bumped Standards-Version to 4.6.1, no changes necessary.
+  * Removed obsolete "-Wl,--as-needed" linker flag.
+  * Added "Rules-Requires-Root: no" to debian/control to silence Lintian's
+    silent-on-rules-requiring-root.
+  * Removed trailing whitespace from changelog.
+  * Ran wrap-and-sort.
+
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Wed, 06 Jul 2022 23:27:06 -0500
+
 lxqt-powermanagement (1.1.0-0ubuntu1) kinetic; urgency=medium
 
   * New upstream release.
@@ -272,4 +288,3 @@ lxqt-powermanagement (0.9.0+20150807-1) unstable; urgency=medium
   * Merging upstream version 0.9.0+20150807.
 
  -- Andrew Lee (李健秋) <ajqlee@debian.org>  Sun, 16 Aug 2015 19:19:12 +0800
-

debian/control

@@ -10,19 +10,20 @@ Build-Depends: debhelper-compat (= 13),
                libkf5idletime-dev,
                libkf5solid-dev,
                libkf5windowsystem-dev,
-               liblxqt1-dev (>= 1.1.0),
-               liblxqt-globalkeys1-dev (>= 1.1.0),
                liblxqt-globalkeys-ui1-dev (>= 1.1.0),
+               liblxqt-globalkeys1-dev (>= 1.1.0),
+               liblxqt1-dev (>= 1.1.0),
                libqt5svg5-dev,
                libqt5x11extras5-dev,
                libx11-dev,
                qtbase5-private-dev
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
 Vcs-Browser: https://phab.lubuntu.me/source/lxqt-policykit/
 Vcs-Git: https://phab.lubuntu.me/source/lxqt-policykit.git
 XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-powermanagement
 XS-Debian-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

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: lxqt-powermanagement
 Source: https://github.com/lxqt/lxqt-powermanagement
 
 Files: *
-Copyright: 2013-2020, LXQt team
+Copyright: 2013-2022, LXQt team
            2011-2012, Razor team
 License: LGPL-2.1+
 
@@ -24,7 +24,7 @@ Copyright: 2013, Alec Moskvin <alecm@gmx.com>
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2021,      Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2021-2022, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
            2014-2019, Alf Gaida <agaida@siduction.org>
            2015,      Andrew Lee (李健秋) <ajqlee@debian.org>
 License: LGPL-2.1+

debian/lintian-overrides

@@ -4,3 +4,6 @@ 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
+
+# don't care about the missing keywords entry
+lxqt-powermanagement: desktop-entry-lacks-keywords-entry usr/share/applications/lxqt-config-powermanagement.desktop

debian/rules

@@ -2,7 +2,6 @@
 # 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
 
 %:

debian/upstream/metadata

@@ -3,5 +3,3 @@ 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-Browser: https://github.com/lxqt/lxqt-powermanagement
-