Compare commits

..

No commits in common. 'ubuntu/oracular' and 'ubuntu/kinetic' have entirely different histories.

252
debian/changelog vendored

@ -1,97 +1,89 @@
lxqt-panel (1.4.0-0ubuntu2) noble; urgency=medium lxqt-panel (1.1.0-0ubuntu2) kinetic; urgency=medium
* Apply upstream patch fixing a crash on a custom command. * Add some missing build dependencies.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 22 Dec 2023 16:40:34 -0600 -- Simon Quigley <tsimonq2@ubuntu.com> Thu, 02 Jun 2022 13:15:43 -0500
lxqt-panel (1.4.0-0ubuntu1) noble; urgency=medium lxqt-panel (1.1.0-0ubuntu1) kinetic; urgency=medium
* New upstream release. * New upstream release.
* Fixed copyright file. * Bumped build dependencies.
* Bumped build dependency versions. * Drop old Breaks/Replaces since we're past the LTS. Update the
* Added lxqt-menu-data as a build dependency. runtime dependencies too.
* 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 -- Simon Quigley <tsimonq2@ubuntu.com> Thu, 02 Jun 2022 12:43:41 -0500
lxqt-panel (1.3.0-0ubuntu1) mantic; urgency=medium lxqt-panel (0.17.1-0ubuntu1) impish; urgency=medium
* New upstream release. * New upstream release 0.17.1
* Bump build dependencies. * Update debian/control
* Fix some build dependencies that were renamed. - Bump Standards-Version to 4.5.1
* Remove redundant hardening rule. - Use liblxqt0-dev 0.17.0
- Use liblxqt-globalkeys0-dev 0.17.0
- Use liblxqt-globalkeys-ui0-dev 0.17.0
- Use libsysstat-qt5-0-dev 0.4.5
- Extend lxqt-panel-l10n package description
* Run wrap-and-sort
- Remove duplicate Build-Depends libkf5solid-dev
* Update debian/copyright
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 11 Aug 2023 12:49:49 -0500 -- apt-ghetto <apt-ghetto@protonmail.com> Sat, 14 Aug 2021 15:49:34 +0200
lxqt-panel (1.2.1-1ubuntu1) lunar; urgency=medium lxqt-panel (0.16.1-1ubuntu1) hirsute; urgency=medium
* Merge from Debian Unstable, remaining changes: * New upstream version. Merge from debian unstable.
- Lubuntuify the package slightly. * Tighten debhelper-compat requirement.
- Run wrap-and-sort for cleanliness. * Updated dependencies.
- Update the copyright file. * Updated debian/rules.
- 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 -- Raman Sarda <theloudspeaker@disroot.org> Mon, 22 Feb 2021 02:37:32 +0530
lxqt-panel (1.2.1-1) unstable; urgency=medium lxqt-panel (0.16.1-1) unstable; urgency=medium
* New upstream release. [ Alf Gaida ]
* Bump Standards-Version to 4.6.2. * 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)
-- ChangZhuo Chen (陳昌倬) <czchen@debian.org> Thu, 05 Jan 2023 00:10:18 +0800 -- Andrew Lee (李健秋) <ajqlee@debian.org> Wed, 06 Jan 2021 18:30:22 +0800
lxqt-panel (1.2.0-1) unstable; urgency=medium lxqt-panel (0.15.0-0ubuntu1) groovy; urgency=medium
* New upstream release. * New upstream release.
* Bump Standards-Version to 4.6.1. - Update upstream signing key.
* Add Rules-Requires-Root: no - Update LXQt build depends.
* Bump compat to 13. * Bump Standards-version to 4.5.0, no changes needed.
* Remove unnecessary -Wl,--as-needed in d/rules * Run wrap-and-sort.
* 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
lxqt-panel (1.1.0-2) unstable; urgency=medium -- Simon Quigley <tsimonq2@ubuntu.com> Thu, 04 Jun 2020 14:30:49 -0500
* Merge to unstable. lxqt-panel (0.14.1-1ubuntu3) focal; urgency=medium
-- ChangZhuo Chen (陳昌倬) <czchen@debian.org> Sat, 19 Nov 2022 16:14:37 +0800 * Updated rules to match debian unstable
* Updated copyright.
lxqt-panel (1.1.0-1) experimental; urgency=medium -- Raman Sarda <theloudspeaker@lubuntu.me> Sun, 16 Feb 2020 00:58:19 +0530
* Add debian/salsa-ci.yml file. lxqt-panel (0.14.1-1ubuntu2) focal; urgency=medium
* 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 * Correct merge from Ubuntu Merge-oMatic
* 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
lxqt-panel (0.16.1-1) unstable; urgency=medium -- Raman Sarda <theloudspeaker@lubuntu.me> Sun, 09 Feb 2020 11:29:09 +0530
[ Alf Gaida ] lxqt-panel (0.14.1-1ubuntu1) focal; urgency=low
* Switched to gbp
* Bumped Standards-Version to 4.4.0, no changes needed
* improved debian/rules
[ Andrew Lee (李健秋) ] * Merge from Debian unstable. Remaining changes:
* New upstream release. (Closes: #916105, #953154, #978204) - Updated control file to include new deps.
-- Andrew Lee (李健秋) <ajqlee@debian.org> Wed, 06 Jan 2021 18:30:22 +0800 -- Raman Sarda <theloudspeaker@lubuntu.me> Fri, 07 Feb 2020 22:20:45 +0530
lxqt-panel (0.14.1-1) unstable; urgency=medium lxqt-panel (0.14.1-1) unstable; urgency=medium
@ -103,6 +95,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 +119,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 +151,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 +243,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 +497,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

24
debian/control vendored

@ -1,9 +1,7 @@
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 (= 13),
@ -13,13 +11,13 @@ Build-Depends: debhelper-compat (= 13),
libicu-dev, libicu-dev,
libkf5solid-dev, libkf5solid-dev,
libkf5windowsystem-dev, libkf5windowsystem-dev,
liblxqt-globalkeys-ui1-dev (>= 1.4.0), liblxqt-globalkeys-ui1-dev (>= 1.1.0),
liblxqt-globalkeys1-dev (>= 1.4.0), liblxqt-globalkeys1-dev (>= 1.1.0),
liblxqt1-dev (>= 1.4.0), liblxqt1-dev (>= 1.1.0),
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.5),
libx11-dev, libx11-dev,
@ -28,22 +26,20 @@ Build-Depends: debhelper-compat (= 13),
libxcb-image0-dev, libxcb-image0-dev,
libxcb-randr0-dev, libxcb-randr0-dev,
libxcb-shm0-dev, libxcb-shm0-dev,
libxcb-util-dev, libxcb-util0-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, libxtst-dev
lxqt-menu-data (>= 1.4.0) Standards-Version: 4.5.1
Standards-Version: 4.6.2 Vcs-Browser: https://phab.lubuntu.me/source/lxqt-panel/
Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-panel-packaging Vcs-Git: https://phab.lubuntu.me/source/lxqt-panel.git
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

19
debian/copyright vendored

@ -3,25 +3,18 @@ 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-2020, LXQt team
2012-2023 LXQt team 2010-2013, Razor team
License: LGPL-2.1+ License: LGPL-2.1+
Files: panel/lxqtpanelapplication_p.h Files: panel/lxqtpanelapplication_p.h
Copyright: 2016 Luís Pereira <luis.artur.pereira@gmail.com> 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: 2021, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
2015-2022 Andrew Lee (李健秋) <ajqlee@debian.org> 2014-2019, Alf Gaida <agaida@siduction.org>
2022-2023 ChangZhuo Chen (陳昌倬) <czchen@debian.org> 2015, Andrew Lee (李健秋) <ajqlee@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+

@ -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 +0,0 @@
trim-custom-commands-prevent-crash.patch

@ -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());
}

9
debian/rules vendored

@ -2,6 +2,7 @@
# 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 include /usr/share/dpkg/architecture.mk
@ -18,12 +19,12 @@ 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 \

@ -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

@ -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

6
debian/watch vendored

@ -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

Loading…
Cancel
Save