Comment 6 for bug 1524165

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote : Re: [Bug 1524165] Re: merge with debian

On 15 December 2015 at 14:41, Steve Langasek
<email address hidden> wrote:
> - debian/helpers/goenv.sh - this had previously been dropped from the Ubuntu packaging (superseded by the changes to debian/rules), but is readded in your version.

I think m-o-m is confusing you. The file is new in debian since we
uploaded the first 1.5 version to wily.

> - debian/control: Debian's golang package has dependencies on golang-{doc,go,src} (= ${source:Version}); Debian has golang-{doc,go,src} (= ${binary:Version}). This difference is not explained in the Ubuntu changelog. I believe the delta should be dropped. It happens that both Debian and Ubuntu are wrong, *some* of these deps should be ${source:Version} and *some* of them should be ${binary:Version}. But the difference between the two is irrelevant in Ubuntu, it only matters in Debian - so we should stay in sync with Debian for this bit, and propose a fix in Debian.

OK. I think the fact that some all packages become any packages as
part of the golang -> gccgo fake package stuff has impact here?

> - debian/patches/skip-userns-tests-when-chrooted.patch: seems to be newly-added in this revision.

Yeah, but I'm fairly the tests will fail without it (and running the
test suite on build is new in Debian recently). I don't know why they
don't fail on debian buildds -- older kernels there, maybe?

> - debian/rules: your merge results look very different than mine, this warrants a closer look since the pre-existing delta was quite large.

Well what I did was mostly take the Debian rules file and re-implement
the dependency packages afresh on top of the new file. I don't know if
it's entirely honest to call this a "merge" but I definitely think
it's an improvement. What does yours look like?