Merge lp:~azzar1/compiz/disable-show-desktop-key into lp:compiz/0.9.10

[Andrea Azzarone]

Disable show_desktop_key by default on ubuntu. Will provide the same option under the unityshell panel.

Disable show desktop key by default on ubuntu. Will provide the same option under the unity panel.

[Sam Spilsbury (smspillaz)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~andyrock/compiz/disable-show-desktop-key/+merge/176552/+edit-commit-message

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3778
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~andyrock/compiz/disable-show-desktop-key/+merge/176552/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-amd64-ci/3
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-armhf-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-team-compiz-0.9.10-ci/3/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-autolanding/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-amd64-autolanding/2
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-armhf-autolanding/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-i386-autolanding/2
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/1082/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

I missed removal of the coverage collection for armhf. Re-approving?

[Francis Ginther (fginther)]

Re-approving!

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/patches/ubuntu-config.patch'
--- debian/patches/ubuntu-config.patch	2013-06-26 08:19:21 +0000
+++ debian/patches/ubuntu-config.patch	2013-07-23 23:36:27 +0000
@@ -38,16 +38,15 @@
  			</option>
  			<option name="maximize_window_horizontally_key" type="key">
  			<_short>Maximize Window Horizontally</_short>
-@@ -215,7 +215,7 @@
+@@ -215,7 +215,6 @@
  			<option name="show_desktop_key" type="key">
  			<_short>Show Desktop</_short>
  			<_long>Hide all windows and focus desktop</_long>
 -			<default>&lt;Control&gt;&lt;Alt&gt;d</default>
-+			<default>&lt;Control&gt;&lt;Super&gt;d</default>
  			</option>
  			<option name="show_desktop_edge" type="edge">
  			<_short>Show Desktop</_short>
-@@ -225,6 +225,7 @@
+@@ -225,6 +224,7 @@
  			<option name="toggle_window_maximized_key" type="key">
  			<_short>Toggle Window Maximized</_short>
  			<_long>Toggle active window maximized</_long>
@@ -55,7 +54,7 @@
  			</option>
  			<option name="toggle_window_maximized_button" type="button">
  			<_short>Toggle Window Maximized</_short>
-@@ -249,7 +250,7 @@
+@@ -249,7 +249,7 @@
  			<option name="hsize" type="int">
  			<_short>Horizontal Virtual Size</_short>
  			<_long>Screen size multiplier for horizontal virtual size</_long>