On Mon, 2020-05-18 at 14:13 +0100, Adam D. Barratt wrote: > That appears to have dropped a number of entries from the changelog > for the unstable upload it's based on, which is a little confusing to > say the least. > > If you're dropping changes for the backport, then the unstable > changelog stanza should be exactly as it was for the upload to > unstable, and any changes that weren't included should be itemised in > the changelog for the stable upload, if they're sufficiently > relevant.
As an alternative suggestion, rather than trying to backport the upload to unstable and reverting a bunch of the changes in the process, it might be easier to start from the current stable package and simply apply the changes required to resolve: + - Fixes issues in accounting due to socket reuse (Closes: #960792) + - Fixes undeclared variable issue assuming those are as simple and isolated as I suspect from looking through the diff. Regards, Adam