← Back to branch summary

~hypodermia/ubuntu/oneiric/compiz/fix-for-bug-301174

« back to all changes in this revision

Viewing changes to debian/patches/029_default_options.patch

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2011-04-07 18:06:44 UTC
  • mfrom: (0.168.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20110407180644-7xwnirf7k3zotc2w
Tags: 1:0.9.4+bzr20110407-0ubuntu2
https://launchpad.net/bugs/711561
https://launchpad.net/bugs/752711
* New upstream snapshot:
  - fix unity-window-decorator crashed with SIGSEGV in event_filter_funct
    (LP: #711561)
* debian/patches/086_new_grid_defaults.patch:
  - change threshold to 15 on sides and 20 on top to work well with the new
    animtion
* debian/patches/01_bzr_fix_grid_on_multimonitor.patch,
  01_bzr_fix_resize.patch, 01_bzr_fix_grid_premultiply.patch:
  - from upstream bzr, fix grid on multimonitor and colors handling
* debian/patches/086_new_grid_defaults.patch,
  debian/patches/029_default_options.patch:
  - set the resize grid shadow to orange (LP: #752711)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/029_default_options.patch
25
25
 The following changes were introduced to the Debian version of this patch:
26
26
 * Add Debian logo for top face of cube.
27
27
Origin: vendor, ubuntu (1:0.6.0+git20071006-0ubuntu1) or perhaps earlier.
28
 
Index: compiz-0.9.4/metadata/core.xml.in
 
28
Index: compiz-0.9.4+bzr20110407/metadata/core.xml.in
29
29
===================================================================
30
 
--- compiz-0.9.4.orig/metadata/core.xml.in      2011-02-24 10:27:13.000000000 +0100
31
 
+++ compiz-0.9.4/metadata/core.xml.in   2011-03-17 17:12:02.028886771 +0100
32
 
@@ -138,7 +138,7 @@
 
30
--- compiz-0.9.4+bzr20110407.orig/metadata/core.xml.in  2011-04-07 14:44:00.000000000 +0200
 
31
+++ compiz-0.9.4+bzr20110407/metadata/core.xml.in       2011-04-07 18:50:08.496431087 +0200
 
32
@@ -145,7 +145,7 @@
33
33
                        <option name="focus_prevention_match" type="match">
34
34
                        <_short>Focus Prevention Windows</_short>
35
35
                        <_long>Focus prevention windows</_long>
38
38
                        </option>
39
39
                </group>
40
40
                <group>
41
 
@@ -244,14 +244,14 @@
 
41
@@ -251,14 +251,14 @@
42
42
                        <option name="hsize" type="int">
43
43
                        <_short>Horizontal Virtual Size</_short>
44
44
                        <_long>Screen size multiplier for horizontal virtual size</_long>
55
55
                        <min>1</min>
56
56
                        <max>32</max>
57
57
                        </option>
58
 
Index: compiz-0.9.4/plugins/scale/scale.xml.in
 
58
Index: compiz-0.9.4+bzr20110407/plugins/scale/scale.xml.in
59
59
===================================================================
60
 
--- compiz-0.9.4.orig/plugins/scale/scale.xml.in        2011-02-24 10:27:13.000000000 +0100
61
 
+++ compiz-0.9.4/plugins/scale/scale.xml.in     2011-03-17 17:12:36.117055808 +0100
 
60
--- compiz-0.9.4+bzr20110407.orig/plugins/scale/scale.xml.in    2011-04-07 14:44:00.000000000 +0200
 
61
+++ compiz-0.9.4+bzr20110407/plugins/scale/scale.xml.in 2011-04-07 18:50:08.500431099 +0200
62
62
@@ -18,14 +18,14 @@
63
63
                        <option name="spacing" type="int">
64
64
                                <_short>Spacing</_short>
139
139
                        </option>
140
140
            </group>
141
141
        </options>
142
 
Index: compiz-0.9.4/plugins/decor/decor.xml.in
 
142
Index: compiz-0.9.4+bzr20110407/plugins/decor/decor.xml.in
143
143
===================================================================
144
 
--- compiz-0.9.4.orig/plugins/decor/decor.xml.in        2011-02-24 10:27:13.000000000 +0100
145
 
+++ compiz-0.9.4/plugins/decor/decor.xml.in     2011-03-17 17:12:02.028886771 +0100
 
144
--- compiz-0.9.4+bzr20110407.orig/plugins/decor/decor.xml.in    2011-04-07 14:44:00.000000000 +0200
 
145
+++ compiz-0.9.4+bzr20110407/plugins/decor/decor.xml.in 2011-04-07 18:50:08.500431099 +0200
146
146
@@ -20,7 +20,7 @@
147
147
            <option name="shadow_radius" type="float">
148
148
                <_short>Shadow Radius</_short>
168
168
            </option>
169
169
            <option name="mipmap" type="bool">
170
170
                <_short>Mipmap</_short>
171
 
Index: compiz-0.9.4/plugins/cube/cube.xml.in
 
171
Index: compiz-0.9.4+bzr20110407/plugins/cube/cube.xml.in
172
172
===================================================================
173
 
--- compiz-0.9.4.orig/plugins/cube/cube.xml.in  2011-02-24 10:27:13.000000000 +0100
174
 
+++ compiz-0.9.4/plugins/cube/cube.xml.in       2011-03-17 17:12:02.028886771 +0100
 
173
--- compiz-0.9.4+bzr20110407.orig/plugins/cube/cube.xml.in      2011-04-07 14:44:00.000000000 +0200
 
174
+++ compiz-0.9.4+bzr20110407/plugins/cube/cube.xml.in   2011-04-07 18:50:08.500431099 +0200
175
175
@@ -86,18 +86,18 @@
176
176
                                <_short>Top</_short>
177
177
                                <_long>Color of top face of the cube</_long>
205
205
                        </option>
206
206
                        <option name="skydome_animated" type="bool">
207
207
                        <_short>Animate Skydome</_short>
208
 
Index: compiz-0.9.4/plugins/place/place.xml.in
 
208
Index: compiz-0.9.4+bzr20110407/plugins/place/place.xml.in
209
209
===================================================================
210
 
--- compiz-0.9.4.orig/plugins/place/place.xml.in        2011-02-24 10:27:13.000000000 +0100
211
 
+++ compiz-0.9.4/plugins/place/place.xml.in     2011-03-17 17:12:02.032886795 +0100
 
210
--- compiz-0.9.4+bzr20110407.orig/plugins/place/place.xml.in    2011-04-07 14:44:00.000000000 +0200
 
211
+++ compiz-0.9.4+bzr20110407/plugins/place/place.xml.in 2011-04-07 18:50:08.500431099 +0200
212
212
@@ -19,7 +19,7 @@
213
213
            <option name="mode" type="int">
214
214
                <_short>Placement Mode</_short>
218
218
                <min>0</min>
219
219
                <max>5</max>
220
220
                <desc>
221
 
Index: compiz-0.9.4/plugins/resize/resize.xml.in
 
221
Index: compiz-0.9.4+bzr20110407/plugins/resize/resize.xml.in
222
222
===================================================================
223
 
--- compiz-0.9.4.orig/plugins/resize/resize.xml.in      2011-02-24 10:27:13.000000000 +0100
224
 
+++ compiz-0.9.4/plugins/resize/resize.xml.in   2011-03-17 17:12:02.032886795 +0100
 
223
--- compiz-0.9.4+bzr20110407.orig/plugins/resize/resize.xml.in  2011-04-07 14:44:00.000000000 +0200
 
224
+++ compiz-0.9.4+bzr20110407/plugins/resize/resize.xml.in       2011-04-07 18:50:32.296549111 +0200
225
225
@@ -123,7 +123,7 @@
226
226
            <option name="mode" type="int">
227
227
                <_short>Default Resize Mode</_short>
231
231
                <min>0</min>
232
232
                <max>3</max>
233
233
                <desc>
234
 
@@ -147,20 +147,20 @@
 
234
@@ -147,9 +147,9 @@
235
235
                <_short>Border Color</_short>
236
236
                <_long>Border color used for outline and rectangle resize modes</_long>
237
237
                <default>
238
238
-                   <red>0x2f2f</red>
239
239
-                   <green>0x2f2f</green>
240
240
-                   <blue>0x4f4f</blue>
241
 
-                   <alpha>0x9f9f</alpha>
242
 
+                   <red>0xffff</red>
243
 
+                   <green>0xffff</green>
244
 
+                   <blue>0xffff</blue>
245
 
+                   <alpha>0x6464</alpha>
 
241
+                   <red>0xfbfb</red>
 
242
+                   <green>0x8b8b</green>
 
243
+                   <blue>0x0</blue>
 
244
                    <alpha>0x9f9f</alpha>
246
245
                </default>
247
246
            </option>
248
 
            <option name="fill_color" type="color">
 
247
@@ -157,10 +157,10 @@
249
248
                <_short>Fill Color</_short>
250
249
                <_long>Fill color used for rectangle resize mode</_long>
251
250
                <default>
253
252
-                   <green>0x2f2f</green>
254
253
-                   <blue>0x4f4f</blue>
255
254
-                   <alpha>0x4f4f</alpha>
256
 
+                   <red>0x0</red>
257
 
+                   <green>0x0</green>
 
255
+                   <red>0xfbfb</red>
 
256
+                   <green>0x8b8b</green>
258
257
+                   <blue>0x0</blue>
259
 
+                   <alpha>0x1e1e</alpha>
 
258
+                   <alpha>0x1919</alpha>
260
259
                </default>
261
260
            </option>
262
261
            <option name="normal_match" type="match">
263
 
Index: compiz-0.9.4/plugins/fade/fade.xml.in
 
262
Index: compiz-0.9.4+bzr20110407/plugins/fade/fade.xml.in
264
263
===================================================================
265
 
--- compiz-0.9.4.orig/plugins/fade/fade.xml.in  2011-02-24 10:27:13.000000000 +0100
266
 
+++ compiz-0.9.4/plugins/fade/fade.xml.in       2011-03-17 17:12:02.032886795 +0100
 
264
--- compiz-0.9.4+bzr20110407.orig/plugins/fade/fade.xml.in      2011-04-07 14:44:00.000000000 +0200
 
265
+++ compiz-0.9.4+bzr20110407/plugins/fade/fade.xml.in   2011-04-07 18:50:08.504431114 +0200
267
266
@@ -49,7 +49,7 @@
268
267
            <option name="window_match" type="match">
269
268
                <_short>Fade windows</_short>
273
272
            </option>
274
273
            <option name="visual_bell" type="bool">
275
274
                <_short>Visual Bell</_short>
276
 
Index: compiz-0.9.4/plugins/opengl/opengl.xml.in
 
275
Index: compiz-0.9.4+bzr20110407/plugins/opengl/opengl.xml.in
277
276
===================================================================
278
 
--- compiz-0.9.4.orig/plugins/opengl/opengl.xml.in      2011-02-24 10:27:13.000000000 +0100
279
 
+++ compiz-0.9.4/plugins/opengl/opengl.xml.in   2011-03-17 17:12:02.032886795 +0100
 
277
--- compiz-0.9.4+bzr20110407.orig/plugins/opengl/opengl.xml.in  2011-04-07 14:44:00.000000000 +0200
 
278
+++ compiz-0.9.4+bzr20110407/plugins/opengl/opengl.xml.in       2011-04-07 18:50:08.504431114 +0200
280
279
@@ -31,7 +31,7 @@
281
280
            <option name="lighting" type="bool">
282
281
                <_short>Lighting</_short>