Merge lp:~bfiller/unity-2d/update-metacity into lp:~unity-2d-team/unity-2d/unity-2d-default-settings-maverick

[Bill Filler]

This branch attempts to fix the problem where the patched version of metacity from the ppa is not getting automatically upgraded when installing unity-2d-default-settings as it should. I changed the depends on metacity to read (> 2.30.2-0ubuntu1) rather than (>= 2.30.2-0ubuntu1upicek2).

[Florian Boucault (fboucault)]

Great stuff Bill. Did you notice people still experiencing the issue?

review: Approve

[Bill Filler (bfiller)]

I was still seeing issue on latest system we tried upgrading.

=== modified file 'debian/control'
--- debian/control	2011-01-19 20:42:09 +0000
+++ debian/control	2011-01-20 21:54:52 +0000
@@ -10,7 +10,7 @@
 Depends: ${misc:Depends},
  indicator-application, indicator-appmenu, indicator-datetime, indicator-me, indicator-messages, indicator-session, indicator-sound,
  unity-2d-launcher, unity-2d-panel, unity-2d-places, unity-2d-spread,
- metacity (>=2.30.2-0ubuntu1upicek2), gnome-session-bin, gnome-settings-daemon, nautilus, policykit-1-gnome, gnome-power-manager,
+ metacity (> 2.30.2-0ubuntu1), gnome-session-bin, gnome-settings-daemon, nautilus, policykit-1-gnome, gnome-power-manager,
  ubuntu-wallpapers, gtk2-engines-pixbuf, light-themes
 Provides: unity-qt-default-settings
 Conflicts: unity-qt-default-settings (<= 0.1.28)