« back to all changes in this revision
Viewing changes to debian/patches/ubuntu-config.patch
- browse files at revision 3789
- compare with another revision
- compare with revision 3789
- download diff
- download tarball
- view history from revision 3789
- Committer: Tarmac
- Author(s): Marco Trevisan (Treviño)
- Date: 2013-09-16 19:15:02 UTC
- mfrom: (3788.1.1 compiz)
- Revision ID: tarmac-20130916191502-bai0cajf55op1t9c
debian/patches/ubuntu-config.patch: remove grid custom keybindings for window management
We handle these directly in unity. Fixes: https://bugs.launchpad.net/bugs/992697.
Approved by Christopher Townsend, PS Jenkins bot.
We handle these directly in unity. Fixes: https://bugs.launchpad.net/bugs/992697.
Approved by Christopher Townsend, PS Jenkins bot.
- files modified:
- debian/patches/ubuntu-config.patch
added
removed
debian/patches/ubuntu-config.patch
1
1
=== modified file 'metadata/core.xml.in'
2
--- a/metadata/core.xml.in
3
+++ b/metadata/core.xml.in
2
Index: compiz/metadata/core.xml.in
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
6
@@ -139,7 +139,7 @@
5
7
<option name="focus_prevention_match" type="match">
6
8
<_short>Focus Prevention Windows</_short>
63
65
<min>1</min>
64
66
<max>32</max>
65
67
</option>
66
--- a/plugins/animation/animation.xml.in
67
+++ b/plugins/animation/animation.xml.in
68
Index: compiz/plugins/animation/animation.xml.in
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
68
72
@@ -36,7 +36,7 @@
69
73
<extensible/>
70
74
<sort start="2"/>
203
207
<min>0</min>
204
208
<max>1</max>
205
209
<precision>0.01</precision>
206
--- a/plugins/decor/decor.xml.in
207
+++ b/plugins/decor/decor.xml.in
210
Index: compiz/plugins/decor/decor.xml.in
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
208
214
@@ -31,7 +31,7 @@
209
215
<option name="active_shadow_opacity" type="float">
210
216
<_short>Shadow Opacity</_short>
241
247
</option>
242
248
<option name="mipmap" type="bool">
243
249
<_short>Mipmap</_short>
244
--- a/plugins/fade/fade.xml.in
245
+++ b/plugins/fade/fade.xml.in
250
Index: compiz/plugins/fade/fade.xml.in
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
246
254
@@ -10,6 +10,7 @@
247
255
</requirement>
248
256
<relation type="after">
260
268
</option>
261
269
<option name="visual_bell" type="bell">
262
270
<_short>Visual Bell</_short>
263
--- a/plugins/gnomecompat/gnomecompat.xml.in
264
+++ b/plugins/gnomecompat/gnomecompat.xml.in
271
Index: compiz/plugins/gnomecompat/gnomecompat.xml.in
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
265
275
@@ -53,6 +53,7 @@
266
276
<option name="run_command_terminal_key" type="key">
267
277
<_short>Open a terminal</_short>
270
280
</option>
271
281
</group>
272
282
</options>
273
--- a/plugins/place/place.xml.in
274
+++ b/plugins/place/place.xml.in
283
Index: compiz/plugins/place/place.xml.in
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
275
287
@@ -20,8 +20,8 @@
276
288
<option name="mode" type="int">
277
289
<_short>Placement Mode</_short>
283
295
<max>5</max>
284
296
<desc>
285
297
<value>0</value>
286
--- a/plugins/resize/resize.xml.in
287
+++ b/plugins/resize/resize.xml.in
298
Index: compiz/plugins/resize/resize.xml.in
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
288
302
@@ -28,7 +28,7 @@
289
303
<option name="mode" type="int">
290
304
<_short>Default Resize Mode</_short>
329
343
</default>
330
344
</option>
331
345
<subgroup>
332
--- a/plugins/scale/scale.xml.in
333
+++ b/plugins/scale/scale.xml.in
346
Index: compiz/plugins/scale/scale.xml.in
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
334
350
@@ -19,14 +19,14 @@
335
351
<option name="spacing" type="int">
336
352
<_short>Spacing</_short>
419
435
</option>
420
436
</group>
421
437
</options>
422
--- a/plugins/staticswitcher/staticswitcher.xml.in
423
+++ b/plugins/staticswitcher/staticswitcher.xml.in
438
Index: compiz/plugins/staticswitcher/staticswitcher.xml.in
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
424
442
@@ -11,7 +11,6 @@
425
443
<relation type="after">
426
444
<plugin>composite</plugin>
497
515
<desc>
498
516
<value>0</value>
499
517
<_name>None</_name>
500
--- a/plugins/vpswitch/vpswitch.xml.in
501
+++ b/plugins/vpswitch/vpswitch.xml.in
518
Index: compiz/plugins/vpswitch/vpswitch.xml.in
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
502
522
@@ -95,13 +95,11 @@
503
523
<option name="next_button" type="button">
504
524
<_short>Move Next</_short>
513
533
<internal/>
514
534
</option>
515
535
<option name="initiate_button" type="button">
516
--- a/plugins/wall/wall.xml.in
517
+++ b/plugins/wall/wall.xml.in
536
Index: compiz/plugins/wall/wall.xml.in
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
518
540
@@ -30,12 +30,12 @@
519
541
<option name="miniscreen" type="bool">
520
542
<_short>Show Live Viewport Previews</_short>
671
693
</option>
672
694
<option name="edgeflip_dnd" type="bool">
673
695
<_short>Edge Flip DnD</_short>
674
--- a/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
675
+++ b/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
696
Index: compiz/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
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
676
700
@@ -46,7 +46,7 @@
677
701
678
702
namespace
682
706
unsigned int DEFAULT_VIEWPORT_HEIGHT = 1;
683
707
684
708
bool Advance (Display *d, bool r)
685
--- a/plugins/grid/grid.xml.in
686
+++ b/plugins/grid/grid.xml.in
687
@@ -23,17 +23,16 @@
688
<option name="put_center_key" type="key">
689
<_short>Put Center Key</_short>
690
<_long>Move window to the center.</_long>
691
- <default><Control><Alt>KP_5</default>
692
</option>
693
<option name="put_left_key" type="key">
694
<_short>Put Left Key</_short>
695
<_long>Move window to the left edge.</_long>
696
- <default><Control><Alt>KP_4</default>
697
+ <default><Control><Super>Left</default>
698
</option>
699
<option name="put_right_key" type="key">
700
<_short>Put Right Key</_short>
701
<_long>Move window to the right edge.</_long>
702
- <default><Control><Alt>KP_6</default>
703
+ <default><Control><Super>Right</default>
704
</option>
705
<option name="put_top_key" type="key">
706
<_short>Put Top Key</_short>
707
@@ -68,12 +67,11 @@
708
<option name="put_maximize_key" type="key">
709
<_short>Maximize Key</_short>
710
<_long>Maximize window.</_long>
711
- <default><Control><Alt>KP_0</default>
712
</option>
709
Index: compiz/plugins/grid/grid.xml.in
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 @@
713
714
<option name="put_restore_key" type="key">
714
715
<_short>Restore</_short>
715
716
<_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>
718
719
</option>
719
720
</group>
720
721
<group>
721
--- a/plugins/ezoom/ezoom.xml.in
722
+++ b/plugins/ezoom/ezoom.xml.in
722
Index: compiz/plugins/ezoom/ezoom.xml.in
723
===================================================================
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
723
726
@@ -30,7 +30,7 @@
724
727
<option type="button" name="zoom_in_button">
725
728
<_short>Zoom In Button</_short>
756
759
</option>
757
760
</subgroup>
758
761
</group>
759
--- a/plugins/expo/expo.xml.in
760
+++ b/plugins/expo/expo.xml.in
762
Index: compiz/plugins/expo/expo.xml.in
763
===================================================================
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
761
766
@@ -17,6 +17,7 @@
762
767
<plugin>wobbly</plugin>
763
768
<plugin>animation</plugin>
852
857
</option>
853
858
<option name="ground_color1" type="color">
854
859
<_short>Ground Color (near)</_short>
855
--- a/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
856
+++ b/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
860
Index: compiz/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
861
===================================================================
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
857
864
@@ -10,6 +10,9 @@
858
865
<key type="s" name="command-screenshot">
859
866
<default>"gnome-screenshot"</default>
874
881
<key type="s" name="command-12">
875
882
<default>""</default>
876
883
</key>
877
--- a/plugins/commands/commands.xml.in
878
+++ b/plugins/commands/commands.xml.in
884
Index: compiz/plugins/commands/commands.xml.in
885
===================================================================
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
879
888
@@ -117,7 +117,7 @@
880
889
<option name="command20" type="string">
881
890
<_short>Command line 20</_short>
Loggerhead is a web-based interface for Breezy
Version: 2.0.1