← Back to branch summary

~ps-jenkins/compiz/latestsnapshot-10.9.10+13.10.20131011-0ubuntu1

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu-config.patch

  • Committer: Tarmac
  • Author(s): Marco Trevisan (Treviño)
  • Date: 2013-10-08 17:22:09 UTC
  • mfrom: (3796.1.1 compiz-0.9.10)
  • Revision ID: tarmac-20131008172209-91znomlqzdgvtmtb
debian/patches/ubuntu-config.patch: Don't use Ctrl+Alt+KP_0 for grid maximize

Otherwise this clashes with default minimize key. Fixes: https://bugs.launchpad.net/bugs/1236899.

Approved by PS Jenkins bot, Christopher Townsend.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu-config.patch
1
1
=== modified file 'metadata/core.xml.in'
2
 
Index: compiz/metadata/core.xml.in
 
2
Index: compiz-0.9.10/metadata/core.xml.in
3
3
===================================================================
4
 
--- compiz.orig/metadata/core.xml.in    2013-09-16 18:01:32.553411336 +0200
5
 
+++ compiz/metadata/core.xml.in 2013-09-16 18:01:32.537411397 +0200
 
4
--- compiz-0.9.10.orig/metadata/core.xml.in     2013-10-08 17:02:17.016547820 +0200
 
5
+++ compiz-0.9.10/metadata/core.xml.in  2013-10-08 17:02:17.004547851 +0200
6
6
@@ -139,7 +139,7 @@
7
7
                        <option name="focus_prevention_match" type="match">
8
8
                        <_short>Focus Prevention Windows</_short>
65
65
                        <min>1</min>
66
66
                        <max>32</max>
67
67
                        </option>
68
 
Index: compiz/plugins/animation/animation.xml.in
 
68
Index: compiz-0.9.10/plugins/animation/animation.xml.in
69
69
===================================================================
70
 
--- compiz.orig/plugins/animation/animation.xml.in      2013-09-16 18:01:32.553411336 +0200
71
 
+++ compiz/plugins/animation/animation.xml.in   2013-09-16 18:01:32.537411397 +0200
 
70
--- compiz-0.9.10.orig/plugins/animation/animation.xml.in       2013-10-08 17:02:17.016547820 +0200
 
71
+++ compiz-0.9.10/plugins/animation/animation.xml.in    2013-10-08 17:02:17.004547851 +0200
72
72
@@ -36,7 +36,7 @@
73
73
            <extensible/>
74
74
            <sort start="2"/>
207
207
            <min>0</min>
208
208
            <max>1</max>
209
209
            <precision>0.01</precision>
210
 
Index: compiz/plugins/decor/decor.xml.in
 
210
Index: compiz-0.9.10/plugins/decor/decor.xml.in
211
211
===================================================================
212
 
--- compiz.orig/plugins/decor/decor.xml.in      2013-09-16 18:01:32.553411336 +0200
213
 
+++ compiz/plugins/decor/decor.xml.in   2013-09-16 18:01:32.537411397 +0200
 
212
--- compiz-0.9.10.orig/plugins/decor/decor.xml.in       2013-10-08 17:02:17.016547820 +0200
 
213
+++ compiz-0.9.10/plugins/decor/decor.xml.in    2013-10-08 17:02:17.008547841 +0200
214
214
@@ -31,7 +31,7 @@
215
215
                <option name="active_shadow_opacity" type="float">
216
216
                    <_short>Shadow Opacity</_short>
247
247
            </option>
248
248
            <option name="mipmap" type="bool">
249
249
                <_short>Mipmap</_short>
250
 
Index: compiz/plugins/fade/fade.xml.in
 
250
Index: compiz-0.9.10/plugins/fade/fade.xml.in
251
251
===================================================================
252
 
--- compiz.orig/plugins/fade/fade.xml.in        2013-09-16 18:01:32.553411336 +0200
253
 
+++ compiz/plugins/fade/fade.xml.in     2013-09-16 18:01:32.541411382 +0200
 
252
--- compiz-0.9.10.orig/plugins/fade/fade.xml.in 2013-10-08 17:02:17.016547820 +0200
 
253
+++ compiz-0.9.10/plugins/fade/fade.xml.in      2013-10-08 17:02:17.008547841 +0200
254
254
@@ -10,6 +10,7 @@
255
255
            </requirement>
256
256
            <relation type="after">
268
268
            </option>
269
269
            <option name="visual_bell" type="bell">
270
270
                <_short>Visual Bell</_short>
271
 
Index: compiz/plugins/gnomecompat/gnomecompat.xml.in
 
271
Index: compiz-0.9.10/plugins/gnomecompat/gnomecompat.xml.in
272
272
===================================================================
273
 
--- compiz.orig/plugins/gnomecompat/gnomecompat.xml.in  2013-09-16 18:01:32.553411336 +0200
274
 
+++ compiz/plugins/gnomecompat/gnomecompat.xml.in       2013-09-16 18:01:32.541411382 +0200
 
273
--- compiz-0.9.10.orig/plugins/gnomecompat/gnomecompat.xml.in   2013-10-08 17:02:17.016547820 +0200
 
274
+++ compiz-0.9.10/plugins/gnomecompat/gnomecompat.xml.in        2013-10-08 17:02:17.008547841 +0200
275
275
@@ -53,6 +53,7 @@
276
276
                <option name="run_command_terminal_key" type="key">
277
277
                    <_short>Open a terminal</_short>
280
280
                </option>
281
281
            </group>
282
282
        </options>
283
 
Index: compiz/plugins/place/place.xml.in
 
283
Index: compiz-0.9.10/plugins/place/place.xml.in
284
284
===================================================================
285
 
--- compiz.orig/plugins/place/place.xml.in      2013-09-16 18:01:32.553411336 +0200
286
 
+++ compiz/plugins/place/place.xml.in   2013-09-16 18:01:32.541411382 +0200
 
285
--- compiz-0.9.10.orig/plugins/place/place.xml.in       2013-10-08 17:02:17.016547820 +0200
 
286
+++ compiz-0.9.10/plugins/place/place.xml.in    2013-10-08 17:02:17.008547841 +0200
287
287
@@ -20,8 +20,8 @@
288
288
            <option name="mode" type="int">
289
289
                <_short>Placement Mode</_short>
295
295
                <max>5</max>
296
296
                <desc>
297
297
                    <value>0</value>
298
 
Index: compiz/plugins/resize/resize.xml.in
 
298
Index: compiz-0.9.10/plugins/resize/resize.xml.in
299
299
===================================================================
300
 
--- compiz.orig/plugins/resize/resize.xml.in    2013-09-16 18:01:32.553411336 +0200
301
 
+++ compiz/plugins/resize/resize.xml.in 2013-09-16 18:01:32.541411382 +0200
 
300
--- compiz-0.9.10.orig/plugins/resize/resize.xml.in     2013-10-08 17:02:17.016547820 +0200
 
301
+++ compiz-0.9.10/plugins/resize/resize.xml.in  2013-10-08 17:02:17.008547841 +0200
302
302
@@ -28,7 +28,7 @@
303
303
            <option name="mode" type="int">
304
304
                <_short>Default Resize Mode</_short>
343
343
                </default>
344
344
            </option>
345
345
            <subgroup>
346
 
Index: compiz/plugins/scale/scale.xml.in
 
346
Index: compiz-0.9.10/plugins/scale/scale.xml.in
347
347
===================================================================
348
 
--- compiz.orig/plugins/scale/scale.xml.in      2013-09-16 18:01:32.553411336 +0200
349
 
+++ compiz/plugins/scale/scale.xml.in   2013-09-16 18:01:32.541411382 +0200
 
348
--- compiz-0.9.10.orig/plugins/scale/scale.xml.in       2013-10-08 17:02:17.016547820 +0200
 
349
+++ compiz-0.9.10/plugins/scale/scale.xml.in    2013-10-08 17:02:17.008547841 +0200
350
350
@@ -19,14 +19,14 @@
351
351
                        <option name="spacing" type="int">
352
352
                                <_short>Spacing</_short>
435
435
                        </option>
436
436
            </group>
437
437
        </options>
438
 
Index: compiz/plugins/staticswitcher/staticswitcher.xml.in
 
438
Index: compiz-0.9.10/plugins/staticswitcher/staticswitcher.xml.in
439
439
===================================================================
440
 
--- compiz.orig/plugins/staticswitcher/staticswitcher.xml.in    2013-09-16 18:01:32.553411336 +0200
441
 
+++ compiz/plugins/staticswitcher/staticswitcher.xml.in 2013-09-16 18:01:32.541411382 +0200
 
440
--- compiz-0.9.10.orig/plugins/staticswitcher/staticswitcher.xml.in     2013-10-08 17:02:17.016547820 +0200
 
441
+++ compiz-0.9.10/plugins/staticswitcher/staticswitcher.xml.in  2013-10-08 17:02:17.008547841 +0200
442
442
@@ -11,7 +11,6 @@
443
443
            <relation type="after">
444
444
                <plugin>composite</plugin>
515
515
                        <desc>
516
516
                            <value>0</value>
517
517
                            <_name>None</_name>
518
 
Index: compiz/plugins/vpswitch/vpswitch.xml.in
 
518
Index: compiz-0.9.10/plugins/vpswitch/vpswitch.xml.in
519
519
===================================================================
520
 
--- compiz.orig/plugins/vpswitch/vpswitch.xml.in        2013-09-16 18:01:32.553411336 +0200
521
 
+++ compiz/plugins/vpswitch/vpswitch.xml.in     2013-09-16 18:01:32.541411382 +0200
 
520
--- compiz-0.9.10.orig/plugins/vpswitch/vpswitch.xml.in 2013-10-08 17:02:17.016547820 +0200
 
521
+++ compiz-0.9.10/plugins/vpswitch/vpswitch.xml.in      2013-10-08 17:02:17.008547841 +0200
522
522
@@ -95,13 +95,11 @@
523
523
                                <option name="next_button" type="button">
524
524
                                        <_short>Move Next</_short>
533
533
                                        <internal/>
534
534
                                </option>
535
535
                                <option name="initiate_button" type="button">
536
 
Index: compiz/plugins/wall/wall.xml.in
 
536
Index: compiz-0.9.10/plugins/wall/wall.xml.in
537
537
===================================================================
538
 
--- compiz.orig/plugins/wall/wall.xml.in        2013-09-16 18:01:32.553411336 +0200
539
 
+++ compiz/plugins/wall/wall.xml.in     2013-09-16 18:01:32.541411382 +0200
 
538
--- compiz-0.9.10.orig/plugins/wall/wall.xml.in 2013-10-08 17:02:17.016547820 +0200
 
539
+++ compiz-0.9.10/plugins/wall/wall.xml.in      2013-10-08 17:02:17.008547841 +0200
540
540
@@ -30,12 +30,12 @@
541
541
                                <option name="miniscreen" type="bool">
542
542
                                        <_short>Show Live Viewport Previews</_short>
693
693
                                </option>
694
694
                                <option name="edgeflip_dnd" type="bool">
695
695
                                        <_short>Edge Flip DnD</_short>
696
 
Index: compiz/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
 
696
Index: compiz-0.9.10/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
697
697
===================================================================
698
 
--- compiz.orig/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp        2013-09-16 18:01:32.553411336 +0200
699
 
+++ compiz/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp     2013-09-16 18:01:32.541411382 +0200
 
698
--- compiz-0.9.10.orig/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2013-10-08 17:02:17.016547820 +0200
 
699
+++ compiz-0.9.10/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp      2013-10-08 17:02:17.008547841 +0200
700
700
@@ -46,7 +46,7 @@
701
701
 
702
702
 namespace
706
706
 unsigned int DEFAULT_VIEWPORT_HEIGHT = 1;
707
707
 
708
708
 bool Advance (Display *d, bool r)
709
 
Index: compiz/plugins/grid/grid.xml.in
 
709
Index: compiz-0.9.10/plugins/grid/grid.xml.in
710
710
===================================================================
711
 
--- compiz.orig/plugins/grid/grid.xml.in        2013-09-16 18:01:32.553411336 +0200
712
 
+++ compiz/plugins/grid/grid.xml.in     2013-09-16 18:01:49.693346061 +0200
713
 
@@ -73,7 +73,7 @@
 
711
--- compiz-0.9.10.orig/plugins/grid/grid.xml.in 2013-10-08 17:02:17.016547820 +0200
 
712
+++ compiz-0.9.10/plugins/grid/grid.xml.in      2013-10-08 17:02:27.968519933 +0200
 
713
@@ -68,12 +68,11 @@
 
714
                <option name="put_maximize_key" type="key">
 
715
                    <_short>Maximize Key</_short>
 
716
                    <_long>Maximize window.</_long>
 
717
-                   <default>&lt;Control&gt;&lt;Alt&gt;KP_0</default>
 
718
                </option>
714
719
                <option name="put_restore_key" type="key">
715
720
                    <_short>Restore</_short>
716
721
                    <_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>
719
724
                </option>
720
725
            </group>
721
726
            <group>
722
 
Index: compiz/plugins/ezoom/ezoom.xml.in
 
727
Index: compiz-0.9.10/plugins/ezoom/ezoom.xml.in
723
728
===================================================================
724
 
--- compiz.orig/plugins/ezoom/ezoom.xml.in      2013-09-16 18:01:32.553411336 +0200
725
 
+++ compiz/plugins/ezoom/ezoom.xml.in   2013-09-16 18:01:32.545411366 +0200
 
729
--- compiz-0.9.10.orig/plugins/ezoom/ezoom.xml.in       2013-10-08 17:02:17.016547820 +0200
 
730
+++ compiz-0.9.10/plugins/ezoom/ezoom.xml.in    2013-10-08 17:02:17.012547830 +0200
726
731
@@ -30,7 +30,7 @@
727
732
                <option type="button" name="zoom_in_button">
728
733
                    <_short>Zoom In Button</_short>
759
764
                    </option>
760
765
                </subgroup>
761
766
            </group>
762
 
Index: compiz/plugins/expo/expo.xml.in
 
767
Index: compiz-0.9.10/plugins/expo/expo.xml.in
763
768
===================================================================
764
 
--- compiz.orig/plugins/expo/expo.xml.in        2013-09-16 18:01:32.553411336 +0200
765
 
+++ compiz/plugins/expo/expo.xml.in     2013-09-16 18:01:32.545411366 +0200
 
769
--- compiz-0.9.10.orig/plugins/expo/expo.xml.in 2013-10-08 17:02:17.016547820 +0200
 
770
+++ compiz-0.9.10/plugins/expo/expo.xml.in      2013-10-08 17:02:17.012547830 +0200
766
771
@@ -17,6 +17,7 @@
767
772
                <plugin>wobbly</plugin>
768
773
                <plugin>animation</plugin>
857
862
                    </option>
858
863
                    <option name="ground_color1" type="color">
859
864
                        <_short>Ground Color (near)</_short>
860
 
Index: compiz/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
 
865
Index: compiz-0.9.10/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
861
866
===================================================================
862
 
--- compiz.orig/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml      2013-09-16 18:01:32.553411336 +0200
863
 
+++ compiz/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml   2013-09-16 18:01:32.545411366 +0200
 
867
--- compiz-0.9.10.orig/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml       2013-10-08 17:02:17.016547820 +0200
 
868
+++ compiz-0.9.10/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml    2013-10-08 17:02:17.012547830 +0200
864
869
@@ -10,6 +10,9 @@
865
870
        <key type="s" name="command-screenshot">
866
871
            <default>"gnome-screenshot"</default>
881
886
        <key type="s" name="command-12">
882
887
            <default>""</default>
883
888
        </key>
884
 
Index: compiz/plugins/commands/commands.xml.in
 
889
Index: compiz-0.9.10/plugins/commands/commands.xml.in
885
890
===================================================================
886
 
--- compiz.orig/plugins/commands/commands.xml.in        2013-09-16 18:01:32.553411336 +0200
887
 
+++ compiz/plugins/commands/commands.xml.in     2013-09-16 18:01:32.545411366 +0200
 
891
--- compiz-0.9.10.orig/plugins/commands/commands.xml.in 2013-10-08 17:02:17.016547820 +0200
 
892
+++ compiz-0.9.10/plugins/commands/commands.xml.in      2013-10-08 17:02:17.012547830 +0200
888
893
@@ -117,7 +117,7 @@
889
894
                <option name="command20" type="string">
890
895
                    <_short>Command line 20</_short>