Merge lp:~didrocks/unity-2d/no-gconf-in-2d into lp:unity-2d

[Didier Roche-Tolomelli]

debian/unity-2d.gconf-defaults:
  - removed: not used anymore and causing regression with hide-mode=2
    by default, converted to the gsettings key (LP: #942772)

[Gerry Boland (gerboland)]

Works great, thanks Didier!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-05 08:55:31 +0000
+++ debian/changelog	2012-03-07 18:00:27 +0000
@@ -1,3 +1,11 @@
+unity-2d (5.6.0-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/unity-2d.gconf-defaults:
+    - removed: not used anymore and causing regression with hide-mode=2
+      by default, converted to the gsettings key (LP: #942772)
+
+ -- Didier Roche <[e-mail]>  Wed, 07 Mar 2012 18:43:46 +0100
+
 unity-2d (5.6.0-0ubuntu1) precise; urgency=low
 
   * New upstream release

=== removed file 'debian/unity-2d.gconf-defaults'
--- debian/unity-2d.gconf-defaults	2011-07-01 16:02:43 +0000
+++ debian/unity-2d.gconf-defaults	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-/desktop/unity-2d/launcher/favorites [ubiquity-gtkui.desktop,nautilus-home.desktop,firefox.desktop,libreoffice-writer.desktop,libreoffice-calc.desktop,libreoffice-impress.desktop,ubuntu-software-center.desktop,ubuntuone-control-panel-gtk.desktop]
-/desktop/unity-2d/launcher/hide_mode 2
-/desktop/unity-2d/launcher/use_strut false
-/desktop/unity-2d/launcher/super_key_enable true