Copy over GTK 3 settings by default (LP: #2047705).

This reverts commit 8837be7937.

debian/changelog

@@ -1,19 +1,8 @@
-lxqt-session (2.1.0-0ubuntu1) plucky; urgency=medium
+lxqt-session (1.4.0-0ubuntu3~ppa22.04.1) jammy; 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.
+  * Backport to Jammy.
 
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:44:52 -0500
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 01 Jan 2024 14:02:49 -0600
 
 lxqt-session (1.4.0-0ubuntu3) noble; urgency=medium
 

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),
-               libkf6windowsystem-dev (>= 6.0.0),
-               liblayershellqtinterface-dev (>= 6.0.0),
-               liblxqt2-dev (>= 2.1.0),
-               libproc2-dev,
+               libkf5windowsystem-dev,
+               liblxqt1-dev (>= 1.4.0),
+               libprocps-dev,
+               libqt5svg5-dev,
+               libqt5x11extras5-dev,
                libudev-dev [linux-any],
                libx11-dev,
-               qt6-svg-dev (>= 6.6.0),
-               qt6-wayland-dev (>= 6.6.0),
-               qtxdg-tools (>= 4.1.0),
+               qtxdg-tools (>= 3.12.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
-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-session.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-session
+XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-session.git
 Homepage: https://github.com/lxqt/lxqt-session
 Rules-Requires-Root: no
 
@@ -61,11 +59,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
- 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.
+ The l10n files for lxqt-session.
  .
  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-2023 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

@@ -1,3 +1,4 @@
+debian/lxqt-portals.conf /usr/share/xdg-desktop-portal
 etc/xdg/autostart/lxqt-xscreensaver-autostart.desktop
 usr/bin/lxqt-config-session
 usr/bin/lxqt-leave
@@ -13,7 +14,6 @@ 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

@@ -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/autostart-ux-polish.patch

@@ -0,0 +1,55 @@
+Description: lxqt-config-session/autostart: More strict user inputs
+ Makes name and command mandatory when adding or editing a autostart an
+ application. Check for already existing files when editing.
+ .
+ TODO: Add and Edit functions are almost indentical. Candidates to some
+ refactoring.
+Author: Luís Pereira <luis.artur.pereira@gmail.com>
+Origin: upstream
+Bug: https://github.com/lxqt/lxqt-session/issues/486
+Applied-Upstream: 35acc5e7fe64ab78616968a5b73b150fdf2f002a
+Last-Update: 2023-12-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/lxqt-config-session/autostartpage.cpp
++++ b/lxqt-config-session/autostartpage.cpp
+@@ -133,6 +133,11 @@ void AutoStartPage::addButton_clicked()
+     while (!success && edit.exec() == QDialog::Accepted)
+     {
+         QModelIndex index = ui->autoStartView->selectionModel()->currentIndex();
++        if (edit.name().isEmpty() || edit.command().isEmpty() )
++        {
++            QMessageBox::critical(this, tr("Error"), tr("Please provide Name and Command"));
++            continue;
++        }
+         XdgDesktopFile file(XdgDesktopFile::ApplicationType, edit.name(), edit.command());
+         if (edit.needTray())
+             file.setValue(QL1S("X-LXQt-Need-Tray"), true);
+@@ -148,8 +153,14 @@ void AutoStartPage::editButton_clicked()
+     QModelIndex index = ui->autoStartView->selectionModel()->currentIndex();
+     XdgDesktopFile file = mXdgAutoStartModel->desktopFile(index);
+     AutoStartEdit edit(file.name(), file.value(QL1S("Exec")).toString(), file.contains(QL1S("X-LXQt-Need-Tray")));
+-    if (edit.exec() == QDialog::Accepted)
++    bool success = false;
++    while (!success && edit.exec() == QDialog::Accepted)
+     {
++        if (edit.name().isEmpty() || edit.command().isEmpty() )
++        {
++            QMessageBox::critical(this, tr("Error"), tr("Please provide Name and Command"));
++            continue;
++        }
+         file.setLocalizedValue(QL1S("Name"), edit.name());
+         file.setValue(QL1S("Exec"), edit.command());
+         if (edit.needTray())
+@@ -157,7 +168,10 @@ void AutoStartPage::editButton_clicked()
+         else
+             file.removeEntry(QL1S("X-LXQt-Need-Tray"));
+ 
+-        mXdgAutoStartModel->setEntry(index, file, true);
++        if (mXdgAutoStartModel->setEntry(index, file, true))
++            success = true;
++        else
++            QMessageBox::critical(this, tr("Error"), tr("File '%1' already exists!").arg(file.fileName()));
+     }
+ }
+ 

debian/patches/series

@@ -1,2 +1,3 @@
 ensure-necessary-paths-are-pulled-from.patch
+autostart-ux-polish.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]