Compiz

Merge lp:~3v1n0/compiz/unity-wm-shortcuts-0.9.10 into lp:compiz/0.9.10

  1. unity-wm-shortcuts-0.9.10
  2. Merge into 0.9.10
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Christopher Townsend
Approved revision: 3789
Merged at revision: 3789
Proposed branch: lp:~3v1n0/compiz/unity-wm-shortcuts-0.9.10
Merge into: lp:compiz/0.9.10
Diff against target: 249 lines (+69/-60)
1 file modified
debian/patches/ubuntu-config.patch (+69/-60)
To merge this branch: bzr merge lp:~3v1n0/compiz/unity-wm-shortcuts-0.9.10
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+185823@code.launchpad.net

Commit message

debian/patches/ubuntu-config.patch: remove grid custom keybindings for window management

We handle these directly in unity

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

PASSED: Continuous integration, rev:3789
http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-i386-ci/12

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

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

PASSED: Continuous integration, rev:3789
http://jenkins.qa.ubuntu.com/job/compiz-0.9.10-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.10-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.10-saucy-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.10-saucy-i386-ci/2

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

review: Approve (continuous-integration)
lp:~3v1n0/compiz/unity-wm-shortcuts-0.9.10 updated
3789. By Marco Trevisan (Treviño)

debian/patches/ubuntu-config.patch: remove grid custom keybindings for window management

We handle these directly in unity

Revision history for this message
Christopher Townsend (townsend) wrote :

LGTM

review: Approve

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-09-09 14:08:50 +0000
3+++ debian/patches/ubuntu-config.patch 2013-09-16 16:03:41 +0000
4@@ -1,6 +1,8 @@
5 === modified file 'metadata/core.xml.in'
6---- a/metadata/core.xml.in
7-+++ b/metadata/core.xml.in
8+Index: compiz/metadata/core.xml.in
9+===================================================================
10+--- compiz.orig/metadata/core.xml.in 2013-09-16 18:01:32.553411336 +0200
11++++ compiz/metadata/core.xml.in 2013-09-16 18:01:32.537411397 +0200
12 @@ -139,7 +139,7 @@
13 <option name="focus_prevention_match" type="match">
14 <_short>Focus Prevention Windows</_short>
15@@ -63,8 +65,10 @@
16 <min>1</min>
17 <max>32</max>
18 </option>
19---- a/plugins/animation/animation.xml.in
20-+++ b/plugins/animation/animation.xml.in
21+Index: compiz/plugins/animation/animation.xml.in
22+===================================================================
23+--- compiz.orig/plugins/animation/animation.xml.in 2013-09-16 18:01:32.553411336 +0200
24++++ compiz/plugins/animation/animation.xml.in 2013-09-16 18:01:32.537411397 +0200
25 @@ -36,7 +36,7 @@
26 <extensible/>
27 <sort start="2"/>
28@@ -203,8 +207,10 @@
29 <min>0</min>
30 <max>1</max>
31 <precision>0.01</precision>
32---- a/plugins/decor/decor.xml.in
33-+++ b/plugins/decor/decor.xml.in
34+Index: compiz/plugins/decor/decor.xml.in
35+===================================================================
36+--- compiz.orig/plugins/decor/decor.xml.in 2013-09-16 18:01:32.553411336 +0200
37++++ compiz/plugins/decor/decor.xml.in 2013-09-16 18:01:32.537411397 +0200
38 @@ -31,7 +31,7 @@
39 <option name="active_shadow_opacity" type="float">
40 <_short>Shadow Opacity</_short>
41@@ -241,8 +247,10 @@
42 </option>
43 <option name="mipmap" type="bool">
44 <_short>Mipmap</_short>
45---- a/plugins/fade/fade.xml.in
46-+++ b/plugins/fade/fade.xml.in
47+Index: compiz/plugins/fade/fade.xml.in
48+===================================================================
49+--- compiz.orig/plugins/fade/fade.xml.in 2013-09-16 18:01:32.553411336 +0200
50++++ compiz/plugins/fade/fade.xml.in 2013-09-16 18:01:32.541411382 +0200
51 @@ -10,6 +10,7 @@
52 </requirement>
53 <relation type="after">
54@@ -260,8 +268,10 @@
55 </option>
56 <option name="visual_bell" type="bell">
57 <_short>Visual Bell</_short>
58---- a/plugins/gnomecompat/gnomecompat.xml.in
59-+++ b/plugins/gnomecompat/gnomecompat.xml.in
60+Index: compiz/plugins/gnomecompat/gnomecompat.xml.in
61+===================================================================
62+--- compiz.orig/plugins/gnomecompat/gnomecompat.xml.in 2013-09-16 18:01:32.553411336 +0200
63++++ compiz/plugins/gnomecompat/gnomecompat.xml.in 2013-09-16 18:01:32.541411382 +0200
64 @@ -53,6 +53,7 @@
65 <option name="run_command_terminal_key" type="key">
66 <_short>Open a terminal</_short>
67@@ -270,8 +280,10 @@
68 </option>
69 </group>
70 </options>
71---- a/plugins/place/place.xml.in
72-+++ b/plugins/place/place.xml.in
73+Index: compiz/plugins/place/place.xml.in
74+===================================================================
75+--- compiz.orig/plugins/place/place.xml.in 2013-09-16 18:01:32.553411336 +0200
76++++ compiz/plugins/place/place.xml.in 2013-09-16 18:01:32.541411382 +0200
77 @@ -20,8 +20,8 @@
78 <option name="mode" type="int">
79 <_short>Placement Mode</_short>
80@@ -283,8 +295,10 @@
81 <max>5</max>
82 <desc>
83 <value>0</value>
84---- a/plugins/resize/resize.xml.in
85-+++ b/plugins/resize/resize.xml.in
86+Index: compiz/plugins/resize/resize.xml.in
87+===================================================================
88+--- compiz.orig/plugins/resize/resize.xml.in 2013-09-16 18:01:32.553411336 +0200
89++++ compiz/plugins/resize/resize.xml.in 2013-09-16 18:01:32.541411382 +0200
90 @@ -28,7 +28,7 @@
91 <option name="mode" type="int">
92 <_short>Default Resize Mode</_short>
93@@ -329,8 +343,10 @@
94 </default>
95 </option>
96 <subgroup>
97---- a/plugins/scale/scale.xml.in
98-+++ b/plugins/scale/scale.xml.in
99+Index: compiz/plugins/scale/scale.xml.in
100+===================================================================
101+--- compiz.orig/plugins/scale/scale.xml.in 2013-09-16 18:01:32.553411336 +0200
102++++ compiz/plugins/scale/scale.xml.in 2013-09-16 18:01:32.541411382 +0200
103 @@ -19,14 +19,14 @@
104 <option name="spacing" type="int">
105 <_short>Spacing</_short>
106@@ -419,8 +435,10 @@
107 </option>
108 </group>
109 </options>
110---- a/plugins/staticswitcher/staticswitcher.xml.in
111-+++ b/plugins/staticswitcher/staticswitcher.xml.in
112+Index: compiz/plugins/staticswitcher/staticswitcher.xml.in
113+===================================================================
114+--- compiz.orig/plugins/staticswitcher/staticswitcher.xml.in 2013-09-16 18:01:32.553411336 +0200
115++++ compiz/plugins/staticswitcher/staticswitcher.xml.in 2013-09-16 18:01:32.541411382 +0200
116 @@ -11,7 +11,6 @@
117 <relation type="after">
118 <plugin>composite</plugin>
119@@ -497,8 +515,10 @@
120 <desc>
121 <value>0</value>
122 <_name>None</_name>
123---- a/plugins/vpswitch/vpswitch.xml.in
124-+++ b/plugins/vpswitch/vpswitch.xml.in
125+Index: compiz/plugins/vpswitch/vpswitch.xml.in
126+===================================================================
127+--- compiz.orig/plugins/vpswitch/vpswitch.xml.in 2013-09-16 18:01:32.553411336 +0200
128++++ compiz/plugins/vpswitch/vpswitch.xml.in 2013-09-16 18:01:32.541411382 +0200
129 @@ -95,13 +95,11 @@
130 <option name="next_button" type="button">
131 <_short>Move Next</_short>
132@@ -513,8 +533,10 @@
133 <internal/>
134 </option>
135 <option name="initiate_button" type="button">
136---- a/plugins/wall/wall.xml.in
137-+++ b/plugins/wall/wall.xml.in
138+Index: compiz/plugins/wall/wall.xml.in
139+===================================================================
140+--- compiz.orig/plugins/wall/wall.xml.in 2013-09-16 18:01:32.553411336 +0200
141++++ compiz/plugins/wall/wall.xml.in 2013-09-16 18:01:32.541411382 +0200
142 @@ -30,12 +30,12 @@
143 <option name="miniscreen" type="bool">
144 <_short>Show Live Viewport Previews</_short>
145@@ -671,8 +693,10 @@
146 </option>
147 <option name="edgeflip_dnd" type="bool">
148 <_short>Edge Flip DnD</_short>
149---- a/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
150-+++ b/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
151+Index: compiz/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
152+===================================================================
153+--- compiz.orig/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2013-09-16 18:01:32.553411336 +0200
154++++ compiz/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2013-09-16 18:01:32.541411382 +0200
155 @@ -46,7 +46,7 @@
156
157 namespace
158@@ -682,34 +706,11 @@
159 unsigned int DEFAULT_VIEWPORT_HEIGHT = 1;
160
161 bool Advance (Display *d, bool r)
162---- a/plugins/grid/grid.xml.in
163-+++ b/plugins/grid/grid.xml.in
164-@@ -23,17 +23,16 @@
165- <option name="put_center_key" type="key">
166- <_short>Put Center Key</_short>
167- <_long>Move window to the center.</_long>
168-- <default>&lt;Control&gt;&lt;Alt&gt;KP_5</default>
169- </option>
170- <option name="put_left_key" type="key">
171- <_short>Put Left Key</_short>
172- <_long>Move window to the left edge.</_long>
173-- <default>&lt;Control&gt;&lt;Alt&gt;KP_4</default>
174-+ <default>&lt;Control&gt;&lt;Super&gt;Left</default>
175- </option>
176- <option name="put_right_key" type="key">
177- <_short>Put Right Key</_short>
178- <_long>Move window to the right edge.</_long>
179-- <default>&lt;Control&gt;&lt;Alt&gt;KP_6</default>
180-+ <default>&lt;Control&gt;&lt;Super&gt;Right</default>
181- </option>
182- <option name="put_top_key" type="key">
183- <_short>Put Top Key</_short>
184-@@ -68,12 +67,11 @@
185- <option name="put_maximize_key" type="key">
186- <_short>Maximize Key</_short>
187- <_long>Maximize window.</_long>
188-- <default>&lt;Control&gt;&lt;Alt&gt;KP_0</default>
189- </option>
190+Index: compiz/plugins/grid/grid.xml.in
191+===================================================================
192+--- compiz.orig/plugins/grid/grid.xml.in 2013-09-16 18:01:32.553411336 +0200
193++++ compiz/plugins/grid/grid.xml.in 2013-09-16 18:01:49.693346061 +0200
194+@@ -73,7 +73,7 @@
195 <option name="put_restore_key" type="key">
196 <_short>Restore</_short>
197 <_long>Restore window to it's original size. Note: Use the same shortcut you are using to unmaximize a window to be able to restore grid-maximized windows.</_long>
198@@ -718,8 +719,10 @@
199 </option>
200 </group>
201 <group>
202---- a/plugins/ezoom/ezoom.xml.in
203-+++ b/plugins/ezoom/ezoom.xml.in
204+Index: compiz/plugins/ezoom/ezoom.xml.in
205+===================================================================
206+--- compiz.orig/plugins/ezoom/ezoom.xml.in 2013-09-16 18:01:32.553411336 +0200
207++++ compiz/plugins/ezoom/ezoom.xml.in 2013-09-16 18:01:32.545411366 +0200
208 @@ -30,7 +30,7 @@
209 <option type="button" name="zoom_in_button">
210 <_short>Zoom In Button</_short>
211@@ -756,8 +759,10 @@
212 </option>
213 </subgroup>
214 </group>
215---- a/plugins/expo/expo.xml.in
216-+++ b/plugins/expo/expo.xml.in
217+Index: compiz/plugins/expo/expo.xml.in
218+===================================================================
219+--- compiz.orig/plugins/expo/expo.xml.in 2013-09-16 18:01:32.553411336 +0200
220++++ compiz/plugins/expo/expo.xml.in 2013-09-16 18:01:32.545411366 +0200
221 @@ -17,6 +17,7 @@
222 <plugin>wobbly</plugin>
223 <plugin>animation</plugin>
224@@ -852,8 +857,10 @@
225 </option>
226 <option name="ground_color1" type="color">
227 <_short>Ground Color (near)</_short>
228---- a/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
229-+++ b/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
230+Index: compiz/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
231+===================================================================
232+--- compiz.orig/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2013-09-16 18:01:32.553411336 +0200
233++++ compiz/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2013-09-16 18:01:32.545411366 +0200
234 @@ -10,6 +10,9 @@
235 <key type="s" name="command-screenshot">
236 <default>"gnome-screenshot"</default>
237@@ -874,8 +881,10 @@
238 <key type="s" name="command-12">
239 <default>""</default>
240 </key>
241---- a/plugins/commands/commands.xml.in
242-+++ b/plugins/commands/commands.xml.in
243+Index: compiz/plugins/commands/commands.xml.in
244+===================================================================
245+--- compiz.orig/plugins/commands/commands.xml.in 2013-09-16 18:01:32.553411336 +0200
246++++ compiz/plugins/commands/commands.xml.in 2013-09-16 18:01:32.545411366 +0200
247 @@ -117,7 +117,7 @@
248 <option name="command20" type="string">
249 <_short>Command line 20</_short>

Subscribers

People subscribed via source and target branches