debian/changelog

@@ -1,100 +1,3 @@
-lxqt-config (2.2.0-0ubuntu1) questing; urgency=medium
-
-  * New upstream release.
-    - Update build dependencies.
-  * Update copyright file.
-  * Update Standards-Version to 4.7.2, no changes needed.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 31 Jul 2025 16:19:33 -0500
-
-lxqt-config (2.1.1-0ubuntu4) plucky; urgency=medium
-
-  * Update Standards-Version to 4.7.1, no changes needed.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 21 Feb 2025 16:48:27 -0600
-
-lxqt-config (2.1.1-0ubuntu3) plucky; urgency=medium
-
-  * Recommend iso-flags-svg to utilize the new flags feature in the locale
-    menu.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 15 Feb 2025 00:37:37 -0600
-
-lxqt-config (2.1.1-0ubuntu2) plucky; urgency=medium
-
-  * Fix manpage installation.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 08 Feb 2025 01:28:05 -0600
-
-lxqt-config (2.1.1-0ubuntu1) plucky; urgency=medium
-
-  * New upstream release.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 07 Feb 2025 14:34:41 -0600
-
-lxqt-config (2.1.0-0ubuntu1) plucky; urgency=medium
-
-  * New upstream release.
-    - Bump build dependencies.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:32:32 -0600
-
-lxqt-config (2.0.0-0ubuntu2) oracular; urgency=medium
-
-  * Fix libkscreen build dep package name.
-
- -- Rik Mills <rikmills@kde.org>  Tue, 27 Aug 2024 11:33:02 +0100
-
-lxqt-config (2.0.0-0ubuntu1) oracular; urgency=medium
-
-  * New upstream release.
-  * Update copyright file.
-  * Bump Standards-Version to 4.7.0, no changes necessary.
-  * Remove obsolete patches.
-  * Adjust build dependencies.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:41:23 -0500
-
-lxqt-config (1.4.0-0ubuntu2) noble; urgency=medium
-
-  * Add two upstream patches to improve the user experience, especially around
-    monitor handling.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 22 Dec 2023 16:05:33 -0600
-
-lxqt-config (1.4.0-0ubuntu1) noble; urgency=medium
-
-  * New upstream release.
-  * Bumped build dependency versions.
-  * Added lxqt-menu-data as a build dependency.
-  * Removee no-longer-existing files from lxqt-config.install.
-  * Updated lintian-overrides syntax.
-  * Removed obsolete '-Wl,--as-needed' linker flag.
-  * Created upstream/metadata file.
-
- -- Aaron Rainbolt <arraybolt3@gmail.com>  Sun, 12 Nov 2023 18:12:05 -0600
-
-lxqt-config (1.3.0-0ubuntu1) mantic; urgency=medium
-
-  * New upstream release.
-  * Bump build dependencies.
-  * I guess we don't require root to build, do we?
-  * Bump Standards-version to 4.6.2, no changes needed.
-  * Fix the copyright years.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 09:49:54 -0500
-
-lxqt-config (1.2.0-0ubuntu1) lunar; urgency=medium
-
-  * New upstream version.
-  * Fix the watch file, for real this time.
-  * Lubuntuify the package slightly, to make debhelper happy.
-  * Bump Standards-version, no changes needed.
-  * Bump build dependencies in debian/control.
-  * Drop reverse-applicable patch.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 18 Nov 2022 17:09:36 -0600
-
 lxqt-config (1.1.0-0ubuntu2) kinetic; urgency=medium
 
   * Enhancements to the theme list.
@@ -453,3 +356,4 @@ lxqt-config (0.9.0+20150806-1) unstable; urgency=medium
   * Added README.source -- mention for License.
 
  -- Yukiharu YABUKI <yyabuki@debian.org>  Fri, 21 Aug 2015 19:40:47 +0900
+

debian/control

@@ -1,36 +1,34 @@
 Source: lxqt-config
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-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: Simon Quigley <tsimonq2@ubuntu.com>
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               libkf6windowsystem-dev (>= 6.0.0),
-               libkscreen-dev (>= 6.0.0),
-               liblxqt2-dev (>= 2.2.0),
+               libkf5screen-dev,
+               libkf5windowsystem-dev,
+               liblxqt1-dev (>= 1.1.0),
+               libqt5svg5-dev,
+               libqt5x11extras5-dev,
                libx11-dev,
                libxcb-randr0-dev,
                libxcursor-dev,
                libxfixes-dev,
                libxi-dev,
-               lxqt-menu-data (>= 2.2.0),
-               qt6-base-private-dev (>= 6.6.0),
-               qt6-svg-dev (>= 6.6.0),
+               qtbase5-private-dev,
                xserver-xorg-input-libinput-dev,
                zlib1g-dev
-Standards-Version: 4.7.2
-Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-config-packaging
-Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-config-packaging.git
-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-config
-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-config.git
-Rules-Requires-Root: no
+Standards-Version: 4.5.1
+Vcs-Browser: https://phab.lubuntu.me/source/lxqt-config/
+Vcs-Git: https://phab.lubuntu.me/source/lxqt-config.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-config
+XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-config.git
 Homepage: https://github.com/lxqt/lxqt-config
 
 Package: lxqt-config
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: galternatives,
-            iso-flags-svg,
             lxqt-config-l10n,
             lxqt-policykit,
             lxqt-powermanagement,
@@ -45,6 +43,7 @@ Suggests: adwaita-qt,
           lxappearance,
           lxqt | lxqt-core,
           obconf-qt,
+          qt5-style-plugins,
           synaptic
 Description: LXQt system settings center
  The LXQt system settings center
@@ -55,8 +54,6 @@ Package: lxqt-config-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qt6-translations-l10n, ${misc:Depends}
+Depends: qttranslations5-l10n, ${misc:Depends}
 Description: Language package for lxqt-config
- The LXQt system settings center
- .
  This package contains the l10n files needed by lxqt-config.

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: lxqt-config
 Source: https://github.com/lxqt/lxqt-config
 
 Files: *
-Copyright: 2012-2025, LXQt team
+Copyright: 2012-2020, LXQt team
            2010-2012, Razor team
            2013, Christian Surlykke
            2014, Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
@@ -123,8 +123,6 @@ License: LGPL-2.0+
 Files: debian/*
 Copyright: 2014-2018 Alf Gaida <agaida@siduction.org>
            2015      Andrew Lee (李健秋) <ajqlee@debian.org>
-           2023-2025 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-           2025      Aaron Rainbolt <arraybolt3@ubuntu.com>
 License: LGPL-2.1+
 
 License: LGPL-2.0+

debian/lintian-overrides

@@ -1,15 +1,15 @@
 # there will be no man-pages in a foreseeable future
-lxqt-config: no-manual-page [usr/bin/lxqt-config-brightness]
-lxqt-config: no-manual-page [usr/bin/lxqt-config-file-associations]
-lxqt-config: no-manual-page [usr/bin/lxqt-config-input]
-lxqt-config: no-manual-page [usr/bin/lxqt-config-locale]
-lxqt-config: no-manual-page [usr/bin/lxqt-config-monitor]
+lxqt-config: no-manual-page usr/bin/lxqt-config-brightness
+lxqt-config: no-manual-page usr/bin/lxqt-config-file-associations
+lxqt-config: no-manual-page usr/bin/lxqt-config-input
+lxqt-config: no-manual-page usr/bin/lxqt-config-locale
+lxqt-config: no-manual-page usr/bin/lxqt-config-monitor
 
 # not a bug, LXQt has not reached free-desktop yet
-lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-appearance.desktop]
-lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-brightness.desktop]
-lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-file-associations.desktop]
-lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-input.desktop]
-lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-locale.desktop]
-lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-monitor.desktop]
-lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config.desktop]
+lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-appearance.desktop
+lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-brightness.desktop
+lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-file-associations.desktop
+lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-input.desktop
+lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-locale.desktop
+lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-monitor.desktop
+lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config.desktop

debian/lxqt-config.install

@@ -1,3 +1,4 @@
+etc/xdg/menus/lxqt-config.menu
 usr/bin/lxqt-config
 usr/bin/lxqt-config-appearance
 usr/bin/lxqt-config-brightness
@@ -13,5 +14,8 @@ usr/share/applications/lxqt-config-input.desktop
 usr/share/applications/lxqt-config-locale.desktop
 usr/share/applications/lxqt-config-monitor.desktop
 usr/share/applications/lxqt-config.desktop
+usr/share/desktop-directories/lxqt-settings-lxqt.directory
+usr/share/desktop-directories/lxqt-settings-other.directory
+usr/share/desktop-directories/lxqt-settings-system.directory
 usr/share/icons/hicolor/48x48/apps/brightnesssettings.svg
 usr/share/lxqt/icons/monitor.svg

debian/lxqt-config.lintian-overrides

@@ -1,4 +0,0 @@
-# This is expected
-lxqt-config: desktop-entry-lacks-keywords-entry [usr/share/applications/*.desktop]
-lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/*.desktop]
-lxqt-config: no-manual-page [usr/bin/*]

debian/manpages

@@ -1,3 +1,3 @@
 usr/share/man/man1/lxqt-config-appearance.1
-usr/share/man/man1/lxqt-config-input.1
+usr/share/man/man1/lxqt-config-mouse.1
 usr/share/man/man1/lxqt-config.1

debian/patches/series

@@ -0,0 +1 @@
+theme-list-enhancements.patch

debian/patches/theme-list-enhancements.patch

@@ -0,0 +1,109 @@
+From ccc2ede1557523ed396e488f705132f187ab750f Mon Sep 17 00:00:00 2001
+From: tsujan <tsujan2000@gmail.com>
+Date: Mon, 16 May 2022 19:05:49 +0430
+Subject: [PATCH] Small enhancement to theme list in appearance config dialog
+ (#854)
+
+* Small enhancement to theme list in appearance config dialog
+
+Themes are always sorted alphabetically, user themes are distinguished, and theme folders can be opened by double clicking or by using context menus.
+
+Closes https://github.com/lxqt/lxqt-config/issues/852
+
+* Don't use `WhatsThisRole` for theme path
+
+`WhatsThisRole` might be needed later for another purpose, and finding the theme path directly has no real cost.
+---
+ lxqt-config-appearance/lxqtthemeconfig.cpp | 40 ++++++++++++++++++++++
+ lxqt-config-appearance/lxqtthemeconfig.h   |  4 +++
+ 2 files changed, 44 insertions(+)
+
+diff --git a/lxqt-config-appearance/lxqtthemeconfig.cpp b/lxqt-config-appearance/lxqtthemeconfig.cpp
+index 49b65e8b..8bc903f8 100644
+--- a/lxqt-config-appearance/lxqtthemeconfig.cpp
++++ b/lxqt-config-appearance/lxqtthemeconfig.cpp
+@@ -32,6 +32,11 @@
+ #include <QProcess>
+ #include <QItemDelegate>
+ #include <QPainter>
++#include <QMenu>
++#include <QDesktopServices>
++#include <QUrl>
++
++#include <XdgDirs>
+ 
+ /*!
+  * \brief Simple delegate to draw system background color below decoration/icon
+@@ -84,6 +89,10 @@ LXQtThemeConfig::LXQtThemeConfig(LXQt::Settings *settings, QWidget *parent) :
+     {
+         QString themeName = theme.name();
+         themeName[0] = themeName[0].toTitleCase();
++        if (theme.path().contains(XdgDirs::dataHome(false) + QStringLiteral("/")))
++        {
++            themeName += QStringLiteral(" ") + tr("(User Theme)");
++        }
+         QTreeWidgetItem *item = new QTreeWidgetItem(QStringList(themeName));
+         if (!theme.previewImage().isEmpty())
+         {
+@@ -93,11 +102,16 @@ LXQtThemeConfig::LXQtThemeConfig(LXQt::Settings *settings, QWidget *parent) :
+         item->setData(0, Qt::UserRole, theme.name());
+         ui->lxqtThemeList->addTopLevelItem(item);
+     }
++    ui->lxqtThemeList->sortItems(0, Qt::AscendingOrder);
++    ui->lxqtThemeList->setContextMenuPolicy(Qt::CustomContextMenu);
+ 
+     initControls();
+ 
+     connect(ui->lxqtThemeList, &QTreeWidget::currentItemChanged, this, &LXQtThemeConfig::settingsChanged);
+     connect(ui->wallpaperOverride, &QAbstractButton::clicked, this, &LXQtThemeConfig::settingsChanged);
++
++    connect(ui->lxqtThemeList, &QTreeWidget::itemDoubleClicked, this, &LXQtThemeConfig::doubleClicked);
++    connect(ui->lxqtThemeList, &QWidget::customContextMenuRequested, this, &LXQtThemeConfig::contextMenu);
+ }
+ 
+ 
+@@ -145,3 +159,29 @@ void LXQtThemeConfig::applyLxqtTheme()
+         }
+     }
+ }
++
++void LXQtThemeConfig::doubleClicked(QTreeWidgetItem *item, int /*column*/)
++{
++    if (!item)
++        return;
++
++    LXQt::LXQtTheme theme{item->data(0, Qt::UserRole).toString()};
++    if (!theme.isValid())
++        return;
++
++    // first try "qtxdg-mat"; fall back to QDesktopServices if we are not inside an LXQt session
++    if (!QProcess::startDetached(QStringLiteral("qtxdg-mat"), QStringList() << QStringLiteral("open") << theme.path()))
++    {
++        QDesktopServices::openUrl(QUrl(theme.path()));
++    }
++}
++
++void LXQtThemeConfig::contextMenu(const QPoint& p)
++{
++    QMenu menu;
++    QAction *a = menu.addAction(tr("Open theme folder"));
++    connect(a, &QAction::triggered, [this, p] {
++        doubleClicked(ui->lxqtThemeList->itemAt(p), 0);
++    });
++    menu.exec(ui->lxqtThemeList->viewport()->mapToGlobal(p));
++}
+diff --git a/lxqt-config-appearance/lxqtthemeconfig.h b/lxqt-config-appearance/lxqtthemeconfig.h
+index 8846dbbe..1886738c 100644
+--- a/lxqt-config-appearance/lxqtthemeconfig.h
++++ b/lxqt-config-appearance/lxqtthemeconfig.h
+@@ -53,6 +53,10 @@ public slots:
+ signals:
+     void settingsChanged();
+ 
++private slots:
++    void doubleClicked(QTreeWidgetItem *item, int column);
++    void contextMenu(const QPoint& p);
++
+ private:
+     Ui::LXQtThemeConfig *ui;
+     LXQt::Settings *mSettings;

debian/rules

@@ -2,6 +2,7 @@
 # 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
 
 %:

debian/source/lintian-overrides

@@ -1,2 +0,0 @@
-# Translation files may be long
-lxqt-config source: very-long-line-length-in-source-file * > 512 [*.ts:*]

debian/upstream/metadata

@@ -1,5 +0,0 @@
-Bug-Database: https://github.com/lxqt/lxqt-config/issues
-Bug-Submit: https://github.com/lxqt/lxqt-config/issues/new
-Changelog: https://github.com/lxqt/lxqt-config/blob/master/CHANGELOG
-Repository: https://github.com/lxqt/lxqt-config.git
-Repository-Browse: https://github.com/lxqt/lxqt-config

debian/watch

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