From b3774c91d93a11256b0cc0af6a25db80765b976d Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 14:26:12 -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 b073f8d..7f6f653 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lxqt-panel (1.1.0-0ubuntu2~ppa1) jammy; urgency=medium + + * Backport to Jammy. + + -- Aaron Rainbolt Wed, 06 Jul 2022 14:25:33 -0500 + lxqt-panel (1.1.0-0ubuntu2) kinetic; urgency=medium * Add some missing build dependencies. From 70ba2306ce510992ba261e103035e84bf4f1ad4d Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 15:10:10 -0500 Subject: [PATCH 2/9] Updated copyright file --- debian/changelog | 1 + debian/copyright | 31 +++++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f6f653..8f2f0ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ lxqt-panel (1.1.0-0ubuntu2~ppa1) jammy; urgency=medium * Backport to Jammy. + * Updated copyright file. -- Aaron Rainbolt Wed, 06 Jul 2022 14:25:33 -0500 diff --git a/debian/copyright b/debian/copyright index 20aa139..f0bdd3c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,16 +3,43 @@ Upstream-Name: lxqt-panel Source: https://github.com/lxqt/lxqt-panel Files: * -Copyright: 2012-2020, LXQt team +Copyright: 2012-2022, LXQt team 2010-2013, Razor team License: LGPL-2.1+ +Files: plugin-tray/fdoselectionmanager.cpp + plugin-tray/snidbus.cpp + plugin-tray/sniproxy.cpp + plugin-tray/sniproxy.h +Copyright: 2015 David Edmundson + 2019 Konrad Materka + 2022 LXQt team +License: LGPL-2.1+ + +Files: plugin-tray/fdoselectionmanager.h + plugin-tray/snidbus.h +Copyright: 2015 David Edmundson + 2022 LXQt team +License: LGPL-2.1+ + +Files: plugin-tray/xcbutils.h +Copyright: 2012, 2013 Martin Graesslin + 2015 David Edmundson + 2022 LXQt team +License: LGPL-2.1+ + +Files: plugin-tray/xtestsender.cpp + plugin-tray/xtestsender.h +Copyright: 2017 David Edmundson + 2022 LXQt team +License: LGPL-2.1+ + Files: panel/lxqtpanelapplication_p.h Copyright: 2016, Luís Pereira 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 7149a66dcee7d06bc4c8a688a12af337e6e189e7 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 20:44:38 -0500 Subject: [PATCH 3/9] Silenced a small army of very-long-line-length-in-source-file messages --- debian/changelog | 2 ++ debian/lintian-overrides | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 debian/lintian-overrides diff --git a/debian/changelog b/debian/changelog index 8f2f0ff..92d0199 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ lxqt-panel (1.1.0-0ubuntu2~ppa1) jammy; urgency=medium * Backport to Jammy. * Updated copyright file. + * Overrode all very-long-line-length-in-source-file notices that Lintian + will ever throw at us with this package for the rest of forever. -- Aaron Rainbolt Wed, 06 Jul 2022 14:25:33 -0500 diff --git a/debian/lintian-overrides b/debian/lintian-overrides new file mode 100644 index 0000000..cde2e57 --- /dev/null +++ b/debian/lintian-overrides @@ -0,0 +1,2 @@ +# We don't care about line length in source files +lxqt-panel source: very-long-line-length-in-source-file * From 2a89ac97ebf9dc39665165c9b829ccffc3b9d1c1 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 21:12:06 -0500 Subject: [PATCH 4/9] Removed Repository-Browser field --- debian/changelog | 1 + debian/upstream/metadata | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 92d0199..2674c6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ lxqt-panel (1.1.0-0ubuntu2~ppa1) jammy; urgency=medium * Updated copyright file. * Overrode all very-long-line-length-in-source-file notices that Lintian will ever throw at us with this package for the rest of forever. + * Removed redundant "Repository-Browser" field from d/upstream/metadata. -- Aaron Rainbolt Wed, 06 Jul 2022 14:25:33 -0500 diff --git a/debian/upstream/metadata b/debian/upstream/metadata index 5026336..2fce1ff 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -3,4 +3,3 @@ Bug-Database: https://github.com/lxqt/lxqt-panel/issues Bug-Submit: https://github.com/lxqt/lxqt-panel/issues/new Changelog: https://github.com/lxqt/lxqt-panel/blob/master/CHANGELOG Repository: https://github.com/lxqt/lxqt-panel -Repository-Browser: https://github.com/lxqt/lxqt-panel From 28a1c34625de9f09da82d2ecdfee545bdda65c5d Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 21:13:39 -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 2674c6b..4768e41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ lxqt-panel (1.1.0-0ubuntu2~ppa1) jammy; urgency=medium * Overrode all very-long-line-length-in-source-file notices that Lintian will ever throw at us with this package for the rest of forever. * Removed redundant "Repository-Browser" field from d/upstream/metadata. + * Bumped Standards-Version to 4.6.1, no changes necessary. -- Aaron Rainbolt Wed, 06 Jul 2022 14:25:33 -0500 diff --git a/debian/control b/debian/control index f50d8a9..f682cc3 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,7 @@ Build-Depends: debhelper-compat (= 13), libxkbcommon-x11-dev, libxrender-dev, libxtst-dev -Standards-Version: 4.5.1 +Standards-Version: 4.6.1 Vcs-Browser: https://phab.lubuntu.me/source/lxqt-panel/ Vcs-Git: https://phab.lubuntu.me/source/lxqt-panel.git XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-panel From 09ee4c49ad3920ee132fe492455432a9cd425d79 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 21:14:16 -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 4768e41..7e2fce8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ lxqt-panel (1.1.0-0ubuntu2~ppa1) jammy; urgency=medium will ever throw at us with this package for the rest of forever. * Removed redundant "Repository-Browser" field from d/upstream/metadata. * Bumped Standards-Version to 4.6.1, no changes necessary. + * Removed obsolete "-Wl,--as-needed" linker flag. -- Aaron Rainbolt Wed, 06 Jul 2022 14:25:33 -0500 diff --git a/debian/rules b/debian/rules index ccd9c70..b8fe772 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 include /usr/share/dpkg/architecture.mk From e564b770fa9f854048e23b98bd77799994446a6a Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 21:15:07 -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 7e2fce8..c627f20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ lxqt-panel (1.1.0-0ubuntu2~ppa1) jammy; urgency=medium * Removed redundant "Repository-Browser" field from d/upstream/metadata. * 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. + - Silences "silent-on-rules-requiring-root" Lintian message. -- Aaron Rainbolt Wed, 06 Jul 2022 14:25:33 -0500 diff --git a/debian/control b/debian/control index f682cc3..e515b29 100644 --- a/debian/control +++ b/debian/control @@ -40,6 +40,7 @@ Vcs-Git: https://phab.lubuntu.me/source/lxqt-panel.git XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-panel XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-panel.git Homepage: https://github.com/lxqt/lxqt-panel +Rules-Requires-Root: no Package: lxqt-panel Architecture: any From 6f5da2807926c887b97fa75ea7ddadbf833a723a Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 21:15:33 -0500 Subject: [PATCH 8/9] Remove trailing whitespace from changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c627f20..02e778e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ lxqt-panel (1.1.0-0ubuntu2~ppa1) jammy; urgency=medium * Removed obsolete "-Wl,--as-needed" linker flag. * Added "Rules-Requires-Root: no" to debian/control. - Silences "silent-on-rules-requiring-root" Lintian message. + * Removed trailing whitespace from changelog. -- Aaron Rainbolt Wed, 06 Jul 2022 14:25:33 -0500 @@ -511,4 +512,3 @@ lxqt-panel (0.9.0+20151101-1) experimental; urgency=medium * Removing whitespaces at EOL and EOF. -- Alf Gaida Sun, 25 Oct 2015 02:27:12 +0200 - From c15b67b32f605d7ed4c968e45cf591792a94ba2a Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 23:15:57 -0500 Subject: [PATCH 9/9] Gave up on overriding the Lintian crud --- debian/changelog | 2 -- debian/lintian-overrides | 2 -- 2 files changed, 4 deletions(-) delete mode 100644 debian/lintian-overrides diff --git a/debian/changelog b/debian/changelog index 02e778e..c7fca16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,6 @@ lxqt-panel (1.1.0-0ubuntu2~ppa1) jammy; urgency=medium * Backport to Jammy. * Updated copyright file. - * Overrode all very-long-line-length-in-source-file notices that Lintian - will ever throw at us with this package for the rest of forever. * Removed redundant "Repository-Browser" field from d/upstream/metadata. * Bumped Standards-Version to 4.6.1, no changes necessary. * Removed obsolete "-Wl,--as-needed" linker flag. diff --git a/debian/lintian-overrides b/debian/lintian-overrides deleted file mode 100644 index cde2e57..0000000 --- a/debian/lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# We don't care about line length in source files -lxqt-panel source: very-long-line-length-in-source-file *