Compiz

Merge lp:~3v1n0/compiz/ctrl+alt+kp0-clash-fix-0.9.10 into lp:compiz/0.9.10

  1. ctrl+alt+kp0-clash-fix-0.9.10
  2. Merge into 0.9.10
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Christopher Townsend
Approved revision: 3797
Merged at revision: 3797
Proposed branch: lp:~3v1n0/compiz/ctrl+alt+kp0-clash-fix-0.9.10
Merge into: lp:compiz/0.9.10
Diff against target: 246 lines (+57/-52)
1 file modified
debian/patches/ubuntu-config.patch (+57/-52)
To merge this branch: bzr merge lp:~3v1n0/compiz/ctrl+alt+kp0-clash-fix-0.9.10
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Christopher Townsend Approve
Review via email: mp+189881@code.launchpad.net

Commit message

debian/patches/ubuntu-config.patch: Don't use Ctrl+Alt+KP_0 for grid maximize

Otherwise this clashes with default minimize key.

Description of the change

debian/patches/ubuntu-config.patch: Don't use Ctrl+Alt+KP_0 for grid maximize

Otherwise this clashes with default minimize key.

To post a comment you must log in.
Revision history for this message
Christopher Townsend (townsend) wrote :

+1

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

Subscribers

People subscribed via source and target branches