Update Standards-Version to 4.7.1, no changes needed.

Remove runtime dependency on lxmenu-data.
2.1.4
2025-02-21 16:42:48 -06:00 · 2025-02-21 16:33:23 -06:00 · 2025-01-11 18:06:21 -06:00 · 2024-11-15 15:34:45 -06:00 · 2024-11-05 14:49:39 -06:00 · 2024-11-05 14:31:13 -06:00
22 changed files with 345 additions and 2791 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,74 +1,186 @@
-lxqt-panel (0.13.0-0ubuntu5) cosmic; urgency=medium
+lxqt-panel (2.1.4-0ubuntu3) plucky; urgency=medium

-  * Add optional overriding of icon theme.
-  * Run wrap-and-sort.
+  * Update Standards-Version to 4.7.1, no changes needed.

- -- Walter Lapchynski <wxl@ubuntu.com>  Tue, 21 Aug 2018 23:37:22 -0700
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 21 Feb 2025 16:33:31 -0600

-lxqt-panel (0.13.0-0ubuntu4) cosmic; urgency=medium
+lxqt-panel (2.1.4-0ubuntu2) plucky; 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.
+  * Remove runtime dependency on lxmenu-data.

- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 16 Aug 2018 16:17:17 -0500
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 18 Feb 2025 14:57:47 -0600

-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
+lxqt-panel (2.1.4-0ubuntu1) plucky; 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
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 11 Jan 2025 16:48:49 -0600

-lxqt-panel (0.12.0-9ubuntu1) cosmic; urgency=medium
+lxqt-panel (2.1.0-0ubuntu1) plucky; 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.
+  * New upstream release.
+    - Bump build dependencies.

- -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 21 May 2018 00:43:10 -0500
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:32:51 -0600
+
+lxqt-panel (2.0.1-0ubuntu1) oracular; urgency=medium
+
+  * New upstream release.
+  * Update copyright file.
+  * Bump Standards-Version to 4.7.0, no changes necessary.
+  * Dropped trim-custom-commands-prevent-crash.patch, applied upstream.
+  * Adjust build dependencies.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:25:54 -0500
+
+lxqt-panel (1.4.0-0ubuntu2) noble; urgency=medium
+
+  * Apply upstream patch fixing a crash on a custom command.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 22 Dec 2023 16:40:34 -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
+
+  * 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:
+    - 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.
+  * 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
+
+lxqt-panel (1.1.0-2) unstable; urgency=medium
+
+  * 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
+
+  * Cherry-picking new upstream version 0.14.1.
+  * Bumped minimum versions:
+    - liblxqt0-dev (>= 0.14.1~)
+    - liblxqt-globalkeys0-dev (>= 0.14.1~)
+    - liblxqt-globalkeys-ui0-dev (>= 0.14.1~)
+
+ -- Alf Gaida <agaida@siduction.org>  Tue, 26 Feb 2019 03:28:17 +0100
+
+lxqt-panel (0.14.0-1) unstable; urgency=medium
+
+  * Cherry-picking new upstream version 0.14.0.
+  * Bumped Standards to 4.3.0, no changes needed
+  * Dropped d/compat, use debhelper-compat = 12, no changes needed
+  * Fixed years in d/copyright
+  * Bumped minimum versions:
+    - liblxqt0-dev (>= 0.14.0~)
+    - liblxqt-globalkeys0-dev (>= 0.14.0~)
+    - liblxqt-globalkeys-ui0-dev (>= 0.14.0~)
+    - libsysstat-qt5-0-dev (>= 0.4.2~)
+  * Removed obsolete PULL_TRANSLATIONS= OFF from dh_auto_configure
+  * Added l10n-package, moved from lxqt-l10n
+  * Added d/upstream/metadata
+
+ -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 23:13:10 +0100
+
+lxqt-panel (0.13.0-2) unstable; urgency=medium
+
+  * Build dependency libsensors4-dev -> libsensors-dev (Closes: #917440)
+  * Bumped Standards to 4.2.1, no changes needed
+
+ -- Alf Gaida <agaida@siduction.org>  Sat, 29 Dec 2018 13:03:56 +0100
+
+lxqt-panel (0.13.0-1) unstable; urgency=medium
+
+  * Cherry-picking new upstream version 0.13.0.
+  * Bumped build dependencies
+    - liblxqt0-dev to >= 0.13.0~
+    - liblxqt0-dev to >= 0.13.0~
+    - liblxqt-globalkeys0-dev to >= 0.13.0~
+    - liblxqt-globalkeys-ui0-dev to >= 0.13.0~
+    - libsysstat-qt5-0-dev to >= 0.4.1~
+  * Removed build dependency libglib2.0-dev, thrown in via lxqt-build-tools
+  * Bumped year in copyright
+
+ -- Alf Gaida <agaida@siduction.org>  Fri, 25 May 2018 00:08:49 +0200
+
+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-9) unstable; urgency=medium

@ -84,43 +196,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)
--- a/debian/compat
+++ b/debian/compat
@ -1 +0,0 @@
-11
--- a/debian/control
+++ b/debian/control
@ -1,44 +1,56 @@
 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>
+Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Uploaders: Alf Gaida <agaida@siduction.org>,
+           ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
+           Andrew Lee (李健秋) <ajqlee@debian.org>
 Section: x11
 Priority: optional
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper-compat (= 13),
+               layer-shell-qt,
               libasound2-dev,
-               libdbusmenu-qt5-dev,
+               libdbusmenu-lxqt0-dev (>= 0.2.0),
               libglib2.0-dev,
               libicu-dev,
-               libkf5solid-dev,
-               libkf5windowsystem-dev,
-               liblxqt-globalkeys-ui0-dev (>= 0.13.0),
-               liblxqt-globalkeys0-dev (>= 0.13.0),
-               liblxqt0-dev (>= 0.13.0),
+               libkf6solid-dev (>= 6.0.0),
+               libkf6windowsystem-dev (>= 6.0.0),
+               liblayershellqtinterface-dev,
+               liblxqt-globalkeys-ui2-dev (>= 2.1.0),
+               liblxqt-globalkeys2-dev (>= 2.1.0),
+               liblxqt2-dev (>= 2.1.0),
               libpulse-dev,
-               libqt5svg5-dev,
-               libqt5x11extras5-dev,
-               libsensors4-dev [!hurd-any],
+               libsensors-dev [!hurd-any],
               libstatgrab-dev [linux-any],
-               libsysstat-qt5-0-dev (>= 0.4.1),
+               libsysstat-qt6-1-dev (>= 1.1.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
-Standards-Version: 4.2.0
-Vcs-Browser: https://phab.lubuntu.me/source/lxqt-panel/
-Vcs-Git: https://phab.lubuntu.me/source/lxqt-panel.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
+               libxrender-dev,
+               libxtst-dev,
+               lxqt-menu-data (>= 2.1.0),
+               qt6-base-private-dev (>= 6.6.0),
+               qt6-svg-dev (>= 6.6.0),
+               qt6-wayland-dev (>= 6.6.0)
+Standards-Version: 4.7.1
+Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-panel-packaging
+Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-panel-packaging.git
+Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-panel
+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
-Depends: lxmenu-data, lxqt-policykit, ${misc:Depends}, ${shlibs:Depends}
+Depends: layer-shell-qt, lxqt-policykit, ${misc:Depends}, ${shlibs:Depends}
 Recommends: lxqt-about,
            lxqt-config,
            lxqt-notificationd,
@ -49,9 +61,17 @@ 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
 .
- This package contain the LXQt panel.
+ This package contains the LXQt panel.
+
+Package: lxqt-panel-l10n
+Architecture: all
+Multi-Arch: foreign
+Section: localization
+Depends: qt6-translations-l10n, ${misc:Depends}
+Description: Language package for lxqt-panel
+ The l10n files for lxqt-panel.
+ .
+ This package contains the l10n files needed by lxqt-panel.
--- a/debian/copyright
+++ b/debian/copyright
@ -1,15 +1,27 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: lxqt-panel
-Source: https://github.com/lxde/lxqt-panel
+Source: https://github.com/lxqt/lxqt-panel

 Files: *
-Copyright: 2012-2018 LXQt team
-           2010-2012 Razor team
+Copyright: 2010-2013 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-2018 Alf Gaida <agaida@siduction.org>
-           2015 Andrew Lee (李健秋) <ajqlee@debian.org>
+Copyright: 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-2025 Simon Quigley <tsimonq2@ubuntu.com>
+           2023-2024 Aaron Rainbolt <arraybolt3@gmail.com>
 License: LGPL-2.1+

 License: LGPL-2.1+
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@ -0,0 +1,6 @@
+[DEFAULT]
+debian-branch = debian/sid
+upstream-branch = upstream/latest
+pristine-tar = True
+compression = xz
+
--- a/debian/lxqt-panel-l10n.install
+++ b/debian/lxqt-panel-l10n.install
@ -0,0 +1 @@
+usr/share/lxqt/translations/lxqt-panel/
--- a/debian/lxqt-panel.install
+++ b/debian/lxqt-panel.install
@ -0,0 +1,9 @@
+etc/xdg
+usr/bin/lxqt-panel
+usr/include/lxqt
+usr/lib/*/lxqt-panel
+usr/share/applications/
+usr/share/lxqt/lxqt-panel
+usr/share/lxqt/panel.conf
+usr/share/lxqt/panel/qeyes-types/
+usr/share/man
--- a/debian/lxqt-panel.lintian-overrides
+++ b/debian/lxqt-panel.lintian-overrides
@ -0,0 +1,9 @@
+# This is expected
+lxqt-panel: desktop-entry-missing-required-key Name [usr/share/applications/lxqt-panel.desktop]
+lxqt-panel: desktop-entry-limited-to-environments [usr/share/applications/lxqt-panel.desktop]
+
+# Not likely to be fixed soon
+lxqt-panel: spelling-error-in-binary managment management [usr/bin/lxqt-panel]
+
+# False positive
+lxqt-panel: hardening-no-fortify-functions [usr/lib/x86_64-linux-gnu/lxqt-panel/backend/libwmbackend_kwin_wayland.so]
--- a/debian/patches/add-autoexpansion-1.patch
+++ b/debian/patches/add-autoexpansion-1.patch
@ -1,105 +0,0 @@
-Description: Allow plugin's "static" configration change
- This is patch 1/4 adding autoexpansion support to the spacer plugin.
-Author: Palo Kisa <palo.kisa@gmail.com>
-Origin: upstream
-Bug: https://github.com/lxqt/lxqt/issues/1038
-Applied-Upstream: commit:6fbe184
-Last-Update: 2018-08-16
--- a/panel/ilxqtpanel.h
-+++ b/panel/ilxqtpanel.h
-@@ -110,6 +110,16 @@ public:
-      *
-      */
-     virtual void willShowWindow(QWidget * w) = 0;
-+
-+    /*!
-+     * \brief By calling this function, a plugin notifies the panel about change of it's "static"
-+     * configuration
-+     *
-+     * \param plugin the changed plugin
-+     *
-+     * \sa ILXQtPanelPlugin::isSeparate(), ILXQtPanelPlugin::isExpandable
-+     */
-+    virtual void pluginFlagsChanged(const ILXQtPanelPlugin * plugin) = 0;
- };
- 
- #endif // ILXQTPANEL_H
--- a/panel/ilxqtpanelplugin.h
-+++ b/panel/ilxqtpanelplugin.h
-@@ -196,6 +196,17 @@ public:
-         mPanel->willShowWindow(w);
-     }
- 
-+    /*!
-+     * \brief By calling this function, a plugin notifies the panel about change of it's "static"
-+     * configuration
-+     *
-+     * \sa isSeparate(), isExpandable
-+     */
-+    inline void pluginFlagsChanged()
-+    {
-+        mPanel->pluginFlagsChanged(this);
-+    }
-+
-     virtual bool isSeparate() const { return false;  }
-     virtual bool isExpandable() const { return false; }
- private:
--- a/panel/lxqtpanel.cpp
-+++ b/panel/lxqtpanel.cpp
-@@ -1225,6 +1225,14 @@ void LXQtPanel::willShowWindow(QWidget *
- /************************************************
- 
-  ************************************************/
-+void LXQtPanel::pluginFlagsChanged(const ILXQtPanelPlugin * /*plugin*/)
-+{
-+    mLayout->rebuild();
-+}
-+
-+/************************************************
-+
-+ ************************************************/
- QString LXQtPanel::qssPosition() const
- {
-     return positionToStr(position());
--- a/panel/lxqtpanel.h
-+++ b/panel/lxqtpanel.h
-@@ -146,6 +146,7 @@ public:
-     QRect calculatePopupWindowPos(QPoint const & absolutePos, QSize const & windowSize) const override;
-     QRect calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const QSize &windowSize) const override;
-     void willShowWindow(QWidget * w) override;
-+    void pluginFlagsChanged(const ILXQtPanelPlugin * plugin) override;
-     // ........ end of ILXQtPanel overrides
- 
-     /**
--- a/panel/lxqtpanellayout.cpp
-+++ b/panel/lxqtpanellayout.cpp
-@@ -946,6 +946,16 @@ void LXQtPanelLayout::setLineCount(int v
- /************************************************
- 
-  ************************************************/
-+void LXQtPanelLayout::rebuild()
-+{
-+    mLeftGrid->rebuild();
-+    mRightGrid->rebuild();
-+}
-+
-+
-+/************************************************
-+
-+ ************************************************/
- int LXQtPanelLayout::lineSize() const
- {
-     return mLeftGrid->lineSize();
--- a/panel/lxqtpanellayout.h
-+++ b/panel/lxqtpanellayout.h
-@@ -73,6 +73,10 @@ public:
-     ILXQtPanel::Position position() const { return mPosition; }
-     void setPosition(ILXQtPanel::Position value);
- 
-+    /*! \brief Force the layout to re-read items/plugins "static" configuration
-+     */
-+    void rebuild();
-+
-     static bool itemIsSeparate(QLayoutItem *item);
- signals:
-     void pluginMoved(Plugin * plugin);
--- a/debian/patches/add-autoexpansion-2.patch
+++ b/debian/patches/add-autoexpansion-2.patch
@ -1,35 +0,0 @@
-Description: Add "override" to declarations
- This is patch 2/4 adding autoexpansion support to the spacer plugin.
-Author: Palo Kisa <palo.kisa@gmail.com>
-Origin: upstream
-Bug: https://github.com/lxqt/lxqt/issues/1038
-Applied-Upstream: commit:764aadd
-Last-Update: 2018-08-16
--- a/plugin-spacer/spacer.h
-+++ b/plugin-spacer/spacer.h
-@@ -57,18 +57,18 @@ class Spacer :  public QObject, public I
- public:
-     Spacer(const ILXQtPanelPluginStartupInfo &startupInfo);
- 
-    virtual QWidget *widget() { return &mSpacer; }
-    virtual QString themeId() const { return "Spacer"; }
-+    virtual QWidget *widget() override { return &mSpacer; }
-+    virtual QString themeId() const override { return "Spacer"; }
- 
-    bool isSeparate() const { return true; }
-+    bool isSeparate() const override { return true; }
- 
-    virtual ILXQtPanelPlugin::Flags flags() const { return HaveConfigDialog; }
-    QDialog *configureDialog();
-+    virtual ILXQtPanelPlugin::Flags flags() const override { return HaveConfigDialog; }
-+    QDialog *configureDialog() override;
- 
-    virtual void realign();
-+    virtual void realign() override;
- 
- private slots:
-    virtual void settingsChanged();
-+    virtual void settingsChanged() override;
- 
- private:
-     void setSizes();
--- a/debian/patches/add-autoexpansion-3.patch
+++ b/debian/patches/add-autoexpansion-3.patch
@ -1,238 +0,0 @@
-Description: Add auto-expansion feature
- This is patch 3/4 adding autoexpansion support to the spacer plugin.
-Author: Palo Kisa <palo.kisa@gmail.com>
-Origin: upstream
-Bug: https://github.com/lxqt/lxqt/issues/1038
-Applied-Upstream: commit:b57a178
-Last-Update: 2018-08-16
--- a/plugin-spacer/spacer.cpp
-+++ b/plugin-spacer/spacer.cpp
-@@ -55,6 +55,7 @@ Spacer::Spacer(const ILXQtPanelPluginSta
-     QObject()
-     , ILXQtPanelPlugin(startupInfo)
-     , mSize(8)
-+    , mExpandable(false)
- {
-     settingsChanged();
- }
-@@ -65,8 +66,12 @@ Spacer::Spacer(const ILXQtPanelPluginSta
- void Spacer::settingsChanged()
- {
-     mSize = settings()->value("size", 8).toInt();
-+    const bool old_expandable = mExpandable;
-+    mExpandable = settings()->value("expandable", false).toBool();
-     mSpacer.setType(settings()->value("spaceType", SpacerConfiguration::msTypes[0]).toString());
-     setSizes();
-+    if (old_expandable != mExpandable)
-+        pluginFlagsChanged();
- }
- 
- /************************************************
-@@ -82,21 +87,30 @@ QDialog *Spacer::configureDialog()
-  ************************************************/
- void Spacer::setSizes()
- {
-    if (panel()->isHorizontal())
-+    if (mExpandable)
-     {
-        mSpacer.setOrientation("horizontal");
-        mSpacer.setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
-        mSpacer.setFixedWidth(mSize);
-        mSpacer.setMinimumHeight(0);
-        mSpacer.setMaximumHeight(QWIDGETSIZE_MAX);
-    }
-    else
-+        mSpacer.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-+        mSpacer.setMinimumSize({1, 1});
-+        mSpacer.setMaximumSize({QWIDGETSIZE_MAX, QWIDGETSIZE_MAX});
-+        mSpacer.setOrientation(panel()->isHorizontal() ? "horizontal" : "vertical");
-+    } else
-     {
-        mSpacer.setOrientation("vertical");
-        mSpacer.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-        mSpacer.setFixedHeight(mSize);
-        mSpacer.setMinimumWidth(0);
-        mSpacer.setMaximumWidth(QWIDGETSIZE_MAX);
-+        if (panel()->isHorizontal())
-+        {
-+            mSpacer.setOrientation("horizontal");
-+            mSpacer.setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
-+            mSpacer.setFixedWidth(mSize);
-+            mSpacer.setMinimumHeight(0);
-+            mSpacer.setMaximumHeight(QWIDGETSIZE_MAX);
-+        }
-+        else
-+        {
-+            mSpacer.setOrientation("vertical");
-+            mSpacer.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-+            mSpacer.setFixedHeight(mSize);
-+            mSpacer.setMinimumWidth(0);
-+            mSpacer.setMaximumWidth(QWIDGETSIZE_MAX);
-+        }
-     }
- }
- 
--- a/plugin-spacer/spacer.h
-+++ b/plugin-spacer/spacer.h
-@@ -61,6 +61,7 @@ public:
-     virtual QString themeId() const override { return "Spacer"; }
- 
-     bool isSeparate() const override { return true; }
-+    bool isExpandable() const override { return mExpandable; }
- 
-     virtual ILXQtPanelPlugin::Flags flags() const override { return HaveConfigDialog; }
-     QDialog *configureDialog() override;
-@@ -76,6 +77,7 @@ private:
- private:
-     SpacerWidget mSpacer;
-     int mSize;
-+    int mExpandable;
- };
- 
- class SpacerPluginLibrary: public QObject, public ILXQtPanelPluginLibrary
--- a/plugin-spacer/spacerconfiguration.cpp
-+++ b/plugin-spacer/spacerconfiguration.cpp
-@@ -52,6 +52,8 @@ SpacerConfiguration::SpacerConfiguration
- 
-     connect(ui->sizeSB, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &SpacerConfiguration::sizeChanged);
-     connect(ui->typeCB, static_cast<void (QComboBox::*)(int index)>(&QComboBox::currentIndexChanged), this, &SpacerConfiguration::typeChanged);
-+    //Note: if there will be more than 2 radio buttons for width/size type, this simple setting logic will break
-+    connect(ui->sizeExpandRB, &QAbstractButton::toggled, this, &SpacerConfiguration::widthTypeChanged);
- }
- 
- SpacerConfiguration::~SpacerConfiguration()
-@@ -63,6 +65,10 @@ void SpacerConfiguration::loadSettings()
- {
-     ui->sizeSB->setValue(settings().value("size", 8).toInt());
-     ui->typeCB->setCurrentIndex(ui->typeCB->findData(settings().value("spaceType", msTypes[0]).toString()));
-+    const bool expandable = settings().value("expandable", false).toBool();
-+    ui->sizeExpandRB->setChecked(expandable);
-+    ui->sizeFixedRB->setChecked(!expandable);
-+    ui->sizeSB->setDisabled(expandable);
- }
- 
- void SpacerConfiguration::sizeChanged(int value)
-@@ -74,3 +80,8 @@ void SpacerConfiguration::typeChanged(in
- {
-     settings().setValue("spaceType", ui->typeCB->itemData(index, Qt::UserRole));
- }
-+
-+void SpacerConfiguration::widthTypeChanged(bool expandableChecked)
-+{
-+    settings().setValue("expandable", expandableChecked);
-+}
--- a/plugin-spacer/spacerconfiguration.h
-+++ b/plugin-spacer/spacerconfiguration.h
-@@ -58,6 +58,7 @@ private slots:
-     void loadSettings();
-     void sizeChanged(int value);
-     void typeChanged(int index);
-+    void widthTypeChanged(bool expandableChecked);
- };
- 
- #endif // SPACERCONFIGURATION_H
--- a/plugin-spacer/spacerconfiguration.ui
-+++ b/plugin-spacer/spacerconfiguration.ui
-@@ -6,6 +6,8 @@
-    <rect>
-     <x>0</x>
-     <y>0</y>
-+    <width>289</width>
-+    <height>135</height>
-    </rect>
-   </property>
-   <property name="windowTitle">
-@@ -19,7 +21,7 @@
-      </property>
-     </widget>
-    </item>
-   <item row="0" column="1">
-+   <item row="0" column="2">
-     <widget class="QSpinBox" name="sizeSB">
-      <property name="minimum">
-       <number>4</number>
-@@ -32,21 +34,14 @@
-      </property>
-     </widget>
-    </item>
-   <item row="1" column="0">
-+   <item row="2" column="0">
-     <widget class="QLabel" name="labelType">
-      <property name="text">
-       <string>Space type:</string>
-      </property>
-     </widget>
-    </item>
-   <item row="1" column="1">
-    <widget class="QComboBox" name="typeCB">
-     <property name="editable">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="2">
-+   <item row="3" column="0" colspan="3">
-     <widget class="QDialogButtonBox" name="buttons">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-@@ -56,6 +51,27 @@
-      </property>
-     </widget>
-    </item>
-+   <item row="0" column="1">
-+    <widget class="QRadioButton" name="sizeFixedRB">
-+     <property name="text">
-+      <string>fixed</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item row="2" column="1" colspan="2">
-+    <widget class="QComboBox" name="typeCB">
-+     <property name="editable">
-+      <bool>false</bool>
-+     </property>
-+    </widget>
-+   </item>
-+   <item row="1" column="1" colspan="2">
-+    <widget class="QRadioButton" name="sizeExpandRB">
-+     <property name="text">
-+      <string>expandable</string>
-+     </property>
-+    </widget>
-+   </item>
-   </layout>
-  </widget>
-  <resources/>
-@@ -65,6 +81,32 @@
-    <signal>clicked(QAbstractButton*)</signal>
-    <receiver>SpacerConfiguration</receiver>
-    <slot>close()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>20</x>
-+     <y>20</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>20</x>
-+     <y>20</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>sizeFixedRB</sender>
-+   <signal>toggled(bool)</signal>
-+   <receiver>sizeSB</receiver>
-+   <slot>setEnabled(bool)</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>152</x>
-+     <y>21</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>244</x>
-+     <y>21</y>
-+    </hint>
-+   </hints>
-   </connection>
-  </connections>
- </ui>
--- a/debian/patches/add-autoexpansion-4.patch
+++ b/debian/patches/add-autoexpansion-4.patch
@ -1,114 +0,0 @@
-Description: Use QStringLiteral whenever possible
- This is patch 4/4 adding autoexpansion support to the spacer plugin.
-Author: Palo Kisa <palo.kisa@gmail.com>
-Origin: upstream
-Bug: https://github.com/lxqt/lxqt/issues/1038
-Applied-Upstream: commit:4908fcd
-Last-Update: 2018-08-16
--- a/plugin-spacer/spacer.cpp
-+++ b/plugin-spacer/spacer.cpp
-@@ -65,10 +65,10 @@ Spacer::Spacer(const ILXQtPanelPluginSta
-  ************************************************/
- void Spacer::settingsChanged()
- {
-    mSize = settings()->value("size", 8).toInt();
-+    mSize = settings()->value(QStringLiteral("size"), 8).toInt();
-     const bool old_expandable = mExpandable;
-    mExpandable = settings()->value("expandable", false).toBool();
-    mSpacer.setType(settings()->value("spaceType", SpacerConfiguration::msTypes[0]).toString());
-+    mExpandable = settings()->value(QStringLiteral("expandable"), false).toBool();
-+    mSpacer.setType(settings()->value(QStringLiteral("spaceType"), SpacerConfiguration::msTypes[0]).toString());
-     setSizes();
-     if (old_expandable != mExpandable)
-         pluginFlagsChanged();
-@@ -92,12 +92,12 @@ void Spacer::setSizes()
-         mSpacer.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-         mSpacer.setMinimumSize({1, 1});
-         mSpacer.setMaximumSize({QWIDGETSIZE_MAX, QWIDGETSIZE_MAX});
-        mSpacer.setOrientation(panel()->isHorizontal() ? "horizontal" : "vertical");
-+        mSpacer.setOrientation(panel()->isHorizontal() ? QStringLiteral("horizontal") : QStringLiteral("vertical"));
-     } else
-     {
-         if (panel()->isHorizontal())
-         {
-            mSpacer.setOrientation("horizontal");
-+            mSpacer.setOrientation(QStringLiteral("horizontal"));
-             mSpacer.setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
-             mSpacer.setFixedWidth(mSize);
-             mSpacer.setMinimumHeight(0);
-@@ -105,7 +105,7 @@ void Spacer::setSizes()
-         }
-         else
-         {
-            mSpacer.setOrientation("vertical");
-+            mSpacer.setOrientation(QStringLiteral("vertical"));
-             mSpacer.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-             mSpacer.setFixedHeight(mSize);
-             mSpacer.setMinimumWidth(0);
--- a/plugin-spacer/spacer.h
-+++ b/plugin-spacer/spacer.h
-@@ -58,7 +58,7 @@ public:
-     Spacer(const ILXQtPanelPluginStartupInfo &startupInfo);
- 
-     virtual QWidget *widget() override { return &mSpacer; }
-    virtual QString themeId() const override { return "Spacer"; }
-+    virtual QString themeId() const override { return QStringLiteral("Spacer"); }
- 
-     bool isSeparate() const override { return true; }
-     bool isExpandable() const override { return mExpandable; }
--- a/plugin-spacer/spacerconfiguration.cpp
-+++ b/plugin-spacer/spacerconfiguration.cpp
-@@ -31,9 +31,9 @@
- //Note: strings can't actually be translated here (in static initialization time)
- //      the QT_TR_NOOP here is just for qt translate tools to get the strings for translation
- const QStringList SpacerConfiguration::msTypes = {
-    QLatin1String(QT_TR_NOOP("lined"))
-    , QLatin1String(QT_TR_NOOP("dotted"))
-    , QLatin1String(QT_TR_NOOP("invisible"))
-+    QStringLiteral(QT_TR_NOOP("lined"))
-+    , QStringLiteral(QT_TR_NOOP("dotted"))
-+    , QStringLiteral(QT_TR_NOOP("invisible"))
- };
- 
- SpacerConfiguration::SpacerConfiguration(PluginSettings *settings, QWidget *parent) :
-@@ -41,7 +41,7 @@ SpacerConfiguration::SpacerConfiguration
-     ui(new Ui::SpacerConfiguration)
- {
-     setAttribute(Qt::WA_DeleteOnClose);
-    setObjectName("SpacerConfigurationWindow");
-+    setObjectName(QStringLiteral("SpacerConfigurationWindow"));
-     ui->setupUi(this);
- 
-     //Note: translation is needed here in runtime (translator is attached already)
-@@ -63,9 +63,9 @@ SpacerConfiguration::~SpacerConfiguratio
- 
- void SpacerConfiguration::loadSettings()
- {
-    ui->sizeSB->setValue(settings().value("size", 8).toInt());
-    ui->typeCB->setCurrentIndex(ui->typeCB->findData(settings().value("spaceType", msTypes[0]).toString()));
-    const bool expandable = settings().value("expandable", false).toBool();
-+    ui->sizeSB->setValue(settings().value(QStringLiteral("size"), 8).toInt());
-+    ui->typeCB->setCurrentIndex(ui->typeCB->findData(settings().value(QStringLiteral("spaceType"), msTypes[0]).toString()));
-+    const bool expandable = settings().value(QStringLiteral("expandable"), false).toBool();
-     ui->sizeExpandRB->setChecked(expandable);
-     ui->sizeFixedRB->setChecked(!expandable);
-     ui->sizeSB->setDisabled(expandable);
-@@ -73,15 +73,15 @@ void SpacerConfiguration::loadSettings()
- 
- void SpacerConfiguration::sizeChanged(int value)
- {
-    settings().setValue("size", value);
-+    settings().setValue(QStringLiteral("size"), value);
- }
- 
- void SpacerConfiguration::typeChanged(int index)
- {
-    settings().setValue("spaceType", ui->typeCB->itemData(index, Qt::UserRole));
-+    settings().setValue(QStringLiteral("spaceType"), ui->typeCB->itemData(index, Qt::UserRole));
- }
- 
- void SpacerConfiguration::widthTypeChanged(bool expandableChecked)
- {
-    settings().setValue("expandable", expandableChecked);
-+    settings().setValue(QStringLiteral("expandable"), expandableChecked);
- }
--- a/debian/patches/completely-remove-plugin-clock.patch
+++ b/debian/patches/completely-remove-plugin-clock.patch
--- a/debian/patches/don't-autounmute-on-volume-change.patch
+++ b/debian/patches/don't-autounmute-on-volume-change.patch
@ -1,30 +0,0 @@
-Description: volume: Do not auto-unmute on volume change
-Author: Palo Kisa <palo.kisa@gmail.com>
-Origin: upstream
-Bug: https://github.com/lxqt/lxqt/issues/1520
-Applied-Upstream: commit:41259bb
-Last-Update: 2018-07-16
--- a/plugin-volume/audiodevice.cpp
-+++ b/plugin-volume/audiodevice.cpp
-@@ -114,7 +114,6 @@ void AudioDevice::setVolume(int volume)
-         return;
- 
-     setVolumeNoCommit(volume);
-    setMute(false);
- 
-     if (m_engine)
-         m_engine->commitDeviceVolume(this);
--- a/plugin-volume/lxqtvolume.cpp
-+++ b/plugin-volume/lxqtvolume.cpp
-@@ -283,10 +283,7 @@ void LXQtVolume::showNotification(bool f
-     {
-         if (Q_LIKELY(m_defaultSink))
-         {
-            if (m_defaultSink->mute())
-                m_notification->setSummary(tr("Volume: muted"));
-            else
-                m_notification->setSummary(tr("Volume: %1%").arg(QString::number(m_defaultSink->volume())));
-+            m_notification->setSummary(tr("Volume: %1%%2").arg(QString::number(m_defaultSink->volume())).arg(m_defaultSink->mute() ? tr("(muted)") : ""));
-             m_notification->update();
-         }
-     }
--- a/debian/patches/override-icon-theme.patch
+++ b/debian/patches/override-icon-theme.patch
@ -1,322 +0,0 @@
-Description: Add optional overriding of icon theme.
-Author: Walter Lapchynski <wxl@ubuntu.com>
-Last-Updated: 2018-08-22
-Applied-Upstream: https://github.com/lxqt/lxqt-panel/pull/674/commits/1a70479ed931e07a67a182223426328ab3fcbeff
--- a/panel/config/configpaneldialog.cpp
-+++ b/panel/config/configpaneldialog.cpp
-@@ -56,3 +56,8 @@ void ConfigPanelDialog::showConfigPlugin
- {
-     showPage(mPluginsPage);
- }
-+
-+void ConfigPanelDialog::updateIconThemeSettings()
-+{
-+    mPanelPage->updateIconThemeSettings();
-+}
--- a/panel/config/configpaneldialog.h
-+++ b/panel/config/configpaneldialog.h
-@@ -43,6 +43,7 @@ public:
- 
-     void showConfigPanelPage();
-     void showConfigPluginsPage();
-+    void updateIconThemeSettings();
- 
- private:
-     ConfigPanelWidget *mPanelPage;
--- a/panel/config/configpanelwidget.cpp
-+++ b/panel/config/configpanelwidget.cpp
-@@ -57,6 +57,7 @@ ConfigPanelWidget::ConfigPanelWidget(LXQ
- 
-     fillComboBox_position();
-     fillComboBox_alignment();
-+    fillComboBox_icon();
- 
-     mOldPanelSize = mPanel->panelSize();
-     mOldIconSize = mPanel->iconSize();
-@@ -115,6 +116,9 @@ ConfigPanelWidget::ConfigPanelWidget(LXQ
-     connect(ui->slider_opacity,             &QSlider::valueChanged,         this, &ConfigPanelWidget::editChanged);
- 
-     connect(ui->checkBox_reserveSpace, &QAbstractButton::toggled, [this](bool checked) { mPanel->setReserveSpace(checked, true); });
-+
-+    connect(ui->groupBox_icon, &QGroupBox::clicked, this, &ConfigPanelWidget::editChanged);
-+    connect(ui->comboBox_icon, QOverload<int>::of(&QComboBox::activated), this, &ConfigPanelWidget::editChanged);
- }
- 
- 
-@@ -211,6 +215,59 @@ void ConfigPanelWidget::fillComboBox_ali
-     };
- }
- 
-+/************************************************
-+ *
-+ ************************************************/
-+void ConfigPanelWidget::fillComboBox_icon()
-+{
-+    ui->groupBox_icon->setChecked(!mPanel->iconTheme().isEmpty());
-+
-+    QStringList themeList;
-+    QStringList processed;
-+    const QStringList baseDirs = QIcon::themeSearchPaths();
-+    for (const QString &baseDirName : baseDirs)
-+    {
-+        QDir baseDir(baseDirName);
-+        if (!baseDir.exists())
-+            continue;
-+        const QFileInfoList dirs = baseDir.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
-+        for (const QFileInfo &dir : dirs)
-+        {
-+            if (!processed.contains(dir.canonicalFilePath()))
-+            {
-+                processed << dir.canonicalFilePath();
-+                QDir Dir(dir.canonicalFilePath());
-+                QSettings file(Dir.absoluteFilePath(QStringLiteral("index.theme")), QSettings::IniFormat);
-+                if (file.status() == QSettings::NoError
-+                    && !file.value(QStringLiteral("Icon Theme/Directories")).toStringList().join(QLatin1Char(' ')).isEmpty()
-+                    && !file.value(QStringLiteral("Icon Theme/Hidden"), false).toBool())
-+                {
-+                    themeList << Dir.dirName();
-+                }
-+            }
-+        }
-+    }
-+    if (!themeList.isEmpty())
-+    {
-+        themeList.sort();
-+        ui->comboBox_icon->insertItems(0, themeList);
-+        QString curTheme = QIcon::themeName();
-+        if (!curTheme.isEmpty())
-+            ui->comboBox_icon->setCurrentText(curTheme);
-+    }
-+}
-+
-+
-+/************************************************
-+ *
-+ ************************************************/
-+void ConfigPanelWidget::updateIconThemeSettings()
-+{
-+    ui->groupBox_icon->setChecked(!mPanel->iconTheme().isEmpty());
-+    QString curTheme = QIcon::themeName();
-+    if (!curTheme.isEmpty())
-+        ui->comboBox_icon->setCurrentText(curTheme);
-+}
- 
- /************************************************
-  *
-@@ -284,6 +341,11 @@ void ConfigPanelWidget::editChanged()
- 
-     QString image = ui->checkBox_customBgImage->isChecked() ? ui->lineEdit_customBgImage->text() : QString();
-     mPanel->setBackgroundImage(image, true);
-+
-+    if (!ui->groupBox_icon->isChecked())
-+        mPanel->setIconTheme(QString());
-+    else if (!ui->comboBox_icon->currentText().isEmpty())
-+        mPanel->setIconTheme(ui->comboBox_icon->currentText());
- }
- 
- 
--- a/panel/config/configpanelwidget.h
-+++ b/panel/config/configpanelwidget.h
-@@ -49,6 +49,7 @@ public:
- 
-     int screenNum() const { return mScreenNum; }
-     ILXQtPanel::Position position() const { return mPosition; }
-+    void updateIconThemeSettings();
- 
- signals:
-     void changed();
-@@ -73,6 +74,7 @@ private:
-     void addPosition(const QString& name, int screen, LXQtPanel::Position position);
-     void fillComboBox_position();
-     void fillComboBox_alignment();
-+    void fillComboBox_icon();
-     int indexForPosition(int screen, ILXQtPanel::Position position);
-     int getMaxLength();
- 
--- a/panel/config/configpanelwidget.ui
-+++ b/panel/config/configpanelwidget.ui
-@@ -555,6 +555,44 @@
-      </layout>
-     </widget>
-    </item>
-+   <item>
-+    <widget class="QGroupBox" name="groupBox_icon">
-+     <property name="toolTip">
-+      <string>A partial workaround for widget styles that
-+cannot give a separate theme to the panel.
-+
-+You might also want to disable:
-+
-+LXQt Appearance Configuration →
-+Icons Theme →
-+Colorize icons based on widget style (palette)</string>
-+     </property>
-+     <property name="title">
-+      <string>Override icon &amp;theme</string>
-+     </property>
-+     <property name="checkable">
-+      <bool>true</bool>
-+     </property>
-+     <property name="checked">
-+      <bool>false</bool>
-+     </property>
-+     <layout class="QFormLayout" name="formLayout_2">
-+      <property name="formAlignment">
-+       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-+      </property>
-+      <item row="0" column="0">
-+       <widget class="QLabel" name="label_3">
-+        <property name="text">
-+         <string>Icon theme for panels:</string>
-+        </property>
-+       </widget>
-+      </item>
-+      <item row="0" column="1">
-+       <widget class="QComboBox" name="comboBox_icon"/>
-+      </item>
-+     </layout>
-+    </widget>
-+   </item>
-   </layout>
-  </widget>
-  <resources/>
--- a/panel/lxqtpanel.cpp
-+++ b/panel/lxqtpanel.cpp
-@@ -1354,6 +1354,28 @@ void LXQtPanel::setShowDelay(int showDel
-         saveSettings(true);
- }
- 
-+QString LXQtPanel::iconTheme() const
-+{
-+    return mSettings->value("iconTheme").toString();
-+}
-+
-+void LXQtPanel::setIconTheme(const QString& iconTheme)
-+{
-+    LXQtPanelApplication *a = reinterpret_cast<LXQtPanelApplication*>(qApp);
-+    a->setIconTheme(iconTheme);
-+}
-+
-+void LXQtPanel::updateConfigDialog() const
-+{
-+    if (!mConfigDialog.isNull() && mConfigDialog->isVisible())
-+    {
-+        mConfigDialog->updateIconThemeSettings();
-+        const QList<QWidget*> widgets = mConfigDialog->findChildren<QWidget*>();
-+        for (QWidget *widget : widgets)
-+            widget->update();
-+    }
-+}
-+
- bool LXQtPanel::isPluginSingletonAndRunnig(QString const & pluginId) const
- {
-     Plugin const * plugin = mPlugins->pluginByID(pluginId);
--- a/panel/lxqtpanel.h
-+++ b/panel/lxqtpanel.h
-@@ -222,6 +222,7 @@ public:
-     bool hidable() const { return mHidable; }
-     int animationTime() const { return mAnimationTime; }
-     int showDelay() const { return mShowDelayTimer.interval(); }
-+    QString iconTheme() const;
- 
-     /*!
-      * \brief Checks if a given Plugin is running and has the
-@@ -232,6 +233,11 @@ public:
-      * ILXQtPanelPlugin::SingleInstance flag set, false otherwise.
-      */
-     bool isPluginSingletonAndRunnig(QString const & pluginId) const;
-+    /*!
-+     * \brief Updates the config dialog. Used for updating its icons
-+     * when the panel-specific icon theme changes.
-+     */
-+    void updateConfigDialog() const;
- 
- public slots:
-     /**
-@@ -299,6 +305,7 @@ public slots:
-     void setHidable(bool hidable, bool save); //!< \sa setPanelSize()
-     void setAnimationTime(int animationTime, bool save); //!< \sa setPanelSize()
-     void setShowDelay(int showDelay, bool save); //!< \sa setPanelSize()
-+    void setIconTheme(const QString& iconTheme);
- 
-     /**
-      * @brief Saves the current configuration, i.e. writes the current
-@@ -549,7 +556,7 @@ private:
-      * @brief Stores if mLength is stored in pixels or relative to the
-      * screen size in percents. If true, the length is stored in percents,
-      * otherwise in pixels.
-     * 
-+     *
-      * \sa mLength
-      */
-     bool mLengthInPercents;
--- a/panel/lxqtpanelapplication.cpp
-+++ b/panel/lxqtpanelapplication.cpp
-@@ -117,6 +117,15 @@ LXQtPanelApplication::LXQtPanelApplicati
- 
-     QStringList panels = d->mSettings->value("panels").toStringList();
- 
-+    // WARNING: Giving a separate icon theme to the panel is wrong and has side effects.
-+    // However, it is optional and can be used as the last resort for avoiding a low
-+    // contrast in the case of symbolic SVG icons. (The correct way of doing that is
-+    // using a Qt widget style that can assign a separate theme/QPalette to the panel.)
-+    mGlobalIconTheme = QIcon::themeName();
-+    const QString iconTheme = d->mSettings->value("iconTheme").toString();
-+    if (!iconTheme.isEmpty())
-+        QIcon::setThemeName(iconTheme);
-+
-     if (panels.isEmpty())
-     {
-         panels << "panel1";
-@@ -280,3 +289,21 @@ bool LXQtPanelApplication::isPluginSingl
- 
-     return false;
- }
-+
-+// See LXQtPanelApplication::LXQtPanelApplication for why this isn't good.
-+void LXQtPanelApplication::setIconTheme(const QString &iconTheme)
-+{
-+    Q_D(LXQtPanelApplication);
-+
-+    d->mSettings->setValue("iconTheme", iconTheme == mGlobalIconTheme ? QString() : iconTheme);
-+    QString newTheme = iconTheme.isEmpty() ? mGlobalIconTheme : iconTheme;
-+    if (newTheme != QIcon::themeName())
-+    {
-+        QIcon::setThemeName(newTheme);
-+        for(LXQtPanel* panel : qAsConst(mPanels))
-+        {
-+            panel->update();
-+            panel->updateConfigDialog();
-+        }
-+    }
-+}
--- a/panel/lxqtpanelapplication.h
-+++ b/panel/lxqtpanelapplication.h
-@@ -69,12 +69,14 @@ public:
-     explicit LXQtPanelApplication(int& argc, char** argv);
-     ~LXQtPanelApplication();
- 
-+    void setIconTheme(const QString &iconTheme);
-+
-     /*!
-      * \brief Determines the number of LXQtPanel objects
-      * \return the current number of LXQtPanel objects
-      */
-    int count() { return mPanels.count(); }
-    
-+    int count() const { return mPanels.count(); }
-+
-     /*!
-      * \brief Checks if a given Plugin is running and has the
-      * ILXQtPanelPlugin::SingleInstance flag set. As Plugins are added to
-@@ -123,6 +125,10 @@ private:
-      */
-     QList<LXQtPanel*> mPanels;
-     /*!
-+     * \brief The global icon theme used by all apps (except for panels perhaps).
-+     */
-+    QString mGlobalIconTheme;
-+    /*!
-      * \brief Creates a new LXQtPanel with the given name and connects the
-      * appropriate signals and slots.
-      * This method can be used at application startup.
--- a/debian/patches/series
+++ b/debian/patches/series
@ -1,7 +0,0 @@
-completely-remove-plugin-clock.patch
-don't-autounmute-on-volume-change.patch
-add-autoexpansion-1.patch
-add-autoexpansion-2.patch
-add-autoexpansion-3.patch
-add-autoexpansion-4.patch
-override-icon-theme.patch
--- a/debian/rules
+++ b/debian/rules
@ -2,26 +2,29 @@
 # 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

-WHICH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
+include /usr/share/dpkg/architecture.mk

-ifeq ($(WHICH_OS), kfreebsd)
-    NOT_LINUX := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO
+ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+    CONF_FLAGS := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO
 endif

-ifeq ($(WHICH_OS), hurd)
-    NOT_LINUX := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO -DSENSORS_PLUGIN=NO
+ifeq ($(DEB_HOST_ARCH_OS), hurd)
+    CONF_FLAGS := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO -DSENSORS_PLUGIN=NO
 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 --\
-		-DPULL_TRANSLATIONS=OFF \
+	dh_auto_configure -- \
 		-DUPDATE_TRANSLATIONS=OFF \
 		-DDOM_PLUGIN=YES \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		$(NOT_LINUX)
+		$(CONF_FLAGS)
--- a/debian/salsa-ci.yml
+++ b/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
+
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@ -0,0 +1,5 @@
+# Expected to be verylong
+lxqt-panel source: very-long-line-length-in-source-file * > 512 [*.ts:*]
+lxqt-panel source: very-long-line-length-in-source-file * > 512 [CHANGELOG:*]
+lxqt-panel source: very-long-line-length-in-source-file * > 512 [plugin-colorpicker/colorpicker.cpp:52]
+lxqt-panel source: very-long-line-length-in-source-file * > 512 [*.ui:*]
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@ -0,0 +1,6 @@
+Name: lxqt-panel
+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-Browse: https://github.com/lxqt/lxqt-panel
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@ -1,50 +1,52 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----

-mQINBFXQeMMBEACif4+9pTrC6uNmRng0ZbzLh7p3cazmbnp2YFgDQDJZ7ZNmebxy
-ngRuRhjGuDcFAL/37BwJnrBpfZFK9ljoH4Fo5Jm9cOELaTy7AIcEiV9dKMyrKF1E
-C76d8jHVuzuPbI92DkFdLZAdk+qjrrAy0x43PvUd+aaBGLcFs1ZMk7gOvElc2d95
-zWWSp5anjukmGbp+EsStnWJkF6VHj56qmklfYy5ioiVBOSpXo/RsACAcIlz8C8A1
-d4tNMiB2uF2OrUfrL8DD6m3nBqep+AYbIQrxMl9kUQH3I33e9kH/L+SHQyE6phS8
-Czq06WjV4TcJ9VWxm7hQCNLYSxhZYYr1AW45lS5+xmfBOq2qeLgvjbFxa8PPrsp6
-Bqgt8MjwUkXjU5IB7YulUBvFU2l0MJZWDBuNy0oNtCe1cU3JyIqLKjvzQQQ9eD5L
-o3Ul704TLHz0z+67Rxh05Mi4JvyFMjnooSJkNH8/7yXoBN0ZGOh1/5zMU1gK5bmP
-6hKgis2exSZNIS74mF6/PqGgcwk3PyI4T3keUQoNPj11M2EznLHxY19QZfQ5oMed
-8xOlHKjpcm8PYMB4gduNXlV7gI9h7UxuC5GuPiP2lmM6wUyHu48divxDk5UYgPEC
-xlPI2wHCNDsuy0EruCYIvrMSZfpYCCSrmXiOORBLO5qXkauILLkJarHqjQARAQAB
-tCBBbGYgR2FpZGEgPGFnYWlkYUBzaWR1Y3Rpb24ub3JnPokCOAQTAQIAIgUCVdB4
-wwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQQsnI069epeOT2xAAgSHf
-41103cnElGf6TokPl4J6hdRPy2CUAjmBtMfr8eajYvGDGgnmsh9AGYGURjfFVCCf
-Ag+8b6nF3xg03UmgsuSO8H78HGv9kKzF9aHmLt+SXq3jUX+LnIkFHErZWjFAKdJr
-luu1j6ltxLe9PQljxZnugzMaUbW8eEPKvcriiDn3S4/DtikW/jpGA0MTY4ZWs9pZ
-L/6iRRH99L2X/cWO4sCgDXCTt4oK0f5OvwiuCoVOM+PYoIm31JICCKOlqamkCn7d
-2KH3nsy0v7tXgnrnb/zr8jVGsZLzUE51AFOzb5Ec74/2SAq8X4gbTppttLXEIooq
-nbepitW/PePkPY5gpfwHtFbl88qFnir+ABMefqRZkzeh0tsxJVLVHGP1KZykXpv7
-96A6Q1h7Zo9Ny7WwN5Xl02g35LVCaPyzd3A8A4315uMuP3iziq57UktKqh9d5S3t
-jfK7e9UfFQZBLfxn2sNPsjdYSNUQp/PXTTk/599h359WVuUIR866T8K7N7EEon3p
-qLItZljQ9Nmr/yGwKi9iQgi2LtZj5KUcF1zBLzZKf95FvoqSZqBXdFSjm+eYGaCH
-Q2IBnhyP92lEknSK9ystUJXmY69tQKBFqJxScwaS+7a/rfLKssQjSWxqk+SX4QeW
-e9z9FUpo71bq0Zkc/M9aOCoEEmhg4Ob/JWy08oC5Ag0EVdB4wwEQAKZDCc/C41y0
-omLFCAJybvHiFScM+jOpyGpQvceoviEhIT7h1br/pnSEMkgPQEDPWJGtKueg1/94
-sXTH24uefr3Y6JdZoBtprxl4JXUoOndgq1QH1xuUsy3/9YWU8Qboy9j8a8w0oCDE
-T8Z03KHCwqzD3K+44jhmhF+0eLoaaY8ohS8ziP+DcFKVHyatmS5yCCdjVrj6PxMp
-uy/y5SXT1kmiPdVAIzQlM5DlN6o46TV+BH0pPvVYjtwf31o0FckJxy5S1v0koCNB
-vX2b7tTDPKzn8G18eUVhGoUTZBUCp1gg36wJ0YY4xgZ9vI/xDCeHeAkyvGtaTAoy
-qP4rHoUO5KVRSDh7frSlrdbLGWHaQwOhcqoKd4qP/164wHPGkgHL1vztdOc7l1wx
-q3gMh2uwmJR0NRrw4WVuaIqL9lEbGBNijlmGsuqXfsMRhc/qoqgVDWvrcCtEoOwl
-TONGobW3jpCCjpa9SeGNjxuY6IVLn0lfX4hItNVY9sFA+H+yj4uBQ7zsmMUXafxt
-Yllm0f98yGNg5lnJg4bLOYu3IkpogUKNA3qkZ+6vRtwH70/bJGp7qdx/3G4W5dMX
-asd/rJjdELW+R/NVULAmK1ETSklaa3Z6vbTu8bN8gvP8pmMJ8f/U8+qzkuAqc201
-Z4O+s7ZsQfTiz5mm7zPGIYTnppDSno/rABEBAAGJAh8EGAECAAkFAlXQeMMCGwwA
-CgkQQsnI069epeMt0g/+JrwLhULD6NOxaLgxboh/KZkh/7ViU4cB+QPT8JIcWxkZ
-zj8uk85TUitEUzKmjp/ItCrhQE5WNNWbz/FBnAuLtaQuHhcHMA3Vu95UUCGi1vyZ
-ZRlS3YRM6S9BOzrjG7fGQJmO/RU3g6rb0TAwGFxDHj8t4JEDTc3zASG7wV/VTn06
-d8XIH9CZOw3kUuhkQ3OR/PEj1BCeCC+caC+tBjO0fgvDp8RV7NFQQ9kH8R3/xlWd
-6KMPtILE6fUft6LubWRGd1P5JBuzXivELolASajewbYtL/s87CCji3ngq0aT9raK
-m02wqFzNbX1iv+w2iqPQXq6pdRyxtJ8+Q8Z7zEBGJS5nkrYjsLTduZIjJHYHYH7f
-3/ydVjQ3z12iqHKElgaRI7RUmpNiNxVIr+TtuxzeC6G+CF++XNkUtJODvCmRaoJS
-waYsitz8+LSv3tawZJ0iQkKc9nerQMuBD+AzIr3i4NgXiEIN513esUtnKzeyIIsL
-ntUcBjXKuLCj8OZrZtexjq7edWWbN57/3ikyS2Z7y0i3O30qk5jmccSaS6kA7xTY
-WCDFzbN2v2y+vGu9KYn+2HtrP2BtNa8JTh3waNeLUTpn4GV4mMrsZjOy6vhhHb91
-1TKfI1gvjk7lE9xaWmcDjdI55dw3jIq8kK9SdgORGq9/S3g7KJNRjme+6GjqQfk=
-=h7ww
+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
+sw==
+=gSIv
 -----END PGP PUBLIC KEY BLOCK-----
--- a/debian/watch
+++ b/debian/watch
@ -1,3 +1,5 @@
 version=4
-opts="pgpsigurlmangle=s/$/.asc/" \
-    https://github.com/lxde/lxqt-panel/releases .*/lxqt-panel-([\d\.]+).tar.xz
+opts="searchmode=plain, \
+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
Author	SHA1	Message	Date
Simon Quigley	a6ac6bb9c7	Update Standards-Version to 4.7.1, no changes needed.	2025-02-21 16:42:48 -06:00
Simon Quigley	cfba902d32	Remove runtime dependency on lxmenu-data.	2025-02-21 16:33:23 -06:00
Simon Quigley	7435d81119	2.1.4	2025-01-11 18:06:21 -06:00
Simon Quigley	dbfd79c3bf	Upload to Plucky	2024-11-15 15:34:45 -06:00
Simon Quigley	2f7966264f	Lintian is happy now	2024-11-05 14:49:39 -06:00
Simon Quigley	5bb061489b	Bump build dependencies.	2024-11-05 14:31:13 -06:00
Simon Quigley	5e6811e1b8	New upstream release.	2024-11-05 14:13:13 -06:00
Aaron Rainbolt	f9a3bc567b	Release to Oracular	2024-08-15 16:26:02 -05:00
Aaron Rainbolt	4d34a6cb7c	PPA upload	2024-06-26 12:58:40 -05:00
Aaron Rainbolt	7663443027	Adjust build dependencies.	2024-06-26 12:50:57 -05:00
Aaron Rainbolt	22e92065a0	Drop trim-custom-commands-prevent-crash.patch	2024-06-19 18:39:51 -05:00
Aaron Rainbolt	f17d25defb	Bump Standards-Version	2024-06-19 18:37:34 -05:00
Aaron Rainbolt	cc96fa1354	Update copyright file	2024-06-19 18:36:35 -05:00
Aaron Rainbolt	f6b2fcdb42	Bump version for new upstream release	2024-06-19 18:31:54 -05:00
Simon Quigley	44882ee268	Apply upstream patch fixing a crash on a custom command.	2023-12-22 16:41:03 -06:00
Aaron Rainbolt	fd6365df82	Move qeyes-types README file to where it belongs	2023-11-13 12:19:12 -06:00
Aaron Rainbolt	cd2bd55b59	Remove a moved directory from the lxqt-panel.install	2023-11-13 11:54:29 -06:00
Aaron Rainbolt	061c453034	Add lxqt-menu-data build dep	2023-11-13 11:46:21 -06:00
Aaron Rainbolt	56eb2dcb06	Bump build deps	2023-11-13 11:45:41 -06:00
Aaron Rainbolt	78bafeec97	Fix copyright file	2023-11-13 11:40:12 -06:00
Aaron Rainbolt	d9ed05f600	Bump version for new upstream release	2023-11-13 11:34:32 -06:00
Simon Quigley	92c312fa11	Upload to Mantic.	2023-08-11 12:50:03 -05:00
Simon Quigley	a0d6712f47	Remove redundant hardening rule.	2023-08-11 11:47:17 -05:00
Simon Quigley	8e7d101288	Fix some build dependencies that were renamed.	2023-08-11 11:46:13 -05:00
Simon Quigley	028929145f	Bump build dependencies.	2023-08-11 11:34:58 -05:00
Simon Quigley	93606d77e9	New upstream release.	2023-08-11 11:33:06 -05:00
Simon Quigley	6bcb16a614	Upload to Lunar.	2023-03-07 13:23:49 -07:00
Simon Quigley	b7472164bb	Add missing entry from the install file.	2023-01-16 16:43:28 -06:00
Simon Quigley	820873539e	Document watch file delta.	2023-01-16 16:29:32 -06:00
Simon Quigley	32fe0ac1ea	Remove some obsolete parts of the rules file, syncing with Debian.	2023-01-16 16:29:27 -06:00
Simon Quigley	ace4e34bbb	Update the copyright file.	2023-01-16 16:26:57 -06:00
Simon Quigley	8ad4e6ee66	We shouldn't remove the Salsa CI file as part of the delta.	2023-01-16 16:20:59 -06:00
Simon Quigley	f326631c35	Merge in debian/control.	2023-01-16 16:20:03 -06:00
Simon Quigley	e61b40dfb2	New changelog entry.	2023-01-16 16:15:26 -06:00
Simon Quigley	fe87874b79	Upload to Lunar.	2022-11-18 22:11:02 -06:00
Simon Quigley	2e246947f8	Minor copyright updates.	2022-11-18 22:09:33 -06:00
Simon Quigley	ee19df87ab	Less Rs.	2022-11-18 21:54:04 -06:00
Simon Quigley	25b2e6b34b	Lubuntuify the package slightly, to make debhelper happy.	2022-11-18 21:48:06 -06:00
Simon Quigley	9d5b1225d8	Bump Standards-version to 4.6.1, no changes needed.	2022-11-18 21:46:27 -06:00
Simon Quigley	5f63969a22	Bump build dependencies in debian/control.	2022-11-18 21:45:34 -06:00
Simon Quigley	b1548fe065	Fix the watch file, for real this time.	2022-11-18 21:43:57 -06:00
Simon Quigley	bd12faebd9	New upstream release.	2022-11-18 21:43:42 -06:00
Simon Quigley	2a38ff7e2b	Add some missing build dependencies.	2022-06-02 13:16:45 -05:00
Simon Quigley	79c7c121a2	Upload to Kinetic.	2022-06-02 12:44:33 -05:00
Simon Quigley	b987625e63	Drop old Breaks/Replaces since we're past the LTS. Update the runtime dependencies too.	2022-06-02 12:42:29 -05:00
Simon Quigley	5540a9b11d	Bumped build dependencies.	2022-06-02 12:39:22 -05:00
Simon Quigley	cbef7a6dea	New upstream release.	2022-06-02 12:35:19 -05:00
apt-ghetto	f3f136d899	New upstream release for lxqt-panel 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	2021-08-17 21:33:07 -04:00
Raman Sarda	2d271d3ad8	New upstream version.	2021-02-22 03:06:46 +05:30
Simon Quigley	31bbcecc2a	Upload to Groovy.	2020-06-04 14:30:57 -05:00
Simon Quigley	3c8fdee35b	Update LXQt build depends.	2020-04-30 23:19:31 -05:00
Simon Quigley	a989b7a09c	Run wrap-and-sort.	2020-04-30 23:17:18 -05:00
Simon Quigley	72b733018c	Bump Standards-version to 4.5.0, no changes needed.	2020-04-30 23:16:49 -05:00
Simon Quigley	1b2f20e3ad	Update upstream signing key.	2020-04-30 23:16:28 -05:00
Simon Quigley	f90e559cac	New upstream release.	2020-04-30 23:16:13 -05:00
Raman Sarda	d8e78c972c	Updated rules and copyright.	2020-02-16 01:12:28 +05:30
Raman Sarda	b03e9d7595	Correctly Merge from Merge-o-Matic Summary: * Bumped minimum requirements in control file * Copyright updates. * Updated debian/watch to point to correct source. * Updated debian/upstream/metadata Test Plan: Lookout if anything breaks due to the update. Also check about debhelper and debhelper-compat. Reviewers: rikmills, wxl Differential Revision: https://phab.lubuntu.me/D81	2020-02-09 14:18:21 +05:30
Raman Sarda	4ef0632ba2	Merge from Ubuntu Merge-o-Matic	2020-02-08 01:57:25 +05:30
Simon Quigley	e8e9e9401a	Upload to Disco.	2019-03-09 13:27:39 -06:00
Simon Quigley	c43109ce5d	Run wrap-and-sort.	2019-03-09 13:27:29 -06:00
Simon Quigley	fe0f0bd6cb	New upstream release.	2019-03-09 13:27:21 -06:00
Simon Quigley	f2dedd73f4	Upload to Disco.	2019-01-26 01:19:29 -06:00
Simon Quigley	a0418e8556	Remove reverse-applicable patches.	2019-01-26 01:16:18 -06:00
Simon Quigley	3425a55990	Add a new lxqt-panel-l10n package.	2019-01-26 01:15:33 -06:00
Simon Quigley	e1a2304211	Bump build dependencies.	2019-01-26 01:14:13 -06:00
Simon Quigley	a3714bec33	Bump debhelper compat to 12, no changes needed.	2019-01-26 01:13:41 -06:00
Simon Quigley	5107d99afd	Bump Standards-version to 4.3.0, no changes needed.	2019-01-26 01:13:41 -06:00
Simon Quigley	2a5d48a9a1	New upstream release.	2019-01-26 01:13:34 -06:00