debian/changelog

@@ -1,49 +1,3 @@
-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

debian/control

@@ -1,28 +1,26 @@
 Source: lxqt-session
 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: Alf Gaida <agaida@siduction.org>,
            ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
            Andrew Lee (李健秋) <ajqlee@debian.org>
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               layer-shell-qt (>= 6.0.0),
+               libkf5windowsystem-dev,
-               libkf6windowsystem-dev (>= 6.0.0),
+               liblxqt1-dev (>= 1.3.0),
-               liblayershellqtinterface-dev (>= 6.0.0),
-               liblxqt2-dev (>= 2.1.0),
                libproc2-dev,
+               libqt5svg5-dev,
+               libqt5x11extras5-dev,
                libudev-dev [linux-any],
                libx11-dev,
-               qt6-svg-dev (>= 6.6.0),
+               qtxdg-tools (>= 3.11.0),
-               qt6-wayland-dev (>= 6.6.0),
-               qtxdg-tools (>= 4.1.0),
                xdg-user-dirs
-Standards-Version: 4.7.0
+Standards-Version: 4.6.2
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-session-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-session-packaging.git
-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-session
+XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-session
-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-session.git
+XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-session.git
 Homepage: https://github.com/lxqt/lxqt-session
 Rules-Requires-Root: no
 
@@ -33,8 +31,7 @@ Depends: lxqt-qtplugin,
          x11-xkb-utils,
          ${misc:Depends},
          ${shlibs:Depends}
-Recommends: dbus-bin,
+Recommends: lxqt-config,
-            lxqt-config,
             lxqt-notificationd,
             lxqt-policykit,
             lxqt-powermanagement,
@@ -61,11 +58,8 @@ Package: lxqt-session-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qt6-translations-l10n, ${misc:Depends}
+Depends: qttranslations5-l10n, ${misc:Depends}
 Description: Language package for lxqt-session
- LXQt is an advanced, easy-to-use, and fast desktop environment based on
+ The l10n files for lxqt-session.
- 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-2024 LXQt team
+Copyright: 2010-2022 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-2024 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2021-2023 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-portals.conf

@@ -0,0 +1,2 @@
+[preferred]
+default=lxqt;kde;gtk;

debian/lxqt-session.install

@@ -13,10 +13,10 @@ 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
 usr/share/man/man1/lxqt-session.1
 usr/share/man/man1/startlxqt.1
 usr/share/xsessions/lxqt.desktop
+debian/lxqt-portals.conf /usr/share/xdg-desktop-portal

debian/lxqt-session.lintian-overrides

@@ -1,4 +0,0 @@
-# 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/gtk-3-configuration-copy.patch

@@ -1,34 +0,0 @@
-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 @@
 ensure-necessary-paths-are-pulled-from.patch
-gtk-3-configuration-copy.patch

debian/source/lintian-overrides

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

debian/upstream/signing-key.asc

@@ -1,55 +1,5 @@
 -----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