[Pkg-xen-devel] [PATCH 0/9] Package the ocaml libraries

[Jonathan Ludlam]

On 26 Oct 2011, at 10:43, Bastian Blank wrote:

> On Wed, Oct 26, 2011 at 10:24:58AM +0100, Ian Campbell wrote:
>> On Wed, 2011-10-26 at 10:59 +0200, Bastian Blank wrote:
>>> This patches are not enough. I pulled them from xen-unstable and got:
>>> | The next patch would delete the file tools/ocaml/libs/xl/xl.mli.in,
>>> | which does not exist!  Applying it anyway.
>>> | patching file tools/ocaml/libs/xl/xl.mli.in
>>> | Hunk #1 FAILED at 1.
>>> | 1 out of 1 hunk FAILED -- rejects in file tools/ocaml/libs/xl/xl.mli.in
>> 
>> A bunch of other stuff changed in the ocaml stuff between 4.1 and the
>> current unstable version (e.g. we now autogenerate the xl bindings,
>> which is where xl.mli.in comes from), it's stuff which I don't think is
>> suitable for backport either upstream or to these packages.
>> 
>> I suspect that when Jon says "import" he actually means "apply the moral
>> equivalent of".
> 
> Well. Then the patches are too large. They must not rename files,
> because diff can't handle this properly.
> 
> Even the upstream repository misses the informations about the renames.
> 

Partly because they necessarily aren't just renames; the modules have 
interdependencies. For example, xc.ml references the modules Mmap, and
mmap was renamed in the same patch.

It's probably a little unfortunate that the modules weren't renamed individually. 
Had this been done, each patch would have been a combination of:

* rename of file (e.g. mmap.ml -> xenmmap.ml)
* patch of dependent other files (e.g. in xc.ml Mmap.foo -> Xenmmap.foo)

but it's a little late for xen-unstable.hg.

If you'd prefer, I could make the changes like this, but then you'd be deviating
even more from what's gone into xen-unstable. I don't really know which approach
is better.

Jon



> Bastian
> 
> -- 
> You're too beautiful to ignore.  Too much woman.
> 		-- Kirk to Yeoman Rand, "The Enemy Within", stardate unknown
> 
> _______________________________________________
> Pkg-xen-devel mailing list
> Pkg-xen-devel at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-xen-devel