Platform team meeting minutes 2008/06/25

[Colin Watson]

On Wed, Jun 25, 2008 at 08:32:16PM -0700, Kees Cook wrote:
> On Wed, Jun 25, 2008 at 06:53:49PM -0700, Bryce Harrington wrote:
> >  * libx86: cjwatson will do this
> 
> This shouldn't be needed.  The current Debian version is the same as
> Ubuntu's as far as the code itself -- the Debian version is mostly build
> changes that aren't an issue.  And doing the merge may be a bit confused
> unless a lot of care is taken.

I took care of this before noticing this mail. Trust me, I did the merge
without reference to merge-o-matic's rather confused output in this
case. :-) There was one remaining changes in Ubuntu, which I filed as
Debian bug #488100, and a build problem noticed as a result of the
upload, which I filed as Debian bug #488101. Both are now fixed in
Debian and so we are now in sync.

> I actually reorganized the entire x86emu layout so it matched the
> x86emu from xorg, extracted the libx86-specific patchsets, and added
> build targets to do an automatic sync with xorg's version.  I've been
> in discussion with mjg59 about it going upstream, and haven't uploaded
> it yet because if there are changes, the "merge" would be especially
> horrific given the moved files, etc.  Better to just do a straight sync
> once it's in Debian.

Yes, sounds like that's best to go upstream ...

Cheers,

-- 
Colin Watson                                       [cjwatson at ubuntu.com]