diff -Nru compiz-plugins-main-0.9.7.0~bzr19/debian/changelog compiz-plugins-main-0.9.7.0~bzr19/debian/changelog
--- compiz-plugins-main-0.9.7.0~bzr19/debian/changelog	2012-02-13 14:30:41.000000000 +0000
+++ compiz-plugins-main-0.9.7.0~bzr19/debian/changelog	2012-02-16 15:34:40.000000000 +0000
@@ -1,3 +1,16 @@
+compiz-plugins-main (1:0.9.7.0~bzr19-0ubuntu2) precise; urgency=low
+
+  [ Sam Spilsbury ]
+  * debian/patches/expo_api_931927.patch
+  * debian/patches/workarounds_923087.patch
+    - adjust for API breaks (LP: #931927, #923087)
+
+  [ Didier Roche ]
+  * debian/control:
+    - build-dep on latest compiz-dev for ABI dev
+
+ -- Didier Roche <didrocks@ubuntu.com>  Thu, 16 Feb 2012 15:14:05 +0100
+
 compiz-plugins-main (1:0.9.7.0~bzr19-0ubuntu1) precise; urgency=low
 
   * New upstream snapshot:
diff -Nru compiz-plugins-main-0.9.7.0~bzr19/debian/control compiz-plugins-main-0.9.7.0~bzr19/debian/control
--- compiz-plugins-main-0.9.7.0~bzr19/debian/control	2012-02-13 14:30:41.000000000 +0000
+++ compiz-plugins-main-0.9.7.0~bzr19/debian/control	2012-02-16 15:34:40.000000000 +0000
@@ -7,7 +7,7 @@
                cmake,
                quilt,
                intltool,
-               compiz-dev (>= 1:0.9.7.0~bzr2995),
+               compiz-dev (>= 1:0.9.7.0~bzr2995-0ubuntu2),
                libgconf2-dev,
                libglib2.0-dev,
                libtool,
diff -Nru compiz-plugins-main-0.9.7.0~bzr19/debian/patches/expo_api_931927.patch compiz-plugins-main-0.9.7.0~bzr19/debian/patches/expo_api_931927.patch
--- compiz-plugins-main-0.9.7.0~bzr19/debian/patches/expo_api_931927.patch	1970-01-01 00:00:00.000000000 +0000
+++ compiz-plugins-main-0.9.7.0~bzr19/debian/patches/expo_api_931927.patch	2012-02-16 15:34:40.000000000 +0000
@@ -0,0 +1,23 @@
+=== modified file 'src/expo.cpp'
+Index: compiz-plugins-main-0.9.7.0~bzr19/expo/src/expo.cpp
+===================================================================
+--- compiz-plugins-main-0.9.7.0~bzr19.orig/expo/src/expo.cpp	2012-02-16 18:25:46.971255273 +0800
++++ compiz-plugins-main-0.9.7.0~bzr19/expo/src/expo.cpp	2012-02-16 18:26:49.999567822 +0800
+@@ -171,7 +171,7 @@
+     if (!expoMode)
+ 	return false;
+ 
+-    termExpo (action, 0, noOptions);
++    termExpo (action, 0, noOptions ());
+     anyClick = true;
+     cScreen->damageScreen ();
+ 
+@@ -352,7 +352,7 @@
+ 		clickTime   = 0;
+ 		doubleClick = false;
+ 
+-		termExpo (&action, 0, noOptions);
++		termExpo (&action, 0, noOptions ());
+ 		anyClick = true;
+ 	    }
+ 	}
diff -Nru compiz-plugins-main-0.9.7.0~bzr19/debian/patches/series compiz-plugins-main-0.9.7.0~bzr19/debian/patches/series
--- compiz-plugins-main-0.9.7.0~bzr19/debian/patches/series	2012-02-13 14:30:41.000000000 +0000
+++ compiz-plugins-main-0.9.7.0~bzr19/debian/patches/series	2012-02-16 15:34:40.000000000 +0000
@@ -1,3 +1,5 @@
 expo.patch
 fix_clipping_issues_in_expo.patch
 ubuntu_config.patch
+expo_api_931927.patch
+workarounds_923087.patch
diff -Nru compiz-plugins-main-0.9.7.0~bzr19/debian/patches/workarounds_923087.patch compiz-plugins-main-0.9.7.0~bzr19/debian/patches/workarounds_923087.patch
--- compiz-plugins-main-0.9.7.0~bzr19/debian/patches/workarounds_923087.patch	1970-01-01 00:00:00.000000000 +0000
+++ compiz-plugins-main-0.9.7.0~bzr19/debian/patches/workarounds_923087.patch	2012-02-16 15:34:40.000000000 +0000
@@ -0,0 +1,50 @@
+=== modified file 'src/workarounds.cpp'
+Index: compiz-plugins-main-0.9.7.0~bzr19/workarounds/src/workarounds.cpp
+===================================================================
+--- compiz-plugins-main-0.9.7.0~bzr19.orig/workarounds/src/workarounds.cpp	2012-02-10 00:53:27.000000000 +0800
++++ compiz-plugins-main-0.9.7.0~bzr19/workarounds/src/workarounds.cpp	2012-02-16 18:27:34.223787104 +0800
+@@ -548,39 +548,13 @@
+ void
+ WorkaroundsScreen::setWindowState (unsigned int state, Window id)
+ {
++    int i = 0;
+     Atom data[32];
+-    int  i = 0;
+ 
+-    if (state & CompWindowStateModalMask)
+-        data[i++] = Atoms::winStateModal;
+-    if (state & CompWindowStateStickyMask)
+-        data[i++] = Atoms::winStateSticky;
+-    if (state & CompWindowStateMaximizedVertMask)
+-        data[i++] = Atoms::winStateMaximizedVert;
+-    if (state & CompWindowStateMaximizedHorzMask)
+-        data[i++] = Atoms::winStateMaximizedHorz;
+-    if (state & CompWindowStateShadedMask)
+-        data[i++] = Atoms::winStateShaded;
+-    if (state & CompWindowStateSkipTaskbarMask)
+-        data[i++] = Atoms::winStateSkipTaskbar;
+-    if (state & CompWindowStateSkipPagerMask)
+-        data[i++] = Atoms::winStateSkipPager;
+-    if (state & CompWindowStateHiddenMask)
+-        data[i++] = Atoms::winStateHidden;
+-    if (state & CompWindowStateFullscreenMask)
+-        data[i++] = Atoms::winStateFullscreen;
+-    if (state & CompWindowStateAboveMask)
+-        data[i++] = Atoms::winStateAbove;
+-    if (state & CompWindowStateBelowMask)
+-        data[i++] = Atoms::winStateBelow;
+-    if (state & CompWindowStateDemandsAttentionMask)
+-        data[i++] = Atoms::winStateDemandsAttention;
+-    if (state & CompWindowStateDisplayModalMask)
+-        data[i++] = Atoms::winStateDisplayModal;
+-
+-    XChangeProperty (screen->dpy (), id, Atoms::winState,
+-                     XA_ATOM, 32, PropModeReplace,
+-                     (unsigned char *) data, i);
++    if ((i = compiz::window::fillStateData (state, data)))
++        XChangeProperty (screen->dpy (), id, Atoms::winState,
++	                 XA_ATOM, 32, PropModeReplace,
++	                 (unsigned char *) data, i);
+ }
+ 
+ void