[Pkg-crosswire-devel] Ubuntu changelogs and diffs

[Daniel Glassey]

On Sat, Jan 24, 2009 at 7:27 PM, Дмитрий Ледков
<dmitrij.ledkov at gmail.com> wrote:
> Daniel Glassey wrote:
>> I don't know if any changes have been made to the Ubuntu versions of
>> the sword package. But anything relevant should go into the 1.5.11
>> package. Anyone like to check that?
>
> I've checked.

Thanks :) I assume that means nothing was relevant?

>> And then there's merging Ubuntu and Debian changelog entries. I
>> haven't followed the, er, flamewars so is there a sane way to keep
>> them in sync?
>
> Erhmmmm, I think because of the tarball, inside tarball the checksums
> got out of sync with ubuntu, that's why their auto-sync from debian was
> failing. So they were doing a fake-sync merge - copy the package over,
> and a changelog entry and rebuild.

Ah, oh dear. I don't remember hearing about that.

> The usual way is to keep debian only changelog in debian. If there is
> anything on ubuntu side, they do manual merges and preserve the
> changelog in this order:
>
> 0.1-2ubuntu1
> 0.1-2
> 0.1-1ubuntu2
> 0.1-1ubuntu1
> 0.1-1
>
> So on ubuntu you get chronological debian/ubuntu changelog. While debian
> doesn't need to sync any changelogs in.
>
> If ubuntu patches get incorporated into debian package. A debian
> changelog mentions it, and from that point on, ubuntu packages are
> auto-sync and old ubuntu changelogs are silently dropped.

OK, that sounds good to me.

Thanks,
Daniel