diff -Nru compiz-0.9.0/debian/changelog compiz-0.9.0/debian/changelog
--- compiz-0.9.0/debian/changelog	2010-08-13 16:33:58.000000000 +0000
+++ compiz-0.9.0/debian/changelog	2010-09-13 07:05:10.000000000 +0000
@@ -1,4 +1,4 @@
-compiz (1:0.9.0-0ubuntu1~ppawithoutdecoration1) maverick; urgency=low
+compiz (1:0.9.0-0ubuntu1~ppb1) maverick; urgency=low
 
   * Update to new release
   * debian/control:
@@ -10,7 +10,8 @@
     - don't install usr/share/compiz/locale
   * debian/compiz-gnome.install:
     - no more usr/lib/window-manager-settings
-  * /!\ I didn't get gtk decorator working. The qt one is working though
+  * debian/patches/060_move_checks_to_compiz.patch:
+    - rename decoration to decor plugin
 
  -- Didier Roche <didrocks@ubuntu.com>  Fri, 13 Aug 2010 18:31:08 +0200
 
diff -Nru compiz-0.9.0/debian/patches/060_move_checks_to_compiz.patch compiz-0.9.0/debian/patches/060_move_checks_to_compiz.patch
--- compiz-0.9.0/debian/patches/060_move_checks_to_compiz.patch	2010-08-13 16:33:58.000000000 +0000
+++ compiz-0.9.0/debian/patches/060_move_checks_to_compiz.patch	2010-09-13 07:05:10.000000000 +0000
@@ -14,8 +14,10 @@
 # Origin: Ubuntu
 # Author: Travis Watkins <amaranth@ubuntu.com>
 
---- a/plugins/opengl/src/screen.cpp
-+++ b/plugins/opengl/src/screen.cpp
+Index: compiz-0.9.0/plugins/opengl/src/screen.cpp
+===================================================================
+--- compiz-0.9.0.orig/plugins/opengl/src/screen.cpp	2010-07-04 02:45:21.000000000 +0200
++++ compiz-0.9.0/plugins/opengl/src/screen.cpp	2010-09-06 19:33:35.964323000 +0200
 @@ -94,6 +94,7 @@
      GLfloat		 diffuseLight[]   = { 0.9f, 0.9f,  0.9f, 0.9f };
      GLfloat		 light0Position[] = { -0.5f, 0.5f, -9.0f, 1.0f };
@@ -78,8 +80,10 @@
  
      if (strstr (glExtensions, "GL_ARB_texture_non_power_of_two"))
  	GL::textureNonPowerOfTwo = true;
---- a/src/main.cpp
-+++ b/src/main.cpp
+Index: compiz-0.9.0/src/main.cpp
+===================================================================
+--- compiz-0.9.0.orig/src/main.cpp	2010-07-04 02:45:21.000000000 +0200
++++ compiz-0.9.0/src/main.cpp	2010-09-06 19:33:44.608323000 +0200
 @@ -59,6 +59,13 @@
  
  unsigned int pluginClassHandlerIndex = 0;
@@ -166,18 +170,17 @@
      for (i = 1; i < argc; i++)
      {
  	if (!strcmp (argv[i], "--help"))
-@@ -183,14 +238,24 @@
+@@ -183,14 +238,23 @@
  	}
      }
  
 +    /* add in default plugins if none are given */
 +    if (plugins.size () == 0)
 +    {
-+        plugins.push_back ("ccp");
 +        plugins.push_back ("move");
 +        plugins.push_back ("resize");
 +        plugins.push_back ("place");
-+        plugins.push_back ("decoration");
++        plugins.push_back ("decor");
 +    }
 +
      screen = new CompScreen ();
@@ -193,7 +196,7 @@
  
      if (!plugins.empty ())
      {
-@@ -211,12 +276,22 @@
+@@ -211,12 +275,22 @@
      }
  
      if (!screen->init (displayName))