From e2b30f0e1944691c00b5d8a38489f52c116bb430 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 23:56:58 -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 5204c7f..a07aaa9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lxqt-runner (1.1.0-0ubuntu2~ppa1) jammy; urgency=medium + + * Backport to Jammy. + + -- Aaron Rainbolt Wed, 06 Jul 2022 23:56:39 -0500 + lxqt-runner (1.1.0-0ubuntu2) kinetic; urgency=medium * Backport upstream patches: From 888d6fab484087d233e52ff78cae74b4bfe70b94 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 6 Jul 2022 23:58:37 -0500 Subject: [PATCH 2/7] 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 a07aaa9..8573b3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ lxqt-runner (1.1.0-0ubuntu2~ppa1) jammy; urgency=medium * Backport to Jammy. + * Updated copyright file. -- Aaron Rainbolt Wed, 06 Jul 2022 23:56:39 -0500 diff --git a/debian/copyright b/debian/copyright index 5b6d26e..1ceb3bf 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,12 +3,12 @@ Upstream-Name: lxqt-runner Source: https://github.com/lxqt/lxqt-runner Files: * -Copyright: 2012-2019, LXQt team +Copyright: 2012-2022, LXQt team 2010-2013, Razor team License: LGPL-2.1+ Files: debian/* -Copyright: 2021, Lubuntu Developers +Copyright: 2021-2022, Lubuntu Developers 2014-2019, Alf Gaida License: LGPL-2.1+ From 607b4a4b9978a731d21151190e2baa7598384107 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Thu, 7 Jul 2022 00:01:25 -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 8573b3e..fe56f69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ lxqt-runner (1.1.0-0ubuntu2~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:56:39 -0500 diff --git a/debian/upstream/metadata b/debian/upstream/metadata index 719fb1e..7bb6f35 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -3,4 +3,3 @@ Bug-Database: https://github.com/lxqt/lxqt-runner/issues Bug-Submit: https://github.com/lxqt/lxqt-runner/issues/new Changelog: https://github.com/lxqt/lxqt-runner/blob/master/CHANGELOG Repository: https://github.com/lxqt/lxqt-runner -Repository-Browser: https://github.com/lxqt/lxqt-runner From 958c0ebc0d78b2514eea2766536bf1f2eb6f3c51 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Thu, 7 Jul 2022 00:02:22 -0500 Subject: [PATCH 4/7] 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 fe56f69..d6a65b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ lxqt-runner (1.1.0-0ubuntu2~ppa1) jammy; urgency=medium * Backport to Jammy. * Updated copyright file. * 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 23:56:39 -0500 diff --git a/debian/control b/debian/control index 3593b7b..78dbee2 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: debhelper-compat (= 13), libqt5svg5-dev, libqt5x11extras5-dev, libx11-dev -Standards-Version: 4.5.1 +Standards-Version: 4.6.1 Vcs-Browser: https://phab.lubuntu.me/source/lxqt-runner/ Vcs-Git: https://phab.lubuntu.me/source/lxqt-runner.git XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-runner From 5be03d4716b280ecd1e4b2ea64a8ec18c122a0f7 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Thu, 7 Jul 2022 00:02:54 -0500 Subject: [PATCH 5/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 d6a65b2..3109ad8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ lxqt-runner (1.1.0-0ubuntu2~ppa1) jammy; urgency=medium * Updated copyright file. * 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 23:56:39 -0500 diff --git a/debian/rules b/debian/rules index 53420c0..13af0ea 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 e5e9e999c0249a0eb7ff4cf7f4e990c6d26eead8 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Thu, 7 Jul 2022 00:03:50 -0500 Subject: [PATCH 6/7] 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 3109ad8..8f69e9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ lxqt-runner (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 to silence Lintian's + silent-on-rules-requiring-root. -- Aaron Rainbolt Wed, 06 Jul 2022 23:56:39 -0500 diff --git a/debian/control b/debian/control index 78dbee2..f02ccf0 100644 --- a/debian/control +++ b/debian/control @@ -21,6 +21,7 @@ Vcs-Git: https://phab.lubuntu.me/source/lxqt-runner.git XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-runner XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-runner.git Homepage: https://github.com/lxqt/lxqt-runner +Rules-Requires-Root: no Package: lxqt-runner Architecture: any From 82662f148226297937f7ce7ff297d07024713952 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Thu, 7 Jul 2022 00:04:27 -0500 Subject: [PATCH 7/7] Removed trailing whitespace from changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8f69e9e..ef7e8fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ lxqt-runner (1.1.0-0ubuntu2~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:56:39 -0500 @@ -336,4 +337,3 @@ lxqt-runner (0.9.0+20150831-1) experimental; urgency=medium * Adding upstream version 0.9.0. -- Alf Gaida Sun, 15 Feb 2015 18:41:53 +0100 -