05.04.2017 20:42, Niels Thykier wrote: > Control: tags -1 moreinfo > > On Wed, 05 Apr 2017 09:35:19 +0300 Michael Tokarev <m...@tls.msk.ru> wrote: >> Package: release.debian.org >> Severity: normal >> User: release.debian....@packages.debian.org >> Usertags: unblock >> >> Please unblock package qemu >> >> Upstream released a new stable/bugfix version which >> includes many changes we already had in debian >> package, but picked up more accurately (especially >> the 9pfs changes), and includes other bugfixes which >> were found since 2.8.0 release. After careful review >> of the changes upstream released I tend to think it >> is better to have whole set than to cherry-pick from >> a cherry-pick. >> >> I'd rather follow upstream here than to roll our own >> selection which no one knows how to deal with :) >> >> [...] >> > > Just to be sure, are you recommending 1:2.8+dfsg-4 or that we go with > upstream's 2.8.1 release?
Historically, for some reason I don't remember what, we kept the "major" upstream version and source in qemu and used just a patch (v2.8.1.patch in this case) pulled from upstream (tarball or git difference, which is the same in this case). Note that the version number has just 2 components, and the unblock request is for 2.8+dfsg-4, which includes v2.8.1.patch as a single upstream patch. The bulk of the debdiff (about 90% of it) is due to patch rearrangement, -- all of the upstream patches being removed are actually moved to v2.8.1.patch (with additions). Besides, it just occured to me that I can, at least, make a set of git differences which where already included in current debian release, and which are being added in the proposed v2.8.1.patch. If that helps, I'll do this. Thanks! /mjt