compiz team mailing list archive

[Łukasz Zemczak <lukasz.zemczak@xxxxxxxxxxxxx>]

Łukasz Zemczak has proposed merging lp:~sil2100/compcomm-plugins-main/shift_954079 into lp:~compiz/compcomm-plugins-main/ubuntu.

Requested reviews:
  compiz packagers (compiz)

For more details, see:
https://code.launchpad.net/~sil2100/compcomm-plugins-main/shift_954079/+merge/97825

Cherry-picked fix for #954079 as a distro-patch.
-- 
https://code.launchpad.net/~sil2100/compcomm-plugins-main/shift_954079/+merge/97825
Your team compiz packagers is requested to review the proposed merge of lp:~sil2100/compcomm-plugins-main/shift_954079 into lp:~compiz/compcomm-plugins-main/ubuntu.

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-12 11:45:31 +0000
+++ debian/changelog	2012-03-16 10:03:09 +0000
@@ -1,3 +1,11 @@
+compiz-plugins-main (1:0.9.7.0~bzr19-0ubuntu7) precise; urgency=low
+
+  * debian/patches/shift_954079.patch:
+    - cherry picked the shift plugin patch for fixing an issue with compiz crashes
+      on right-click. This removes an unused option in the plugin. (LP: #954079)
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@xxxxxxxxxxxxx>  Fri, 16 Mar 2012 10:37:23 +0100
+
 compiz-plugins-main (1:0.9.7.0~bzr19-0ubuntu6) precise; urgency=low
 
   [ Łukasz 'sil2100' Zemczak ]

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-02-28 12:48:11 +0000
+++ debian/patches/series	2012-03-16 10:03:09 +0000
@@ -4,3 +4,4 @@
 expo_api_931927.patch
 workarounds_923087.patch
 workarounds_931473.patch
+shift_954079.patch

=== added file 'debian/patches/shift_954079.patch'
--- debian/patches/shift_954079.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/shift_954079.patch	2012-03-16 10:03:09 +0000
@@ -0,0 +1,15 @@
+--- a/shift/shift.xml.in	2011-08-12 06:41:38 +0000
++++ b/shift/shift.xml.in	2012-03-15 16:37:19 +0000
+@@ -47,11 +47,6 @@
+ 					<_short>Initiate (All Workspaces)</_short>
+ 					<_long>Initiate switcher (All Workspaces).</_long>
+ 				</option>
+-				<option name="terminate_button" type="button">
+-					<_short>Terminate</_short>
+-					<_long>Terminate switcher.</_long>
+-					<default>Button3</default>
+-				</option>
+ 				<option name="next_key" type="key">
+ 					<_short>Next Window</_short>
+ 					<_long>Show switcher if not visible and select next window.</_long>
+