Merge lp:~seb128/compiz/install-ucc-keybindings into lp:compiz/0.9.11

[Sebastien Bacher]

debian/compiz-gnome.links: lists keybinding in unity-control-center

debian/compiz-gnome.links: lists keybinding in unity-control-center

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

+1

review: Approve

[lp:~seb128/compiz/install-ucc-keybindings]

3819. By Sebastien Bacher on 2014-02-03

debian/compiz-gnome.links: lists keybinding in unity-control-center.

Approved by Christopher Townsend, PS Jenkins bot.

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-13 16:05:23 +0000
+++ debian/changelog	2014-02-03 18:19:36 +0000
@@ -8,6 +8,9 @@
     to avoid to load the decor plugin on compiz startup when using unity.
   * debian/compiz-gnome.gconf-defaults: disable decor plugin on unity session
 
+  [ Sebastien Bacher ]
+  * debian/compiz-gnome.links: lists keybinding in unity-control-center
+
  -- Timo Jyrinki <[e-mail]>  Wed, 23 Oct 2013 08:17:03 +0300
 
 compiz (1:0.9.10+13.10.20131011-0ubuntu1) saucy; urgency=low
 
=== added file 'debian/compiz-gnome.links'
--- debian/compiz-gnome.links	1970-01-01 00:00:00 +0000
+++ debian/compiz-gnome.links	2014-02-03 18:19:36 +0000
@@ -0,0 +1,3 @@
+usr/share/gnome-control-center/keybindings/50-compiz-navigation.xml usr/share/unity-control-center/keybindings/50-compiz-navigation.xml
+usr/share/gnome-control-center/keybindings/50-compiz-windows.xml usr/share/unity-control-center/keybindings/50-compiz-navigation.xml
+