Release to Oracular

Summary:
Packaged new upstream version 0.17.1 of lxqt-panel
Updated changelog, control and copyright

Test Plan: Successfully built on https://launchpad.net/~apt-ghetto/+archive/ubuntu/ludev

Reviewers: kc2bez

Reviewed By: kc2bez

Differential Revision: https://phab.lubuntu.me/D130

debian/changelog

@@ -1,58 +1,107 @@
-lxqt-panel (0.16.1-1ubuntu1) hirsute; urgency=medium
+lxqt-panel (2.0.1-0ubuntu1) oracular; urgency=medium
 
-  * New upstream version. Merge from debian unstable.
+  * New upstream release.
-  * Tighten debhelper-compat requirement.
+  * Update copyright file.
-  * Updated dependencies.
+  * Bump Standards-Version to 4.7.0, no changes necessary.
-  * Updated debian/rules.
+  * Dropped trim-custom-commands-prevent-crash.patch, applied upstream.
+  * Adjust build dependencies.
 
- -- Raman Sarda <theloudspeaker@disroot.org>  Mon, 22 Feb 2021 02:37:32 +0530
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:25:54 -0500
 
-lxqt-panel (0.16.1-1) unstable; urgency=medium
+lxqt-panel (1.4.0-0ubuntu2) noble; urgency=medium
 
-  [ Alf Gaida ]
+  * Apply upstream patch fixing a crash on a custom command.
-  * Switched to gbp
-  * Bumped Standards-Version to 4.4.0, no changes needed
-  * improved debian/rules
 
-  [ Andrew Lee (李健秋) ]
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 22 Dec 2023 16:40:34 -0600
-  * New upstream release. (Closes: #916105, #953154, #978204)
 
- -- Andrew Lee (李健秋) <ajqlee@debian.org>  Wed, 06 Jan 2021 18:30:22 +0800
+lxqt-panel (1.4.0-0ubuntu1) noble; urgency=medium
+
+  * New upstream release.
+  * Fixed copyright file.
+  * Bumped build dependency versions.
+  * Added lxqt-menu-data as a build dependency.
+  * Removed no-longer-existing directory from lxqt-panel.install.
+  * Move a README file for qeyes-types to the proper documentation directory.
+
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Mon, 13 Nov 2023 11:34:09 -0600
+
+lxqt-panel (1.3.0-0ubuntu1) mantic; urgency=medium
+
+  * New upstream release.
+  * Bump build dependencies.
+  * Fix some build dependencies that were renamed.
+  * Remove redundant hardening rule.
 
-lxqt-panel (0.15.0-0ubuntu1) groovy; urgency=medium
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 12:49:49 -0500
+
+lxqt-panel (1.2.1-1ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian Unstable, remaining changes:
+    - Lubuntuify the package slightly.
+    - Run wrap-and-sort for cleanliness.
+    - Update the copyright file.
+    - Take a different approach for the watch file.
+    - Add missing entry from the install file.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 16 Jan 2023 16:43:29 -0600
+
+lxqt-panel (1.2.1-1) unstable; urgency=medium
 
   * New upstream release.
-    - Update upstream signing key.
+  * Bump Standards-Version to 4.6.2.
-    - Update LXQt build depends.
-  * Bump Standards-version to 4.5.0, no changes needed.
-  * Run wrap-and-sort.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 04 Jun 2020 14:30:49 -0500
+ -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Thu, 05 Jan 2023 00:10:18 +0800
 
-lxqt-panel (0.14.1-1ubuntu3) focal; urgency=medium
+lxqt-panel (1.2.0-1) unstable; urgency=medium
 
-  * Updated rules to match debian unstable
+  * New upstream release.
-  * Updated copyright.
+  * Bump Standards-Version to 4.6.1.
+    * Add Rules-Requires-Root: no
+  * Bump compat to 13.
+    * Remove unnecessary -Wl,--as-needed in d/rules
+    * Remove unnecessary --fail-missing in d/rules
+  * Fix d/upstream/metadata.
+  * Update d/copyright.
+  * Update d/watch for GitHub.
+
+ -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Fri, 16 Dec 2022 01:24:07 +0800
 
- -- Raman Sarda <theloudspeaker@lubuntu.me>  Sun, 16 Feb 2020 00:58:19 +0530
+lxqt-panel (1.1.0-2) unstable; urgency=medium
+
+  * Merge to unstable.
 
-lxqt-panel (0.14.1-1ubuntu2) focal; urgency=medium
+ -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Sat, 19 Nov 2022 16:14:37 +0800
 
-  * Correct merge from Ubuntu Merge-oMatic
+lxqt-panel (1.1.0-1) experimental; urgency=medium
-  * Bumped minimum requirements in control file
-  * Copyright updates.
-  * Updated debian/watch to point to correct source.
-  * Updated debian/upstream/metadata
-  * using debhelper-compat instead of debhelper and d/compat
 
- -- Raman Sarda <theloudspeaker@lubuntu.me>  Sun, 09 Feb 2020 11:29:09 +0530
+  * Add debian/salsa-ci.yml file.
+  * Update debian/upstream/signing-key.asc.
+  * New upstream version 1.0.0
+  * New upstream version 1.1.0
+  * Build-deps on liblxqt1-dev (>= 1.1.0~).
+  * Build-deps on liblxqt-globalkeys1-dev (>= 1.1.0~).
+  * Build-deps on liblxqt-globalkeys-ui1-dev (>= 1.1.0~).
+  * Build-deps on libsysstat-qt5-0-dev (>= 0.4.6~).
+  * Drop obsoleted Breaks and Replaces lines.
+  * debian/copyright: update years.
+  * Build-deps on libxcb-randr0-dev.
+  * Build-deps on libxcb-image0-dev.
+  * Build-deps on libxtst-dev.
+  * Build-deps on libxcb-composite0-dev.
 
-lxqt-panel (0.14.1-1ubuntu1) focal; urgency=low
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Sat, 16 Jul 2022 00:26:18 +0800
+
+lxqt-panel (0.16.1-1) unstable; urgency=medium
+
+  [ Alf Gaida ]
+  * Switched to gbp
+  * Bumped Standards-Version to 4.4.0, no changes needed
+  * improved debian/rules
 
-  * Merge from Debian unstable.  Remaining changes:
+  [ Andrew Lee (李健秋) ]
-    - Updated control file to include new deps.
+  * New upstream release. (Closes: #916105, #953154, #978204)
 
- -- Raman Sarda <theloudspeaker@lubuntu.me>  Fri, 07 Feb 2020 22:20:45 +0530
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Wed, 06 Jan 2021 18:30:22 +0800
 
 lxqt-panel (0.14.1-1) unstable; urgency=medium
 
@@ -64,13 +113,6 @@ lxqt-panel (0.14.1-1) unstable; urgency=medium
 
  -- Alf Gaida <agaida@siduction.org>  Tue, 26 Feb 2019 03:28:17 +0100
 
-lxqt-panel (0.14.1-0ubuntu1) disco; urgency=medium
-
-  * New upstream release.
-  * Run wrap-and-sort.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 09 Mar 2019 13:27:32 -0600
-
 lxqt-panel (0.14.0-1) unstable; urgency=medium
 
   * Cherry-picking new upstream version 0.14.0.
@@ -88,17 +130,6 @@ lxqt-panel (0.14.0-1) unstable; urgency=medium
 
  -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 23:13:10 +0100
 
-lxqt-panel (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-panel-l10n package.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 26 Jan 2019 01:19:25 -0600
-
 lxqt-panel (0.13.0-2) unstable; urgency=medium
 
   * Build dependency libsensors4-dev -> libsensors-dev (Closes: #917440)
@@ -120,84 +151,12 @@ lxqt-panel (0.13.0-1) unstable; urgency=medium
 
  -- Alf Gaida <agaida@siduction.org>  Fri, 25 May 2018 00:08:49 +0200
 
-lxqt-panel (0.13.0-0ubuntu5) cosmic; urgency=medium
-
-  * Add optional overriding of icon theme.
-  * Run wrap-and-sort.
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Tue, 21 Aug 2018 23:37:22 -0700
-
-lxqt-panel (0.13.0-0ubuntu4) cosmic; urgency=medium
-
-  * Change the Uploaders to Ubuntu uploaders.
-  * Update Standards-version to 4.2.0, no changes needed.
-  * Add an autoexpansion feature to the spacer plugin.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 16 Aug 2018 16:17:17 -0500
-
-lxqt-panel (0.13.0-0ubuntu3) cosmic; urgency=medium
-
-  * Add a DEP-3 header for the patch completely removing the clock plugin.
-  * Don't auto-unmute the volume when it's changed.
-  * Bump Standards-version to 4.1.5, no changes needed.
-  * Run wrap-and-sort.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 16 Jul 2018 21:58:19 -0500
-
-lxqt-panel (0.13.0-0ubuntu2) cosmic; urgency=medium
-
-  * Completely remove plugin-clock.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 24 May 2018 22:51:05 -0500
-
-lxqt-panel (0.13.0-0ubuntu1) cosmic; urgency=medium
-
-  * New upstream release.
-  * Update build dependencies.
-  * Update copyright.
-  * Remove patches applied upstream.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 23 May 2018 22:38:37 -0500
-
 lxqt-panel (0.12.0-10) unstable; urgency=medium
 
   * Changed Source and watch for lxqt
 
  -- Alf Gaida <agaida@siduction.org>  Sat, 28 Apr 2018 15:17:35 +0200
 
-lxqt-panel (0.12.0-9ubuntu1) cosmic; urgency=medium
-
-  * Merge from Debian Sid. Remaining changes:
-    - Cherry-pick some upstream commits:
-      + Fix wrongly positioned popups (LP: #1527013).
-        * fix-wrongly-positioned-popups.patch
-        * Upstream commit 7391172.
-      + plugin-volume: Use a specific icon for the panel.
-        * use-specific-panel-icon.patch
-        * Upstream commit eaa65e5.
-      + Fix various memory leaks.
-        * fix-memory-leaks.patch
-        * mainmenu: Fix possible leaks in menu-cache usage.
-          - Upstream commit 04630d4.
-        * mount: Fix leak by correctly assigning the QObject parent.
-          - Upstream commit d1bd23f.
-        * taskbar: Avoid conditionals on unintialized values by proper
-          initialization of data members
-          - Upstream commit 1cb5778.
-      + Avoid infinite recursion when no icon is available.
-        * avoid-infinite-recursion-icons.patch
-        * Upstream commit b9b4133.
-      + Add Move and Resize items in the task-button context menu.
-        * add-move-resize-items.patch
-        * Upstream commit b69fe72.
-      + Set the initial task button text (and icon) correctly.
-        * set-initial-task-button-correctly.patch
-        * Upstream commit 563d6bf.
-  * Change the Vcs entries to be Lubuntu-specific.
-  * Fix typo in the patch description of fix-memory-leaks.patch.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 21 May 2018 00:43:10 -0500
-
 lxqt-panel (0.12.0-9) unstable; urgency=medium
 
   * Ported back USE_MENU_CACHE handling
@@ -212,43 +171,6 @@ lxqt-panel (0.12.0-9) unstable; urgency=medium
 
  -- Alf Gaida <agaida@siduction.org>  Mon, 23 Apr 2018 19:47:29 +0200
 
-lxqt-panel (0.12.0-8ubuntu1) bionic; urgency=medium
-
-  * Cherry-pick some upstream commits because the upstream release cycle is
-    horribly slow (and without this it'll be years before they come in):
-    - Fix wrongly positioned popups (LP: #1527013).
-      + fix-wrongly-positioned-popups.patch
-      + Upstream commit 7391172.
-    - plugin-volume: Use a specific icon for the panel.
-      + use-specific-panel-icon.patch
-      + Upstream commit eaa65e5.
-    - Fix various memory leaks.
-      + fix-memory-leaks.patch
-      + mainmenu: Fix possible leaks in menu-cache usage.
-        * Upstream commit 04630d4.
-      + mount: Fix leak by correctly assigning the QObject parent.
-        * Upstream commit d1bd23f.
-      + taskbar: Avoid conditionals on unintialized values by proper
-        initialization of data members
-        * Upstream commit 1cb5778.
-    - Avoid infinite recursion when no icon is available.
-      + avoid-infinite-recursion-icons.patch
-      + Upstream commit b9b4133.
-    - Add Move and Resize items in the task-button context menu.
-      + add-move-resize-items.patch
-      + Upstream commit b69fe72.
-    - Set the initial task button text (and icon) correctly.
-      + set-initial-task-button-correctly.patch
-      + Upstream commit 563d6bf.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 05 Feb 2018 20:04:48 -0600
-
-lxqt-panel (0.12.0-8build1) bionic; urgency=medium
-
-  * No change rebuild against libdbusmenu-qt5-2.
-
- -- Dmitry Shachnev <mitya57@ubuntu.com>  Tue, 30 Jan 2018 22:29:41 +0300
-
 lxqt-panel (0.12.0-8) unstable; urgency=medium
 
   * Fix plugin-volume, use pavucontrol-qt (Closes: #884547)
@@ -466,4 +388,3 @@ lxqt-panel (0.9.0+20151101-1) experimental; urgency=medium
   * Removing whitespaces at EOL and EOF.
 
  -- Alf Gaida <agaida@siduction.org>  Sun, 25 Oct 2015 02:27:12 +0200
-

debian/control

@@ -1,41 +1,51 @@
 Source: lxqt-panel
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
 XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
-Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
+Uploaders: Alf Gaida <agaida@siduction.org>,
+           ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
+           Andrew Lee (李健秋) <ajqlee@debian.org>
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
+               layer-shell-qt,
                libasound2-dev,
-               libdbusmenu-qt5-dev,
+               libdbusmenu-lxqt0-dev,
                libglib2.0-dev,
                libicu-dev,
-               libkf5solid-dev,
+               libkf6solid-dev,
-               libkf5windowsystem-dev,
+               libkf6windowsystem-dev,
-               liblxqt0-dev (>= 0.15.0),
+               liblayershellqtinterface-dev,
-               libkf5solid-dev,
+               liblxqt-globalkeys-ui2-dev (>= 2.0.0),
-               liblxqt-globalkeys0-dev (>= 0.16.0~),
+               liblxqt-globalkeys2-dev (>= 2.0.0),
-               liblxqt-globalkeys-ui0-dev (>= 0.16.0~),
+               liblxqt2-dev (>= 2.0.0),
                libpulse-dev,
-               libqt5svg5-dev,
+               libsensors-dev [!hurd-any],
-               libqt5x11extras5-dev,
-               libsensors4-dev [!hurd-any],
                libstatgrab-dev [linux-any],
-               libsysstat-qt5-0-dev (>= 0.4.4~),
+               libsysstat-qt6-1-dev (>= 1.0.0),
                libx11-dev,
+               libxcb-composite0-dev,
                libxcb-damage0-dev,
-               libxcb-util0-dev,
+               libxcb-image0-dev,
+               libxcb-randr0-dev,
+               libxcb-shm0-dev,
+               libxcb-util-dev,
                libxcb-xkb-dev,
                libxcomposite-dev,
                libxdamage-dev,
                libxkbcommon-dev,
                libxkbcommon-x11-dev,
-               libxrender-dev
+               libxrender-dev,
-Standards-Version: 4.5.0
+               libxtst-dev,
-Vcs-Browser: https://phab.lubuntu.me/source/lxqt-panel/
+               lxqt-menu-data (>= 2.0.0),
-Vcs-Git: https://phab.lubuntu.me/source/lxqt-panel.git
+               qt6-svg-dev,
+               qt6-wayland-dev
+Standards-Version: 4.7.0
+Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-panel-packaging
+Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-panel-packaging.git
 XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-panel
 XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-panel.git
 Homepage: https://github.com/lxqt/lxqt-panel
+Rules-Requires-Root: no
 
 Package: lxqt-panel
 Architecture: any
@@ -50,8 +60,6 @@ Recommends: lxqt-about,
             pavucontrol-qt | pavucontrol,
             qlipper
 Suggests: lxqt | lxqt-core
-Breaks: lxqt-common (<< 0.12.0)
-Replaces: lxqt-common (<< 0.12.0)
 Description: LXQt desktop panel
  The LXQt desktop panel
  .
@@ -61,8 +69,8 @@ Package: lxqt-panel-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qttranslations5-l10n, ${misc:Depends}
+Depends: qt6-translations-l10n, ${misc:Depends}
-Breaks: lxqt-panel (<< 0.11.0)
-Replaces: lxqt-panel (<< 0.11.0)
 Description: Language package for lxqt-panel
+ The l10n files for lxqt-panel.
+ .
  This package contains the l10n files needed by lxqt-panel.

debian/copyright

@@ -3,13 +3,25 @@ Upstream-Name: lxqt-panel
 Source: https://github.com/lxqt/lxqt-panel
 
 Files: *
-Copyright: 2012-2019 LXQt team
+Copyright: 2010-2013 Razor team
-           2010-2012 Razor team
+           2012-2024 LXQt team
+License: LGPL-2.1+
+
+Files: panel/lxqtpanelapplication_p.h
+Copyright: 2016 Luís Pereira <luis.artur.pereira@gmail.com>
 License: LGPL-2.1+
 
 Files: debian/*
 Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
-           2015 Andrew Lee (李健秋) <ajqlee@debian.org>
+           2015-2022 Andrew Lee (李健秋) <ajqlee@debian.org>
+           2022-2023 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
+           2015      Shih-Yuan Lee (FourDollars) <fourdollars@gmail.com>
+           2016      Ralf Jung <post@ralfj.de>
+           2018      Walter Lapchynski <wxl@ubuntu.com>
+           2020-2021 Raman Sarda <theloudspeaker@lubuntu.me>
+           2021      apt-ghetto <apt-ghetto@protonmail.com>
+           2018-2023 Simon Quigley <tsimonq2@ubuntu.com>
+           2023-2024 Aaron Rainbolt <arraybolt3@gmail.com>
 License: LGPL-2.1+
 
 License: LGPL-2.1+

debian/lxqt-panel.install

@@ -2,7 +2,7 @@ etc/xdg
 usr/bin/lxqt-panel
 usr/include/lxqt
 usr/lib/*/lxqt-panel
-usr/share/desktop-directories
 usr/share/lxqt/lxqt-panel
 usr/share/lxqt/panel.conf
+usr/share/lxqt/panel/qeyes-types/
 usr/share/man

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
 
 include /usr/share/dpkg/architecture.mk
@@ -19,12 +18,12 @@ endif
 %:
 	dh ${@} --buildsystem cmake
 
-override_dh_missing:
+override_dh_installdocs:
-	dh_missing --fail-missing
+	dh_installdocs
+	mv debian/lxqt-panel/usr/share/lxqt/panel/qeyes-types/README debian/lxqt-panel/usr/share/doc/lxqt-panel/README.qeyes-types
 
 override_dh_auto_configure:
-	dh_auto_configure --\
+	dh_auto_configure -- \
-		-DPULL_TRANSLATIONS=OFF \
 		-DUPDATE_TRANSLATIONS=OFF \
 		-DDOM_PLUGIN=YES \
 		-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

@@ -3,4 +3,4 @@ Bug-Database: https://github.com/lxqt/lxqt-panel/issues
 Bug-Submit: https://github.com/lxqt/lxqt-panel/issues/new
 Changelog: https://github.com/lxqt/lxqt-panel/blob/master/CHANGELOG
 Repository: https://github.com/lxqt/lxqt-panel
-Repository-Browser: https://github.com/lxqt/lxqt-panel
+Repository-Browse: https://github.com/lxqt/lxqt-panel

debian/watch

@@ -1,3 +1,5 @@
 version=4
-opts="pgpsigurlmangle=s/$/.asc/" \
+opts="searchmode=plain, \
-    https://github.com/lxqt/lxqt-panel/releases .*/lxqt-panel-([\d\.]+).tar.xz
+pgpsigurlmangle=s/$/.asc/, \
+uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \
+  https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz