[28779] in Source-Commits
xsession commit: Update 99upstart-debathena for Xenial
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Sun May 7 03:01:16 2017
Date: Sun, 7 May 2017 03:01:06 -0400
From: Anders Kaseorg <andersk@mit.edu>
Message-Id: <201705070701.v47715K0026212@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/xsession/commit/c402f3df74d00a951fc33c64adfc0cb39bfb1129
commit c402f3df74d00a951fc33c64adfc0cb39bfb1129
Author: Anders Kaseorg <andersk@mit.edu>
Date: Sun May 7 02:40:07 2017 -0400
Update 99upstart-debathena for Xenial
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
debian/99upstart-debathena | 2 +-
debian/changelog | 7 +++++++
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/debian/99upstart-debathena b/debian/99upstart-debathena
index 2e546a4..fd8fa6a 100644
--- a/debian/99upstart-debathena
+++ b/debian/99upstart-debathena
@@ -1,7 +1,7 @@
# This is run after 99upstart, to wrap the session
# in our xsession code
#
-if [ "$STARTUP" = "init --user" ] && \
+if { [ "$STARTUP" = "init --user" ] || [ "$STARTUP" = "/sbin/upstart --user" ]; } && \
[ -e /etc/X11/Xsession.d/98debathena-xsession ]; then
. /etc/X11/Xsession.d/98debathena-xsession
fi
diff --git a/debian/changelog b/debian/changelog
index ff72d0e..09ad556 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debathena-xsession (1.28) unstable; urgency=medium
+
+ * /etc/X11/Xsession.d/99upstart-debathena: Update to match
+ ‘/sbin/upstart --user’ as well as ‘init --user’, for Xenial.
+
+ -- Anders Kaseorg <andersk@mit.edu> Sun, 07 May 2017 02:39:08 -0400
+
debathena-xsession (1.27) unstable; urgency=low
* Restore per-user xsessions (Trac: #1525)
