From 897e7df462b7cd21e1a66d9793d3dfae48f190df Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 15 Mar 2023 12:04:11 -0500 Subject: [PATCH] Sync with archive. --- debian/.gitignore | 7 -- debian/changelog | 80 ++++++++++++++++++- debian/control | 8 +- debian/copyright | 4 +- debian/lintian-overrides | 2 +- debian/patches/0001-Use-procps-ng-4.0.0.patch | 63 +++++++++++++++ debian/patches/series | 1 + debian/rules | 4 - debian/salsa-ci.yml | 12 +++ debian/watch | 9 ++- 10 files changed, 167 insertions(+), 23 deletions(-) delete mode 100644 debian/.gitignore create mode 100644 debian/patches/0001-Use-procps-ng-4.0.0.patch create mode 100644 debian/salsa-ci.yml diff --git a/debian/.gitignore b/debian/.gitignore deleted file mode 100644 index 5e88259..0000000 --- a/debian/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/*.debhelper -/*.log -/*.substvars -/debhelper-build-stamp -/files - -/lxqt-session/ diff --git a/debian/changelog b/debian/changelog index 4075919..3dc89d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,39 @@ +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 Tue, 14 Mar 2023 13:30:45 +0100 + +lxqt-session (1.2.0-3) unstable; urgency=medium + + * Merge to unstable. + + -- ChangZhuo Chen (陳昌倬) Fri, 23 Dec 2022 00:31:41 +0800 + +lxqt-session (1.2.0-2) experimental; urgency=medium + + * Add patch to use libproc2. + + -- ChangZhuo Chen (陳昌倬) 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 (陳昌倬) 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 Mon, 13 Mar 2023 08:52:34 +0100 + lxqt-session (1.2.0-0ubuntu3) lunar; urgency=medium * Change build dependency libprocps-dev -> libproc2-dev. @@ -24,6 +60,41 @@ lxqt-session (1.2.0-0ubuntu1) lunar; urgency=medium -- Simon Quigley 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 (李健秋) 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 Wed, 13 Jul 2022 19:57:58 -0500 + lxqt-session (1.1.1-0ubuntu2) kinetic; urgency=medium * Add upstream patch fixing some bluetooth settings. @@ -40,6 +111,14 @@ lxqt-session (1.1.1-0ubuntu1) kinetic; urgency=medium -- Simon Quigley 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 Thu, 25 Nov 2021 18:19:55 +0200 + lxqt-session (0.17.1-0ubuntu1) impish; urgency=medium * New upstream release 0.17.1 @@ -353,4 +432,3 @@ lxqt-session (0.9.0+20150807-1) unstable; urgency=low * Initial release (Closes: #747608) -- ChangZhuo Chen (陳昌倬) Sat, 12 Sep 2015 00:05:13 +0800 - diff --git a/debian/control b/debian/control index d4fdc87..69cb43f 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,5 @@ Source: lxqt-session -Maintainer: Lubuntu Developers -XSBC-Original-Maintainer: LXQt Packaging Team +Maintainer: LXQt Packaging Team Uploaders: Alf Gaida , ChangZhuo Chen (陳昌倬) , Andrew Lee (李健秋) @@ -8,13 +7,13 @@ Section: x11 Priority: optional Build-Depends: debhelper-compat (= 13), libkf5windowsystem-dev, - liblxqt1-dev (>= 1.2.0), + liblxqt1-dev (>= 1.2.0~), libproc2-dev, libqt5svg5-dev, libqt5x11extras5-dev, libudev-dev [linux-any], libx11-dev, - qtxdg-tools, + qtxdg-tools (>= 3.10.0~), xdg-user-dirs Standards-Version: 4.6.1 Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-session-packaging @@ -22,6 +21,7 @@ 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 diff --git a/debian/copyright b/debian/copyright index 863248c..b5cfa91 100644 --- a/debian/copyright +++ b/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-2021, LXQt team 2010-2013, Razor team License: LGPL-2.1+ @@ -61,7 +61,7 @@ Comment: Some code is taken from numlockx Files: debian/* Copyright: 2021-2022, Lubuntu Developers - 2014-2018, Alf Gaida + 2014-2019, Alf Gaida 2015, Andrew Lee (李健秋) 2015, ChangZhuo Chen (陳昌倬) License: LGPL-2.1+ diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 66e34bc..acff59e 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,2 +1,2 @@ # category LXQt in not yet in freedesktop specs - no bug -lxqt-session: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-session.desktop] +lxqt-session: desktop-entry-invalid-category LXQt * diff --git a/debian/patches/0001-Use-procps-ng-4.0.0.patch b/debian/patches/0001-Use-procps-ng-4.0.0.patch new file mode 100644 index 0000000..4b4a766 --- /dev/null +++ b/debian/patches/0001-Use-procps-ng-4.0.0.patch @@ -0,0 +1,63 @@ +From: Bernhard Rosenkraenzer +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 +-#include ++#include + #elif defined(Q_OS_FREEBSD) + #include + #include +@@ -109,16 +109,21 @@ void ProcReaper::stop(const std::set & excludedPids) + const pid_t my_pid = ::getpid(); + std::vector 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)) diff --git a/debian/patches/series b/debian/patches/series index 0ed5a23..cd0dfde 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ ensure-necessary-paths-are-pulled-from.patch +0001-Use-procps-ng-4.0.0.patch diff --git a/debian/rules b/debian/rules index d2ddc12..7c5fcd5 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,6 @@ 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 @@ -15,9 +14,6 @@ endif %: dh ${@} --buildsystem cmake -override_dh_missing: - dh_missing --fail-missing - override_dh_auto_configure: dh_auto_configure -- \ -DPULL_TRANSLATIONS=OFF \ diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml new file mode 100644 index 0000000..28214c5 --- /dev/null +++ b/debian/salsa-ci.yml @@ -0,0 +1,12 @@ +# 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 + diff --git a/debian/watch b/debian/watch index a544020..b75fbc5 100644 --- a/debian/watch +++ b/debian/watch @@ -1,5 +1,6 @@ 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 + +# See https://davesteele.github.io/development/2015/05/02/debian-watch-file-format-for-signed-github-source-tars/ for GitHub workaround for releases page. + +opts="downloadurlmangle=s/archive\/refs\/tags\/@ANY_VERSION@@ARCHIVE_EXT@/releases\/download\/$1\/@PACKAGE@-$1\.tar\.xz/,filenamemangle=s/@ANY_VERSION@@ARCHIVE_EXT@/@PACKAGE@-$1\.tar\.xz/,pgpsigurlmangle=s/$/.asc/" \ +https://github.com/lxqt/@PACKAGE@/tags .*/@ANY_VERSION@@ARCHIVE_EXT@