11 changed files with 45 additions and 259 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,112 +1,3 @@
-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.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 11 Jun 2022 14:22:35 -0400
-
-lxqt-config (1.1.0-0ubuntu1) kinetic; urgency=medium
-
-  * New upstream release.
-  * Bump build dependencies.
-  * Remove old Breaks/Replaces since we're past the LTS.
-  * Add a new entry to the install file.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 01 Jun 2022 15:00:38 -0500
-
-lxqt-config (0.17.1-0ubuntu1) impish; urgency=medium
-
-  * New upstream release 0.17.1
-  * Update debian/control
-    - Bump Standards-Version to 4.5.1
-    - Use liblxqt0-dev 0.17.0
-  * Rename tag for lintian override
-  * Update debian/copyright
-  * Run wrap-and-sort
-
- -- apt-ghetto <apt-ghetto@protonmail.com>  Thu, 12 Aug 2021 17:03:12 +0200
-
-lxqt-config (0.16.1-1ubuntu1) hirsute; urgency=medium
-
-  * New upstream version.
-  * Updated recommends.
-  * Bumped debhelper-compat requirement to 13.
-  * Fixed manpage errors about files existing in debian/tmp but not installed anywhere.
-
- -- Raman Sarda <theloudspeaker@disroot.org>  Sun, 21 Feb 2021 22:44:21 +0530
-
-lxqt-config (0.16.1-1) unstable; urgency=medium
-
-  * New upstream release. (Closes: #864482)
-  * debian/control: updated build-deps.
-  * debian/control: drop disk-manager from recommends as it has been
-    removed from unstable. (Closes: #952967)
-  * Update debian/lxqt-config.install to ship new binary files.
-
- -- Andrew Lee (李健秋) <ajqlee@debian.org>  Wed, 06 Jan 2021 16:09:45 +0800
-
 lxqt-config (0.15.0-0ubuntu1) groovy; urgency=medium

  * New upstream release.
@ -118,37 +9,6 @@ lxqt-config (0.15.0-0ubuntu1) groovy; urgency=medium

 -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 04 Jun 2020 00:42:32 -0500

-lxqt-config (0.14.1-4) unstable; urgency=medium
-
-  * Added build dependency libxcb-randr0-dev to fix FTBFS in testing and sid.
-    Thanks Lucas Nussbaum <lucas@debian.org> for spotting this.
-    (Closes: #952266)
-  * Bumped Standards-Version to 4.5.0, no changes needed
-  * Switched to gbp
-
- -- Alf Gaida <agaida@siduction.org>  Mon, 24 Feb 2020 01:49:32 +0100
-
-lxqt-config (0.14.1-3) unstable; urgency=medium
-
-  * Build without touchpad support on kfreebsd and hurd, thanks
-    Paul Sonnenschein <paul@sonnenschein.ruhr> (Closes: #933336)
-
- -- Alf Gaida <agaida@siduction.org>  Sun, 04 Aug 2019 04:07:48 +0200
-
-lxqt-config (0.14.1-2) unstable; urgency=medium
-
-  * Fixed keyboard layout switch shortcut (Closes: #925346)
-
- -- Alf Gaida <agaida@siduction.org>  Sat, 23 Mar 2019 15:53:38 +0100
-
-lxqt-config (0.14.1-1) unstable; urgency=medium
-
-  * Cherry-picking new upstream version 0.14.1.
-  * Bumped build dependency liblxqt to 0.14.1~
-  * Extended the package description a bit
-
- -- Alf Gaida <agaida@siduction.org>  Sun, 24 Feb 2019 20:35:48 +0100
-
 lxqt-config (0.14.1-0ubuntu1) disco; urgency=medium

  * New upstream release.
@ -156,23 +16,6 @@ lxqt-config (0.14.1-0ubuntu1) disco; urgency=medium

 -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 09 Mar 2019 12:54:59 -0600

-lxqt-config (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 version liblxqt0-dev (>= 0.14.0~)
-  * Added build dependency libxi-dev
-  * Added build dependency xserver-xorg-input-libinput-dev
-  * Removed obsolete PULL_TRANSLATIONS= OFF from dh_auto_configure
-  * Added l10n-package, moved from lxqt-l10n
-  * Added d/upstream/metadata
-  * Fixed d/manpages
-  * Basic Touchpad configuration added upstream (Closes: #845624)
-
- -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 17:15:29 +0100
-
 lxqt-config (0.14.0-0ubuntu1) disco; urgency=medium

  * New upstream release.
@ -205,14 +48,6 @@ lxqt-config (0.13.0+git20181226-0ubuntu1) disco; urgency=medium

 -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 30 Dec 2018 17:21:31 -0600

-lxqt-config (0.13.0-1) unstable; urgency=medium
-
-  * Cherry-picking new upstream version 0.13.0.
-  * Bumped build dependency liblxqt0-dev to >= 0.13.0~
-  * Added recommend xsettingsd
-
- -- Alf Gaida <agaida@siduction.org>  Thu, 24 May 2018 20:43:08 +0200
-
 lxqt-config (0.13.0-0ubuntu5) cosmic; urgency=medium

  * Set default GTK theme if rc file doesn't exists.
--- a/debian/control
+++ b/debian/control
@ -1,36 +1,35 @@
 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.1.0),
+Build-Depends: debhelper-compat (= 12),
+               libkf5screen-dev,
+               libkf5windowsystem-dev,
+               liblxqt0-dev (>= 0.15.0),
+               libqt5svg5-dev,
+               libqt5x11extras5-dev,
               libx11-dev,
               libxcb-randr0-dev,
               libxcursor-dev,
               libxfixes-dev,
               libxi-dev,
-               lxqt-menu-data (>= 2.1.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.0
-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.0
+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,
-            lxqt-config-l10n,
+Recommends: disk-manager,
+            galternatives,
            lxqt-policykit,
            lxqt-powermanagement,
            lxqt-qtplugin,
@ -44,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
@ -54,8 +54,8 @@ Package: lxqt-config-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qt6-translations-l10n, ${misc:Depends}
+Depends: qttranslations5-l10n, ${misc:Depends}
+Breaks: lxqt-config (<< 0.11.0)
+Replaces: lxqt-config (<< 0.11.0)
 Description: Language package for lxqt-config
- The LXQt system settings center
- .
 This package contains the l10n files needed by lxqt-config.
--- a/debian/copyright
+++ b/debian/copyright
@ -3,11 +3,10 @@ Upstream-Name: lxqt-config
 Source: https://github.com/lxqt/lxqt-config

 Files: *
-Copyright: 2012-2024, LXQt team
-           2010-2012, Razor team
-           2013, Christian Surlykke
-           2014, Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-           2014, Luís Pereira <luis.artur.pereira@gmail.com>
+Copyright: 2012-2018 LXQt team
+           2010-2012 Razor team
+           2013 Christian Surlykke
+           2014 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
 License: LGPL-2.1+

 Files: lxqt-config-appearance/iconthemeinfo.cpp
@ -20,8 +19,7 @@ Copyright: 2007, 2009 Rafael Fernández López <ereslibre@kde.org>
           2007 John Tapsell <tapsell@kde.org>
 License: LGPL-2.0+

-Files: liblxqt-config-cursor/cfgfile.cpp
-       liblxqt-config-cursor/cfgfile.h
+Files: liblxqt-config-cursor/cfgfile.h
       liblxqt-config-cursor/main.cpp
       liblxqt-config-cursor/main.h
       liblxqt-config-cursor/selectwnd.cpp
@ -61,31 +59,7 @@ Files: lxqt-config-input/keyboardconfig.cpp
 Copyright: 2013-2014 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
 License: GPL-2.0+

-Files: lxqt-config-input/touchpadconfig.cpp
-       lxqt-config-input/touchpadconfig.h
-       lxqt-config-input/touchpaddevice.cpp
-       lxqt-config-input/touchpaddevice.h
-Copyright: 2016-2018, Chih-Hsuan Yen <yan12125@gmail.com>
-License: GPL-2.0+
-
-Files: lxqt-config-locale/combobox.h
-Copyright: 2018, Pedram Pourang <tsujan2000@gmail.com>
-License: GPL-2.0+
-
-Files: lxqt-config-locale/localeconfig.cpp
-       lxqt-config-locale/localeconfig.h
-Copyright: 2014, LXQt team
-           2014, Sebastian Kügler <sebas@kde.org>
-License: GPL-2.0+
-
-Files: lxqt-config-monitor/fastmenu.cpp
-       lxqt-config-monitor/fastmenu.h
-       lxqt-config-monitor/kscreenutils.h
-       lxqt-config-monitor/loadsettings.cpp
-       lxqt-config-monitor/loadsettings.h
-       lxqt-config-monitor/main.cpp
-       lxqt-config-monitor/managesavedsettings.cpp
-       lxqt-config-monitor/managesavedsettings.h
+Files: lxqt-config-monitor/main.cpp
       lxqt-config-monitor/monitor.cpp
       lxqt-config-monitor/monitor.h
       lxqt-config-monitor/monitorwidget.cpp
@ -94,27 +68,16 @@ Files: lxqt-config-monitor/fastmenu.cpp
       lxqt-config-monitor/monitorsettingsdialog.cpp
       lxqt-config-monitor/monitorsettingsdialog.h
       lxqt-config-monitor/savesettings.cpp
-       lxqt-config-monitor/settingsdialog.cpp
-       lxqt-config-monitor/settingsdialog.h
-       lxqt-config-monitor/timeoutdialog.cpp
-       lxqt-config-monitor/timeoutdialog.h
-Copyright: 2014-2016, 2019, P.L. Lucas <selairi@gmail.com>
+Copyright: 2014 P.L. Lucas <selairi@gmail.com>
           2014 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
 License: GPL-2.0+

 Files: lxqt-config-brightness/brightnesssettings.*
       lxqt-config-brightness/main.cpp
       lxqt-config-brightness/monitorinfo.*
-       lxqt-config-brightness/outputwidget.cpp
-       lxqt-config-brightness/outputwidget.h
 Copyright: 2016 P.L. Lucas <selairi@gmail.com>
 License: LGPL-2.1+

-Files: lxqt-config-brightness/brightnesswatcher.cpp
-       lxqt-config-brightness/brightnesswatcher.h
-Copyright: 2020, Luís Pereira <luis.artur.pereira@gmail.com>
-License: GPL-2.0+
-
 Files: lxqt-config-brightness/xrandrbrightness.*
 Copyright: 2015 Kai Uwe Broulik <kde@privat.broulik.de>
           2010 Lukas Tinkl <ltinkl@redhat.com>
@ -123,7 +86,6 @@ License: LGPL-2.0+
 Files: debian/*
 Copyright: 2014-2018 Alf Gaida <agaida@siduction.org>
           2015      Andrew Lee (李健秋) <ajqlee@debian.org>
-           2023-2024 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
 License: LGPL-2.1+

 License: LGPL-2.0+
--- a/debian/lintian-overrides
+++ b/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: binary-without-manpage usr/bin/lxqt-config-brightness
+lxqt-config: binary-without-manpage usr/bin/lxqt-config-file-associations
+lxqt-config: binary-without-manpage usr/bin/lxqt-config-input
+lxqt-config: binary-without-manpage usr/bin/lxqt-config-locale
+lxqt-config: binary-without-manpage 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
--- a/debian/lxqt-config.install
+++ b/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
--- a/debian/lxqt-config.lintian-overrides
+++ b/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/*]
--- a/debian/manpages
+++ b/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.1
+liblxqt-config-cursor/man/lxqt-config-mouse.1
+lxqt-config-appearance/man/lxqt-config-appearance.1
+man/lxqt-config.1
--- a/debian/rules
+++ b/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

 %:
--- a/debian/source/lintian-overrides
+++ b/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:*]
--- a/debian/upstream/metadata
+++ b/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
--- a/debian/watch
+++ b/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