Merge lp:~om26er/ubuntu/oneiric/compiz-plugins-main/fix-876591-2 into lp:ubuntu/oneiric-proposed/compiz-plugins-main

[Omer Akram]

fix linked bug

[Luke Yelavich (themuso)]

I think didia needs to look at this one.

[Luke Yelavich (themuso)]

Whoops I meant didier

[Didier Roche-Tolomelli (didrocks)]

Uploaded to oneiric-proposed. Thanks a lot Omer!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-05 15:36:29 +0000
+++ debian/changelog	2011-12-05 15:59:58 +0000
@@ -1,3 +1,12 @@
+compiz-plugins-main (1:0.9.6-0ubuntu4.2) oneiric-proposed; urgency=low
+
+  * debian/patches/fix-876591.patch:
+    - Ctrl-Alt-KP_9 adjusts window to upper half instead of top right corner 
+      (behaves like Ctrl-Alt-KP_8) 
+      (lp: #876591)
+
+ -- Omer Akram <[e-mail]>  Mon, 05 Dec 2011 20:38:27 +0500
+
 compiz-plugins-main (1:0.9.6-0ubuntu4.1) oneiric-proposed; urgency=low
 
   * debian/patches/fix-875557.patch:
 
=== added file 'debian/patches/fix-876591.patch'
--- debian/patches/fix-876591.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-876591.patch	2011-12-05 15:59:58 +0000
@@ -0,0 +1,13 @@
+=== modified file 'src/grid.cpp'
+--- compiz-plugins-main-0.9.6.orig/grid/src/grid.cpp	2011-10-05 17:41:22 +0000
++++ compiz-plugins-main-0.9.6.orig/grid/src/grid.cpp	2011-10-25 18:20:34 +0000
+@@ -1018,7 +1018,7 @@
+     gridProps[GridRight]  = GridProps {1,0, 2,1};
+     gridProps[GridTopLeft]  = GridProps{0,0, 2,2};
+     gridProps[GridTop]  = GridProps {0,0, 1,2};
+-    gridProps[GridTopRight]  = GridProps {0,0, 1,2};
++    gridProps[GridTopRight]  = GridProps {1,0, 2,2};
+     gridProps[GridMaximize]  = GridProps {0,0, 1,1};
+ 
+ 	animations.clear ();
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-12-05 15:36:29 +0000
+++ debian/patches/series	2011-12-05 15:59:58 +0000
@@ -13,3 +13,4 @@
 fix-872161.patch
 fix-891886.patch
 fix-875557.patch
+fix-876591.patch