Merge lp:~darkxst/gnome-settings-daemon/lp1224217 into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

Proposed by Tim Lunn
Status: Merged
Merged at revision: 463
Proposed branch: lp:~darkxst/gnome-settings-daemon/lp1224217
Merge into: lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu
Diff against target: 28 lines (+9/-1)
2 files modified
debian/changelog (+8/-0)
debian/gnome-settings-daemon.user-session.upstart (+1/-1)
To merge this branch: bzr merge lp:~darkxst/gnome-settings-daemon/lp1224217
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+210914@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-02-20 10:38:43 +0000
+++ debian/changelog 2014-03-13 21:26:15 +0000
@@ -1,3 +1,11 @@
1gnome-settings-daemon (3.8.6.1-0ubuntu10) UNRELEASED; urgency=medium
2
3 * gnome-settings-daemon.user-session.upstart: Use XDG_CURRENT_DESKTOP
4 as the instance specifier for gnome-session upstart jobs, since
5 other sessions apart from ubuntu will need to use u-s-d (LP: #1224217)
6
7 -- Tim Lunn <tim@feathertop.org> Wed, 12 Mar 2014 16:47:04 +1100
8
1gnome-settings-daemon (3.8.6.1-0ubuntu9) trusty; urgency=medium9gnome-settings-daemon (3.8.6.1-0ubuntu9) trusty; urgency=medium
210
3 * debian/patches/git_enable_auto_hidpi.patch: enable hidpi on screen11 * debian/patches/git_enable_auto_hidpi.patch: enable hidpi on screen
412
=== modified file 'debian/gnome-settings-daemon.user-session.upstart'
--- debian/gnome-settings-daemon.user-session.upstart 2014-02-07 14:39:55 +0000
+++ debian/gnome-settings-daemon.user-session.upstart 2014-03-13 21:26:15 +0000
@@ -1,7 +1,7 @@
1description "The Gnome Settings Daemon"1description "The Gnome Settings Daemon"
2author "St├ęphane Graber <stgraber@ubuntu.com>"2author "St├ęphane Graber <stgraber@ubuntu.com>"
33
4start on started dbus and starting gnome-session INSTANCE!=ubuntu4start on started dbus and starting gnome-session INSTANCE=GNOME
5stop on stopping gnome-session5stop on stopping gnome-session
66
7respawn7respawn

Subscribers

People subscribed via source and target branches

to all changes: