Merge branch 'ubuntu/noble' into backports/jammy

debian/changelog

@@ -1,8 +1,19 @@
-lxqt-panel (1.3.0-0ubuntu1~ppa1) jammy; urgency=medium
+lxqt-panel (1.4.0-0ubuntu1~ppa1) jammy; urgency=medium
 
   * Backport to Jammy.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 14:20:37 -0500
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Mon, 13 Nov 2023 11:34:09 -0600
+
+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
 

debian/control

@@ -13,9 +13,9 @@ Build-Depends: debhelper-compat (= 13),
                libicu-dev,
                libkf5solid-dev,
                libkf5windowsystem-dev,
-               liblxqt-globalkeys-ui1-dev (>= 1.3.0),
+               liblxqt-globalkeys-ui1-dev (>= 1.4.0),
-               liblxqt-globalkeys1-dev (>= 1.3.0),
+               liblxqt-globalkeys1-dev (>= 1.4.0),
-               liblxqt1-dev (>= 1.3.0),
+               liblxqt1-dev (>= 1.4.0),
                libpulse-dev,
                libqt5svg5-dev,
                libqt5x11extras5-dev,
@@ -35,7 +35,8 @@ Build-Depends: debhelper-compat (= 13),
                libxkbcommon-dev,
                libxkbcommon-x11-dev,
                libxrender-dev,
-               libxtst-dev
+               libxtst-dev,
+               lxqt-menu-data (>= 1.4.0)
 Standards-Version: 4.6.2
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-panel-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-panel-packaging.git

debian/copyright

@@ -3,8 +3,8 @@ Upstream-Name: lxqt-panel
 Source: https://github.com/lxqt/lxqt-panel
 
 Files: *
-Copyright: 2012-2023 LXQt team
+Copyright: 2010-2013 Razor team
-           2010-2013 Razor team
+           2012-2023 LXQt team
 License: LGPL-2.1+
 
 Files: panel/lxqtpanelapplication_p.h
@@ -12,10 +12,16 @@ Copyright: 2016 Luís Pereira <luis.artur.pereira@gmail.com>
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2021-2023 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
-           2014-2019 Alf Gaida <agaida@siduction.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      Aaron Rainbolt <arraybolt3@gmail.com>
 License: LGPL-2.1+
 
 License: LGPL-2.1+

debian/lxqt-panel.install

@@ -2,7 +2,6 @@ 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/

debian/rules

@@ -18,6 +18,10 @@ endif
 %:
 	dh ${@} --buildsystem cmake
 
+override_dh_installdocs:
+	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 -- \
 		-DUPDATE_TRANSLATIONS=OFF \