Merge lp:~ubuntu-branches/ubuntu/oneiric/compiz-plugins-main/oneiric-proposed-201112051511 into lp:ubuntu/oneiric-proposed/compiz-plugins-main

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric-proposed/compiz-plugins-main reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/compiz-plugins-main/oneiric-proposed-201112051511. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

24. By Martin Pitt on 2011-12-05

releasing version 1:0.9.6-0ubuntu4.1

23. By Martin Pitt on 2011-12-05

* 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)

=== added file 'debian/patches/fix-875557.patch'
--- debian/patches/fix-875557.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-875557.patch	2011-12-05 15:17:27 +0000
@@ -0,0 +1,12 @@
+--- a/expo/src/expo.cpp	2011-10-05 06:48:41 +0000
++++ b/expo/src/expo.cpp	2011-11-26 20:47:23 +0000
+@@ -148,8 +148,6 @@
+     else
+ 	vpUpdateMode = VPUpdateMouseOver;
+ 
+-    dndState  = DnDNone;
+-
+     screen->removeAction (&optionGetDndButton ());
+     screen->removeAction (&optionGetExitButton ());
+     screen->removeAction (&optionGetNextVpButton ());
+

=== renamed file 'debian/patches/fix-875557.patch' => 'debian/patches/fix-875557.patch.moved'
=== added file 'debian/patches/fix-891886.patch'
--- debian/patches/fix-891886.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-891886.patch	2011-12-05 15:17:27 +0000
@@ -0,0 +1,14 @@
+=== modified file 'src/grid.cpp'
+--- a/grid/src/grid.cpp	2011-10-05 17:41:22 +0000
++++ b/grid/src/grid.cpp	2011-11-19 18:19:19 +0000
+@@ -766,7 +766,8 @@
+ 			unsigned int state,
+ 			unsigned int mask)
+ {
+-    if (mask & (CompWindowGrabMoveMask | CompWindowGrabButtonMask))
++    if ((mask & (CompWindowGrabMoveMask | CompWindowGrabButtonMask)) &&
++        !(mask & CompWindowGrabResizeMask))
+     {
+ 	gScreen->o[0].value ().set ((int) window->id ());
+ 
+

=== renamed file 'debian/patches/fix-891886.patch' => 'debian/patches/fix-891886.patch.moved'