Comment 3 for bug 1524165

The debdiff shows some changes that are not part of the existing diff between Ubuntu and Debian, e.g. in the 0ubuntu1->4ubuntu1 debdiff:

-Build-Depends: debhelper (>= 7.4.10), bison, ed, mawk | awk, perl, netbase,
- golang (>= 1:1.4~) | gccgo-5
-Build-Depends-Indep: po-debconf
+Build-Depends: debhelper (>= 7.4.10),
+ golang-go (>= 2:1.4.2-2~) | gccgo-5,
+ netbase

These appear to be reasonable changes to make to the packaging, but it's incorrect to list them as "remaining changes" in the debian changelog for the merge. It also complicates the review of the package, since this combines the merge of the new Debian package version, with a number of independent changes.

Could we instead do a clean merge of Debian -4 into xenial, so we can account for everything that's currently in the Ubuntu delta, and then apply any further improvements on top of that? Doing a test merge here gave me several differences to your package, and it would be clearer to understand if these are the result of a disagreement in the merge, or the result of an additional change.