Re: Bug#898494: dgit: conventions for uploading to suites with semantics like *-backports
On Sat, May 12, 2018 at 10:18:55AM -0700, Sean Whitton wrote:
> Here are two ways of managing uploads to -backports with dgit:
>
> 1. maintain a stretch-bpo branch, merge the debian/ tags for uploads
> that have migrated to testing, `dch --bpo` and `dgit push-source` to
> backports
> [snip]
>
> In particular, the changelog entry for the upload to backports is meant
> to contain a description of all the changes from the version in testing
> that were needed in order to backport. If you use (1), this means that
> you have multiple entries in d/changelog with the same text, which
> doesn't really make sense in a changelog.[1]
I don't see why there would be duplicate changelog entries in this
workflow. You're building on a version of the package that was already
backported, so the earlier changelog entry already notes what
backport-specific changes were needed. We don't repeat descriptions of
Debian-specific patches every time we upload a new upstream version to
unstable, just because they're still relevant.
I'll also note that there is wording (emphasis added) in the
documentation for contributing[0] that seems to agree with that.
It is recommended to include all changelog entries since the _last
version on debian-backports_ or since stable if it's the first version.
...
Backports of an updated version of a package that was backported
before may have a changelog that _merges entries of backports of
previous versions_, but this is not required.
Especially in the case where it's a single person/team that's
maintaining the backport, I think performing merges, and _not_
duplicating changelog information, is appropriate.
[0]: https://backports.debian.org/Contribute/
Cheers,
--
James
GPG Key: 4096R/91BF BF4D 6956 BD5D F7B7 2D23 DFE6 91AE 331B A3DB
Reply to: