Merge tag 'release_2.6' into dgit/sid

At least in theory, a trivial merge, part of wiring dgit into the
packaging (see the dgit manual). Dgit made a synthetic commit from the
archive, and that needs to be brought into my git history.