From d9ed05f600b9660b3f3c5a9b3f4fa3cf568bf737 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Mon, 13 Nov 2023 11:34:32 -0600 Subject: [PATCH 1/6] Bump version for new upstream release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 250908a..8cf9474 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lxqt-panel (1.4.0-0ubuntu1) noble; urgency=medium + + * New upstream release. + + -- Aaron Rainbolt Mon, 13 Nov 2023 11:34:09 -0600 + lxqt-panel (1.3.0-0ubuntu1) mantic; urgency=medium * New upstream release. From 78bafeec973ef1697107f84950699a9adac343c4 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Mon, 13 Nov 2023 11:40:12 -0600 Subject: [PATCH 2/6] Fix copyright file --- debian/changelog | 1 + debian/copyright | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8cf9474..1f95a02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ lxqt-panel (1.4.0-0ubuntu1) noble; urgency=medium * New upstream release. + * Fixed copyright file. -- Aaron Rainbolt Mon, 13 Nov 2023 11:34:09 -0600 diff --git a/debian/copyright b/debian/copyright index 7f0cc42..3ec88ec 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,8 +3,8 @@ Upstream-Name: lxqt-panel Source: https://github.com/lxqt/lxqt-panel Files: * -Copyright: 2012-2023 LXQt team - 2010-2013 Razor team +Copyright: 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 License: LGPL-2.1+ Files: debian/* -Copyright: 2021-2023 Lubuntu Developers - 2014-2019 Alf Gaida +Copyright: 2014-2019 Alf Gaida 2015-2022 Andrew Lee (李健秋) 2022-2023 ChangZhuo Chen (陳昌倬) + 2015 Shih-Yuan Lee (FourDollars) + 2016 Ralf Jung + 2018 Walter Lapchynski + 2020-2021 Raman Sarda + 2021 apt-ghetto + 2018-2023 Simon Quigley + 2023 Aaron Rainbolt License: LGPL-2.1+ License: LGPL-2.1+ From 56eb2dcb06271e4c2bc40568bd2a2605063ed7f7 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Mon, 13 Nov 2023 11:45:41 -0600 Subject: [PATCH 3/6] Bump build deps --- debian/changelog | 1 + debian/control | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1f95a02..a758157 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ lxqt-panel (1.4.0-0ubuntu1) noble; urgency=medium * New upstream release. * Fixed copyright file. + * Bumped build dependency versions. -- Aaron Rainbolt Mon, 13 Nov 2023 11:34:09 -0600 diff --git a/debian/control b/debian/control index 6595219..a749adc 100644 --- a/debian/control +++ b/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-globalkeys1-dev (>= 1.3.0), - liblxqt1-dev (>= 1.3.0), + liblxqt-globalkeys-ui1-dev (>= 1.4.0), + liblxqt-globalkeys1-dev (>= 1.4.0), + liblxqt1-dev (>= 1.4.0), libpulse-dev, libqt5svg5-dev, libqt5x11extras5-dev, From 061c45303435ebe096d3d68a1424970f81a788a2 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Mon, 13 Nov 2023 11:46:21 -0600 Subject: [PATCH 4/6] Add lxqt-menu-data build dep --- debian/changelog | 1 + debian/control | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a758157..607605c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ 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. -- Aaron Rainbolt Mon, 13 Nov 2023 11:34:09 -0600 diff --git a/debian/control b/debian/control index a749adc..a717855 100644 --- a/debian/control +++ b/debian/control @@ -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 From cd2bd55b5963c713a53b0c1823558924cf24e709 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Mon, 13 Nov 2023 11:54:29 -0600 Subject: [PATCH 5/6] Remove a moved directory from the lxqt-panel.install --- debian/changelog | 1 + debian/lxqt-panel.install | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 607605c..a3fba7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ lxqt-panel (1.4.0-0ubuntu1) noble; urgency=medium * Fixed copyright file. * Bumped build dependency versions. * Added lxqt-menu-data as a build dependency. + * Removed no-longer-existing directory from lxqt-panel.install. -- Aaron Rainbolt Mon, 13 Nov 2023 11:34:09 -0600 diff --git a/debian/lxqt-panel.install b/debian/lxqt-panel.install index a6bf57a..f77b9e6 100644 --- a/debian/lxqt-panel.install +++ b/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/ From fd6365df82e22bf3f2c6445da9cca682a5b93231 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Mon, 13 Nov 2023 12:19:12 -0600 Subject: [PATCH 6/6] Move qeyes-types README file to where it belongs --- debian/changelog | 1 + debian/rules | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index a3fba7b..af3fc56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ lxqt-panel (1.4.0-0ubuntu1) noble; urgency=medium * 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 Mon, 13 Nov 2023 11:34:09 -0600 diff --git a/debian/rules b/debian/rules index 2936a60..0ee5f97 100755 --- a/debian/rules +++ b/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 \