Update build deps

debian/changelog

@@ -1,14 +1,66 @@
-lxqt-config (1.4.0-0ubuntu1~ppa2) jammy; urgency=medium
+lxqt-config (2.2.0-0ubuntu1) questing; urgency=medium
 
-  * Revert a kscreen change that caused build failures in Jammy.
+  * New upstream release.
+    - Update build dependencies.
+  * Update copyright file.
+  * Update Standards-Version to 4.7.2, no changes needed.
 
- -- Aaron Rainbolt <arraybolt3@gmail.com>  Mon, 13 Nov 2023 11:22:25 -0600
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 31 Jul 2025 16:19:33 -0500
 
-lxqt-config (1.4.0-0ubuntu1~ppa1) jammy; urgency=medium
+lxqt-config (2.1.1-0ubuntu4) plucky; urgency=medium
 
-  * Backport to Jammy.
+  * Update Standards-Version to 4.7.1, no changes needed.
 
- -- Aaron Rainbolt <arraybolt3@gmail.com>  Sun, 12 Nov 2023 18:12:05 -0600
+ -- 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
 

debian/control

@@ -1,29 +1,28 @@
 Source: lxqt-config
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+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),
-               libkf5screen-dev,
+               libkf6windowsystem-dev (>= 6.0.0),
-               libkf5windowsystem-dev,
+               libkscreen-dev (>= 6.0.0),
-               liblxqt1-dev (>= 1.4.0),
+               liblxqt2-dev (>= 2.2.0),
-               libqt5svg5-dev,
-               libqt5x11extras5-dev,
                libx11-dev,
                libxcb-randr0-dev,
                libxcursor-dev,
                libxfixes-dev,
                libxi-dev,
-               lxqt-menu-data (>= 1.4.0),
+               lxqt-menu-data (>= 2.2.0),
-               qtbase5-private-dev,
+               qt6-base-private-dev (>= 6.6.0),
+               qt6-svg-dev (>= 6.6.0),
                xserver-xorg-input-libinput-dev,
                zlib1g-dev
-Standards-Version: 4.6.2
+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
-XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-config
+Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-config
-XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-config.git
+Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-config.git
 Rules-Requires-Root: no
 Homepage: https://github.com/lxqt/lxqt-config
 
@@ -31,6 +30,7 @@ Package: lxqt-config
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: galternatives,
+            iso-flags-svg,
             lxqt-config-l10n,
             lxqt-policykit,
             lxqt-powermanagement,
@@ -45,7 +45,6 @@ Suggests: adwaita-qt,
           lxappearance,
           lxqt | lxqt-core,
           obconf-qt,
-          qt5-style-plugins,
           synaptic
 Description: LXQt system settings center
  The LXQt system settings center
@@ -56,6 +55,8 @@ Package: lxqt-config-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qttranslations5-l10n, ${misc:Depends}
+Depends: qt6-translations-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-2023, LXQt team
+Copyright: 2012-2025, LXQt team
            2010-2012, Razor team
            2013, Christian Surlykke
            2014, Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
@@ -123,7 +123,8 @@ License: LGPL-2.0+
 Files: debian/*
 Copyright: 2014-2018 Alf Gaida <agaida@siduction.org>
            2015      Andrew Lee (李健秋) <ajqlee@debian.org>
-           2023      Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+           2023-2025 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+           2025      Aaron Rainbolt <arraybolt3@ubuntu.com>
 License: LGPL-2.1+
 
 License: LGPL-2.0+

debian/lxqt-config.lintian-overrides

@@ -0,0 +1,4 @@
+# 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-mouse.1
+usr/share/man/man1/lxqt-config-input.1
 usr/share/man/man1/lxqt-config.1

debian/patches/0001-revert-kscreen-fix.patch

@@ -1,73 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d2f842c..77f98c2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,7 +26,7 @@ set(CMAKE_AUTOUIC ON)
- set(CMAKE_AUTORCC ON)
- 
- set(KF5_MINIMUM_VERSION "5.36.0")
--set(KF5SCREEN_MINIMUM_VERSION "5.27.0")
-+set(KF5SCREEN_MINIMUM_VERSION "5.2.0")
- set(LXQT_MINIMUM_VERSION "1.4.0")
- set(QT_MINIMUM_VERSION "5.15.0")
- 
-diff --git a/lxqt-config-monitor/kscreenutils.cpp b/lxqt-config-monitor/kscreenutils.cpp
-index 6deee2a..be2634d 100644
---- a/lxqt-config-monitor/kscreenutils.cpp
-+++ b/lxqt-config-monitor/kscreenutils.cpp
-@@ -63,9 +63,9 @@ void KScreenUtils::extended(KScreen::ConfigPtr &config)
-         output->setPos(pos);
-         output->setEnabled(true);
-         //first left one as primary
--        output->setPriority(width == 0 ? 1 : 0);
-+        output->setPrimary(width == 0);
-         KScreen::ModePtr mode(output->currentMode());
--        //if (!mode)
-+        //if (!mode) 
-         {
-             // Set the biggest mode between preferred modes and the first mode.
-             mode = output->modes().first();
-@@ -83,7 +83,7 @@ void KScreenUtils::extended(KScreen::ConfigPtr &config)
-             if (mode)
-                 output->setCurrentModeId(mode->id());
-         }
--        if (mode)
-+        if (mode) 
-             width += mode->size().width();
-     }
- }
-diff --git a/lxqt-config-monitor/loadsettings.cpp b/lxqt-config-monitor/loadsettings.cpp
-index 26d669a..284cad0 100644
---- a/lxqt-config-monitor/loadsettings.cpp
-+++ b/lxqt-config-monitor/loadsettings.cpp
-@@ -133,7 +133,7 @@ bool applySettings(KScreen::ConfigPtr config, QList<MonitorSettings> monitors)
-                 if( !output->isConnected() )
-                     continue;
-                 output->setEnabled( monitor.enabled );
--                output->setPriority( monitor.primary ? 1 : 0 );
-+                output->setPrimary( monitor.primary );
-                 output->setPos( QPoint(monitor.xPos, monitor.yPos) );
-                 output->setRotation( (KScreen::Output::Rotation)(monitor.rotation) );
-                 // output->setCurrentModeId could fail. KScreen sometimes changes mode Id.
-diff --git a/lxqt-config-monitor/monitorwidget.cpp b/lxqt-config-monitor/monitorwidget.cpp
-index b4b7fb9..41883c2 100644
---- a/lxqt-config-monitor/monitorwidget.cpp
-+++ b/lxqt-config-monitor/monitorwidget.cpp
-@@ -138,7 +138,7 @@ MonitorWidget::MonitorWidget(KScreen::OutputPtr output, KScreen::ConfigPtr confi
-     if (config->connectedOutputs().count() == 1) {
-         setOnlyMonitor(true);
-         // There isn't always a primary output. Gross.
--        output->setPriority(1);
-+        output->setPrimary(true);
-     }
- 
-     ui.xPosSpinBox->setValue(output->pos().x());
-@@ -208,7 +208,7 @@ void MonitorWidget::onBehaviorChanged(int idx)
-     ui.xPosSpinBox->setVisible(idx == ExtendDisplay);
-     ui.yPosSpinBox->setVisible(idx == ExtendDisplay);
- 
--    output->setPriority(idx == PrimaryDisplay ? 1 : 0);
-+    output->setPrimary(idx == PrimaryDisplay);
-     if(idx == PrimaryDisplay)
-         emit primaryOutputChanged(this);
- }

debian/patches/series

@@ -1 +0,0 @@
-0001-revert-kscreen-fix.patch

debian/source/lintian-overrides

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