Merge branch 'ubuntu/noble' into backports/jammy

debian/changelog

@@ -1,8 +1,20 @@
-lxqt-config (1.3.0-0ubuntu1~ppa1) jammy; urgency=medium
+lxqt-config (1.4.0-0ubuntu1~ppa1) jammy; urgency=medium
 
   * Backport to Jammy.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 13:02:14 -0500
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Sun, 12 Nov 2023 18:12:05 -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
 

debian/control

@@ -7,7 +7,7 @@ Priority: optional
 Build-Depends: debhelper-compat (= 13),
                libkf5screen-dev,
                libkf5windowsystem-dev,
-               liblxqt1-dev (>= 1.3.0),
+               liblxqt1-dev (>= 1.4.0),
                libqt5svg5-dev,
                libqt5x11extras5-dev,
                libx11-dev,
@@ -15,6 +15,7 @@ Build-Depends: debhelper-compat (= 13),
                libxcursor-dev,
                libxfixes-dev,
                libxi-dev,
+               lxqt-menu-data (>= 1.4.0),
                qtbase5-private-dev,
                xserver-xorg-input-libinput-dev,
                zlib1g-dev

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]

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
@@ -14,8 +13,5 @@ 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-other.directory
-usr/share/desktop-directories/lxqt-settings-system.directory
 usr/share/icons/hicolor/48x48/apps/brightnesssettings.svg
 usr/share/lxqt/icons/monitor.svg

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/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