Upload to Plucky

This reverts commit aa5018171a.

debian/changelog

@@ -1,3 +1,93 @@
+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.
@@ -329,4 +419,3 @@ 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,34 +1,34 @@
 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),
-               liblxqt0-dev (>= 0.16.0~),
+               liblxqt2-dev (>= 2.1.0),
-               libqt5svg5-dev,
-               libqt5x11extras5-dev,
                libx11-dev,
                libxcb-randr0-dev,
                libxcursor-dev,
                libxfixes-dev,
                libxi-dev,
-               qtbase5-private-dev,
+               lxqt-menu-data (>= 2.1.0),
+               qt6-base-private-dev (>= 6.6.0),
+               qt6-svg-dev (>= 6.6.0),
                xserver-xorg-input-libinput-dev,
                zlib1g-dev
-Standards-Version: 4.5.0
+Standards-Version: 4.7.0
-Vcs-Browser: https://phab.lubuntu.me/source/lxqt-config/
+Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-config-packaging
-Vcs-Git: https://phab.lubuntu.me/source/lxqt-config.git
+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
 
 Package: lxqt-config
 Architecture: any
-Depends: ${misc:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}
-         ${shlibs:Depends}
 Recommends: galternatives,
             lxqt-config-l10n,
             lxqt-policykit,
@@ -44,7 +44,6 @@ 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,8 @@ Package: lxqt-config-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qttranslations5-l10n, ${misc:Depends}
+Depends: qt6-translations-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.

debian/copyright

@@ -3,10 +3,11 @@ Upstream-Name: lxqt-config
 Source: https://github.com/lxqt/lxqt-config
 
 Files: *
-Copyright: 2012-2018 LXQt team
+Copyright: 2012-2024, LXQt team
-           2010-2012 Razor team
+           2010-2012, Razor team
-           2013 Christian Surlykke
+           2013, Christian Surlykke
-           2014 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+           2014, Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+           2014, Luís Pereira <luis.artur.pereira@gmail.com>
 License: LGPL-2.1+
 
 Files: lxqt-config-appearance/iconthemeinfo.cpp
@@ -19,7 +20,8 @@ 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.h
+Files: liblxqt-config-cursor/cfgfile.cpp
+       liblxqt-config-cursor/cfgfile.h
        liblxqt-config-cursor/main.cpp
        liblxqt-config-cursor/main.h
        liblxqt-config-cursor/selectwnd.cpp
@@ -59,7 +61,31 @@ Files: lxqt-config-input/keyboardconfig.cpp
 Copyright: 2013-2014 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
 License: GPL-2.0+
 
-Files: lxqt-config-monitor/main.cpp
+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
        lxqt-config-monitor/monitor.cpp
        lxqt-config-monitor/monitor.h
        lxqt-config-monitor/monitorwidget.cpp
@@ -68,16 +94,27 @@ Files: lxqt-config-monitor/main.cpp
        lxqt-config-monitor/monitorsettingsdialog.cpp
        lxqt-config-monitor/monitorsettingsdialog.h
        lxqt-config-monitor/savesettings.cpp
-Copyright: 2014 P.L. Lucas <selairi@gmail.com>
+       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>
            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>
@@ -86,6 +123,7 @@ 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+

debian/lintian-overrides

@@ -1,15 +1,15 @@
 # there will be no man-pages in a foreseeable future
-lxqt-config: binary-without-manpage usr/bin/lxqt-config-brightness
+lxqt-config: no-manual-page [usr/bin/lxqt-config-brightness]
-lxqt-config: binary-without-manpage usr/bin/lxqt-config-file-associations
+lxqt-config: no-manual-page [usr/bin/lxqt-config-file-associations]
-lxqt-config: binary-without-manpage usr/bin/lxqt-config-input
+lxqt-config: no-manual-page [usr/bin/lxqt-config-input]
-lxqt-config: binary-without-manpage usr/bin/lxqt-config-locale
+lxqt-config: no-manual-page [usr/bin/lxqt-config-locale]
-lxqt-config: binary-without-manpage usr/bin/lxqt-config-monitor
+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-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-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-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-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-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-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.desktop]

debian/lxqt-config.install

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

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-mouse.1
 usr/share/man/man1/lxqt-config-appearance.1
+usr/share/man/man1/lxqt-config-mouse.1
 usr/share/man/man1/lxqt-config.1

debian/rules

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

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

debian/upstream/metadata

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