Lubuntu
/
lxqt-panel-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Lubuntu:ubuntu/oracular
Branches Tags
Lubuntu:backports/mantic
Lubuntu:backports/jammy
Lubuntu:ubuntu/noble
Lubuntu:ubuntu/oracular
Lubuntu:ubuntu/mantic
Lubuntu:ubuntu/lunar
Lubuntu:ubuntu/kinetic
Lubuntu:ci/stable
Lubuntu:ci/unstable
Lubuntu:ubuntu/impish
Lubuntu:ubuntu/hirsute
Lubuntu:backports/focal
Lubuntu:ubuntu/groovy
Lubuntu:ubuntu/focal
Lubuntu:ubuntu/disco
Lubuntu:ubuntu/eoan
Lubuntu:ubuntu/cosmic
Lubuntu:ubuntu/bionic
..
compare: Lubuntu:ubuntu/focal
Branches Tags
Lubuntu:backports/mantic
Lubuntu:backports/jammy
Lubuntu:ubuntu/noble
Lubuntu:ubuntu/oracular
Lubuntu:ubuntu/mantic
Lubuntu:ubuntu/lunar
Lubuntu:ubuntu/kinetic
Lubuntu:ci/stable
Lubuntu:ci/unstable
Lubuntu:ubuntu/impish
Lubuntu:ubuntu/hirsute
Lubuntu:backports/focal
Lubuntu:ubuntu/groovy
Lubuntu:ubuntu/focal
Lubuntu:ubuntu/disco
Lubuntu:ubuntu/eoan
Lubuntu:ubuntu/cosmic
Lubuntu:ubuntu/bionic

No commits in common. 'ubuntu/oracular' and 'ubuntu/focal' have entirely different histories.
ubuntu/ora ... ubuntu/foc

12 changed files with 228 additions and 280 deletions
Show Stats

230
debian/changelog vendored
Unescape View File

@ -1,97 +1,27 @@
lxqt-panel (1.4.0-0ubuntu2) noble; urgency=medium lxqt-panel (0.14.1-1ubuntu3) focal; urgency=medium
* Apply upstream patch fixing a crash on a custom command. * Updated rules to match debian unstable
* Updated copyright.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 22 Dec 2023 16:40:34 -0600 -- Raman Sarda <theloudspeaker@lubuntu.me> Sun, 16 Feb 2020 00:58:19 +0530
lxqt-panel (1.4.0-0ubuntu1) noble; urgency=medium lxqt-panel (0.14.1-1ubuntu2) focal; urgency=medium
* New upstream release. * Correct merge from Ubuntu Merge-oMatic
* Fixed copyright file. * Bumped minimum requirements in control file
* Bumped build dependency versions. * Copyright updates.
* Added lxqt-menu-data as a build dependency. * Updated debian/watch to point to correct source.
* Removed no-longer-existing directory from lxqt-panel.install. * Updated debian/upstream/metadata
* Move a README file for qeyes-types to the proper documentation directory. * using debhelper-compat instead of debhelper and d/compat
-- 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.
-- 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: -- Raman Sarda <theloudspeaker@lubuntu.me> Sun, 09 Feb 2020 11:29:09 +0530
- 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 (0.14.1-1ubuntu1) focal; urgency=low
lxqt-panel (1.2.1-1) unstable; urgency=medium
* New upstream release.
* Bump Standards-Version to 4.6.2.
-- ChangZhuo Chen (陳昌倬) <czchen@debian.org> Thu, 05 Jan 2023 00:10:18 +0800
lxqt-panel (1.2.0-1) unstable; urgency=medium
* New upstream release.
* 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 * Merge from Debian unstable. Remaining changes:
- Updated control file to include new deps.
lxqt-panel (1.1.0-2) unstable; urgency=medium -- Raman Sarda <theloudspeaker@lubuntu.me> Fri, 07 Feb 2020 22:20:45 +0530
* Merge to unstable.
-- ChangZhuo Chen (陳昌倬) <czchen@debian.org> Sat, 19 Nov 2022 16:14:37 +0800
lxqt-panel (1.1.0-1) experimental; urgency=medium
* 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.
-- 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
[ Andrew Lee (李健秋) ]
* New upstream release. (Closes: #916105, #953154, #978204)
-- Andrew Lee (李健秋) <ajqlee@debian.org> Wed, 06 Jan 2021 18:30:22 +0800
lxqt-panel (0.14.1-1) unstable; urgency=medium lxqt-panel (0.14.1-1) unstable; urgency=medium
@ -103,6 +33,13 @@ lxqt-panel (0.14.1-1) unstable; urgency=medium
-- Alf Gaida <agaida@siduction.org> Tue, 26 Feb 2019 03:28:17 +0100 -- 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 lxqt-panel (0.14.0-1) unstable; urgency=medium
* Cherry-picking new upstream version 0.14.0. * Cherry-picking new upstream version 0.14.0.
@ -120,6 +57,17 @@ lxqt-panel (0.14.0-1) unstable; urgency=medium
-- Alf Gaida <agaida@siduction.org> Sun, 27 Jan 2019 23:13:10 +0100 -- 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 lxqt-panel (0.13.0-2) unstable; urgency=medium
* Build dependency libsensors4-dev -> libsensors-dev (Closes: #917440) * Build dependency libsensors4-dev -> libsensors-dev (Closes: #917440)
@ -141,12 +89,84 @@ lxqt-panel (0.13.0-1) unstable; urgency=medium
-- Alf Gaida <agaida@siduction.org> Fri, 25 May 2018 00:08:49 +0200 -- 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 lxqt-panel (0.12.0-10) unstable; urgency=medium
* Changed Source and watch for lxqt * Changed Source and watch for lxqt
-- Alf Gaida <agaida@siduction.org> Sat, 28 Apr 2018 15:17:35 +0200 -- 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 lxqt-panel (0.12.0-9) unstable; urgency=medium
* Ported back USE_MENU_CACHE handling * Ported back USE_MENU_CACHE handling
@ -161,6 +181,43 @@ lxqt-panel (0.12.0-9) unstable; urgency=medium
-- Alf Gaida <agaida@siduction.org> Mon, 23 Apr 2018 19:47:29 +0200 -- 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 lxqt-panel (0.12.0-8) unstable; urgency=medium
* Fix plugin-volume, use pavucontrol-qt (Closes: #884547) * Fix plugin-volume, use pavucontrol-qt (Closes: #884547)
@ -378,3 +435,4 @@ lxqt-panel (0.9.0+20151101-1) experimental; urgency=medium
* Removing whitespaces at EOL and EOF. * Removing whitespaces at EOL and EOF.
-- Alf Gaida <agaida@siduction.org> Sun, 25 Oct 2015 02:27:12 +0200 -- Alf Gaida <agaida@siduction.org> Sun, 25 Oct 2015 02:27:12 +0200

40
debian/control vendored
Unescape View File

@ -1,49 +1,41 @@
Source: lxqt-panel Source: lxqt-panel
Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com> Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
XSBC-Original-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>, Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
Andrew Lee (李健秋) <ajqlee@debian.org>
Section: x11 Section: x11
Priority: optional Priority: optional
Build-Depends: debhelper-compat (= 13), Build-Depends: debhelper-compat (= 12),
libasound2-dev, libasound2-dev,
libdbusmenu-qt5-dev, libdbusmenu-qt5-dev,
libglib2.0-dev, libglib2.0-dev,
libicu-dev, libicu-dev,
libkf5solid-dev, libkf5solid-dev,
libkf5windowsystem-dev, libkf5windowsystem-dev,
liblxqt-globalkeys-ui1-dev (>= 1.4.0), libkf5solid-dev,
liblxqt-globalkeys1-dev (>= 1.4.0), liblxqt0-dev (>= 0.14.1~),
liblxqt1-dev (>= 1.4.0), liblxqt-globalkeys0-dev (>= 0.14.1~),
liblxqt-globalkeys-ui0-dev (>= 0.14.1~),
libpulse-dev, libpulse-dev,
libqt5svg5-dev, libqt5svg5-dev,
libqt5x11extras5-dev, libqt5x11extras5-dev,
libsensors-dev [!hurd-any], libsensors4-dev [!hurd-any],
libstatgrab-dev [linux-any], libstatgrab-dev [linux-any],
libsysstat-qt5-0-dev (>= 0.4.5), libsysstat-qt5-0-dev (>= 0.4.2~),
libx11-dev, libx11-dev,
libxcb-composite0-dev,
libxcb-damage0-dev, libxcb-damage0-dev,
libxcb-image0-dev, libxcb-util0-dev,
libxcb-randr0-dev,
libxcb-shm0-dev,
libxcb-util-dev,
libxcb-xkb-dev, libxcb-xkb-dev,
libxcomposite-dev, libxcomposite-dev,
libxdamage-dev, libxdamage-dev,
libxkbcommon-dev, libxkbcommon-dev,
libxkbcommon-x11-dev, libxkbcommon-x11-dev,
libxrender-dev, libxrender-dev
libxtst-dev, Standards-Version: 4.3.0
lxqt-menu-data (>= 1.4.0) Vcs-Browser: https://phab.lubuntu.me/source/lxqt-panel/
Standards-Version: 4.6.2 Vcs-Git: https://phab.lubuntu.me/source/lxqt-panel.git
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-Browser: https://salsa.debian.org/lxqt-team/lxqt-panel
XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-panel.git XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-panel.git
Homepage: https://github.com/lxqt/lxqt-panel Homepage: https://github.com/lxqt/lxqt-panel
Rules-Requires-Root: no
Package: lxqt-panel Package: lxqt-panel
Architecture: any Architecture: any
@ -58,6 +50,8 @@ Recommends: lxqt-about,
pavucontrol-qt | pavucontrol, pavucontrol-qt | pavucontrol,
qlipper qlipper
Suggests: lxqt | lxqt-core Suggests: lxqt | lxqt-core
Breaks: lxqt-common (<< 0.12.0)
Replaces: lxqt-common (<< 0.12.0)
Description: LXQt desktop panel Description: LXQt desktop panel
The LXQt desktop panel The LXQt desktop panel
. .
@ -68,7 +62,7 @@ Architecture: all
Multi-Arch: foreign Multi-Arch: foreign
Section: localization Section: localization
Depends: qttranslations5-l10n, ${misc:Depends} Depends: qttranslations5-l10n, ${misc:Depends}
Breaks: lxqt-panel (<< 0.11.0)
Replaces: lxqt-panel (<< 0.11.0)
Description: Language package for lxqt-panel Description: Language package for lxqt-panel
The l10n files for lxqt-panel.
.
This package contains the l10n files needed by lxqt-panel. This package contains the l10n files needed by lxqt-panel.

18
debian/copyright vendored
Unescape View File

@ -3,25 +3,13 @@ Upstream-Name: lxqt-panel
Source: https://github.com/lxqt/lxqt-panel Source: https://github.com/lxqt/lxqt-panel
Files: * Files: *
Copyright: 2010-2013 Razor team Copyright: 2012-2019 LXQt team
2012-2023 LXQt team 2010-2012 Razor team
License: LGPL-2.1+
Files: panel/lxqtpanelapplication_p.h
Copyright: 2016 Luís Pereira <luis.artur.pereira@gmail.com>
License: LGPL-2.1+ License: LGPL-2.1+
Files: debian/* Files: debian/*
Copyright: 2014-2019 Alf Gaida <agaida@siduction.org> Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
2015-2022 Andrew Lee (李健秋) <ajqlee@debian.org> 2015 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+
License: LGPL-2.1+ License: LGPL-2.1+

6
debian/gbp.conf vendored
Unescape View File

@ -1,6 +0,0 @@
[DEFAULT]
debian-branch = debian/sid
upstream-branch = upstream/latest
pristine-tar = True
compression = xz

2
debian/lxqt-panel.install vendored
Unescape View File

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

1
debian/patches/series vendored
Unescape View File

@ -1 +0,0 @@
trim-custom-commands-prevent-crash.patch

69
debian/patches/trim-custom-commands-prevent-crash.patch vendored
Unescape View File

@ -1,69 +0,0 @@
Description: LXQtCustomCommand: trim command to remove spaces
This fixes crash when command is made of only whitespace characters.
It's not detected as empty and upon argument split, it tries to access
first element of an empty list.
.
Also trim when saving settings in LXQtCustomCommandConfiguration
so placeholder text shows up on next run
Author: Filippo Gentile <42845724+gfgit@users.noreply.github.com>
Origin: upstream, https://github.com/lxqt/lxqt-panel/pull/1964
Applied-Upstream: bd637abafc9e8e9c7727a89e5d86e0f07f213c23
Last-Update: 2023-12-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/plugin-customcommand/lxqtcustomcommand.cpp
+++ b/plugin-customcommand/lxqtcustomcommand.cpp
@@ -109,7 +109,7 @@ void LXQtCustomCommand::settingsChanged(
mAutoRotate = settings()->value(QStringLiteral("autoRotate"), true).toBool();
mFont = settings()->value(QStringLiteral("font"), QString()).toString(); // the default font should be empty
- mCommand = settings()->value(QStringLiteral("command"), QStringLiteral("echo Configure...")).toString();
+ mCommand = settings()->value(QStringLiteral("command"), QStringLiteral("echo Configure...")).toString().trimmed();
mRunWithBash = settings()->value(QStringLiteral("runWithBash"), true).toBool();
mOutputImage = settings()->value(QStringLiteral("outputImage"), false).toBool();
mRepeat = settings()->value(QStringLiteral("repeat"), true).toBool();
@@ -118,9 +118,9 @@ void LXQtCustomCommand::settingsChanged(
mIcon = settings()->value(QStringLiteral("icon"), QString()).toString();
mText = settings()->value(QStringLiteral("text"), QStringLiteral("%1")).toString();
mMaxWidth = settings()->value(QStringLiteral("maxWidth"), 200).toInt();
- mClick = settings()->value(QStringLiteral("click"), QString()).toString();
- mWheelUp = settings()->value(QStringLiteral("wheelUp"), QString()).toString();
- mWheelDown = settings()->value(QStringLiteral("wheelDown"), QString()).toString();
+ mClick = settings()->value(QStringLiteral("click"), QString()).toString().trimmed();
+ mWheelUp = settings()->value(QStringLiteral("wheelUp"), QString()).toString().trimmed();
+ mWheelDown = settings()->value(QStringLiteral("wheelDown"), QString()).toString().trimmed();
if (oldFont != mFont) {
QFont newFont;
--- a/plugin-customcommand/lxqtcustomcommandconfiguration.cpp
+++ b/plugin-customcommand/lxqtcustomcommandconfiguration.cpp
@@ -108,7 +108,7 @@ void LXQtCustomCommandConfiguration::fon
void LXQtCustomCommandConfiguration::commandPlainTextEditChanged()
{
if (!mLockSettingChanges)
- settings().setValue(QStringLiteral("command"), ui->commandPlainTextEdit->toPlainText());
+ settings().setValue(QStringLiteral("command"), ui->commandPlainTextEdit->toPlainText().trimmed());
}
void LXQtCustomCommandConfiguration::runWithBashCheckBoxChanged(bool runWithBash)
@@ -163,17 +163,17 @@ void LXQtCustomCommandConfiguration::max
void LXQtCustomCommandConfiguration::clickLineEditChanged(QString click)
{
if (!mLockSettingChanges)
- settings().setValue(QStringLiteral("click"), click);
+ settings().setValue(QStringLiteral("click"), click.trimmed());
}
void LXQtCustomCommandConfiguration::wheelUpLineEditChanged(QString wheelUp)
{
if (!mLockSettingChanges)
- settings().setValue(QStringLiteral("wheelUp"), wheelUp);
+ settings().setValue(QStringLiteral("wheelUp"), wheelUp.trimmed());
}
void LXQtCustomCommandConfiguration::wheelDownLineEditChanged(QString wheelDown)
{
if (!mLockSettingChanges)
- settings().setValue(QStringLiteral("wheelDown"), wheelDown);
+ settings().setValue(QStringLiteral("wheelDown"), wheelDown.trimmed());
}

22
debian/rules vendored
Unescape View File

@ -2,29 +2,29 @@
# export DH_VERBOSE=1 # export DH_VERBOSE=1
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_BUILD_MAINT_OPTIONS = hardening=+all
include /usr/share/dpkg/architecture.mk WHICH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) ifeq ($(WHICH_OS), kfreebsd)
CONF_FLAGS := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO NOT_LINUX := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO
endif endif
ifeq ($(DEB_HOST_ARCH_OS), hurd) ifeq ($(WHICH_OS), hurd)
CONF_FLAGS := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO -DSENSORS_PLUGIN=NO NOT_LINUX := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO -DSENSORS_PLUGIN=NO
endif endif
%: %:
dh ${@} --buildsystem cmake dh ${@} --buildsystem cmake
override_dh_installdocs: override_dh_missing:
dh_installdocs dh_missing --fail-missing
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: override_dh_auto_configure:
dh_auto_configure -- \ dh_auto_configure --\
-DPULL_TRANSLATIONS=OFF \
-DUPDATE_TRANSLATIONS=OFF \ -DUPDATE_TRANSLATIONS=OFF \
-DDOM_PLUGIN=YES \ -DDOM_PLUGIN=YES \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
$(CONF_FLAGS) $(NOT_LINUX)

12
debian/salsa-ci.yml vendored
Unescape View File

@ -1,12 +0,0 @@
# 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

2
debian/upstream/metadata vendored
Unescape View File

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

100
debian/upstream/signing-key.asc vendored
Unescape View File

@ -1,52 +1,50 @@
-----BEGIN PGP PUBLIC KEY BLOCK----- -----BEGIN PGP PUBLIC KEY BLOCK-----
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 =h7ww
sw==
=gSIv
-----END PGP PUBLIC KEY BLOCK----- -----END PGP PUBLIC KEY BLOCK-----

6
debian/watch vendored
Unescape View File

@ -1,5 +1,3 @@
version=4 version=4
opts="searchmode=plain, \ opts="pgpsigurlmangle=s/$/.asc/" \
pgpsigurlmangle=s/$/.asc/, \ https://github.com/lxqt/lxqt-panel/releases .*/lxqt-panel-([\d\.]+).tar.xz
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

Write Preview
Loading…
Cancel
Save