From 2260ec9e8aa0239ac3dde36aa52a6f59c5e4088d Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Thu, 17 Nov 2022 23:01:34 -0600 Subject: [PATCH] Sync with Debian version 1.1.0-1. --- debian/changelog | 153 ++--------------------- debian/control | 16 +-- debian/copyright | 4 +- debian/lxqt-globalkeys.lintian-overrides | 6 +- debian/rules | 2 - debian/salsa-ci.yml | 12 ++ debian/upstream/metadata | 5 + 7 files changed, 41 insertions(+), 157 deletions(-) create mode 100644 debian/salsa-ci.yml create mode 100644 debian/upstream/metadata diff --git a/debian/changelog b/debian/changelog index 062bd3f..9802a9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,31 +1,17 @@ -lxqt-globalkeys (1.1.0-0ubuntu1) kinetic; urgency=medium +lxqt-globalkeys (1.1.0-1) experimental; urgency=medium * New upstream release. - * Bump build dependencies. - * Ah yes, symbols. 🤦 - * Lots of package renaming too, due to the SONAME bump. + * Cleaned up gbp.conf trailing whitespace. + * Upstreamed compatible changes from Ubuntu, modifying the following files: + - control + - copyright + - *.install + - *.symbols + - lxqt-globalkeys.lintian-overrides + - rules + - upstream/* - -- Simon Quigley Wed, 01 Jun 2022 15:39:25 -0500 - -lxqt-globalkeys (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 - * Add Build-Depends-Package metadata field to symbols files - * Rename tag for lintian override - * Extend lxqt-globalkeys-l10n package description - * Update debian/copyright - - -- apt-ghetto Fri, 13 Aug 2021 10:36:06 +0200 - -lxqt-globalkeys (0.16.0-1ubuntu1) hirsute; urgency=medium - - * New upstream version. - * debhelper-compat requirement bumped to 13. - - -- Raman Sarda Mon, 22 Feb 2021 00:38:07 +0530 + -- Aaron Rainbolt Wed, 13 Jul 2022 13:02:01 -0500 lxqt-globalkeys (0.16.0-1) unstable; urgency=medium @@ -33,40 +19,6 @@ lxqt-globalkeys (0.16.0-1) unstable; urgency=medium -- Andrew Lee (李健秋) Wed, 06 Jan 2021 17:04:29 +0800 -lxqt-globalkeys (0.15.0-0ubuntu1) groovy; urgency=medium - - * New upstream release. - - Update upstream signing key. - - Bump LXQt build dependencies. - * Bump Standards-version to 4.5.0, no changes needed. - * debhelper -> debhelper-compat. - * Run wrap-and-sort. - * Move ${misc:Pre-Depends} to Pre-Depends. - - -- Simon Quigley Thu, 04 Jun 2020 13:58:05 -0500 - -lxqt-globalkeys (0.14.3-1ubuntu1) focal; urgency=low - - * Merge from Debian unstable. Remaining changes: - - Modified lxqt-globalkeys.install to include ubuntu specific changes. - The changes install default config file to another location so that distribution specific config files provided via xdg take precedence. - - new dependencies in control file. - - Translations from debian for following: - 1. config/translations/lxqt-config-globalkeyshortcuts_cs.ts - 2. config/translations/lxqt-config-globalkeyshortcuts_da.ts - 3. config/translations/lxqt-config-globalkeyshortcuts_de.ts - 4. config/translations/lxqt-config-globalkeyshortcuts_el.ts - 5. config/translations/lxqt-config-globalkeyshortcuts_gl.ts - 6. config/translations/lxqt-config-globalkeyshortcuts_gl.ts - 7. config/translations/lxqt-config-globalkeyshortcuts_ja.ts - 8. config/translations/lxqt-config-globalkeyshortcuts_it.ts - 9. config/translations/lxqt-config-globalkeyshortcuts_nb_NO.ts - 10. config/translations/lxqt-config-globalkeyshortcuts_pt.ts - 11. config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts - - Removed an unncessary patch. - - -- Raman Sarda Tue, 07 Jan 2020 19:26:41 +0530 - lxqt-globalkeys (0.14.3-1) unstable; urgency=medium * New upstream version 0.14.3 (Closes: #883035) @@ -82,12 +34,6 @@ lxqt-globalkeys (0.14.2-1) unstable; urgency=medium -- Alf Gaida Thu, 10 Oct 2019 23:34:49 +0200 -lxqt-globalkeys (0.14.1+git20190923-0ubuntu1) eoan; urgency=medium - - * Picked the latest git. - - -- Raman Sarda Tue, 08 Oct 2019 03:27:38 +0530 - lxqt-globalkeys (0.14.1-1) unstable; urgency=medium * Cherry-picking new upstream version 0.14.1. @@ -96,31 +42,6 @@ lxqt-globalkeys (0.14.1-1) unstable; urgency=medium -- Alf Gaida Sun, 24 Feb 2019 21:28:30 +0100 -lxqt-globalkeys (0.14.1-0ubuntu4) eoan; urgency=medium - - * Correctly changed the location of upstream config. - - -- Raman Sarda Thu, 05 Sep 2019 22:35:29 +0000 - -lxqt-globalkeys (0.14.1-0ubuntu3) eoan; urgency=medium - - * Changed the location of upstream config. - - -- Raman Sarda Wed, 04 Sep 2019 23:15:09 +0530 - -lxqt-globalkeys (0.14.1-0ubuntu2) eoan; urgency=medium - - * Add XDG support. - * Bump Standards-Version to 4.4.0, no changes needed. - - -- Walter Lapchynski Tue, 20 Aug 2019 22:46:08 -0700 - -lxqt-globalkeys (0.14.1-0ubuntu1) disco; urgency=medium - - * New upstream release. - - -- Simon Quigley Sat, 09 Mar 2019 13:06:02 -0600 - lxqt-globalkeys (0.14.0-1) unstable; urgency=medium * Cherry-picking new upstream version 0.14.0. @@ -136,16 +57,6 @@ lxqt-globalkeys (0.14.0-1) unstable; urgency=medium -- Alf Gaida Sun, 27 Jan 2019 17:37:07 +0100 -lxqt-globalkeys (0.14.0-0ubuntu1) disco; urgency=medium - - * New upstream release. - - Bump build dependencies. - * Bump Standards-version to 4.3.0, no changes needed. - * Bump debhelper compat to 12, no changes needed. - * Add a lxqt-globalkeys-l10n package. - - -- Simon Quigley Sat, 26 Jan 2019 00:15:52 -0600 - lxqt-globalkeys (0.13.0-1) unstable; urgency=medium * Cherry-picking new upstream version 0.13.0. @@ -153,34 +64,6 @@ lxqt-globalkeys (0.13.0-1) unstable; urgency=medium -- Alf Gaida Thu, 24 May 2018 21:23:58 +0200 -lxqt-globalkeys (0.13.0-0ubuntu2) cosmic; urgency=medium - - * Provide a more complete default configuration file. - - -- Walter Lapchynski Sat, 06 Oct 2018 23:26:56 -0700 - -lxqt-globalkeys (0.13.0-0ubuntu1) cosmic; urgency=medium - - * New upstream release. - * Keep the Vcs entries as Lubuntu-specific; drop all other changes. - * Update build dependencies. - - -- Simon Quigley Tue, 22 May 2018 23:29:33 -0500 - -lxqt-globalkeys (0.12.0-4ubuntu1) cosmic; urgency=medium - - * Merge from Debian Sid. Remaining changes: - - Backport two upstream patches: - + Fix wrong radio buttons when changing shortcuts. - * fix-wrong-radio-buttons.patch - * Upstream commit a9ec3c0. - + Avoid polluting the the x11 shortcut map. - * avoid-polluting-x11-shortcut-map.patch - * Upstream commit c79d560. - * Change the Vcs entries to be Lubuntu-specific. - - -- Simon Quigley Sat, 19 May 2018 17:37:34 -0500 - lxqt-globalkeys (0.12.0-4) unstable; urgency=medium * Bumped compat to 11 @@ -192,19 +75,6 @@ lxqt-globalkeys (0.12.0-4) unstable; urgency=medium -- Alf Gaida Sat, 28 Apr 2018 13:53:23 +0200 -lxqt-globalkeys (0.12.0-3ubuntu1) bionic; urgency=medium - - * Cherry-pick some upstream commits because the upstream release cycle is - too slow: - - Fix wrong radio buttons when changing shortcuts. - + fix-wrong-radio-buttons.patch - + Upstream commit a9ec3c0. - - Avoid polluting the the x11 shortcut map. - + avoid-polluting-x11-shortcut-map.patch - + Upstream commit c79d560. - - -- Simon Quigley Mon, 05 Feb 2018 21:19:18 -0600 - lxqt-globalkeys (0.12.0-3) unstable; urgency=medium * Bumped Standards to 4.1.2, no changes needed @@ -361,4 +231,3 @@ lxqt-globalkeys (0.9.0+20150806-1) unstable; urgency=low * Use lower-case for description. -- Andrew Lee (李健秋) Sun, 16 Aug 2015 02:18:03 +0800 - diff --git a/debian/control b/debian/control index ecdf3a8..ded2e19 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,10 @@ Source: lxqt-globalkeys -Maintainer: Lubuntu Developers -XSBC-Original-Maintainer: LXQt Packaging Team +Maintainer: LXQt Packaging Team Uploaders: Alf Gaida , ChangZhuo Chen (陳昌倬) , - Andrew Lee (李健秋) + Andrew Lee (李健秋) , + Simon Quigley , + Aaron Rainbolt Section: x11 Priority: optional Build-Depends: debhelper-compat (= 13), @@ -13,12 +14,11 @@ Build-Depends: debhelper-compat (= 13), libqt5x11extras5-dev, libx11-dev, xserver-xorg-input-libinput-dev -Standards-Version: 4.5.1 -Vcs-Browser: https://phab.lubuntu.me/source/lxqt-globalkeys/ -Vcs-Git: https://phab.lubuntu.me/source/lxqt-globalkeys.git -XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-globalkeys -XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-globalkeys.git +Standards-Version: 4.6.1 +Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-globalkeys +Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-globalkeys.git Homepage: https://github.com/lxqt/lxqt-globalkeys +Rules-Requires-Root: no Package: lxqt-globalkeys Architecture: any diff --git a/debian/copyright b/debian/copyright index 6af309b..9a34112 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,12 +3,12 @@ Upstream-Name:lxqt-globalkeys Source: https://github.com/lxqt/lxqt-globalkeys 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 2015, Andrew Lee (李健秋) License: LGPL-2.1+ diff --git a/debian/lxqt-globalkeys.lintian-overrides b/debian/lxqt-globalkeys.lintian-overrides index 0896fde..13351ee 100644 --- a/debian/lxqt-globalkeys.lintian-overrides +++ b/debian/lxqt-globalkeys.lintian-overrides @@ -1,6 +1,6 @@ # there will be no manpages in foreseable future -lxqt-globalkeys: no-manual-page usr/bin/lxqt-config-globalkeyshortcuts -lxqt-globalkeys: no-manual-page usr/bin/lxqt-globalkeysd +lxqt-globalkeys: no-manual-page [usr/bin/lxqt-config-globalkeyshortcuts] +lxqt-globalkeys: no-manual-page [usr/bin/lxqt-globalkeysd] # category not yet in freedesktop -lxqt-globalkeys: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-globalkeyshortcuts.desktop +lxqt-globalkeys: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-globalkeyshortcuts.desktop] diff --git a/debian/rules b/debian/rules index 981aa07..46685d7 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 %: @@ -13,6 +12,5 @@ override_dh_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..d1e633f --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,5 @@ +Name: lxqt-globalkeys +Bug-Database: https://github.com/lxqt/lxqt-globalkeys/issues +Bug-Submit: https://github.com/lxqt/lxqt-globalkeys/issues/new +Changelog: https://github.com/lxqt/lxqt-globalkeys/blob/master/CHANGELOG +Repository: https://github.com/lxqt/lxqt-globalkeys