Merge lp:~pitti/unity-2d/fix-gsettings-migration into lp:unity-2d

[Martin Pitt]

r802 removed the "use-struts" gsettings option, but forgot to remove it from
the gconf migration schema as well. This causes gsettings-data-convert to
crash, causing the whole configuration migration to fail.

Please apply quickly. Thanks!

[Martin Pitt (pitti)]

As discussed with Didier, I'm uploading this now as it's a major regression since December. If you merge this, don't worry about preserving the changelog, that's not important.

Thanks!

[lp:~pitti/unity-2d/fix-gsettings-migration]

866. By Martin Pitt on 2012-01-24

debian/source/format: Move back to 1.0, as we have inline code changes
with the full code being branched from trunk. Current dpkg makes it
impossible to build a source package with 3.0 now.

867. By Martin Pitt on 2012-01-24

releasing version 5.2.0-0ubuntu2

[Martin Pitt (pitti)]

Note, I also had to change the source package format from 3.0 (quilt) to 1.0, otherwise precise's dpkg fails to build a source package (and the --commit option doesn't seem to work).

[Gerry Boland (gerboland)]

Ok, I was confused by the change of source package format, but a quick chat with didrocks has sorted that out for me.
Thank you for the fix!

review: Approve

=== modified file 'data/unity-2d.convert'
--- data/unity-2d.convert	2011-08-02 10:15:06 +0000
+++ data/unity-2d.convert	2012-01-24 13:20:31 +0000
@@ -1,5 +1,4 @@
 [com.canonical.Unity2d.Launcher]
 super-key-enable = /desktop/unity-2d/launcher/super_key_enable
 hide-mode = /desktop/unity-2d/launcher/hide_mode
-use-strut = /desktop/unity-2d/launcher/use_strut
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-01-13 08:13:09 +0000
+++ debian/changelog	2012-01-24 13:20:31 +0000
@@ -1,3 +1,15 @@
+unity-2d (5.2.0-0ubuntu2) precise; urgency=low
+
+  * debian/control: Fix Vcs-Bzr: to point to precise/trunk branch.
+  * data/unity-2d.convert: Drop invalid "use-strut". This gsettings key does
+    not exist and causes gsettings-data-convert to crash, making the whole
+    settings migration fail. This cleans up after r804. (LP: #920894)
+  * debian/source/format: Move back to 1.0, as we have inline code changes
+    with the full code being branched from trunk. Current dpkg makes it
+    impossible to build a source package with 3.0 now.
+
+ -- Martin Pitt <[e-mail]>  Tue, 24 Jan 2012 14:11:16 +0100
+
 unity-2d (5.2.0-0ubuntu1) precise; urgency=low
 
   [ Didier Roche ]
 
=== modified file 'debian/control'
--- debian/control	2012-01-12 17:21:09 +0000
+++ debian/control	2012-01-24 13:20:31 +0000
@@ -26,7 +26,7 @@
                libnux-2.0-dev (>= 2.0),
                libxi-dev,
 Standards-Version: 3.9.2
-Vcs-Bzr: http://bazaar.launchpad.net/~unity-2d-team/unity-2d/oneiric
+Vcs-Bzr: https://code.launchpad.net/~unity-2d-team/unity-2d/trunk
 
 Package: unity-2d
 Architecture: all
 
=== modified file 'debian/source/format'
--- debian/source/format	2011-01-15 02:08:47 +0000
+++ debian/source/format	2012-01-24 13:20:31 +0000
@@ -1,1 +1,1 @@
-3.0 (quilt)
+1.0