Nux

Merge lp://qastaging/~3v1n0/nux/x11-conffile-on-unity-only-ab into lp://qastaging/nux/bionic

x11-conffile-on-unity-only-ab
Merge into bionic

Proposed by Marco Trevisan (Treviño) on 2018-06-13

Status:

Merged

Approved by:

Marco Trevisan (Treviño) on 2018-06-13

Approved revision:

894

Merged at revision:

891

Proposed branch:

lp://qastaging/~3v1n0/nux/x11-conffile-on-unity-only-ab

Merge into:

lp://qastaging/nux/bionic

Diff against target:

41 lines (+23/-2)

2 files modified

debian/50_check_unity_support (+14/-2)
debian/changelog (+9/-0)

To merge this branch:

bzr merge lp://qastaging/~3v1n0/nux/x11-conffile-on-unity-only-ab

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Marco Trevisan (Treviño)			Approve on 2018-06-13
Review via email: mp+347867@code.qastaging.launchpad.net

Commit message

X11-check-unity-support: only run when called from an unity session

The content of $XDG_CURRENT_DESKTOP is checked inside a sub-shell
not to affect the value of IFS for all the scripts sourced by the X session.

If running in Unity we should call unity_support_test, not inside gnome
ubuntu X sessions.

XDG_CURRENT_DESKTOP values are currently the followings:
- unity before 17.10: Unity
- unity after 17.10: Unity:Unity7:ubuntu
- gnome session: GNOME
- ubuntu gnome session: ubuntu:GNOME

Description of the change

Backport to Bionic

lp://qastaging/~3v1n0/nux/x11-conffile-on-unity-only-ab updated on 2018-06-13

894. By Marco Trevisan (Treviño) on 2018-06-13

Revert: "debian: don't consider the Xsession.d script as a config file anymore"

It seems something there's not full agreement on it, so to avoid further discussions
I'm reverting this back. However I strongly believe that given the current tools we have
this is the way to go, as debian doesn't provide other tools to get this done.
Nor X11 can move files outside of /etc.

Revision history for this message