Compare commits

..

2 Commits

Author SHA1 Message Date
Simon Quigley 87552a4872 Merge branch 'ci/stable' into ci/unstable
4 years ago
apt-ghetto 9594400b52 Removed etc/xdg/openbox/lxqt-rc.xml
4 years ago

213
debian/changelog vendored

@ -1,215 +1,3 @@
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.
* 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
* New upstream release.
* Fix the watch file, for real this time.
* Bump Standards-version to 4.6.1, no changes needed.
* Lubuntuify the package slightly, to make debhelper happy.
* Bump build dependencies in debian/control.
* Remove reverse-applicable patch.
* Update the only Lintian override.
* Less Rs.
* Briefly update copyright.
-- 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.
-- Simon Quigley <tsimonq2@ubuntu.com> Mon, 06 Jun 2022 16:36:17 -0500
lxqt-session (1.1.1-0ubuntu1) kinetic; urgency=medium
* New upstream release.
- Add qtxdg-tools as a build dependency.
* Bump build dependencies.
* Remove old Breaks/Replaces since we're past the LTS.
* Remove the old KDM config file, it is no longer shipped upstream.
-- 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
* Update debian/control
- Bump Standards-Version to 4.5.1
- Use liblxqt0-dev 0.17.0
- Extend lxqt-session-l10n package description
* Remove etc/xdg/openbox/lxqt-rc.xml from lxqt-session.install
* Update debian/copyright
-- apt-ghetto <apt-ghetto@protonmail.com> Sat, 14 Aug 2021 10:46:02 +0200
lxqt-session (0.16.0-1ubuntu1) hirsute; urgency=medium
* New upstream version.
@ -511,3 +299,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

43
debian/control vendored

@ -1,30 +1,25 @@
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,
liblxqt0-dev (>= 0.16.0~),
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),
xdg-user-dirs
Standards-Version: 4.7.0
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
Standards-Version: 4.5.0
Vcs-Browser: https://phab.lubuntu.me/source/lxqt-session/
Vcs-Git: https://phab.lubuntu.me/source/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
Package: lxqt-session
Architecture: any
@ -33,8 +28,7 @@ Depends: lxqt-qtplugin,
x11-xkb-utils,
${misc:Depends},
${shlibs:Depends}
Recommends: dbus-bin,
lxqt-config,
Recommends: lxqt-config,
lxqt-notificationd,
lxqt-policykit,
lxqt-powermanagement,
@ -43,12 +37,10 @@ Recommends: dbus-bin,
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
Breaks: lxqt-common (<< 0.12.0)
Replaces: lxqt-common (<< 0.12.0)
Description: session manager component for LXQt
LXQt is an advanced, easy-to-use, and fast desktop environment based on
Qt technologies. It has been tailored for users who value simplicity,
@ -61,11 +53,8 @@ Package: lxqt-session-l10n
Architecture: all
Multi-Arch: foreign
Section: localization
Depends: qt6-translations-l10n, ${misc:Depends}
Depends: qttranslations5-l10n, ${misc:Depends}
Breaks: lxqt-session (<< 0.11.0)
Replaces: lxqt-session (<< 0.11.0)
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.
.
This package contains the l10n files needed by lxqt-session.

82
debian/copyright vendored

@ -3,29 +3,53 @@ Upstream-Name: lxqt-session
Source: https://github.com/lxqt/lxqt-session
Files: *
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>
2015 Luís Pereira <luis.artur.pereira@gmail.com>
2010-2014 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
2010-2013 Razor team
2011-2012 Alec Moskvin <alecm@gmx.com>
2010-2011 Alexander Sokoloff <sokoloff.a@gmail.com>
Christopher "VdoP" Regali
Copyright: 2012-2018 LXQt team
2010-2012 Razor team
License: LGPL-2.1+
Files: lxqt-session/src/numlock.cpp
Copyright: 2000-2001, Lubos Lunak <l.lunak@kde.org>
2001, Oswald Buddenhagen <ossi@kde.org>
License: MIT
Comment: Some code is taken from numlockx
Files: lxqt-config-session/autostartedit.*
lxqt-config-session/autostartitem.*
lxqt-config-session/autostartpage.*
lxqt-config-session/modulemodel.*
Copyright: 2011-2012 Alec Moskvin <alecm@gmx.com>
License: LGPL-2.1+
Files: lxqt-config-session/basicsettings.*
lxqt-config-session/defaultappspage.*
lxqt-config-session/environmentpage.*
lxqt-config-session/main.cpp
lxqt-config-session/sessionconfigwindow.*
Copyright: 2010-2016 LXQt team
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: debian/*
Copyright: 2021-2024 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>
Copyright: 2014-2018 Alf Gaida <agaida@siduction.org>
2015 Andrew Lee (李健秋) <ajqlee@debian.org>
2015 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
License: LGPL-2.1+
License: LGPL-2.1+
@ -42,23 +66,3 @@ License: LGPL-2.1+
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
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
.
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
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.

@ -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-*.desktop

@ -11,9 +11,9 @@ usr/share/applications/lxqt-logout.desktop
usr/share/applications/lxqt-reboot.desktop
usr/share/applications/lxqt-shutdown.desktop
usr/share/applications/lxqt-suspend.desktop
usr/share/kdm/sessions/lxqt.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

@ -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]

@ -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"

@ -1,2 +1 @@
ensure-necessary-paths-are-pulled-from.patch
gtk-3-configuration-copy.patch

4
debian/rules vendored

@ -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 \

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

@ -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]

@ -3,4 +3,5 @@ Bug-Database: https://github.com/lxqt/lxqt-session/issues
Bug-Submit: https://github.com/lxqt/lxqt-session/issues/new
Changelog: https://github.com/lxqt/lxqt-session/blob/master/CHANGELOG
Repository: https://github.com/lxqt/lxqt-session
Repository-Browse: https://github.com/lxqt/lxqt-session
Repository-Browser: https://github.com/lxqt/lxqt-session

6
debian/watch vendored

@ -1,5 +1,3 @@
version=4
opts="searchmode=plain, \
pgpsigurlmangle=s/$/.asc/, \
uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \
https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz
opts="pgpsigurlmangle=s/$/.asc/" \
https://github.com/lxqt/lxqt-session/releases .*/lxqt-session-([\d\.]+).tar.xz

Loading…
Cancel
Save