From f76bedfac967ba59f26318eb00fd7ec5f2d12d8a Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 23:27:34 -0500 Subject: [PATCH 1/9] Prepare for backport --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index d5da674..ccaa911 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lxqt-powermanagement (1.1.0-0ubuntu1~ppa1) jammy; urgency=medium + + * Backport to Jammy. + + -- Aaron Rainbolt Wed, 06 Jul 2022 23:27:06 -0500 + lxqt-powermanagement (1.1.0-0ubuntu1) kinetic; urgency=medium * New upstream release. From 311dce9aec18564325c7d2e6249c789f97e80e38 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 23:37:57 -0500 Subject: [PATCH 2/9] Updated copyright file --- debian/changelog | 1 + debian/copyright | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ccaa911..6490865 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ lxqt-powermanagement (1.1.0-0ubuntu1~ppa1) jammy; urgency=medium * Backport to Jammy. + * Updated copyright file. -- Aaron Rainbolt Wed, 06 Jul 2022 23:27:06 -0500 diff --git a/debian/copyright b/debian/copyright index 5d617bb..04d1206 100644 --- a/debian/copyright +++ b/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 License: LGPL-2.1+ Files: debian/* -Copyright: 2021, Lubuntu Developers +Copyright: 2021-2022, Lubuntu Developers 2014-2019, Alf Gaida 2015, Andrew Lee (李健秋) License: LGPL-2.1+ From 1bd6105d9e4b22255c68871253c0a0de40a78c12 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 23:45:06 -0500 Subject: [PATCH 3/9] Removed Repository-Browser field --- debian/changelog | 1 + debian/upstream/metadata | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6490865..5debb26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ 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. -- Aaron Rainbolt Wed, 06 Jul 2022 23:27:06 -0500 diff --git a/debian/upstream/metadata b/debian/upstream/metadata index 0194f40..310bfed 100644 --- a/debian/upstream/metadata +++ b/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 - From 3be61b80d5c4d327a2ca0b36a07b7ee57d1874b1 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 23:46:23 -0500 Subject: [PATCH 4/9] Overrode message about missing keywords entry --- debian/changelog | 2 ++ debian/lintian-overrides | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5debb26..75ecda7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ 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. -- Aaron Rainbolt Wed, 06 Jul 2022 23:27:06 -0500 diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 01c17e4..2e79862 100644 --- a/debian/lintian-overrides +++ b/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 From 050cef8c2e3efc534fb1725c50cb3fa1e2aa52f8 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 23:47:01 -0500 Subject: [PATCH 5/9] Bumped Standards-Version --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 75ecda7..bb8ee67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ lxqt-powermanagement (1.1.0-0ubuntu1~ppa1) jammy; urgency=medium * 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. -- Aaron Rainbolt Wed, 06 Jul 2022 23:27:06 -0500 diff --git a/debian/control b/debian/control index 3d11d3e..5c58e8b 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: debhelper-compat (= 13), 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 From fb844307137016026736a61a813092aa6cf1c3ef Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 23:47:29 -0500 Subject: [PATCH 6/9] Removed obsolete linker flag --- debian/changelog | 1 + debian/rules | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bb8ee67..560a6cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ lxqt-powermanagement (1.1.0-0ubuntu1~ppa1) jammy; urgency=medium * 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. -- Aaron Rainbolt Wed, 06 Jul 2022 23:27:06 -0500 diff --git a/debian/rules b/debian/rules index 5f6e202..dbc664d 100755 --- a/debian/rules +++ b/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 %: From 263e58750f8640053b38dd3fd029a45d8480bb11 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 23:48:27 -0500 Subject: [PATCH 7/9] Added 'Rules-Requires-Root: no' --- debian/changelog | 2 ++ debian/control | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 560a6cd..74d8d58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ lxqt-powermanagement (1.1.0-0ubuntu1~ppa1) jammy; urgency=medium 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. -- Aaron Rainbolt Wed, 06 Jul 2022 23:27:06 -0500 diff --git a/debian/control b/debian/control index 5c58e8b..a425422 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,7 @@ 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 From ee9e847d1f942c5a924eb1785628d22a0e904ed3 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 23:48:57 -0500 Subject: [PATCH 8/9] Removed trailing whitespace from changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 74d8d58..66e4c2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ lxqt-powermanagement (1.1.0-0ubuntu1~ppa1) jammy; urgency=medium * 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. -- Aaron Rainbolt Wed, 06 Jul 2022 23:27:06 -0500 @@ -286,4 +287,3 @@ lxqt-powermanagement (0.9.0+20150807-1) unstable; urgency=medium * Merging upstream version 0.9.0+20150807. -- Andrew Lee (李健秋) Sun, 16 Aug 2015 19:19:12 +0800 - From 0aa1d142880c6887f9b8688948f07a4481da6fd0 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 23:54:10 -0500 Subject: [PATCH 9/9] Ran wrap-and-sort. --- debian/changelog | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 66e4c2a..87592e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ lxqt-powermanagement (1.1.0-0ubuntu1~ppa1) jammy; urgency=medium * 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 Wed, 06 Jul 2022 23:27:06 -0500 diff --git a/debian/control b/debian/control index a425422..6457490 100644 --- a/debian/control +++ b/debian/control @@ -10,9 +10,9 @@ 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,