Comment 3 for bug 1186588

Revision history for this message
James Page (james-page) wrote :

Hi Alessandro

Thanks for taking the time to prepare this merge.

A few comments:

1) preservation of ubuntu changelog entries.

Currently your debdiff does not preserve the changelog entries for previous Ubuntu versions. As this is a merge, it really should do this.

2) dropped changes.

As well as documenting which changes are still required in Ubuntu, its best practice to also document which Ubuntu changes have been dropped and why - for example the fix_thumb_build.patch has been dropped, but no details are provided as to why that is the case.

I'd recommend that you take a look at the 'grab-merge' tool in the ubuntu-dev-tools package as this does most of the hard work re changelogs etc.. leaving the user to just resolve outstanding conflicts etc..