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

(bzr r3661.1.1)

2 files changed, 15 insertions, 0 deletions

diff --git a/debian/gnome-settings-daemon.override b/debian/gnome-settings-daemon.override
new file mode 100644
index 000000000..d81a6011f
--- /dev/null
+++ b/debian/gnome-settings-daemon.override
@@ -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
diff --git a/debian/libunity-core-6.0-9.install b/debian/libunity-core-6.0-9.install
index 9c69159d3..f780d636f 100644
--- a/debian/libunity-core-6.0-9.install
+++ b/debian/libunity-core-6.0-9.install
@@ -8,3 +8,5 @@ debian/unity-crashdb.conf etc/apport/crashdb.conf.d/
 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