Compiz

Merge lp:~mc-return/compiz/compiz.merge-fix966099-refresh-quilt-patch.0 into lp:compiz/0.9.9

  1. compiz.merge-fix966099-refresh-quilt-patch.0
  2. Merge into 0.9.9
Proposed by MC Return
Status: Merged
Approved by: Michael Terry
Approved revision: 3593
Merged at revision: 3594
Proposed branch: lp:~mc-return/compiz/compiz.merge-fix966099-refresh-quilt-patch.0
Merge into: lp:compiz/0.9.9
Diff against target: 227 lines (+36/-60)
1 file modified
debian/patches/ubuntu-config.patch (+36/-60)
To merge this branch: bzr merge lp:~mc-return/compiz/compiz.merge-fix966099-refresh-quilt-patch.0
Reviewer Review Type Date Requested Status
Michael Terry Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+146203@code.launchpad.net

Commit message

quilt ubuntu-config.patch refresh:
The unmaximize_or_minimize_window_key replaces the unmaximize_window_key, so
Ctrl+Super+Down is now the shortcut for the unmaximize_or_minimize_window_key.

(LP: #966099)

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Sure, looks reasonable.

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-01-14 04:13:14 +0000
3+++ debian/patches/ubuntu-config.patch 2013-02-01 19:09:18 +0000
4@@ -1,8 +1,6 @@
5 === modified file 'metadata/core.xml.in'
6-Index: compiz-one-ws/metadata/core.xml.in
7-===================================================================
8---- compiz-one-ws.orig/metadata/core.xml.in 2013-01-13 20:09:29.517213134 -0800
9-+++ compiz-one-ws/metadata/core.xml.in 2013-01-13 20:09:51.461213761 -0800
10+--- a/metadata/core.xml.in
11++++ b/metadata/core.xml.in
12 @@ -139,7 +139,7 @@
13 <option name="focus_prevention_match" type="match">
14 <_short>Focus Prevention Windows</_short>
15@@ -21,7 +19,7 @@
16 </option>
17 <option name="minimize_window_button" type="button">
18 <_short>Minimize Window</_short>
19-@@ -183,12 +183,12 @@
20+@@ -183,16 +183,16 @@
21 <option name="maximize_window_key" type="key">
22 <_short>Maximize Window</_short>
23 <_long>Maximize active window</_long>
24@@ -32,11 +30,15 @@
25 <_short>Unmaximize Window</_short>
26 <_long>Unmaximize active window</_long>
27 - <default>&lt;Alt&gt;F5</default>
28+ </option>
29+ <option name="unmaximize_or_minimize_window_key" type="key">
30+ <_short>Unmaximize or Minimize Window</_short>
31+ <_long>Unmaximize or minimize active window</_long>
32 + <default>&lt;Control&gt;&lt;Super&gt;Down</default>
33 </option>
34 <option name="maximize_window_horizontally_key" type="key">
35 <_short>Maximize Window Horizontally</_short>
36-@@ -211,7 +211,7 @@
37+@@ -215,7 +215,7 @@
38 <option name="show_desktop_key" type="key">
39 <_short>Show Desktop</_short>
40 <_long>Hide all windows and focus desktop</_long>
41@@ -45,7 +47,7 @@
42 </option>
43 <option name="show_desktop_edge" type="edge">
44 <_short>Show Desktop</_short>
45-@@ -221,6 +221,7 @@
46+@@ -225,6 +225,7 @@
47 <option name="toggle_window_maximized_key" type="key">
48 <_short>Toggle Window Maximized</_short>
49 <_long>Toggle active window maximized</_long>
50@@ -53,7 +55,7 @@
51 </option>
52 <option name="toggle_window_maximized_button" type="button">
53 <_short>Toggle Window Maximized</_short>
54-@@ -245,7 +246,7 @@
55+@@ -249,7 +250,7 @@
56 <option name="hsize" type="int">
57 <_short>Horizontal Virtual Size</_short>
58 <_long>Screen size multiplier for horizontal virtual size</_long>
59@@ -62,10 +64,8 @@
60 <min>1</min>
61 <max>32</max>
62 </option>
63-Index: compiz-one-ws/plugins/animation/animation.xml.in
64-===================================================================
65---- compiz-one-ws.orig/plugins/animation/animation.xml.in 2013-01-13 20:09:29.517213134 -0800
66-+++ compiz-one-ws/plugins/animation/animation.xml.in 2013-01-13 20:09:29.501213133 -0800
67+--- a/plugins/animation/animation.xml.in
68++++ b/plugins/animation/animation.xml.in
69 @@ -36,7 +36,7 @@
70 <extensible/>
71 <sort start="2"/>
72@@ -204,10 +204,8 @@
73 <min>0</min>
74 <max>1</max>
75 <precision>0.01</precision>
76-Index: compiz-one-ws/plugins/decor/decor.xml.in
77-===================================================================
78---- compiz-one-ws.orig/plugins/decor/decor.xml.in 2013-01-13 20:09:29.517213134 -0800
79-+++ compiz-one-ws/plugins/decor/decor.xml.in 2013-01-13 20:09:29.501213133 -0800
80+--- a/plugins/decor/decor.xml.in
81++++ b/plugins/decor/decor.xml.in
82 @@ -31,7 +31,7 @@
83 <option name="active_shadow_opacity" type="float">
84 <_short>Shadow Opacity</_short>
85@@ -244,10 +242,8 @@
86 </option>
87 <option name="mipmap" type="bool">
88 <_short>Mipmap</_short>
89-Index: compiz-one-ws/plugins/expo/expo.xml.in
90-===================================================================
91---- compiz-one-ws.orig/plugins/expo/expo.xml.in 2013-01-13 20:09:29.517213134 -0800
92-+++ compiz-one-ws/plugins/expo/expo.xml.in 2013-01-13 20:09:29.501213133 -0800
93+--- a/plugins/expo/expo.xml.in
94++++ b/plugins/expo/expo.xml.in
95 @@ -17,6 +17,7 @@
96 <plugin>wobbly</plugin>
97 <plugin>animation</plugin>
98@@ -359,10 +355,8 @@
99 <min>0.0</min>
100 <max>2.0</max>
101 <precision>0.01</precision>
102-Index: compiz-one-ws/plugins/ezoom/ezoom.xml.in
103-===================================================================
104---- compiz-one-ws.orig/plugins/ezoom/ezoom.xml.in 2013-01-13 20:09:29.517213134 -0800
105-+++ compiz-one-ws/plugins/ezoom/ezoom.xml.in 2013-01-13 20:09:29.505213133 -0800
106+--- a/plugins/ezoom/ezoom.xml.in
107++++ b/plugins/ezoom/ezoom.xml.in
108 @@ -29,7 +29,6 @@
109 <option type="button" name="zoom_in_button">
110 <_short>Zoom In</_short>
111@@ -396,10 +390,8 @@
112 </option>
113 </subgroup>
114 </group>
115-Index: compiz-one-ws/plugins/fade/fade.xml.in
116-===================================================================
117---- compiz-one-ws.orig/plugins/fade/fade.xml.in 2013-01-13 20:09:29.517213134 -0800
118-+++ compiz-one-ws/plugins/fade/fade.xml.in 2013-01-13 20:09:29.505213133 -0800
119+--- a/plugins/fade/fade.xml.in
120++++ b/plugins/fade/fade.xml.in
121 @@ -10,6 +10,7 @@
122 </requirement>
123 <relation type="after">
124@@ -417,10 +409,8 @@
125 </option>
126 <option name="visual_bell" type="bell">
127 <_short>Visual Bell</_short>
128-Index: compiz-one-ws/plugins/gnomecompat/gnomecompat.xml.in
129-===================================================================
130---- compiz-one-ws.orig/plugins/gnomecompat/gnomecompat.xml.in 2013-01-13 20:09:29.517213134 -0800
131-+++ compiz-one-ws/plugins/gnomecompat/gnomecompat.xml.in 2013-01-13 20:09:29.505213133 -0800
132+--- a/plugins/gnomecompat/gnomecompat.xml.in
133++++ b/plugins/gnomecompat/gnomecompat.xml.in
134 @@ -53,6 +53,7 @@
135 <option name="run_command_terminal_key" type="key">
136 <_short>Open a terminal</_short>
137@@ -429,10 +419,8 @@
138 </option>
139 </group>
140 </options>
141-Index: compiz-one-ws/plugins/grid/grid.xml.in
142-===================================================================
143---- compiz-one-ws.orig/plugins/grid/grid.xml.in 2013-01-13 20:09:29.517213134 -0800
144-+++ compiz-one-ws/plugins/grid/grid.xml.in 2013-01-13 20:09:29.509213133 -0800
145+--- a/plugins/grid/grid.xml.in
146++++ b/plugins/grid/grid.xml.in
147 @@ -23,17 +23,16 @@
148 <option name="put_center_key" type="key">
149 <_short>Put Center</_short>
150@@ -461,10 +449,8 @@
151 </option>
152 <option name="put_restore_key" type="key">
153 <_short>Restore</_short>
154-Index: compiz-one-ws/plugins/place/place.xml.in
155-===================================================================
156---- compiz-one-ws.orig/plugins/place/place.xml.in 2013-01-13 20:09:29.517213134 -0800
157-+++ compiz-one-ws/plugins/place/place.xml.in 2013-01-13 20:09:29.509213133 -0800
158+--- a/plugins/place/place.xml.in
159++++ b/plugins/place/place.xml.in
160 @@ -20,8 +20,8 @@
161 <option name="mode" type="int">
162 <_short>Placement Mode</_short>
163@@ -476,10 +462,8 @@
164 <max>5</max>
165 <desc>
166 <value>0</value>
167-Index: compiz-one-ws/plugins/resize/resize.xml.in
168-===================================================================
169---- compiz-one-ws.orig/plugins/resize/resize.xml.in 2013-01-13 20:09:29.517213134 -0800
170-+++ compiz-one-ws/plugins/resize/resize.xml.in 2013-01-13 20:09:29.509213133 -0800
171+--- a/plugins/resize/resize.xml.in
172++++ b/plugins/resize/resize.xml.in
173 @@ -28,7 +28,7 @@
174 <option name="mode" type="int">
175 <_short>Default Resize Mode</_short>
176@@ -524,10 +508,8 @@
177 </default>
178 </option>
179 <subgroup>
180-Index: compiz-one-ws/plugins/scale/scale.xml.in
181-===================================================================
182---- compiz-one-ws.orig/plugins/scale/scale.xml.in 2013-01-13 20:09:29.517213134 -0800
183-+++ compiz-one-ws/plugins/scale/scale.xml.in 2013-01-13 20:09:29.509213133 -0800
184+--- a/plugins/scale/scale.xml.in
185++++ b/plugins/scale/scale.xml.in
186 @@ -19,14 +19,14 @@
187 <option name="spacing" type="int">
188 <_short>Spacing</_short>
189@@ -616,10 +598,8 @@
190 </option>
191 </group>
192 </options>
193-Index: compiz-one-ws/plugins/staticswitcher/staticswitcher.xml.in
194-===================================================================
195---- compiz-one-ws.orig/plugins/staticswitcher/staticswitcher.xml.in 2013-01-13 20:09:29.517213134 -0800
196-+++ compiz-one-ws/plugins/staticswitcher/staticswitcher.xml.in 2013-01-13 20:09:29.509213133 -0800
197+--- a/plugins/staticswitcher/staticswitcher.xml.in
198++++ b/plugins/staticswitcher/staticswitcher.xml.in
199 @@ -11,7 +11,6 @@
200 <relation type="after">
201 <plugin>composite</plugin>
202@@ -696,10 +676,8 @@
203 <desc>
204 <value>0</value>
205 <_name>None</_name>
206-Index: compiz-one-ws/plugins/vpswitch/vpswitch.xml.in
207-===================================================================
208---- compiz-one-ws.orig/plugins/vpswitch/vpswitch.xml.in 2013-01-13 20:09:29.517213134 -0800
209-+++ compiz-one-ws/plugins/vpswitch/vpswitch.xml.in 2013-01-13 20:09:29.509213133 -0800
210+--- a/plugins/vpswitch/vpswitch.xml.in
211++++ b/plugins/vpswitch/vpswitch.xml.in
212 @@ -95,13 +95,11 @@
213 <option name="next_button" type="button">
214 <_short>Move Next</_short>
215@@ -714,10 +692,8 @@
216 <internal/>
217 </option>
218 <option name="initiate_button" type="button">
219-Index: compiz-one-ws/plugins/wall/wall.xml.in
220-===================================================================
221---- compiz-one-ws.orig/plugins/wall/wall.xml.in 2013-01-13 20:09:29.517213134 -0800
222-+++ compiz-one-ws/plugins/wall/wall.xml.in 2013-01-13 20:09:29.509213133 -0800
223+--- a/plugins/wall/wall.xml.in
224++++ b/plugins/wall/wall.xml.in
225 @@ -31,12 +31,12 @@
226 <option name="miniscreen" type="bool">
227 <_short>Show Live Viewport Previews</_short>

Subscribers

People subscribed via source and target branches