Merge lp:~bregma/compiz/lp-873384 into lp:compiz/0.9.12

[Stephen M. Webb]

removed distro-patch for #873384 because it's now upstream

Removes distro-patch for #873384 because the fix has ben pushed upstream.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3891
http://jenkins.qa.ubuntu.com/job/compiz-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-utopic-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-utopic-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/3/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

LGTM

review: Approve

=== modified file 'debian/patches/ubuntu-config.patch'
--- debian/patches/ubuntu-config.patch	2014-03-20 23:58:11 +0000
+++ debian/patches/ubuntu-config.patch	2014-10-28 15:22:05 +0000
@@ -280,21 +280,6 @@
  		</option>
  	    </group>
  	</options>
-Index: scale-xy-offsets/plugins/place/place.xml.in
-===================================================================
---- scale-xy-offsets.orig/plugins/place/place.xml.in	2014-02-17 21:25:57.420121366 +0100
-+++ scale-xy-offsets/plugins/place/place.xml.in	2014-02-17 21:25:57.412121402 +0100
-@@ -20,8 +20,8 @@
- 	    <option name="mode" type="int">
- 		<_short>Placement Mode</_short>
- 		<_long>Algorithm to use for window placement</_long>
--		<default>0</default>
--		<min>2</min>
-+		<default>2</default>
-+		<min>0</min>
- 		<max>5</max>
- 		<desc>
- 		    <value>0</value>
 Index: scale-xy-offsets/plugins/resize/resize.xml.in
 ===================================================================
 --- scale-xy-offsets.orig/plugins/resize/resize.xml.in	2014-02-17 21:25:57.420121366 +0100