~timo-jyrinki/compiz-plugins-main/fix_755842

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu_config.patch

  • Committer: Package Import Robot
  • Author(s): Didier Roche
  • Date: 2012-02-28 10:59:52 UTC
  • Revision ID: package-import@ubuntu.com-20120228105952-ym9oqyw0t03m517a
Tags: 1:0.9.7.0~bzr19-0ubuntu5
* debian/control:
  - build against libjpeg-dev instead of the 62 flavor
* debian/patches/ubuntu_config.patch:
  - revert the keybinding workspace changes as we can't keep the old one in
    addition to the new one. Some plan on compiz will be done for next cycle
    to support this and give another try to the new keybinding. (LP: #940085)

Show diffs side-by-side

added added

removed removed

Lines of Context:
385
385
                                                </default>
386
386
                                        </option>
387
387
                                </subgroup>
388
 
@@ -207,7 +207,7 @@
389
 
                                        <option name="left_key" type="key">
390
 
                                                <_short>Move Left</_short>
391
 
                                                <_long>Move along the wall to the left</_long>
392
 
-                                               <default>&lt;Control&gt;&lt;Alt&gt;Left</default>
393
 
+                                               <default>&lt;Super&gt;&lt;Shift&gt;Left</default>
394
 
                                        </option>
395
 
                                        <option name="left_button" type="button">
396
 
                                                <_short>Move Left</_short>
397
 
@@ -216,7 +216,7 @@
398
 
                                        <option name="right_key" type="key">
399
 
                                                <_short>Move Right</_short>
400
 
                                                <_long>Move along the wall to the right</_long>
401
 
-                                               <default>&lt;Control&gt;&lt;Alt&gt;Right</default>
402
 
+                                               <default>&lt;Super&gt;&lt;Shift&gt;Right</default>
403
 
                                        </option>
404
 
                                        <option name="right_button" type="button">
405
 
                                                <_short>Move Right</_short>
406
 
@@ -225,7 +225,7 @@
407
 
                                        <option name="up_key" type="key">
408
 
                                                <_short>Move Up</_short>
409
 
                                                <_long>Move along the wall up</_long>
410
 
-                                               <default>&lt;Control&gt;&lt;Alt&gt;Up</default>
411
 
+                                               <default>&lt;Super&gt;&lt;Shift&gt;Up</default>
412
 
                                        </option>
413
 
                                        <option name="up_button" type="button">
414
 
                                                <_short>Move Up</_short>
415
 
@@ -234,7 +234,7 @@
416
 
                                        <option name="down_key" type="key">
417
 
                                                <_short>Move Down</_short>
418
 
                                                <_long>Move along the wall down</_long>
419
 
-                                               <default>&lt;Control&gt;&lt;Alt&gt;Down</default>
420
 
+                                               <default>&lt;Super&gt;&lt;Shift&gt;Down</default>
421
 
                                        </option>
422
 
                                        <option name="down_button" type="button">
423
 
                                                <_short>Move Down</_short>
424
 
@@ -262,22 +262,22 @@
425
 
                                        <option name="left_window_key" type="key">
426
 
                                                <_short>Move Left With Window</_short>
427
 
                                                <_long>Move with window along the wall to the left</_long>
428
 
-                                               <default>&lt;Control&gt;&lt;Alt&gt;&lt;Shift&gt;Left</default>
429
 
+                                               <default>&lt;Super&gt;&lt;Alt&gt;Left</default>
430
 
                                        </option>
431
 
                                        <option name="right_window_key" type="key">
432
 
                                                <_short>Move Right With Window</_short>
433
 
                                                <_long>Move with window along the wall to the right</_long>
434
 
-                                               <default>&lt;Control&gt;&lt;Alt&gt;&lt;Shift&gt;Right</default>
435
 
+                                               <default>&lt;Super&gt;&lt;Alt&gt;Right</default>
436
 
                                        </option>
437
 
                                        <option name="up_window_key" type="key">
438
 
                                                <_short>Move Up With Window</_short>
439
 
                                                <_long>Move with window along the wall up</_long>
440
 
-                                               <default>&lt;Control&gt;&lt;Alt&gt;&lt;Shift&gt;Up</default>
441
 
+                                               <default>&lt;Super&gt;&lt;Alt&gt;Up</default>
442
 
                                        </option>
443
 
                                        <option name="down_window_key" type="key">
444
 
                                                <_short>Move Down With Window</_short>
445
 
                                                <_long>Move with window along the wall down</_long>
446
 
-                                               <default>&lt;Control&gt;&lt;Alt&gt;&lt;Shift&gt;Down</default>
447
 
+                                               <default>&lt;Super&gt;&lt;Alt&gt;Down</default>
448
 
                                        </option>
449
 
                                </subgroup>
450
 
                                <subgroup>
451
388
@@ -348,7 +348,7 @@
452
389
                                <option name="edgeflip_move" type="bool">
453
390
                                        <_short>Edge Flip Move</_short>