[Pkg-xfce-commits] [Git][xfce-team/desktop/xfce4-session][debian/master] 9 commits: Revert "d/control: Revert recommends change from dbus-x11 to...

Tue Jul 19 07:41:40 BST 2022


Unit 193   pushed to branch debian/master at xfce / desktop / xfce4-session


Commits:
5efd45ab by Unit 193 at 2022-07-19T01:40:51-04:00
Revert "d/control: Revert recommends change from dbus-x11 to default-dbus-session-bus as #836061 needs to be addressed first. (Reopens: #836062)"

This reverts commit 443386b0cf2ae1a62f54952c9b9b9c96f08a83b9.

- - - - -
5c2031af by Unit 193 at 2022-07-19T01:52:08-04:00
d/55xfce4-session: Inject DBUS_SESSION_BUS_ADDRESS into the session via dbus-update-activation-environment.

- - - - -
7fe45235 by Unit 193 at 2022-07-19T01:52:43-04:00
d/rules: Drop --as-needed, as it is now the default in stable.

- - - - -
5d651b2c by Unit 193 at 2022-07-19T01:53:00-04:00
d/control: Bump DH compat to 13.

- - - - -
da3f9458 by Unit 193 at 2022-07-19T01:54:09-04:00
d/control: Correct typo, fortunes-mod → fortune-mod (LP: #1883867).

- - - - -
abbbaf83 by Unit 193 at 2022-07-19T02:07:04-04:00
d/control: Add all supported screen lockers from xflock4.

- - - - -
08b7ed82 by Unit 193 at 2022-07-19T02:07:08-04:00
Update Standards-Version to 4.6.1.

- - - - -
81235668 by Unit 193 at 2022-07-19T02:10:18-04:00
d/rules, d/systemd/*: Add systemd user session, but only install it if building for Ubuntu.

- - - - -
9cfe5117 by Unit 193 at 2022-07-19T02:15:02-04:00
Update changelog for release.

- - - - -


6 changed files:

- debian/55xfce4-session
- debian/changelog
- debian/control
- debian/rules
- + debian/systemd/run-systemd-session
- + debian/systemd/xfce4-session.service


Changes:

=====================================
debian/55xfce4-session
=====================================
@@ -14,5 +14,9 @@ case "$BASESTARTUP" in
       XDG_DATA_DIRS=/usr/share/xfce4:"$XDG_DATA_DIRS"
     fi
     export XDG_DATA_DIRS
+    if [ -n "$DBUS_SESSION_BUS_ADDRESS" ] && \
+      command -v dbus-update-activation-environment >/dev/null; then
+        dbus-update-activation-environment --verbose --systemd XDG_DATA_DIRS
+    fi
     ;;
 esac


=====================================
debian/changelog
=====================================
@@ -1,10 +1,18 @@
-xfce4-session (4.16.0-2) UNRELEASED; urgency=medium
+xfce4-session (4.16.0-2) unstable; urgency=medium
 
+  * Team upload.
+  * d/55xfce4-session: Inject DBUS_SESSION_BUS_ADDRESS into the session
+    via dbus-update-activation-environment.
   * d/control:
-    - Revert recommends change from dbus-x11 to default-dbus-session-bus as
-      #836061 needs to be addressed first. (Reopens: #836062)
-
- -- Unit 193 <unit193 at debian.org>  Wed, 06 Jan 2021 02:18:01 -0500
+    - Bump DH compat to 13.
+    - Correct typo, fortunes-mod → fortune-mod (LP: #1883867).
+    - Add all supported screen lockers from xflock4. (Closes: #847825)
+  * d/rules: Drop --as-needed, as it is now the default in stable.
+  * d/rules, d/systemd/*:
+    - Add systemd user session, but only install it if building for Ubuntu.
+  * Update Standards-Version to 4.6.1.
+
+ -- Unit 193 <unit193 at debian.org>  Tue, 19 Jul 2022 02:07:26 -0400
 
 xfce4-session (4.16.0-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <debian-xfce at lists.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
                intltool,
                libdbus-1-dev,
                libgtk-3-dev,
@@ -17,7 +17,7 @@ Build-Depends: debhelper-compat (= 12),
                x11-xserver-utils,
                xfce4-dev-tools
 Rules-Requires-Root: no
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
 Homepage: https://docs.xfce.org/xfce/xfce4-session/start
 Vcs-Git: https://salsa.debian.org/xfce-team/desktop/xfce4-session.git
 Vcs-Browser: https://salsa.debian.org/xfce-team/desktop/xfce4-session
@@ -28,14 +28,14 @@ Breaks: xfce4-utils
 Replaces: xfce4-utils
 Pre-Depends: ${misc:Pre-Depends}
 Depends: xfce4-settings (>= 4.10.0), xfconf, x11-xserver-utils, ${misc:Depends}, ${shlibs:Depends}
-Recommends: default-logind [linux-any] | logind [linux-any],
-            dbus-x11,
-            light-locker,
+Recommends: default-dbus-session-bus | dbus-session-bus,
+            default-logind [linux-any] | logind [linux-any],
+            light-locker | xfce4-screensaver | xscreensaver | gnome-screensaver | mate-screensaver | suckless-tools,
             systemd-sysv [linux-any],
             upower,
             xfdesktop4,
             xfwm4
-Suggests: fortunes-mod, sudo
+Suggests: fortune-mod, sudo
 Provides: x-session-manager
 Description: Xfce4 Session Manager
  xfce4-session is an X11-compliant "session manager" designed for use with


=====================================
debian/rules
=====================================
@@ -3,12 +3,16 @@
 # get the various DEB_BUILD/DEB_HOST variables
 include /usr/share/dpkg/architecture.mk
 
-export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,-O1
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 override_dh_install:
 	chmod 755 debian/xfce4-session/etc/xdg/xfce4/xinitrc
 	find debian/xfce4-session/usr/lib -name '*.la' -delete
+ifeq ($(shell dpkg-vendor --derives-from ubuntu && echo 1),1)
+	dh_install debian/systemd/xfce4-session.service /usr/lib/systemd/user/
+	dh_install debian/systemd/run-systemd-session /usr/share/xfce4/scripts/
+endif
 	dh_install
 
 # default backend for Linux and Hurd


=====================================
debian/systemd/run-systemd-session
=====================================
@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e
+
+# robustness: if the previous graphical session left some failed units,
+# reset them so that they don't break this startup
+for unit in $(systemctl --user --no-legend --state=failed list-units | cut -f1 -d' '); do
+if [ "$(systemctl --user show -p PartOf --value)" = "graphical-session.target" ]; then
+    systemctl --user reset-failed $unit
+fi
+done
+
+systemctl --user restart graphical-session-pre.target
+systemctl --user restart "$1"
+
+# Wait until the session gets closed
+# FIXME: replace with an event-based waiting instead of polling (needs new systemctl functionality)
+while systemctl --user --quiet is-active "$1"; do sleep 1; done
+
+# Delay killing the X server until all graphical units stopped
+# FIXME: we currently cannot make targets wait on its dependencies going to
+# "inactive", only to "deactivating"
+while [ -n "$(systemctl --user --no-legend --state=deactivating list-units)" ]; do sleep 0.2; done


=====================================
debian/systemd/xfce4-session.service
=====================================
@@ -0,0 +1,6 @@
+[Unit]
+Description=Xfce 4 Session Manager
+PartOf=graphical-session.target
+
+[Service]
+ExecStart=/usr/bin/startxfce4



View it on GitLab: https://salsa.debian.org/xfce-team/desktop/xfce4-session/-/compare/7d7fca484b25875bcd4e76350b5c004e4a0d4f99...9cfe5117d89f3bd7d415f9843d5b8f83709d7d9b

-- 
View it on GitLab: https://salsa.debian.org/xfce-team/desktop/xfce4-session/-/compare/7d7fca484b25875bcd4e76350b5c004e4a0d4f99...9cfe5117d89f3bd7d415f9843d5b8f83709d7d9b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-xfce-commits/attachments/20220719/40bba68d/attachment-0001.htm>
