15 changed files with 220 additions and 359 deletions
--- a/debian/README.source
+++ b/debian/README.source
@ -1,14 +0,0 @@
-LXQt-config
-----------
-
-Software Licences
-=================
-
-This software contains GPL v2+, GPL v3+ and LGPL v2+.
-This document
-(http://www.gnu.org/licenses/gpl-faq.html#v3HowToUpgrade)
-tells us GPL v2+ can upgrade GPL v3+. You can upgrade LGPL v3+
-
-see also http://gplv3.fsf.org/dd3-faq
-
-- Yukiharu YABUKI <yyabuki@debian.org> 2015-08-21 18:42:35+09:00
--- a/debian/changelog
+++ b/debian/changelog
@ -1,101 +1,14 @@
-lxqt-config (2.1.0-0ubuntu1) plucky; urgency=medium
+lxqt-config (1.1.0-1) experimental; 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
+  * Add debian/salsa-ci.yml file.
+  * Update debian/upstream/signing-key.asc.
+  * New upstream version 1.0.0
+  * New upstream version 1.1.0
+  * Build-deps on liblxqt1-dev (>= 1.1.0~).
+  * Drop lxqt-config (<< 0.11.0) from Breaks and Replaces.
+  * lxqt-config.install: ship lxqt-settings-other.directory file.

-  * 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
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Wed, 13 Jul 2022 23:17:48 +0800

 lxqt-config (0.16.1-1) unstable; urgency=medium

@ -107,17 +20,6 @@ lxqt-config (0.16.1-1) unstable; urgency=medium

 -- 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.
-    - Update upstream signing key.
-    - Bump LXQt build dependencies.
-    - Add build dependency on libxcb-randr0-dev (Closes: #952266).
-  * Bump Standards-version to 4.5.0, no changes needed.
-  * debhelper -> debhelper-compat.
-
- -- 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.
@ -149,13 +51,6 @@ lxqt-config (0.14.1-1) unstable; urgency=medium

 -- 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.
-  * Run wrap-and-sort.
-
- -- 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.
@ -173,38 +68,6 @@ lxqt-config (0.14.0-1) unstable; urgency=medium

 -- 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.
-    - Bump build dependencies.
-    - Remove unneeded patches.
-  * Bump debhelper compat to 12, no changes needed.
-  * Add new lxqt-config-l10n package.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 26 Jan 2019 00:07:14 -0600
-
-lxqt-config (0.13.0+git20181226-0ubuntu3) disco; urgency=medium
-
-  * Don't recommend lxqt-config-l10n and conflict it at the same time.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 05 Jan 2019 15:08:01 -0600
-
-lxqt-config (0.13.0+git20181226-0ubuntu2) disco; urgency=medium
-
-  * Add Conflicts/Replaces for lxqt-config-l10n.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 30 Dec 2018 17:42:43 -0600
-
-lxqt-config (0.13.0+git20181226-0ubuntu1) disco; urgency=medium
-
-  * New upstream Git snapshot.
-    - Remove reverse-applicable patches.
-    - Add a patch lowering the LXQt version required.
-    - Add missing build dependencies.
-  * Bump Standards-version to 4.3.0, no changes needed.
-
- -- 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.
@ -213,42 +76,6 @@ lxqt-config (0.13.0-1) unstable; urgency=medium

 -- 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.
-
- -- Hans P. Möller <hmoller@gmail.com>  Thu, 04 Oct 2018 14:44:03 -0300
-
-lxqt-config (0.13.0-0ubuntu4) cosmic; urgency=medium
-
-  * Make a path for GTK settings if it does not exist.
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Mon, 03 Sep 2018 00:43:25 -7000
-
-lxqt-config (0.13.0-0ubuntu3) cosmic; urgency=medium
-
-  * Run wrap-and-sort.
-  * Demote qt5-style-plugins to a Suggests, because some of the themes are not
-    working (LP: #1785401).
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 09 Aug 2018 14:24:44 -0500
-
-lxqt-config (0.13.0-0ubuntu2) cosmic; urgency=medium
-
-  * Bump Standards-version to 4.1.5, no changes needed.
-  * Change Uploaders to Ubuntu uploaders.
-  * Add support for modifying GTK themes.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 30 Jul 2018 16:35:02 -0500
-
-lxqt-config (0.13.0-0ubuntu1) cosmic; urgency=medium
-
-  * New upstream release.
-  * Update Vcs-* and Maintainer to Lubuntu values.
-  * Update build dependencies.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 22 May 2018 23:25:36 -0500
-
 lxqt-config (0.12.0-4) unstable; urgency=medium

  * Bumped compat to 11
--- a/debian/control
+++ b/debian/control
@ -1,52 +1,55 @@
 Source: lxqt-config
-Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
-Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
+Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Uploaders: Alf Gaida <agaida@siduction.org>,
+           ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
+           Andrew Lee (李健秋) <ajqlee@debian.org>,
+           Yukiharu YABUKI <yyabuki@debian.org>
 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,
+               liblxqt1-dev (>= 1.1.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://salsa.debian.org/lxqt-team/lxqt-config
+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}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: galternatives,
            lxqt-config-l10n,
            lxqt-policykit,
            lxqt-powermanagement,
            lxqt-qtplugin,
            lxqt-session,
-            system-config-printer
+            qt5-style-plugins,
+            system-config-printer,
+            xsettingsd
 Suggests: adwaita-qt,
-          cmst [linux-any] | network-manager-gnome [linux-any],
          faenza-icon-theme,
          gnome-themes-standard,
          gparted | partitionmanager [linux-any],
-          lxappearance,
+          cmst [linux-any] | network-manager-gnome [linux-any],
          lxqt | lxqt-core,
+          lxappearance,
          obconf-qt,
          synaptic
 Description: LXQt system settings center
- The LXQt system settings center
+ The LXQt system settings center which summarizes all configuration tools as
+ well as counterparts of other LXQt components or third-party applications.
 .
 This package contain the LXQt configuration ui.

@ -54,8 +57,10 @@ Package: lxqt-config-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qt6-translations-l10n, ${misc:Depends}
+Depends: ${misc:Depends},
+         qttranslations5-l10n
 Description: Language package for lxqt-config
- The LXQt system settings center
+ The LXQt system settings center which summarizes all configuration tools as
+ well as counterparts of other LXQt components or third-party applications.
 .
- This package contains the l10n files needed by lxqt-config.
+ This package contains the l10n files needed by the 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-2019 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,36 +68,24 @@ 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>
 License: LGPL-2.0+

 Files: debian/*
-Copyright: 2014-2018 Alf Gaida <agaida@siduction.org>
+Copyright: 2014-2020 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/gbp.conf
+++ b/debian/gbp.conf
@ -0,0 +1,6 @@
+[DEFAULT]
+debian-branch = debian/sid
+upstream-branch = upstream/latest
+pristine-tar = True
+compression = xz
+
--- 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,17 +1,21 @@
-usr/bin/lxqt-config
-usr/bin/lxqt-config-appearance
-usr/bin/lxqt-config-brightness
-usr/bin/lxqt-config-file-associations
-usr/bin/lxqt-config-input
-usr/bin/lxqt-config-locale
-usr/bin/lxqt-config-monitor
-usr/lib/*/lxqt-config/liblxqt-config-cursor.so
+etc/xdg/menus/lxqt-config.menu
+usr/share/applications/lxqt-config-locale.desktop
+usr/share/applications/lxqt-config-file-associations.desktop
 usr/share/applications/lxqt-config-appearance.desktop
 usr/share/applications/lxqt-config-brightness.desktop
-usr/share/applications/lxqt-config-file-associations.desktop
-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-input.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/desktop-directories/lxqt-settings-other.directory
 usr/share/lxqt/icons/monitor.svg
+usr/share/icons/hicolor/48x48/apps/brightnesssettings.svg
+usr/bin/lxqt-config-input
+usr/bin/lxqt-config-monitor
+usr/bin/lxqt-config-appearance
+usr/bin/lxqt-config-brightness
+usr/bin/lxqt-config-file-associations 
+usr/bin/lxqt-config-locale
+usr/bin/lxqt-config
+usr/lib/*/lxqt-config/liblxqt-config-cursor.so
--- 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.1
 usr/share/man/man1/lxqt-config-appearance.1
 usr/share/man/man1/lxqt-config-mouse.1
-usr/share/man/man1/lxqt-config.1
--- a/debian/rules
+++ b/debian/rules
@ -2,16 +2,31 @@
 # 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

+include /usr/share/dpkg/architecture.mk
+
+ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+    CONF_FLAGS += -DWITH_TOUCHPAD=NO
+endif
+
+ifeq ($(DEB_HOST_ARCH_OS), hurd)
+    CONF_FLAGS += -DWITH_TOUCHPAD=NO
+endif
+
+
 %:
 	dh ${@} --buildsystem cmake

-override_dh_auto_configure:
-	dh_auto_configure -- \
-		-DPULL_TRANSLATIONS=OFF \
-		-DUPDATE_TRANSLATIONS=OFF \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo
+override_dh_missing:
+	dh_missing --fail-missing

 override_dh_makeshlibs:
 	dh_makeshlibs -Xlxqt-config
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		-DUPDATE_TRANSLATIONS=OFF \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		$(CONF_FLAGS)
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@ -0,0 +1,12 @@
+# For more information on what jobs are run see:
+# https://salsa.debian.org/salsa-ci-team/pipeline
+#
+# To enable the jobs, go to your repository (at salsa.debian.org)
+# and click over Settings > CI/CD > Expand (in General pipelines).
+# In "Custom CI config path" write debian/salsa-ci.yml and click
+# in "Save Changes". The CI tests will run after the next commit.
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
--- 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 +1,7 @@
+Name: lxqt-config
 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
+Repository: https://github.com/lxqt/lxqt-config
+Repository-Browser: https://github.com/lxqt/lxqt-config
+
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@ -1,5 +1,55 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----

+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
+=h7ww
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
 mQINBF6cxrwBEADfl3ydxNfLBbWGPesXty2baQgixZ3D6aCxadI2kX+aikmT8rd0
 ttDKN18cXV52Ssxnj0qhgf4hwnu/b0be6BzqSEyGM+UQR3X2CYpxrMakfW32Q18K
 X5ec0RPR2ucBq9G0r9t6FYC8FkJ4uQUU3xxrLW3z302S0Makjgzm8BV9WrFQ7oFF
--- 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