Merge lp:~robert-ancell/indicator-session/unity-settings-daemon into lp:indicator-session/14.04

[Robert Ancell]

Only depend on gnome-settings-daemon-schemas so can work with unity-settings-daemon only

[Charles Kerr (charlesk)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:430
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/119/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-armhf-ci/15/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-session-ci/119/rebuild

review: Approve (continuous-integration)

[Dimitri John Ledkov (xnox)]

DONE * Ensure the project compiles and the test suite executes without error
DONE * Ensure that non-obvious code has comments explaining it
DONE * If the change works on specific profiles, please include those in the merge description. (no profile specific changes)

DONE * Did the Jenkins build compile? Pass? Run unit tests successfully?
DONE * Are there appropriate tests to cover any new functionality?

[Dimitri John Ledkov (xnox)]

DONE * Run tests indicator-session/unity7

[Dimitri John Ledkov (xnox)]

SKIP * Run tests indicator-session/unity8*
no phone profile / no session indicator as per test-case.

review: Approve

[Dimitri John Ledkov (xnox)]

Please land this branch into the archive.

[Robert Ancell (robert-ancell)]

Is Jenkins confused? This should have landed right?

[Sebastien Bacher (seb128)]

@Robert: no, landing doesn't happen that way anymore with CI train. A lander needs to list the vcs-es to land, the system gives you a ppa to test in return and only if you flag it as good the changes are uploaded and merged back in trunk...

I'm going to drive a landing request for that one today

=== modified file 'debian/control'
--- debian/control	2014-01-14 04:41:16 +0000
+++ debian/control	2014-02-07 16:55:56 +0000
@@ -24,7 +24,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          systemd-services,
-         gnome-settings-daemon,
+         gnome-settings-daemon-schemas,
 Recommends: indicator-applet (>= 0.2) | indicator-renderer,
             gnome-screensaver,
             yelp,