Merge lp:~robert-ancell/compiz/unity-control-center into lp:compiz/0.9.11

[Robert Ancell]

Depend on gnome-settings-daemon-schemas so can work with unity-settings-daemon

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3825
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/32

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/32/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

OK

review: Approve

[lp:~robert-ancell/compiz/unity-control-center]

3826. By Robert Ancell on 2014-02-17

Merge with trunk and remove debian/changelog entry

=== modified file 'debian/control'
--- debian/control	2013-08-19 16:32:52 +0000
+++ debian/control	2014-02-17 21:43:17 +0000
@@ -143,7 +143,7 @@
          ${misc:Depends},
          compiz-plugins-default (= ${binary:Version}),
          gsettings-desktop-schemas,
-         gnome-settings-daemon (>= 3.4.2-0ubuntu9),
+         gnome-settings-daemon-schemas (>= 3.4.2-0ubuntu9),
 Recommends: python-gconf,
             gnome-system-monitor,
 Replaces: compiz-plugins-main (<= 1:0.9.8),