10 changed files with 36 additions and 123 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,81 +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
@ -419,3 +341,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
+
--- a/debian/control
+++ b/debian/control
@ -1,29 +1,28 @@
 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),
+               libkf5screen-dev,
+               libkf5windowsystem-dev,
+               liblxqt0-dev (>= 0.17.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.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
@ -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,7 +3,7 @@ Upstream-Name: lxqt-config
 Source: https://github.com/lxqt/lxqt-config

 Files: *
-Copyright: 2012-2024, LXQt team
+Copyright: 2012-2020, LXQt team
           2010-2012, Razor team
           2013, Christian Surlykke
           2014, Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
@ -123,7 +123,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: 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
--- 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
@ -13,5 +14,7 @@ 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-system.directory
 usr/share/icons/hicolor/48x48/apps/brightnesssettings.svg
 usr/share/lxqt/icons/monitor.svg
--- 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/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