diff -Nru compiz-0.9.2.1+glibmainloop3/debian/changelog compiz-0.9.2.1+glibmainloop3/debian/changelog
--- compiz-0.9.2.1+glibmainloop3/debian/changelog	2010-12-13 15:38:52.000000000 +0000
+++ compiz-0.9.2.1+glibmainloop3/debian/changelog	2010-12-14 01:59:35.000000000 +0000
@@ -1,3 +1,14 @@
+compiz (1:0.9.2.1+glibmainloop3-0ubuntu2) natty; urgency=low
+
+  * debian/patches/000_workaround_gconfbackend_init_hang.patch:
+    - workaround in delaying the plugin init as the gconf backend hangs when
+      trying to contact/launch the gconf daemon. This only happens when you
+      don't change your current profile, at session start.
+  * debian/patches/060_move_checks_to_compiz.patch:
+    - adapted regarding previous patch
+
+ -- Didier Roche <didrocks@ubuntu.com>  Tue, 14 Dec 2010 02:57:50 +0100
+
 compiz (1:0.9.2.1+glibmainloop3-0ubuntu1) natty; urgency=low
 
   * new glibmainloop branch snapshot:
diff -Nru compiz-0.9.2.1+glibmainloop3/debian/patches/000_workaround_gconfbackend_init_hang.patch compiz-0.9.2.1+glibmainloop3/debian/patches/000_workaround_gconfbackend_init_hang.patch
--- compiz-0.9.2.1+glibmainloop3/debian/patches/000_workaround_gconfbackend_init_hang.patch	1970-01-01 00:00:00.000000000 +0000
+++ compiz-0.9.2.1+glibmainloop3/debian/patches/000_workaround_gconfbackend_init_hang.patch	2010-12-14 01:59:35.000000000 +0000
@@ -0,0 +1,36 @@
+Index: compiz-0.9.2.1+glibmainloop3/src/main.cpp
+===================================================================
+--- compiz-0.9.2.1+glibmainloop3.orig/src/main.cpp	2010-12-14 02:34:38.889014003 +0100
++++ compiz-0.9.2.1+glibmainloop3/src/main.cpp	2010-12-14 02:35:27.209014002 +0100
+@@ -217,15 +217,15 @@
+ 	    o->set (value);
+     }
+ 
+-    screen->priv->dirtyPluginList = true;
+-    screen->priv->updatePlugins ();
+-
+     if (!screen->init (displayName))
+ 	return false;
+ 
+     if (!disableSm)
+ 	CompSession::init (clientId);
+ 
++    screen->priv->dirtyPluginList = true;
++    screen->priv->updatePlugins ();
++
+     return true;
+ }
+ 
+Index: compiz-0.9.2.1+glibmainloop3/src/screen.cpp
+===================================================================
+--- compiz-0.9.2.1+glibmainloop3.orig/src/screen.cpp	2010-12-14 02:34:41.993014002 +0100
++++ compiz-0.9.2.1+glibmainloop3/src/screen.cpp	2010-12-14 02:35:06.893014002 +0100
+@@ -4613,8 +4613,6 @@
+     /* The active plugins list might have been changed - load any
+      * new plugins */
+ 
+-    if (priv->dirtyPluginList)
+-	priv->updatePlugins ();
+ 
+     priv->vpSize.setWidth (priv->optionGetHsize ());
+     priv->vpSize.setHeight (priv->optionGetVsize ());
diff -Nru compiz-0.9.2.1+glibmainloop3/debian/patches/060_move_checks_to_compiz.patch compiz-0.9.2.1+glibmainloop3/debian/patches/060_move_checks_to_compiz.patch
--- compiz-0.9.2.1+glibmainloop3/debian/patches/060_move_checks_to_compiz.patch	2010-12-13 15:38:52.000000000 +0000
+++ compiz-0.9.2.1+glibmainloop3/debian/patches/060_move_checks_to_compiz.patch	2010-12-14 01:59:35.000000000 +0000
@@ -11,8 +11,8 @@
 
 Index: compiz-0.9.2.1+glibmainloop3/src/main.cpp
 ===================================================================
---- compiz-0.9.2.1+glibmainloop3.orig/src/main.cpp	2010-12-07 17:54:29.000000000 +0100
-+++ compiz-0.9.2.1+glibmainloop3/src/main.cpp	2010-12-13 11:07:36.964879001 +0100
+--- compiz-0.9.2.1+glibmainloop3.orig/src/main.cpp	2010-12-14 02:35:45.201014003 +0100
++++ compiz-0.9.2.1+glibmainloop3/src/main.cpp	2010-12-14 02:35:45.305014003 +0100
 @@ -81,6 +81,28 @@
  	    programName);
  }
@@ -53,7 +53,7 @@
      initialPlugins = plugins;
  
      return true;
-@@ -224,7 +250,16 @@
+@@ -223,7 +249,16 @@
  	return false;
  
      if (!disableSm)
@@ -68,9 +68,9 @@
  	CompSession::init (clientId);
 +    }
  
-     return true;
- }
-@@ -261,6 +296,13 @@
+     screen->priv->dirtyPluginList = true;
+     screen->priv->updatePlugins ();
+@@ -263,6 +298,13 @@
      signal (SIGINT, signalHandler);
      signal (SIGTERM, signalHandler);
  
diff -Nru compiz-0.9.2.1+glibmainloop3/debian/patches/series compiz-0.9.2.1+glibmainloop3/debian/patches/series
--- compiz-0.9.2.1+glibmainloop3/debian/patches/series	2010-12-13 15:38:52.000000000 +0000
+++ compiz-0.9.2.1+glibmainloop3/debian/patches/series	2010-12-14 01:59:35.000000000 +0000
@@ -1,3 +1,4 @@
+000_workaround_gconfbackend_init_hang.patch
 01_backport_trunk_fix.patch
 002_ship_splited_gconf_cmakeext_files.patch
 #014_fix-no-border-window-shadow.patch