From e9e60cdae973f4e6e0c35810ab1c4dd859ee5413 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Mon, 27 Jun 2022 19:17:32 -0500 Subject: [PATCH 1/7] Prepare for backport --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index f88f4aa..2432167 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lxqt-qtplugin (1.1.0-0ubuntu1~ppa1) jammy; urgency=medium + + * Backport to Jammy. + + -- Aaron Rainbolt Mon, 27 Jun 2022 19:17:00 -0500 + lxqt-qtplugin (1.1.0-0ubuntu1) kinetic; urgency=medium * New upstream release. From c285b3d570c52facce11169fd0f7998607612bd1 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Mon, 27 Jun 2022 19:19:38 -0500 Subject: [PATCH 2/7] Update Lubuntu Developers copyright --- debian/changelog | 1 + debian/copyright | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2432167..72c8247 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ lxqt-qtplugin (1.1.0-0ubuntu1~ppa1) jammy; urgency=medium * Backport to Jammy. + * Updated Lubuntu Developers copyright to 2021-2022. -- Aaron Rainbolt Mon, 27 Jun 2022 19:17:00 -0500 diff --git a/debian/copyright b/debian/copyright index 4fd6dc7..514c292 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,7 +7,7 @@ Copyright: 2014-2015 LXQt team License: LGPL-2.1+ Files: debian/* -Copyright: 2021, Lubuntu Developers +Copyright: 2021-2022 Lubuntu Developers 2014-2019 Alf Gaida 2015 ChangZhuo Chen (陳昌倬) 2015 Yukiharu YABUKI From 49ffc5248daa7b73c58f24c7761c2a5fb406cbb3 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Mon, 27 Jun 2022 21:44:38 -0500 Subject: [PATCH 3/7] 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 72c8247..d7460b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ lxqt-qtplugin (1.1.0-0ubuntu1~ppa1) jammy; urgency=medium * Backport to Jammy. * Updated Lubuntu Developers copyright to 2021-2022. + * Removed reduntant Repository-Browser field from d/upstream/metadata. -- Aaron Rainbolt Mon, 27 Jun 2022 19:17:00 -0500 diff --git a/debian/upstream/metadata b/debian/upstream/metadata index 0bb92c1..f804687 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -3,4 +3,3 @@ Bug-Database: https://github.com/lxqt/lxqt-qtplugin/issues Bug-Submit: https://github.com/lxqt/lxqt-qtplugin/issues/new Changelog: https://github.com/lxqt/lxqt-qtplugin/blob/master/CHANGELOG Repository: https://github.com/lxqt/lxqt-qtplugin -Repository-Browser: https://github.com/lxqt/lxqt-qtplugin From 72d572d489137f294ba1f6d888722dc7ec264de2 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Mon, 27 Jun 2022 21:45:16 -0500 Subject: [PATCH 4/7] 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 d7460b5..93fcafc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ lxqt-qtplugin (1.1.0-0ubuntu1~ppa1) jammy; urgency=medium * Backport to Jammy. * Updated Lubuntu Developers copyright to 2021-2022. * Removed reduntant Repository-Browser field from d/upstream/metadata. + * Removed obsolete "-Wl,--as-needed" linker flag. -- Aaron Rainbolt Mon, 27 Jun 2022 19:17:00 -0500 diff --git a/debian/rules b/debian/rules index 3850f73..eb09d04 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 a84b444240ace5566cad15ac917b93de4515e6b4 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Mon, 27 Jun 2022 21:46:28 -0500 Subject: [PATCH 5/7] Remove trailing whitespace --- debian/changelog | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 93fcafc..50d2875 100644 --- a/debian/changelog +++ b/debian/changelog @@ -118,7 +118,7 @@ lxqt-qtplugin (0.14.0-3ubuntu1) eoan; urgency=medium lxqt-qtplugin (0.14.0-3) unstable; urgency=medium * Try to load the versioned libfm-qt.so.6 instead of libfm-qt.so - (Closes: #927905) + (Closes: #927905) -- Alf Gaida Wed, 24 Apr 2019 23:05:04 +0200 @@ -429,4 +429,3 @@ lxqt-qtplugin (0.9.0+20150819-1) unstable; urgency=medium * Added README.Debian. -- Yukiharu YABUKI Thu, 20 Aug 2015 05:49:28 +0900 - From d062222b625f32ad20147abc02bc1d72df419a58 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Mon, 27 Jun 2022 21:51:20 -0500 Subject: [PATCH 6/7] Bump Standards-Version --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 50d2875..d33370e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ lxqt-qtplugin (1.1.0-0ubuntu1~ppa1) jammy; urgency=medium * Updated Lubuntu Developers copyright to 2021-2022. * Removed reduntant Repository-Browser field from d/upstream/metadata. * Removed obsolete "-Wl,--as-needed" linker flag. + * Bumped Standards-Version to 4.6.1, no changes necessary. -- Aaron Rainbolt Mon, 27 Jun 2022 19:17:00 -0500 diff --git a/debian/control b/debian/control index b734698..c99602a 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: debhelper-compat (= 13), libx11-dev, lxqt-build-tools (>= 0.11.0), qtbase5-private-dev -Standards-Version: 4.5.1 +Standards-Version: 4.6.1 Vcs-Browser: https://phab.lubuntu.me/source/lxqt-qtplugin/ Vcs-Git: https://phab.lubuntu.me/source/lxqt-qtplugin.git XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-qtplugin From aec1637804547ffc5f294854da19feacc2cb0619 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Mon, 27 Jun 2022 22:04:14 -0500 Subject: [PATCH 7/7] Typo fix --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d33370e..f5aef80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ lxqt-qtplugin (1.1.0-0ubuntu1~ppa1) jammy; urgency=medium * Backport to Jammy. * Updated Lubuntu Developers copyright to 2021-2022. - * Removed reduntant Repository-Browser field from d/upstream/metadata. + * Removed redundant Repository-Browser field from d/upstream/metadata. * Removed obsolete "-Wl,--as-needed" linker flag. * Bumped Standards-Version to 4.6.1, no changes necessary.