Control: tags 1025581 + patch pending

Because this bug has been RC for a while with no maintainer response,
and lxsession is now one of only two packages in trixie with dependencies
on policykit-1 (the other is fwupd), I've prepared an NMU for lxsession
versioned as 0.5.5-2.1 and uploaded it. Please see attached debdiff,
or alternatively, the attached patches.

Thanks,
    smcv
diffstat for lxsession-0.5.5 lxsession-0.5.5

 changelog |   15 +++++++++++++++
 control   |    6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff -Nru lxsession-0.5.5/debian/changelog lxsession-0.5.5/debian/changelog
--- lxsession-0.5.5/debian/changelog	2020-03-20 19:05:34.000000000 +0000
+++ lxsession-0.5.5/debian/changelog	2023-10-19 08:53:46.000000000 +0100
@@ -1,3 +1,18 @@
+lxsession (0.5.5-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * lxpolkit, lxsession-logout: Depend on polkitd, not policykit-1.
+    The polkitd package replaces the transitional policykit-1, which
+    should be removed before Debian 13 and also depends on pkexec. These
+    components don't seem to use pkexec. (Closes: #1025581)
+  * lxsession: Add Suggests on pkexec.
+    This can be used for apport-gtk integration (but that feature is off
+    by default) and for apt integration via synaptic-pkexec (but that
+    feature has been patched out because it depends on direct access to
+    internal dpkg files).
+
+ -- Simon McVittie <s...@debian.org>  Thu, 19 Oct 2023 08:53:46 +0100
+
 lxsession (0.5.5-2) unstable; urgency=medium
 
   * Rename debian/TODO.Debian to fix lintian warning.
diff -Nru lxsession-0.5.5/debian/control lxsession-0.5.5/debian/control
--- lxsession-0.5.5/debian/control	2020-03-20 18:05:10.000000000 +0000
+++ lxsession-0.5.5/debian/control	2023-10-19 08:53:46.000000000 +0100
@@ -25,7 +25,7 @@
  lxde-session, lxsession-default-apps | lxsession-edit,
  openssh-client | ssh-client
 Suggests:
- gpicview, lxpanel, pcmanfm,
+ gpicview, lxpanel, pcmanfm, pkexec,
  consolekit | libpam-systemd [linux-any]
 Provides: x-session-manager, lxde-settings-daemon
 Breaks: lxsession-data (<< 0.5.3-1)
@@ -64,7 +64,7 @@
 Package: lxpolkit
 Architecture: any
 Multi-Arch: allowed
-Depends: ${shlibs:Depends}, ${misc:Depends}, lxsession-data, policykit-1
+Depends: ${shlibs:Depends}, ${misc:Depends}, lxsession-data, polkitd
 Breaks: lxsession (<< 0.5.3-1)
 Replaces: lxsession (<< 0.5.3-1)
 Provides: polkit-1-auth-agent
@@ -92,7 +92,7 @@
 Multi-Arch: allowed
 Depends: ${shlibs:Depends}, ${misc:Depends},
  lxsession-data, lxlock | xdg-utils,
- policykit-1
+ polkitd
 Recommends:
  lsb-release, consolekit | logind [linux-any] | default-logind [linux-any]
 Breaks: lxsession (<< 0.5.3-1)
>From 7223999bb2fb761c51977d786233cbe41a3cb4bc Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 19 Oct 2023 08:47:09 +0100
Subject: [PATCH 1/3] lxpolkit, lxsession-logout: Depend on polkitd, not
 policykit-1

The polkitd package replaces the transitional policykit-1, which should
be removed before Debian 13 and also depends on pkexec. These components
don't seem to use pkexec.

Closes: #1025581
Signed-off-by: Simon McVittie <s...@debian.org>
---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 6b5f1c3..0312ea2 100644
--- a/debian/control
+++ b/debian/control
@@ -64,7 +64,7 @@ Description: configure what application start up automatically in LXDE
 Package: lxpolkit
 Architecture: any
 Multi-Arch: allowed
-Depends: ${shlibs:Depends}, ${misc:Depends}, lxsession-data, policykit-1
+Depends: ${shlibs:Depends}, ${misc:Depends}, lxsession-data, polkitd
 Breaks: lxsession (<< 0.5.3-1)
 Replaces: lxsession (<< 0.5.3-1)
 Provides: polkit-1-auth-agent
@@ -92,7 +92,7 @@ Architecture: any
 Multi-Arch: allowed
 Depends: ${shlibs:Depends}, ${misc:Depends},
  lxsession-data, lxlock | xdg-utils,
- policykit-1
+ polkitd
 Recommends:
  lsb-release, consolekit | logind [linux-any] | default-logind [linux-any]
 Breaks: lxsession (<< 0.5.3-1)
-- 
2.42.0

>From 7eedbe0823ae137a4d9086fb99903d070895866a Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 19 Oct 2023 08:50:10 +0100
Subject: [PATCH 2/3] lxsession: Add Suggests on pkexec

This can be used for apport-gtk integration (but that feature is off
by default) and for apt integration via synaptic-pkexec (but that
feature has been patched out because it depends on direct access to
internal dpkg files).

Signed-off-by: Simon McVittie <s...@debian.org>
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 0312ea2..b67eacc 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Recommends:
  lxde-session, lxsession-default-apps | lxsession-edit,
  openssh-client | ssh-client
 Suggests:
- gpicview, lxpanel, pcmanfm,
+ gpicview, lxpanel, pcmanfm, pkexec,
  consolekit | libpam-systemd [linux-any]
 Provides: x-session-manager, lxde-settings-daemon
 Breaks: lxsession-data (<< 0.5.3-1)
-- 
2.42.0

>From b467128331cf9c36c19817fc5d09b9bc17c901b8 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 19 Oct 2023 08:54:18 +0100
Subject: [PATCH 3/3] Update changelog

---
 debian/changelog | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e0224b1..79c70dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+lxsession (0.5.5-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * lxpolkit, lxsession-logout: Depend on polkitd, not policykit-1.
+    The polkitd package replaces the transitional policykit-1, which
+    should be removed before Debian 13 and also depends on pkexec. These
+    components don't seem to use pkexec. (Closes: #1025581)
+  * lxsession: Add Suggests on pkexec.
+    This can be used for apport-gtk integration (but that feature is off
+    by default) and for apt integration via synaptic-pkexec (but that
+    feature has been patched out because it depends on direct access to
+    internal dpkg files).
+
+ -- Simon McVittie <s...@debian.org>  Thu, 19 Oct 2023 08:53:46 +0100
+
 lxsession (0.5.5-2) unstable; urgency=medium
 
   * Rename debian/TODO.Debian to fix lintian warning.
-- 
2.42.0

Reply via email to