[Pkg-crosswire-devel] Ubuntu changelogs and diffs

[Дмитрий Ледков]

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.

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

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.

--Dima

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 260 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/pkg-crosswire-devel/attachments/20090124/32acbc5a/attachment.sig>