Merge lp:~om26er/ubuntu/oneiric/metacity/fix-900063-v2 into lp:ubuntu/oneiric/metacity

[Omer Akram]

The patch which apparently fixed bug 723878 was not even added to the debian/patches/series file at all, I added it. this closes bug 900063

[Stéphane Graber (stgraber)]

Uploaded to oneiric-proposed.

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-16 21:21:58 +0000
+++ debian/changelog	2011-12-24 13:24:25 +0000
@@ -1,3 +1,10 @@
+metacity (1:2.34.1-1ubuntu4.1) oneiric-proposed; urgency=low
+
+  * Make sure the patch to dodge the launcher area for newly created windows
+    gets applied. (LP: #900063)
+
+ -- Omer Akram <[e-mail]>  Sat, 24 Dec 2011 18:08:47 +0500
+
 metacity (1:2.34.1-1ubuntu4) oneiric; urgency=low
 
   * Fix LP: #797078 - metacity crashed with SIGABRT due to unhandled X error.

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-09-14 07:51:11 +0000
+++ debian/patches/series	2011-12-24 13:24:25 +0000
@@ -12,6 +12,7 @@
 16-capture-before-unmap.patch
 17-workspace-switcher-cycle.patch
 18-auto-maximize-windows.patch
+20_do-not-place-windows-over-the-launcher.patch
 21_fix_compositing_startup.patch
 100_fade_on_long_title.patch
 101_override_gconf_settings.patch