Update Standards-Version to 4.7.1, no changes needed.

debian/changelog

@@ -1,3 +1,85 @@
+lxqt-session (2.1.1-0ubuntu2) plucky; urgency=medium
+
+  * Update Standards-Version to 4.7.1, no changes needed.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 21 Feb 2025 16:56:44 -0600
+
+lxqt-session (2.1.1-0ubuntu1) plucky; urgency=medium
+
+  * New upstream release.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 11 Jan 2025 16:58:40 -0600
+
+lxqt-session (2.1.0-0ubuntu1) plucky; urgency=medium
+
+  * New upstream release.
+    - Bump build dependencies.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:33:14 -0600
+
+lxqt-session (2.0.0-0ubuntu1) oracular; urgency=medium
+
+  * New upstream release.
+  * Update copyright file.
+  * Drop autostart-ux-polish.patch, applied upstream.
+  * Adjust dependencies.
+  * Bump Standards-Version to 4.7.0, no changes necessary.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:44:52 -0500
+
+lxqt-session (1.4.0-0ubuntu3) noble; urgency=medium
+
+  * Copy over GTK 3 settings by default (LP: #2047705).
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 29 Dec 2023 12:36:24 -0600
+
+lxqt-session (1.4.0-0ubuntu2) noble; urgency=medium
+
+  * Add an upstream patch polishing the autostart UX.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 22 Dec 2023 16:32:05 -0600
+
+lxqt-session (1.4.0-0ubuntu1) noble; urgency=medium
+
+  * New upstream release.
+  * Bump build dependencies.
+  * Update copyright years.
+  * Wraaaaaaaaaaaaaaaaaaaaaaaaaaaap.
+  * Explicitly depend on dbus-bin, since dbus-update-activation-
+    environment is now directly called.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 12 Nov 2023 19:06:27 -0600
+
+lxqt-session (1.3.0-0ubuntu4) mantic; urgency=medium
+
+  * d/control: Fix the comments added in -0ubuntu3 so that dpkg can
+    process them properly.  (Hotfix for a FTBFS bug)
+
+ -- Thomas Ward <teward@ubuntu.com>  Sat, 23 Sep 2023 19:37:40 -0400
+
+lxqt-session (1.3.0-0ubuntu3) mantic; urgency=medium
+
+  * Since the LXQt handler is limited in the portals it supports, add KDE and
+    GTK as fallbacks. The GTK fallback needs to be removed once KDE's is
+    better.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 22 Sep 2023 14:22:41 -0500
+
+lxqt-session (1.3.0-0ubuntu2) mantic; urgency=high
+
+  * Add /usr/share/xdg-desktop-portal/lxqt-portals.conf, which makes XDG
+    portalling happy (LP: #2036098).
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 20 Sep 2023 22:45:49 -0500
+
+lxqt-session (1.3.0-0ubuntu1) mantic; urgency=medium
+
+  * New upstream release.
+  * Bump build dependencies.
+  * Remove reverse-applicable patch.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 09:51:27 -0500
+
 lxqt-session (1.2.0-3ubuntu2) lunar; urgency=medium
 
   * Lubuntuify the Maintainer field.

debian/control

@@ -1,26 +1,28 @@
 Source: lxqt-session
 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: Alf Gaida <agaida@siduction.org>,
            ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
            Andrew Lee (李健秋) <ajqlee@debian.org>
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               libkf5windowsystem-dev,
+               layer-shell-qt (>= 6.0.0),
-               liblxqt1-dev (>= 1.2.0~),
+               libkf6windowsystem-dev (>= 6.0.0),
+               liblayershellqtinterface-dev (>= 6.0.0),
+               liblxqt2-dev (>= 2.1.0),
                libproc2-dev,
-               libqt5svg5-dev,
-               libqt5x11extras5-dev,
                libudev-dev [linux-any],
                libx11-dev,
-               qtxdg-tools (>= 3.10.0~),
+               qt6-svg-dev (>= 6.6.0),
+               qt6-wayland-dev (>= 6.6.0),
+               qtxdg-tools (>= 4.1.0),
                xdg-user-dirs
-Standards-Version: 4.6.2
+Standards-Version: 4.7.1
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-session-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-session-packaging.git
-XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-session
+Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-session
-XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-session.git
+Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-session.git
 Homepage: https://github.com/lxqt/lxqt-session
 Rules-Requires-Root: no
 
@@ -31,7 +33,8 @@ Depends: lxqt-qtplugin,
          x11-xkb-utils,
          ${misc:Depends},
          ${shlibs:Depends}
-Recommends: lxqt-config,
+Recommends: dbus-bin,
+            lxqt-config,
             lxqt-notificationd,
             lxqt-policykit,
             lxqt-powermanagement,
@@ -40,6 +43,10 @@ Recommends: lxqt-config,
             pcmanfm-qt,
             qlipper,
             qps [linux-any],
+#           xdg-desktop-portal-gtk should be removed soon in the future.
+            xdg-desktop-portal-gtk,
+            xdg-desktop-portal-kde,
+            xdg-desktop-portal-lxqt,
             xscreensaver | gnome-screensaver | light-locker | i3lock | suckless-tools
 Provides: x-session-manager
 Description: session manager component for LXQt
@@ -54,8 +61,11 @@ Package: lxqt-session-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qttranslations5-l10n, ${misc:Depends}
+Depends: qt6-translations-l10n, ${misc:Depends}
 Description: Language package for lxqt-session
- The l10n files for lxqt-session.
+ LXQt is an advanced, easy-to-use, and fast desktop environment based on
+ Qt technologies.  It has been tailored for users who value simplicity,
+ speed, and an intuitive interface.  Unlike most desktop environments,
+ LXQt also works fine with less powerful machines.
  .
  This package contains the l10n files needed by lxqt-session.

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: lxqt-session
 Source: https://github.com/lxqt/lxqt-session
 
 Files: *
-Copyright: 2010-2022 LXQt team
+Copyright: 2010-2024 LXQt team
            2015-2021 Palo Kisa <palo.kisa@gmail.com>
            2010-2018 Petr Vanek <petr@scribus.info>
            2010-2016 Paulo Lieuthier <paulolieuthier@gmail.com>
@@ -22,7 +22,7 @@ License: MIT
 Comment: Some code is taken from numlockx
 
 Files: debian/*
-Copyright: 2021-2023 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2021-2025 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
            2014-2019 Alf Gaida <agaida@siduction.org>
                 2015 Andrew Lee (李健秋) <ajqlee@debian.org>
                 2015 ChangZhuo Chen (陳昌倬) <czchen@debian.org>

debian/lxqt-session.install

@@ -13,6 +13,7 @@ usr/share/applications/lxqt-shutdown.desktop
 usr/share/applications/lxqt-suspend.desktop
 usr/share/lxqt/lxqt.conf
 usr/share/lxqt/session.conf
+usr/share/lxqt/waylandwindowmanagers.conf
 usr/share/lxqt/windowmanagers.conf
 usr/share/man/man1/lxqt-config-session.1
 usr/share/man/man1/lxqt-leave.1

debian/lxqt-session.lintian-overrides

@@ -0,0 +1,4 @@
+# This is expected
+lxqt-session: desktop-entry-lacks-keywords-entry [usr/share/*/*.desktop]
+lxqt-session: desktop-entry-lacks-icon-entry [usr/share/*/*.desktop]
+lxqt-session: desktop-entry-invalid-category LXQt [usr/share/*/*.desktop]

debian/patches/0001-Use-procps-ng-4.0.0.patch

@@ -1,63 +0,0 @@
-From: Bernhard Rosenkraenzer <bero@lindev.ch>
-Date: Sat, 17 Dec 2022 17:34:17 +0800
-Subject: Use procps-ng 4.0.0
-
----
- CMakeLists.txt                  |  2 +-
- lxqt-session/src/procreaper.cpp | 19 ++++++++++++-------
- 2 files changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a3c5e0d..45992a0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -35,7 +35,7 @@ find_package(X11 REQUIRED)
- message(STATUS "Building with Qt${Qt5Core_VERSION}")
- find_package(PkgConfig REQUIRED)
- if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
--    pkg_search_module(PROCPS REQUIRED libprocps)
-+    pkg_search_module(PROCPS REQUIRED libproc2)
- endif()
- 
- # Please don't move, must be after lxqt
-diff --git a/lxqt-session/src/procreaper.cpp b/lxqt-session/src/procreaper.cpp
-index 2acd030..495267e 100644
---- a/lxqt-session/src/procreaper.cpp
-+++ b/lxqt-session/src/procreaper.cpp
-@@ -29,7 +29,7 @@
- #include "log.h"
- #if defined(Q_OS_LINUX)
- #include <sys/prctl.h>
--#include <proc/readproc.h>
-+#include <libproc2/pids.h>
- #elif defined(Q_OS_FREEBSD)
- #include <sys/procctl.h>
- #include <libutil.h>
-@@ -109,16 +109,21 @@ void ProcReaper::stop(const std::set<int64_t> & excludedPids)
-     const pid_t my_pid = ::getpid();
-     std::vector<pid_t> children;
- #if defined(Q_OS_LINUX)
--    PROCTAB * proc_dir = ::openproc(PROC_FILLSTAT);
--    while (proc_t * proc = ::readproc(proc_dir, nullptr))
-+    struct pids_info *info = NULL;
-+    enum pids_item items[] = { PIDS_ID_PPID, PIDS_ID_TGID };
-+    enum rel_items { rel_ppid, rel_tgid };
-+    struct pids_stack *stack;
-+    procps_pids_new(&info, items, 2);
-+    while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY)))
-     {
--        if (proc->ppid == my_pid)
-+        const int ppid = PIDS_VAL(rel_ppid, s_int, stack, info);
-+        if (ppid == my_pid)
-         {
--            children.push_back(proc->tgid);
-+	    const int tgid = PIDS_VAL(rel_tgid, s_int, stack, info);
-+            children.push_back(tgid);
-         }
--        ::freeproc(proc);
-     }
--    ::closeproc(proc_dir);
-+    procps_pids_unref(&info);
- #elif defined(Q_OS_FREEBSD)
-     int cnt = 0;
-     if (kinfo_proc *proc_info = kinfo_getallproc(&cnt))

debian/patches/gtk-3-configuration-copy.patch

@@ -0,0 +1,34 @@
+Description: Copy over GTK 3 settings from XDG_CONFIG_DIRS
+ This is a workaround for GTK 3 settings not being applied by default from XDG.
+ Ideally, all desktop environments would do this, and it would be fixed in GTK itself.
+Author: Simon Quigley <tsimonq2@ubuntu.com>
+Origin: vendor
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gtk+3.0/+bug/2047705
+Forwarded: no
+Last-Update: 2023-12-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/startlxqt.in
++++ b/startlxqt.in
+@@ -32,6 +32,21 @@ else
+         fi
+     done
+ fi
++# Handle GTK 3 configuration files
++echo "$XDG_CONFIG_DIRS" | tr ':' '\n' | while read -r dir; do
++    dir_path="$dir/gtk-3.0/"
++    if [ -d "$dir_path" ]; then
++        mkdir -p "$HOME/.config/gtk-3.0"
++        for file in "$dir_path"*; do
++            if [ -f "$file" ]; then
++                target_file="$HOME/.config/gtk-3.0/$(basename "$file")"
++                if [ ! -f "$target_file" ]; then
++                    cp "$file" "$target_file"
++                fi
++            fi
++        done
++    fi
++done
+ 
+ if [ -z "$XDG_CACHE_HOME" ]; then
+     export XDG_CACHE_HOME="$HOME/.cache"

debian/patches/series

@@ -1,2 +1,2 @@
 ensure-necessary-paths-are-pulled-from.patch
-0001-Use-procps-ng-4.0.0.patch
+gtk-3-configuration-copy.patch

debian/source/lintian-overrides

@@ -0,0 +1,2 @@
+# We will not be forwarding this patch
+lxqt-session source: patch-not-forwarded-upstream [debian/patches/gtk-3-configuration-copy.patch]