=== modified file 'debian/changelog'
--- debian/changelog	2009-02-10 09:43:15 +0000
+++ debian/changelog	2009-03-12 23:28:29 +0000
@@ -1,3 +1,12 @@
+metacity (1:2.25.144-0ubuntu2) jaunty; urgency=low
+
+  * debian/patches/014_fix_panel_behavior.patch
+   - From upstream, fix windows behavior with various panels situations 
+     like autohide mode for gnome-panel or "don't cover the bar" option of 
+     avant-window-navigator.
+
+ -- Julien Lavergne <julien.lavergne@gmail.com>  Fri, 13 Mar 2009 00:25:13 +0100
+
 metacity (1:2.25.144-0ubuntu1) jaunty; urgency=low
 
   * New upstream version (LP: #324110):

=== added file 'debian/patches/014_fix_panel_behavior.patch'
--- debian/patches/014_fix_panel_behavior.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/014_fix_panel_behavior.patch	2009-03-12 23:23:41 +0000
@@ -0,0 +1,111 @@
+#Upstream : http://bugzilla.gnome.org/show_bug.cgi?id=572573
+#Ubuntu : https://bugs.launchpad.net/ubuntu/+source/metacity/+bug/341487
+--- src/core/window-props.c	2009/03/11 14:21:33	4190
++++ src/core/window-props.c	2009/03/12 01:09:41	4191
+@@ -73,12 +73,6 @@
+   ReloadValueFunc   reload_func;
+ } MetaWindowPropHooks;
+ 
+-static void init_prop_value            (MetaDisplay   *display,
+-                                        Atom           property,
+-                                        MetaPropValue *value);
+-static void reload_prop_value          (MetaWindow    *window,
+-                                        MetaPropValue *value,
+-                                        gboolean       initial);
+ static MetaWindowPropHooks* find_hooks (MetaDisplay *display,
+                                         Atom         property);
+ 
+@@ -128,23 +122,34 @@
+   g_return_if_fail (n_properties > 0);
+   
+   values = g_new0 (MetaPropValue, n_properties);
+-  
+-  i = 0;
+-  while (i < n_properties)
++
++  for (i=0; i<n_properties; i++)
+     {
+-      init_prop_value (window->display, properties[i], &values[i]);
+-      ++i;
++      MetaWindowPropHooks *hooks = find_hooks (window->display,
++                                               properties[i]);
++    
++      if (!hooks || hooks->type == META_PROP_VALUE_INVALID)
++        {
++          values[i].type = META_PROP_VALUE_INVALID;
++          values[i].atom = None;
++        }
++      else
++        {
++          values[i].type = hooks->type;
++          values[i].atom = properties[i];
++        }
+     }
+   
+   meta_prop_get_values (window->display, xwindow,
+                         values, n_properties);
+ 
+-  i = 0;
+-  while (i < n_properties)
++  for (i=0; i<n_properties; i++)
+     {
+-      reload_prop_value (window, &values[i], initial);
+-      
+-      ++i;
++      MetaWindowPropHooks *hooks = find_hooks (window->display,
++                                               properties[i]);
++
++      if (hooks && hooks->reload_func != NULL)
++        (* hooks->reload_func) (window, &values[i], initial);
+     }
+ 
+   meta_prop_free_values (values, n_properties);
+@@ -152,37 +157,6 @@
+   g_free (values);
+ }
+ 
+-/* Fill in the MetaPropValue used to get the value of "property" */
+-static void
+-init_prop_value (MetaDisplay   *display,
+-                 Atom           property,
+-                 MetaPropValue *value)
+-{
+-  MetaWindowPropHooks *hooks = find_hooks (display, property);
+-    
+-  if (!hooks || hooks->type == META_PROP_VALUE_INVALID)
+-    {
+-      value->type = META_PROP_VALUE_INVALID;
+-      value->atom = None;
+-    }
+-  else
+-    {
+-      value->type = hooks->type;
+-      value->atom = property;
+-    }
+-}
+-
+-static void
+-reload_prop_value (MetaWindow    *window,
+-                   MetaPropValue *value,
+-                   gboolean       initial)
+-{
+-  MetaWindowPropHooks *hooks = find_hooks (window->display, value->atom);
+-
+-  if (hooks && hooks->reload_func != NULL)
+-    (* hooks->reload_func) (window, value, initial);
+-}
+-
+ static void
+ reload_wm_client_machine (MetaWindow    *window,
+                           MetaPropValue *value,
+@@ -1566,6 +1540,9 @@
+   display->prop_hooks_table = NULL;
+ }
+ 
++/**
++ * Finds the hooks for a particular property.
++ */
+ static MetaWindowPropHooks*
+ find_hooks (MetaDisplay *display,
+             Atom         property)
+