Nux

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

Proposed by Marco Trevisan (Treviño)
Status: Approved
Approved by: Marco Trevisan (Treviño)
Approved revision: 894
Proposed branch: lp://qastaging/~3v1n0/nux/x11-conffile-on-unity-only-ab
Merge into: lp://qastaging/nux/artful
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
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+347866@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 Artful

To post a comment you must log in.
894. By Marco Trevisan (Treviño)

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
Marco Trevisan (Treviño) (3v1n0) wrote :
review: Approve

Unmerged revisions

894. By Marco Trevisan (Treviño)

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.

893. By Marco Trevisan (Treviño)

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

This is just a script to be loaded, and not something the user is supposed to change,
so it should be removed on simple package removal.
To achieve this, as per maintainer-guide 5.3, using sym-links is the standard way.

892. By Marco Trevisan (Treviño)

50_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

891. By Marco Trevisan (Treviño)

50_check_unity_support: only export LIBGL_ALWAYS_SOFTWARE=1 on command failed

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches