Compiz

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

  1. disable-show-desktop-key-0.9.9
  2. Merge into 0.9.9
Proposed by Andrea Azzarone
Status: Merged
Approved by: Brandon Schaefer
Approved revision: 3660
Merged at revision: 3660
Proposed branch: lp:~azzar1/compiz/disable-show-desktop-key-0.9.9
Merge into: lp:compiz/0.9.9
Diff against target: 135 lines (+3/-17)
1 file modified
debian/patches/ubuntu-config.patch (+3/-17)
To merge this branch: bzr merge lp:~azzar1/compiz/disable-show-desktop-key-0.9.9
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Brandon Schaefer (community) Approve
Review via email: mp+177043@code.launchpad.net

Commit message

Disable show desktop key by default on ubuntu.

Description of the change

Disable show desktop key by default on ubuntu.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3660
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-0.9.9/+merge/177043/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-ci/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-raring-amd64-ci/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-raring-armhf-ci/7
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-raring-i386-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/305/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-0.9.9-ci/5/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

The jenkins build configuration on this job was wrong, I'm working to fix it and re-running the ci job.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3660
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-0.9.9/+merge/177043/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-ci/6/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-raring-amd64-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-raring-i386-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/306/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-0.9.9-ci/6/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3660
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-0.9.9/+merge/177043/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-ci/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-raring-amd64-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-raring-i386-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/307/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-0.9.9-ci/7/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3660
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-0.9.9/+merge/177043/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-raring-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-raring-armhf-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.9-raring-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-0.9.9-ci/8/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/patches/ubuntu-config.patch'
--- debian/patches/ubuntu-config.patch 2013-02-14 05:47:11 +0000
+++ debian/patches/ubuntu-config.patch 2013-07-25 21:06:22 +0000
@@ -38,16 +38,15 @@
38 </option>38 </option>
39 <option name="maximize_window_horizontally_key" type="key">39 <option name="maximize_window_horizontally_key" type="key">
40 <_short>Maximize Window Horizontally</_short>40 <_short>Maximize Window Horizontally</_short>
41@@ -215,7 +215,7 @@41@@ -215,7 +215,6 @@
42 <option name="show_desktop_key" type="key">42 <option name="show_desktop_key" type="key">
43 <_short>Show Desktop</_short>43 <_short>Show Desktop</_short>
44 <_long>Hide all windows and focus desktop</_long>44 <_long>Hide all windows and focus desktop</_long>
45- <default>&lt;Control&gt;&lt;Alt&gt;d</default>45- <default>&lt;Control&gt;&lt;Alt&gt;d</default>
46+ <default>&lt;Control&gt;&lt;Super&gt;d</default>
47 </option>46 </option>
48 <option name="show_desktop_edge" type="edge">47 <option name="show_desktop_edge" type="edge">
49 <_short>Show Desktop</_short>48 <_short>Show Desktop</_short>
50@@ -225,6 +225,7 @@49@@ -225,6 +224,7 @@
51 <option name="toggle_window_maximized_key" type="key">50 <option name="toggle_window_maximized_key" type="key">
52 <_short>Toggle Window Maximized</_short>51 <_short>Toggle Window Maximized</_short>
53 <_long>Toggle active window maximized</_long>52 <_long>Toggle active window maximized</_long>
@@ -55,7 +54,7 @@
55 </option>54 </option>
56 <option name="toggle_window_maximized_button" type="button">55 <option name="toggle_window_maximized_button" type="button">
57 <_short>Toggle Window Maximized</_short>56 <_short>Toggle Window Maximized</_short>
58@@ -249,7 +250,7 @@57@@ -249,7 +249,7 @@
59 <option name="hsize" type="int">58 <option name="hsize" type="int">
60 <_short>Horizontal Virtual Size</_short>59 <_short>Horizontal Virtual Size</_short>
61 <_long>Screen size multiplier for horizontal virtual size</_long>60 <_long>Screen size multiplier for horizontal virtual size</_long>
@@ -204,7 +203,6 @@
204 <min>0</min>203 <min>0</min>
205 <max>1</max>204 <max>1</max>
206 <precision>0.01</precision>205 <precision>0.01</precision>
207
208--- a/plugins/decor/decor.xml.in206--- a/plugins/decor/decor.xml.in
209+++ b/plugins/decor/decor.xml.in207+++ b/plugins/decor/decor.xml.in
210@@ -31,7 +31,7 @@208@@ -31,7 +31,7 @@
@@ -243,7 +241,6 @@
243 </option>241 </option>
244 <option name="mipmap" type="bool">242 <option name="mipmap" type="bool">
245 <_short>Mipmap</_short>243 <_short>Mipmap</_short>
246
247--- a/plugins/expo/expo.xml.in244--- a/plugins/expo/expo.xml.in
248+++ b/plugins/expo/expo.xml.in245+++ b/plugins/expo/expo.xml.in
249@@ -17,6 +17,7 @@246@@ -17,6 +17,7 @@
@@ -357,7 +354,6 @@
357 <min>0.0</min>354 <min>0.0</min>
358 <max>2.0</max>355 <max>2.0</max>
359 <precision>0.01</precision>356 <precision>0.01</precision>
360
361--- a/plugins/ezoom/ezoom.xml.in357--- a/plugins/ezoom/ezoom.xml.in
362+++ b/plugins/ezoom/ezoom.xml.in358+++ b/plugins/ezoom/ezoom.xml.in
363@@ -29,7 +29,6 @@359@@ -29,7 +29,6 @@
@@ -393,7 +389,6 @@
393 </option>389 </option>
394 </subgroup>390 </subgroup>
395 </group>391 </group>
396
397--- a/plugins/fade/fade.xml.in392--- a/plugins/fade/fade.xml.in
398+++ b/plugins/fade/fade.xml.in393+++ b/plugins/fade/fade.xml.in
399@@ -10,6 +10,7 @@394@@ -10,6 +10,7 @@
@@ -413,7 +408,6 @@
413 </option>408 </option>
414 <option name="visual_bell" type="bell">409 <option name="visual_bell" type="bell">
415 <_short>Visual Bell</_short>410 <_short>Visual Bell</_short>
416
417--- a/plugins/gnomecompat/gnomecompat.xml.in411--- a/plugins/gnomecompat/gnomecompat.xml.in
418+++ b/plugins/gnomecompat/gnomecompat.xml.in412+++ b/plugins/gnomecompat/gnomecompat.xml.in
419@@ -53,6 +53,7 @@413@@ -53,6 +53,7 @@
@@ -424,7 +418,6 @@
424 </option>418 </option>
425 </group>419 </group>
426 </options>420 </options>
427
428--- a/plugins/grid/grid.xml.in421--- a/plugins/grid/grid.xml.in
429+++ b/plugins/grid/grid.xml.in422+++ b/plugins/grid/grid.xml.in
430@@ -23,17 +23,16 @@423@@ -23,17 +23,16 @@
@@ -455,7 +448,6 @@
455 </option>448 </option>
456 <option name="put_restore_key" type="key">449 <option name="put_restore_key" type="key">
457 <_short>Restore</_short>450 <_short>Restore</_short>
458
459--- a/plugins/place/place.xml.in451--- a/plugins/place/place.xml.in
460+++ b/plugins/place/place.xml.in452+++ b/plugins/place/place.xml.in
461@@ -20,8 +20,8 @@453@@ -20,8 +20,8 @@
@@ -469,7 +461,6 @@
469 <max>5</max>461 <max>5</max>
470 <desc>462 <desc>
471 <value>0</value>463 <value>0</value>
472
473--- a/plugins/resize/resize.xml.in464--- a/plugins/resize/resize.xml.in
474+++ b/plugins/resize/resize.xml.in465+++ b/plugins/resize/resize.xml.in
475@@ -28,7 +28,7 @@466@@ -28,7 +28,7 @@
@@ -516,7 +507,6 @@
516 </default>507 </default>
517 </option>508 </option>
518 <subgroup>509 <subgroup>
519
520--- a/plugins/scale/scale.xml.in510--- a/plugins/scale/scale.xml.in
521+++ b/plugins/scale/scale.xml.in511+++ b/plugins/scale/scale.xml.in
522@@ -19,14 +19,14 @@512@@ -19,14 +19,14 @@
@@ -607,7 +597,6 @@
607 </option>597 </option>
608 </group>598 </group>
609 </options>599 </options>
610
611--- a/plugins/staticswitcher/staticswitcher.xml.in600--- a/plugins/staticswitcher/staticswitcher.xml.in
612+++ b/plugins/staticswitcher/staticswitcher.xml.in601+++ b/plugins/staticswitcher/staticswitcher.xml.in
613@@ -11,7 +11,6 @@602@@ -11,7 +11,6 @@
@@ -686,7 +675,6 @@
686 <desc>675 <desc>
687 <value>0</value>676 <value>0</value>
688 <_name>None</_name>677 <_name>None</_name>
689
690--- a/plugins/vpswitch/vpswitch.xml.in678--- a/plugins/vpswitch/vpswitch.xml.in
691+++ b/plugins/vpswitch/vpswitch.xml.in679+++ b/plugins/vpswitch/vpswitch.xml.in
692@@ -95,13 +95,11 @@680@@ -95,13 +95,11 @@
@@ -703,7 +691,6 @@
703 <internal/>691 <internal/>
704 </option>692 </option>
705 <option name="initiate_button" type="button">693 <option name="initiate_button" type="button">
706
707--- a/plugins/wall/wall.xml.in694--- a/plugins/wall/wall.xml.in
708+++ b/plugins/wall/wall.xml.in695+++ b/plugins/wall/wall.xml.in
709@@ -31,12 +31,12 @@696@@ -31,12 +31,12 @@
@@ -853,7 +840,6 @@
853 </option>840 </option>
854 <option name="edgeflip_dnd" type="bool">841 <option name="edgeflip_dnd" type="bool">
855 <_short>Edge Flip DnD</_short>842 <_short>Edge Flip DnD</_short>
856
857--- a/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp843--- a/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
858+++ b/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp844+++ b/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
859@@ -46,7 +46,7 @@845@@ -46,7 +46,7 @@

Subscribers

People subscribed via source and target branches