Merge lp:~darkxst/unity-settings-daemon/lp1224217 into lp:unity-settings-daemon

Proposed by Tim Lunn
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~darkxst/unity-settings-daemon/lp1224217
Merge into: lp:unity-settings-daemon
Diff against target: 12 lines (+1/-1)
1 file modified
debian/unity-settings-daemon.user-session.upstart (+1/-1)
To merge this branch: bzr merge lp:~darkxst/unity-settings-daemon/lp1224217
Reviewer Review Type Date Requested Status
Luke Yelavich Needs Fixing
Dimitri John Ledkov Pending
Review via email: mp+210913@code.launchpad.net

Commit message

unity-settings-demon.user-session.upstart: Use XDG_CURRENT_DESKTOP
as the instance specifier for gnome-session upstart jobs, since
other sessions apart from ubuntu will need to use u-s-d (LP: #1224217)

Description of the change

see also gnome-session and g-s-d patches

To post a comment you must log in.
Revision history for this message
Luke Yelavich (themuso) wrote :

You need to remove the changelog entry, adn put the contents of the changelog entry into the commit message. The commit message has to be populated for CI autolanding, and the commit message will be used as your changelog entry.

review: Needs Fixing
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

On 13 March 2014 22:58, Robert Ancell <email address hidden> wrote:
> You have been requested to review the proposed merge of lp:~darkxst/unity-settings-daemon/lp1224217 into lp:unity-settings-daemon.
>
> For more details, see:
> https://code.launchpad.net/~darkxst/unity-settings-daemon/lp1224217/+merge/210913
>
> see also gnome-session and g-s-d patches
>
> --
> https://code.launchpad.net/~darkxst/unity-settings-daemon/lp1224217/+merge/210913
> You are requested to review the proposed merge of lp:~darkxst/unity-settings-daemon/lp1224217 into lp:unity-settings-daemon.
>
> === modified file 'debian/changelog'
> --- debian/changelog 2014-03-10 17:25:56 +0000
> +++ debian/changelog 2014-03-13 21:25:21 +0000
> @@ -1,3 +1,11 @@
> +unity-settings-daemon (14.04.0+14.04.20140310-0ubuntu2) UNRELEASED; urgency=medium
> +
> + * unity-settings-demon.user-session.upstart: Use XDG_CURRENT_DESKTOP
> + as the instance specifier for gnome-session upstart jobs, since
> + other sessions apart from ubuntu will need to use u-s-d (LP: #1224217)
> +
> + -- Tim Lunn <email address hidden> Wed, 12 Mar 2014 16:45:51 +1100
> +
> unity-settings-daemon (14.04.0+14.04.20140310-0ubuntu1) trusty; urgency=low
>
> [ David Henningsson ]
>
> === modified file 'debian/unity-settings-daemon.user-session.upstart'
> --- debian/unity-settings-daemon.user-session.upstart 2014-02-07 14:57:09 +0000
> +++ debian/unity-settings-daemon.user-session.upstart 2014-03-13 21:25:21 +0000
> @@ -1,7 +1,7 @@
> description "The Unity Settings Daemon"
> author "Dimitri John Ledkov <email address hidden>"
>
> -start on started dbus and starting gnome-session INSTANCE=ubuntu
> +start on started dbus and starting gnome-session INSTANCE!=GNOME
> stop on stopping gnome-session
>
> respawn
>
>

Hm, the change-log does not match the contents of the change.

When this was designed the assumption was that _everything will use
gnome-settings-daemon_ but the unity7 session.

If this is not the case, we need to redesign this and in the unity-*
upstart jobs have a list of environments to start on.
Or reverse in gnome-* upstart jobs have a list of environments to start on.

--
Regards,

Dimitri.

4031. By Tim Lunn

remove changelog entry

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/unity-settings-daemon.user-session.upstart'
2--- debian/unity-settings-daemon.user-session.upstart 2014-02-07 14:57:09 +0000
3+++ debian/unity-settings-daemon.user-session.upstart 2014-03-14 01:31:13 +0000
4@@ -1,7 +1,7 @@
5 description "The Unity Settings Daemon"
6 author "Dimitri John Ledkov <xnox@ubuntu.com>"
7
8-start on started dbus and starting gnome-session INSTANCE=ubuntu
9+start on started dbus and starting gnome-session INSTANCE!=GNOME
10 stop on stopping gnome-session
11
12 respawn

Subscribers

People subscribed via source and target branches