diff -u metacity-2.30.1/debian/changelog metacity-2.30.1/debian/changelog
--- metacity-2.30.1/debian/changelog
+++ metacity-2.30.1/debian/changelog
@@ -1,3 +1,10 @@
+metacity (1:2.30.1-0ubuntu2) maverick; urgency=low
+
+  * Fix metacity aborting with certain applications
+    - add debian/patches/14_use_gdk_screen_get_system_colormap.patch
+
+ -- Arand Nash <ienorand@gmail.com>  Mon, 24 May 2010 23:52:23 +0100
+
 metacity (1:2.30.1-0ubuntu1) lucid; urgency=low
 
   * New upsteam release:
diff -u metacity-2.30.1/debian/patches/series metacity-2.30.1/debian/patches/series
--- metacity-2.30.1/debian/patches/series
+++ metacity-2.30.1/debian/patches/series
@@ -9,4 +9,5 @@
 12_dont-show-as-user.patch
 13_better_support_for_button_layout.patch
+14_use_gdk_screen_get_system_colormap.patch
 90_autotools.patch
 99_ltmain_as-needed.patch
only in patch2:
unchanged:
--- metacity-2.30.1.orig/.pbuilderrc
+++ metacity-2.30.1/.pbuilderrc
@@ -0,0 +1 @@
+COMPONENTS="main restricted multiverse universe"
only in patch2:
unchanged:
--- metacity-2.30.1.orig/debian/patches/14_use_gdk_screen_get_system_colormap.patch
+++ metacity-2.30.1/debian/patches/14_use_gdk_screen_get_system_colormap.patch
@@ -0,0 +1,13 @@
+Index: metacity-2.30.1/src/ui/ui.c
+===================================================================
+--- metacity-2.30.1.orig/src/ui/ui.c	2010-05-24 18:46:31.875828086 +0200
++++ metacity-2.30.1/src/ui/ui.c	2010-05-24 18:46:47.275831234 +0200
+@@ -166,7 +166,7 @@
+   gint attributes_mask;
+   GdkWindow *window;
+   GdkVisual *visual;
+-  GdkColormap *cmap = gdk_screen_get_default_colormap (screen);
++  GdkColormap *cmap = gdk_screen_get_system_colormap (screen);
+   
+   /* Default depth/visual handles clients with weird visuals; they can
+    * always be children of the root depth/visual obviously, but