unity-2d

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

fix-gsettings-migration
Merge into trunk

Proposed by Martin Pitt on 2012-01-24

Status:

Merged

Approved by:

Gerry Boland on 2012-01-26

Approved revision:

867

Merged at revision:

872

Proposed branch:

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

Merge into:

lp://qastaging/unity-2d

Diff against target:

49 lines (+14/-3)

4 files modified

data/unity-2d.convert (+0/-1)
debian/changelog (+12/-0)
debian/control (+1/-1)
debian/source/format (+1/-1)

To merge this branch:

bzr merge lp://qastaging/~pitti/unity-2d/fix-gsettings-migration

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Gerry Boland (community)		2012-01-24	Approve on 2012-01-26
Review via email: mp+89882@code.qastaging.launchpad.net

Description of the change

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!

Revision history for this message

Martin Pitt (pitti) wrote on 2012-01-24:

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://qastaging/~pitti/unity-2d/fix-gsettings-migration updated on 2012-01-24

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

Revision history for this message

Martin Pitt (pitti) wrote on 2012-01-24:

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).

Revision history for this message

Gerry Boland (gerboland) wrote on 2012-01-26:

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