Upstream lp:compiz-plugins-main is missing grid fixes from downstream (oneiric-proposed)

Bug Description

It looks to me like ubuntu branches have got ahead of upstream, which should never happen...

lp:compiz-grid-plugin
Should always be the most up-to-date, but is missing ALL grid fixes since oneiric was released. This looks wrong to me.
https://code.launchpad.net/~compiz-team/compiz-grid-plugin/0.9.5

lp:ubuntu/compiz-plugins-main
Appears to be ahead of the above branch in grid fixes, when it should always be behind it.
https://code.launchpad.net/~ubuntu-branches/ubuntu/precise/compiz-plugins-main/precise

lp:ubuntu/oneiric-proposed/compiz-plugins-main
This branch seems to be AHEAD of the other two while it should always be behind the other two.
https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/compiz-plugins-main/oneiric-proposed

It would appear all grid fixes since September still need to be manually pushed upstream (lp:compiz-grid-plugin), which should have been done before they went into ubuntu branches. I hope I'm wrong...

Bug confirmed by smspillaz via email.

Here is the superset of grid fixes from oneiric-proposed that are missing upstream:

------------------------------------------------------------
revno: 24
tags: 1:0.9.6-0ubuntu4.2
fixes bug(s): https://launchpad.net/bugs/876591
author: Omer Akram <email address hidden>
committer: Package Import Robot <email address hidden>
branch nick: oneiric-proposed
timestamp: Tue 2011年12月06日 01:38:27 +0500
message:
* 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)
------------------------------------------------------------
revno: 23
tags: 1:0.9.6-0ubuntu4.1
fixes bug(s): https://launchpad.net/bugs/875557 https://launchpad.net/bugs/891886
author: Omer Akram <email address hidden>
committer: Package Import Robot <email address hidden>
branch nick: oneiric-proposed
timestamp: Mon 2011年12月05日 16:36:29 +0100
message:
* debian/patches/fix-875557.patch:
- Compiz grid overlay appears after workspace switcher use.
(LP: #875557)
* debian/patches/fix-891886.patch:
- Compiz grid plugin is fired when resizing a window. (LP: #891886)
------------------------------------------------------------
revno: 21
tags: 1:0.9.6-0ubuntu3
fixes bug(s): https://launchpad.net/bugs/827560 https://launchpad.net/bugs/834585 https://launchpad.net/bugs/853951 https://launchpad.net/bugs/865177 https://launchpad.net/bugs/865179 https://launchpad.net/bugs/862260 https://launchpad.net/bugs/862261 https://launchpad.net/bugs/860646 https://launchpad.net/bugs/864476 https://launchpad.net/bugs/868121
author: Didier Roche <email address hidden>
committer: Bazaar Package Importer <email address hidden>
branch nick: oneiric-proposed
timestamp: Mon 2011年10月10日 15:04:09 +0200
message:
* Cherry-pick upstream fixes:
- unmaximizable windows still show orange glow but fail to maximize
(LP: #827560)
- compiz crashed with SIGSEGV in CompWindow::serverBorderRect()
(LP: #834585)
- Workspace switcher makes windows lose decorations (LP: #853951)
- Windows get corrupted sometimes when semi-maximizing them (LP: #865177)
- Windows like gnome-terminal have awkward space around them after being
semi-maximized (LP: #865179)
- Grid plugin behaviour random (LP: #862260)
- Don't apply snapping to maximized windows (LP: #862261)
- snap movements can cause infinite loops in window movements (LP: #860646)
- it is possible to see a window in it's pre-animation state during unmap
animations (LP: #864476)
- Rendering glitches when resuming from expo mode (LP: #868121)
------------------------------------------------------------

What a great mess. As far as I can tell all oneiric grid fixes will be lost in precise right now.

Ignore comment #2. The fixes from oneiric-proposed missing upstream seem to go back to revision 19 at least.

After an initial review, here is the list of grid fixes in lp:ubuntu/oneiric-proposed/compiz-plugins-main that are missing from lp:compiz-grid-plugin:

bug 860257
bug 827560
bug 865177
bug 865179
bug 862260
bug 875557
bug 891886
bug 876591

Also...
bug 834585

I think bug 875557 maybe wasn't meant to be in that list.