From eca80634b17197c2fea444b35984781614f7908f Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Fri, 18 Nov 2022 18:43:18 -0600 Subject: [PATCH] Sync with Debian version 1.1.0-1. --- debian/changelog | 81 +++++----------------------------------- debian/control | 18 +++++---- debian/copyright | 6 +-- debian/rules | 5 ++- debian/salsa-ci.yml | 12 ++++++ debian/upstream/metadata | 5 +++ 6 files changed, 43 insertions(+), 84 deletions(-) create mode 100644 debian/salsa-ci.yml create mode 100644 debian/upstream/metadata diff --git a/debian/changelog b/debian/changelog index f229353..78f766d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,29 +1,15 @@ -lxqt-sudo (1.1.0-0ubuntu1) kinetic; urgency=medium +lxqt-sudo (1.1.0-1) experimental; urgency=medium * New upstream release. - * Bump build dependencies. - * Drop old Breaks/Replaces, we're past the LTS. + * Removed trailing whitespace from changelog. + * Ran wrap-and-sort. + * Upstreamed packaging changes from Ubuntu, modifying the following files: + - control + - copyright + - rules + - upstream/* - -- Simon Quigley Thu, 02 Jun 2022 09:23:52 -0500 - -lxqt-sudo (0.17.0-0ubuntu1) impish; urgency=medium - - * New upstream release 0.17.0 - * Update debian/control - - Bump Standards-Version to 4.5.1 - - Use liblxqt0-dev 0.17.0 - - Extend lxqt-sudo-l10n package description - * Update debian/copyright - - -- apt-ghetto Sat, 14 Aug 2021 15:18:51 +0200 - -lxqt-sudo (0.16.0-1ubuntu2) hirsute; urgency=low - - [ Raman Sarda ] - * New upstream version. - * Bump debhelper-compat requirement to 13. - - -- Raman Sarda Mon, 22 Feb 2021 01:28:28 +0530 + -- Aaron Rainbolt Wed, 13 Jul 2022 19:57:33 -0500 lxqt-sudo (0.16.0-1) unstable; urgency=medium @@ -36,19 +22,9 @@ lxqt-sudo (0.16.0-1) unstable; urgency=medium -- Andrew Lee (李健秋) Wed, 06 Jan 2021 18:17:56 +0800 -lxqt-sudo (0.15.0-0ubuntu1) groovy; urgency=medium - - * New upstream release. - - Update upstream signing key. - - Update LXQt build dependencies. - * Update Standards-version to 4.5.0, no changes needed. - * Migrate to debhelper-compat. - - -- Simon Quigley Thu, 04 Jun 2020 14:15:22 -0500 - lxqt-sudo (0.14.1-2) unstable; urgency=medium - * Set HOME right, don't strip TERM (Closes: #928941) + * Set HOME right, don't strip TERM (Closes: #928941) -- Alf Gaida Mon, 13 May 2019 19:56:39 +0200 @@ -60,13 +36,6 @@ lxqt-sudo (0.14.1-1) unstable; urgency=medium -- Alf Gaida Sun, 24 Feb 2019 22:25:49 +0100 -lxqt-sudo (0.14.1-0ubuntu1) disco; urgency=medium - - * New upstream release. - * Run wrap-and-sort. - - -- Simon Quigley Sat, 09 Mar 2019 13:20:31 -0600 - lxqt-sudo (0.14.0-1) unstable; urgency=medium * Cherry-picking new upstream version 0.14.0. @@ -80,17 +49,6 @@ lxqt-sudo (0.14.0-1) unstable; urgency=medium -- Alf Gaida Sun, 27 Jan 2019 19:32:15 +0100 -lxqt-sudo (0.14.0-0ubuntu1) disco; urgency=medium - - * New upstream release. - - Bump build dependencies. - - Remove reverse-applicable patches. - * Bump Standards-version to 4.3.0, no changes needed. - * Bump debhelper compat to 12, no changes needed. - * Add a new lxqt-sudo-l10n package. - - -- Simon Quigley Sat, 26 Jan 2019 00:55:00 -0600 - lxqt-sudo (0.13.0-1) unstable; urgency=medium * Cherry-picking new upstream version 0.13.0. @@ -99,24 +57,6 @@ lxqt-sudo (0.13.0-1) unstable; urgency=medium -- Alf Gaida Fri, 25 May 2018 00:02:41 +0200 -lxqt-sudo (0.13.0-0ubuntu2) cosmic; urgency=medium - - * Change Uploaders to Ubuntu uploaders. - * Bump Standards-version to 4.2.0, no changes needed. - * Run wrap-and-sort. - * Fix the layout and line break so text isn't cut off. - - -- Simon Quigley Mon, 20 Aug 2018 23:47:43 -0500 - -lxqt-sudo (0.13.0-0ubuntu1) cosmic; urgency=medium - - * New upstream release. - * Update Vcs-* and Maintainer to Lubuntu values. - * Update build dependencies. - * Update copyright. - - -- Simon Quigley Tue, 22 May 2018 23:52:43 -0500 - lxqt-sudo (0.12.0-4) unstable; urgency=medium * Bumped compat to 11 @@ -244,4 +184,3 @@ lxqt-sudo (0.9.0+20150908-1) experimental; urgency=medium * Initial release (Closes:#795801) -- Alf Gaida Wed, 23 Sep 2015 00:06:05 +0200 - diff --git a/debian/control b/debian/control index 53ac4ed..347b398 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,10 @@ Source: lxqt-sudo -Maintainer: Lubuntu Developers -XSBC-Original-Maintainer: LXQt Packaging Team -Uploaders: Simon Quigley +Maintainer: LXQt Packaging Team +Uploaders: Alf Gaida , + ChangZhuo Chen (陳昌倬) , + Andrew Lee (李健秋) , + Simon Quigley , + Aaron Rainbolt Section: x11 Priority: optional Build-Depends: debhelper-compat (= 13), @@ -10,12 +13,11 @@ Build-Depends: debhelper-compat (= 13), libqt5svg5-dev, libqt5x11extras5-dev, libx11-dev -Standards-Version: 4.5.1 -Vcs-Browser: https://phab.lubuntu.me/source/lxqt-sudo/ -Vcs-Git: https://phab.lubuntu.me/source/lxqt-sudo.git -XS-Debian-Vcs-Browser: https://salsa.debian.org/cgit/pkg-team/lxqt-sudo -XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-sudo.git +Standards-Version: 4.6.1 +Vcs-Browser: https://salsa.debian.org/cgit/pkg-team/lxqt-sudo +Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-sudo.git Homepage: https://github.com/lxqt/lxqt-sudo +Rules-Requires-Root: no Package: lxqt-sudo Architecture: any diff --git a/debian/copyright b/debian/copyright index 4d9d984..1ba94f7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,12 +3,12 @@ Upstream-Name: lxqt-sudo Source: https://github.com/lxqt/lxqt-sudo Files: * -Copyright: 2015-2018 LXQt team +Copyright: 2015-2022 LXQt team License: LGPL-2.1+ Files: debian/* -Copyright: 2021, Lubuntu Developers - 2015-2018, Alf Gaida +Copyright: 2021-2022, Lubuntu Developers + 2015-2019, Alf Gaida 2015, Andrew Lee (李健秋) 2015, ChangZhuo Chen (陳昌倬) License: LGPL-2.1+ diff --git a/debian/rules b/debian/rules index 0e9a06b..4e97055 100755 --- a/debian/rules +++ b/debian/rules @@ -2,14 +2,15 @@ # 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 %: dh ${@} --buildsystem cmake +override_dh_missing: + dh_missing --fail-missing + override_dh_auto_configure: dh_auto_configure -- \ - -DPULL_TRANSLATIONS=OFF \ -DUPDATE_TRANSLATIONS=OFF \ -DCMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml new file mode 100644 index 0000000..28214c5 --- /dev/null +++ b/debian/salsa-ci.yml @@ -0,0 +1,12 @@ +# For more information on what jobs are run see: +# https://salsa.debian.org/salsa-ci-team/pipeline +# +# To enable the jobs, go to your repository (at salsa.debian.org) +# and click over Settings > CI/CD > Expand (in General pipelines). +# In "Custom CI config path" write debian/salsa-ci.yml and click +# in "Save Changes". The CI tests will run after the next commit. +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..1d63076 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,5 @@ +Name: lxqt-sudo +Bug-Database: https://github.com/lxqt/lxqt-sudo/issues +Bug-Submit: https://github.com/lxqt/lxqt-sudo/issues/new +Changelog: https://github.com/lxqt/lxqt-sudo/blob/master/CHANGELOG +Repository: https://github.com/lxqt/lxqt-sudo