Backport to Jammy.

debian/changelog

@@ -1,73 +1,8 @@
-lxqt-session (1.3.0-0ubuntu1~ppa1) jammy; urgency=medium
+lxqt-session (1.2.0-0ubuntu1~ppa1) jammy; urgency=medium
 
   * Backport to Jammy.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 13:03:10 -0500
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 18 Nov 2022 18:37:12 -0600
-
-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.
-  * Restore debian/watch to its original state.
-  * Bumepd Standards-Version to 4.6.2, no changes necessary.
-  * Overhauled copyright file.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Wed, 15 Mar 2023 12:05:32 -0500
-
-lxqt-session (1.2.0-3ubuntu1) lunar; urgency=low
-
-  * Merge from Debian unstable. Remaining changes:
-    - Ensure all proper paths are added to $XDG_CONFIG_DIRS
-
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 14 Mar 2023 13:30:45 +0100
-
-lxqt-session (1.2.0-3) unstable; urgency=medium
-
-  * Merge to unstable.
-
- -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Fri, 23 Dec 2022 00:31:41 +0800
-
-lxqt-session (1.2.0-2) experimental; urgency=medium
-
-  * Add patch to use libproc2.
-
- -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Sat, 17 Dec 2022 19:10:39 +0800
-
-lxqt-session (1.2.0-1) unstable; urgency=medium
-
-  * New upstream release.
-  * Remove unnecessary patch.
-  * Add Rules-Requires-Root: no.
-  * Fix d/lintian-overrides.
-  * Update d/watch for GitHub.
-
- -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Sat, 17 Dec 2022 17:28:26 +0800
-
-lxqt-session (1.2.0-0ubuntu4) lunar; urgency=medium
-
-  * debian/patches/d1db1c791195f3c0cf148e2be8bd46c5a51ca535.patch:
-    - Fix build with libproc2
-
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 13 Mar 2023 08:52:34 +0100
-
-lxqt-session (1.2.0-0ubuntu3) lunar; urgency=medium
-
-  * Change build dependency libprocps-dev -> libproc2-dev.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 10 Mar 2023 18:13:07 -0800
-
-lxqt-session (1.2.0-0ubuntu2) lunar; urgency=medium
-
-  * No-change rebuild against libprocps2-0
-
- -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 10 Mar 2023 23:09:03 +0000
 
 lxqt-session (1.2.0-0ubuntu1) lunar; urgency=medium
 
@@ -83,41 +18,6 @@ lxqt-session (1.2.0-0ubuntu1) lunar; urgency=medium
 
  -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 18 Nov 2022 18:35:56 -0600
 
-lxqt-session (1.1.1-2) unstable; urgency=medium
-
-  * Revert previous improper uploaded changes. Reorganize
-    debian/experimental changes:
-    * debian/upstream/signing-key.asc: update.
-    * debian/copyright: update for new upstream changes.
-    * debian/control: build-deps on libprocps-dev and qtxdg-tools.
-    * debian/control: update descriptions for lxqt-session-l10n package.
-    * Added fix-bluetooth-saving-settings.patch: from upstream. See details:
-      https://github.com/lxqt/lxqt-session/pull/438.
-    * debian/lxqt-session.install: update for upstream changes.
-    * debian/lxqt-session-l10n.install: install into
-      /usr/share/lxqt/translations/lxqt-session.
-    * debian/rules: set -DPULL_TRANSLATIONS=OFF.
-  * debian/upstream/metadata: Change Repository-Browser field to
-    Repository-Browse.
-  * debian/rules: Remove unnecessary -Wl,--as-needed.
-  * debian/rules: Drop --fail-missing argument to dh_missing which is now
-    default in debhelper 13.
-  * debian/watch: fix uscan error.
-
- -- Andrew Lee (李健秋) <ajqlee@debian.org>  Thu, 27 Oct 2022 13:46:17 +0800
-
-lxqt-session (1.1.1-1) experimental; urgency=medium
-
-  * New upstream release.
-  * Bump debhelper compat to 13, no changes needed.
-  * Bump build dependencies.
-  * Bump Standards-version to 4.6.1, no changes needed.
-  * Drop some old Breaks/Replaces.
-  * Run wrap-and-sort.
-  * Pull some useful changes from Ubuntu so we can sync.
-
- -- Simon Quigley <tsimonq2@debian.org>  Wed, 13 Jul 2022 19:57:58 -0500
-
 lxqt-session (1.1.1-0ubuntu2) kinetic; urgency=medium
 
   * Add upstream patch fixing some bluetooth settings.
@@ -134,14 +34,6 @@ lxqt-session (1.1.1-0ubuntu1) kinetic; urgency=medium
 
  -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 01 Jun 2022 16:44:07 -0500
 
-lxqt-session (1.0.1-1) unstable; urgency=medium
-
-  * New upstream release
-  * Bumped Standards-Version to 4.6.0, no changes needed
-  * Update debian/copyright
-
- -- S. 7 <severusseptimius7@gmail.com>  Thu, 25 Nov 2021 18:19:55 +0200
-
 lxqt-session (0.17.1-0ubuntu1) impish; urgency=medium
 
   * New upstream release 0.17.1
@@ -455,3 +347,4 @@ lxqt-session (0.9.0+20150807-1) unstable; urgency=low
   * Initial release (Closes: #747608)
 
  -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Sat, 12 Sep 2015 00:05:13 +0800
+

debian/control

@@ -8,21 +8,20 @@ Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
                libkf5windowsystem-dev,
-               liblxqt1-dev (>= 1.3.0),
+               liblxqt1-dev (>= 1.2.0),
-               libproc2-dev,
+               libprocps-dev,
                libqt5svg5-dev,
                libqt5x11extras5-dev,
                libudev-dev [linux-any],
                libx11-dev,
-               qtxdg-tools (>= 3.11.0),
+               qtxdg-tools,
                xdg-user-dirs
-Standards-Version: 4.6.2
+Standards-Version: 4.6.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
 XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-session.git
 Homepage: https://github.com/lxqt/lxqt-session
-Rules-Requires-Root: no
 
 Package: lxqt-session
 Architecture: any

debian/copyright

@@ -3,16 +3,54 @@ Upstream-Name: lxqt-session
 Source: https://github.com/lxqt/lxqt-session
 
 Files: *
-Copyright: 2010-2022 LXQt team
+Copyright: 2010-2022, LXQt team
-           2015-2021 Palo Kisa <palo.kisa@gmail.com>
+           2010-2013, Razor team
-           2010-2018 Petr Vanek <petr@scribus.info>
+License: LGPL-2.1+
-           2010-2016 Paulo Lieuthier <paulolieuthier@gmail.com>
+
-                2015 Luís Pereira <luis.artur.pereira@gmail.com>
+Files: lxqt-config-session/autostartedit.*
-           2010-2014 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+       lxqt-config-session/autostartitem.*
-           2010-2013 Razor team
+       lxqt-config-session/autostartmodel.*
-           2011-2012 Alec Moskvin <alecm@gmx.com>
+       lxqt-config-session/autostartpage.*
-           2010-2011 Alexander Sokoloff <sokoloff.a@gmail.com>
+       lxqt-config-session/modulemodel.*
-           Christopher "VdoP" Regali
+Copyright: 2011-2012 Alec Moskvin <alecm@gmx.com>
+License: LGPL-2.1+
+
+Files: lxqt-config-session/basicsettings.*
+       lxqt-config-session/environmentpage.*
+       lxqt-config-session/main.cpp
+       lxqt-config-session/sessionconfigwindow.*
+Copyright: 2010-2016 LXQt team
+License: LGPL-2.1+
+
+Files: lxqt-config-session/autostartutils.cpp
+       lxqt-config-session/autostartutils.h
+       lxqt-config-session/userlocationspage.cpp
+       lxqt-config-session/userlocationspage.h
+Copyright: 2015, Luís Pereira <luis.artur.pereira@gmail.com>
+License: LGPL-2.1+
+
+Files: lxqt-leave/leavedialog.*
+Copyright: 2010-2016 LXQt team
+License: LGPL-2.1+
+
+Files: lxqt-session/src/UdevNotifier.*
+       lxqt-session/src/lxqtmodman.*
+       lxqt-session/src/sessiondbusadaptor.h
+       lxqt-session/src/windowmanager.*
+       lxqt-session/src/wmselectdialog.*
+Copyright: 2010-2016 LXQt team
+License: LGPL-2.1+
+
+Files: lxqt-session/src/sessionapplication.*
+Copyright: 2014  Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+License: LGPL-2.1+
+
+Files: lxqt-session/src/lockscreenmanager.*
+Copyright: 2016 Paulo Lieuthier <paulolieuthier@gmail.com>
+License: LGPL-2.1+
+
+Files: lxqt-session/src/log.*
+Copyright: 2016 Palo Kisa <palo.kisa@gmail.com>
 License: LGPL-2.1+
 
 Files: lxqt-session/src/numlock.cpp
@@ -22,27 +60,12 @@ License: MIT
 Comment: Some code is taken from numlockx
 
 Files: debian/*
-Copyright: 2021-2023 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2021-2022, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-           2014-2019 Alf Gaida <agaida@siduction.org>
+           2014-2018, Alf Gaida <agaida@siduction.org>
-                2015 Andrew Lee (李健秋) <ajqlee@debian.org>
+           2015,      Andrew Lee (李健秋) <ajqlee@debian.org>
-                2015 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
+           2015,      ChangZhuo Chen (陳昌倬) <czchen@debian.org>
 License: LGPL-2.1+
 
-License: LGPL-2.1+
- This program or library is free software; you can redistribute it
- and/or modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License version 2.1 can be found in
- "/usr/share/common-licenses/LGPL-2.1".
-
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
@@ -62,3 +85,19 @@ License: MIT
  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+License: LGPL-2.1+
+ This program or library is free software; you can redistribute it
+ and/or modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License version 2.1 can be found in
+ "/usr/share/common-licenses/LGPL-2.1".

debian/lintian-overrides

@@ -1,2 +1,2 @@
 # category LXQt in not yet in freedesktop specs - no bug
-lxqt-session: desktop-entry-invalid-category LXQt *
+lxqt-session: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-session.desktop]

debian/rules

@@ -4,6 +4,7 @@
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 export LC_ALL=C.UTF-8
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
     CMAKE_ARGS += -DWITH_LIBUDEV=ON
@@ -14,6 +15,9 @@ endif
 %:
 	dh ${@} --buildsystem cmake
 
+override_dh_missing:
+	dh_missing --fail-missing
+
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DPULL_TRANSLATIONS=OFF \

debian/salsa-ci.yml

@@ -1,12 +0,0 @@
-# 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
-