Merge lp:~seb128/unity/restore-gsd-override into lp:unity

[Sebastien Bacher]

Restore archive change dropped by error, let g-s-d run in Unity sessions

Restore archive change dropped by error, let g-s-d run in Unity sessions

[Sebastien Bacher (seb128)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3662
http://jenkins.qa.ubuntu.com/job/unity-ci/640/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/176
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/174

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/640/rebuild

review: Approve (continuous-integration)

=== added file 'debian/gnome-settings-daemon.override'
--- debian/gnome-settings-daemon.override	1970-01-01 00:00:00 +0000
+++ debian/gnome-settings-daemon.override	2014-02-17 13:40:58 +0000
@@ -0,0 +1,13 @@
+start on started dbus and starting gnome-session
+
+pre-start script
+  # This is temporary override until unity-settings-daemon is in main
+  # and used by default in unity session
+
+  [ "$DESKTOP_SESSION" = "ubuntu" ] || { exit 0; }
+
+  if initctl status 2>/dev/null 1>/dev/null unity-settings-daemon ; then
+    stop ; exit 0
+  fi
+
+end script
 
=== modified file 'debian/libunity-core-6.0-9.install'
--- debian/libunity-core-6.0-9.install	2014-01-30 17:39:24 +0000
+++ debian/libunity-core-6.0-9.install	2014-02-17 13:40:58 +0000
@@ -8,3 +8,5 @@
 debian/source_unity.py usr/share/apport/package-hooks
 debian/unity7.conf usr/share/upstart/sessions
 tools/convert-files/* usr/lib/compiz/migration/
+# Temporary until unity-settings-daemon is in main
+debian/gnome-settings-daemon.override usr/share/upstart/sessions