Sync with Debian version 1.1.0-1.

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.
+  * Cleaned up gbp.conf trailing whitespace.
-  * Ah yes, symbols. 🤦
+  * Upstreamed compatible changes from Ubuntu, modifying the following files:
-  * Lots of package renaming too, due to the SONAME bump.
+    - control
-
+    - copyright
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 01 Jun 2022 15:39:25 -0500
+    - *.install
-
+    - *.symbols
-lxqt-globalkeys (0.17.0-0ubuntu1) impish; urgency=medium
+    - lxqt-globalkeys.lintian-overrides
-
+    - rules
-  * New upstream release 0.17.0
+    - upstream/*
-  * Update debian/control
+
-    - Bump Standards-Version to 4.5.1
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Wed, 13 Jul 2022 13:02:01 -0500
-    - 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 <apt-ghetto@protonmail.com>  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 <theloudspeaker@disroot.org>  Mon, 22 Feb 2021 00:38:07 +0530
 
 lxqt-globalkeys (0.16.0-1) unstable; urgency=medium
 
@@ -33,40 +19,6 @@ lxqt-globalkeys (0.16.0-1) unstable; urgency=medium
 
  -- Andrew Lee (李健秋) <ajqlee@debian.org>  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 <tsimonq2@ubuntu.com>  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 <theloudspeaker@lubuntu.me>  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 <agaida@siduction.org>  Thu, 10 Oct 2019 23:34:49 +0200
 
-lxqt-globalkeys (0.14.1+git20190923-0ubuntu1) eoan; urgency=medium
-
-  * Picked the latest git.
-
- -- Raman Sarda <theloudspeaker@lubuntu.me>  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 <agaida@siduction.org>  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 <theloudspeaker@lubuntu.me>  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 <theloudspeaker@lubuntu.me>  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 <wxl@ubuntu.com>  Tue, 20 Aug 2019 22:46:08 -0700
-
-lxqt-globalkeys (0.14.1-0ubuntu1) disco; urgency=medium
-
-  * New upstream release.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  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 <agaida@siduction.org>  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 <tsimonq2@ubuntu.com>  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 <agaida@siduction.org>  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 <wxl@ubuntu.com>  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 <tsimonq2@ubuntu.com>  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 <tsimonq2@ubuntu.com>  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 <agaida@siduction.org>  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 <tsimonq2@ubuntu.com>  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 (李健秋) <ajqlee@debian.org>  Sun, 16 Aug 2015 02:18:03 +0800
-

debian/control

@@ -1,9 +1,10 @@
 Source: lxqt-globalkeys
-Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
-XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Alf Gaida <agaida@siduction.org>,
            ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
-           Andrew Lee (李健秋) <ajqlee@debian.org>
+           Andrew Lee (李健秋) <ajqlee@debian.org>,
+           Simon Quigley <tsimonq2@debian.org>,
+           Aaron Rainbolt <arraybolt3@gmail.com>
 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
+Standards-Version: 4.6.1
-Vcs-Browser: https://phab.lubuntu.me/source/lxqt-globalkeys/
+Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-globalkeys
-Vcs-Git: https://phab.lubuntu.me/source/lxqt-globalkeys.git
+Vcs-Git: https://salsa.debian.org/lxqt-team/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
 Homepage: https://github.com/lxqt/lxqt-globalkeys
+Rules-Requires-Root: no
 
 Package: lxqt-globalkeys
 Architecture: any

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 <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2021-2022, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
            2014-2019, Alf Gaida <agaida@siduction.org>
            2015,      Andrew Lee (李健秋) <ajqlee@debian.org>
 License: LGPL-2.1+

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-config-globalkeyshortcuts]
-lxqt-globalkeys: no-manual-page usr/bin/lxqt-globalkeysd
+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]

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

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
+

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