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

Proposed by Andrea Azzarone on 2013-07-25
Status: Merged
Approved by: Brandon Schaefer on 2013-07-26
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 on 2013-07-26
Brandon Schaefer (community) 2013-07-25 Approve on 2013-07-26
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.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
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.

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)
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)
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)
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/ubuntu-config.patch'
2--- debian/patches/ubuntu-config.patch 2013-02-14 05:47:11 +0000
3+++ debian/patches/ubuntu-config.patch 2013-07-25 21:06:22 +0000
4@@ -38,16 +38,15 @@
5 </option>
6 <option name="maximize_window_horizontally_key" type="key">
7 <_short>Maximize Window Horizontally</_short>
8-@@ -215,7 +215,7 @@
9+@@ -215,7 +215,6 @@
10 <option name="show_desktop_key" type="key">
11 <_short>Show Desktop</_short>
12 <_long>Hide all windows and focus desktop</_long>
13 - <default>&lt;Control&gt;&lt;Alt&gt;d</default>
14-+ <default>&lt;Control&gt;&lt;Super&gt;d</default>
15 </option>
16 <option name="show_desktop_edge" type="edge">
17 <_short>Show Desktop</_short>
18-@@ -225,6 +225,7 @@
19+@@ -225,6 +224,7 @@
20 <option name="toggle_window_maximized_key" type="key">
21 <_short>Toggle Window Maximized</_short>
22 <_long>Toggle active window maximized</_long>
23@@ -55,7 +54,7 @@
24 </option>
25 <option name="toggle_window_maximized_button" type="button">
26 <_short>Toggle Window Maximized</_short>
27-@@ -249,7 +250,7 @@
28+@@ -249,7 +249,7 @@
29 <option name="hsize" type="int">
30 <_short>Horizontal Virtual Size</_short>
31 <_long>Screen size multiplier for horizontal virtual size</_long>
32@@ -204,7 +203,6 @@
33 <min>0</min>
34 <max>1</max>
35 <precision>0.01</precision>
36-
37 --- a/plugins/decor/decor.xml.in
38 +++ b/plugins/decor/decor.xml.in
39 @@ -31,7 +31,7 @@
40@@ -243,7 +241,6 @@
41 </option>
42 <option name="mipmap" type="bool">
43 <_short>Mipmap</_short>
44-
45 --- a/plugins/expo/expo.xml.in
46 +++ b/plugins/expo/expo.xml.in
47 @@ -17,6 +17,7 @@
48@@ -357,7 +354,6 @@
49 <min>0.0</min>
50 <max>2.0</max>
51 <precision>0.01</precision>
52-
53 --- a/plugins/ezoom/ezoom.xml.in
54 +++ b/plugins/ezoom/ezoom.xml.in
55 @@ -29,7 +29,6 @@
56@@ -393,7 +389,6 @@
57 </option>
58 </subgroup>
59 </group>
60-
61 --- a/plugins/fade/fade.xml.in
62 +++ b/plugins/fade/fade.xml.in
63 @@ -10,6 +10,7 @@
64@@ -413,7 +408,6 @@
65 </option>
66 <option name="visual_bell" type="bell">
67 <_short>Visual Bell</_short>
68-
69 --- a/plugins/gnomecompat/gnomecompat.xml.in
70 +++ b/plugins/gnomecompat/gnomecompat.xml.in
71 @@ -53,6 +53,7 @@
72@@ -424,7 +418,6 @@
73 </option>
74 </group>
75 </options>
76-
77 --- a/plugins/grid/grid.xml.in
78 +++ b/plugins/grid/grid.xml.in
79 @@ -23,17 +23,16 @@
80@@ -455,7 +448,6 @@
81 </option>
82 <option name="put_restore_key" type="key">
83 <_short>Restore</_short>
84-
85 --- a/plugins/place/place.xml.in
86 +++ b/plugins/place/place.xml.in
87 @@ -20,8 +20,8 @@
88@@ -469,7 +461,6 @@
89 <max>5</max>
90 <desc>
91 <value>0</value>
92-
93 --- a/plugins/resize/resize.xml.in
94 +++ b/plugins/resize/resize.xml.in
95 @@ -28,7 +28,7 @@
96@@ -516,7 +507,6 @@
97 </default>
98 </option>
99 <subgroup>
100-
101 --- a/plugins/scale/scale.xml.in
102 +++ b/plugins/scale/scale.xml.in
103 @@ -19,14 +19,14 @@
104@@ -607,7 +597,6 @@
105 </option>
106 </group>
107 </options>
108-
109 --- a/plugins/staticswitcher/staticswitcher.xml.in
110 +++ b/plugins/staticswitcher/staticswitcher.xml.in
111 @@ -11,7 +11,6 @@
112@@ -686,7 +675,6 @@
113 <desc>
114 <value>0</value>
115 <_name>None</_name>
116-
117 --- a/plugins/vpswitch/vpswitch.xml.in
118 +++ b/plugins/vpswitch/vpswitch.xml.in
119 @@ -95,13 +95,11 @@
120@@ -703,7 +691,6 @@
121 <internal/>
122 </option>
123 <option name="initiate_button" type="button">
124-
125 --- a/plugins/wall/wall.xml.in
126 +++ b/plugins/wall/wall.xml.in
127 @@ -31,12 +31,12 @@
128@@ -853,7 +840,6 @@
129 </option>
130 <option name="edgeflip_dnd" type="bool">
131 <_short>Edge Flip DnD</_short>
132-
133 --- a/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
134 +++ b/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
135 @@ -46,7 +46,7 @@

Subscribers

People subscribed via source and target branches