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

[Tim Lunn]

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

=== 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 @@
+gnome-settings-daemon (3.8.6.1-0ubuntu10) UNRELEASED; urgency=medium
+
+  * gnome-settings-daemon.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 <[e-mail]>  Wed, 12 Mar 2014 16:47:04 +1100
+
 gnome-settings-daemon (3.8.6.1-0ubuntu9) trusty; urgency=medium
 
   * debian/patches/git_enable_auto_hidpi.patch: enable hidpi on screen

=== 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 @@
 description "The Gnome Settings Daemon"
 author "Stéphane Graber <[e-mail]>"
 
-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