GLib

Merge lp://qastaging/~vorlon/glib/multiarch into lp://qastaging/~ubuntu-desktop/glib/ubuntu

multiarch
Merge into ubuntu

Proposed by Steve Langasek on 2011-03-21

Status:	Merged
Merged at revision:	62
Proposed branch:	lp://qastaging/~vorlon/glib/multiarch
Merge into:	lp://qastaging/~ubuntu-desktop/glib/ubuntu
Diff against target:	489 lines (+166/-32) 20 files modified debian/changelog (+62/-0) debian/clean (+10/-0) debian/compat (+1/-1) debian/control (+12/-4) debian/control.in (+12/-4) debian/libgio-fam.install.in (+1/-1) debian/libglib2.0-0-refdbg.install.in (+1/-1) debian/libglib2.0-0.dirs.in (+1/-1) debian/libglib2.0-0.install.in (+4/-4) debian/libglib2.0-0.postinst.in (+10/-6) debian/libglib2.0-0.postrm.in (+5/-0) debian/libglib2.0-0.triggers.in (+1/-0) debian/libglib2.0-bin.links.in (+2/-2) debian/libglib2.0-dbg.install.in (+1/-1) debian/libglib2.0-dev.install.in (+4/-4) debian/libglib2.0-dev.links.in (+1/-1) debian/libglib2.0-udeb.install.in (+1/-1) debian/patches/gio-modules-multiarch-compat.patch (+13/-0) debian/patches/series (+1/-0) debian/rules (+23/-1)
To merge this branch:	bzr merge lp://qastaging/~vorlon/glib/multiarch
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Martin Pitt	2011-03-21	Needs Fixing on 2011-03-21
Sebastien Bacher	2011-03-21	Pending
Robert Ancell	2011-03-21	Pending
Review via email: mp+54143@code.qastaging.launchpad.net

Description of the change

This branch converts the glib2.0 package for multiarch: all contents of libglib2.0-0 are moved to /usr/lib/$arch and /lib/$arch, the module path is changed to /usr/lib/$arch/gio/modules with a patch to add a hard-coded fallback to /usr/lib/gio/modules for backwards compatibility, and Multi-Arch: same/foreign fields are added to the correct places in debian/control.

By and large this follows the same multiarch conversion protocol described at http://wiki.debian.org/Multiarch/Implementation which has been used for the other library conversions to date in natty, but because of the gio module lookup path, and because I'm not actually sure how to *test* that gio modules are working correctly, I'd appreciate the ubuntu-desktop team's review of this rather than just merging it directly. (I'm happy to handle the actual merge, do the changelog cleanup, etc - I just want some eyeballs on this before I push it.)

For convenience, test packages of this branch are available in my multiarch ppa at <https://launchpad.net/~vorlon/+archive/multiarch/>.

Revision history for this message

Martin Pitt (pitti) wrote on 2011-03-21:

Thanks for working on this!

Something went wrong with building libglib2.0-doc, it lost all HTML files (the package is basically empty).

Will reboot with the new packages now and do some extensive testing.

review: Needs Fixing

Revision history for this message

Martin Pitt (pitti) wrote on 2011-03-21:

I tested gphoto://, ftp://, and archive:// gvfs URLs successfully. This confirms that your "include
/usr/lib/gio/modules as a fallback directory for compatibility" patch works (i. e. as long as we don't have a multiarch'ed gvfs yet).

So aside from the -doc contents this looks fine to me.

Thanks!

lp://qastaging/~vorlon/glib/multiarch updated on 2011-03-21

88. By Steve Langasek on 2011-03-21: don't use .in files for anything that doesn't actually contain a substitution;
fixes a problem where arch: indep packages might have been created before
the common-install-arch rule has run. Thanks for catching this, Martin\!