[Bug 1524165] Re: merge with debian

[Steve Langasek]

Hi Michael,

The debdiff for 1.5.2-1ubuntu1 largely looks correct to me.  I have a
few small corrections:

- the changes to debian/copyright should be retained, these fix a real bug and should be upstreamed to Debian.
- the changes to debian/source/lintian-overrides should be retained, for the same reason.
- the debian/control contents have diverged from Debian quite a bit in matters of field ordering, whitespace, etc.  we can lose much of this delta with no change in semantics, so I think it's best to do this now when merging.
- Debian has added versioned Conflicts against golang-golang-x-tools, and golang-go.tools.  This is incorrect, these should be versioned Breaks/Replaces to ensure smooth upgrades with apt.  Since the Ubuntu package already had Breaks/Replaces, I restored this usage with updated version numbers.
- The golang-src package in Ubuntu Breaks/Replaces ancient versions of golang-go, but this has been dropped in Debian.  Unfortunately, these versions are not so ancient that they aren't newer than the version present in the trusty release pocket, so we should hang on to this until xenial is released.
- the changelog should document those changes that have been dropped and why (e.g., patches that are upstream and no longer needed here).
- Debian has added ppc64 to their list of archs where they build golang; so we should extend our list of "go archs" to include this one for better upstreamability to Debian.

Please let me know whether you agree with these changes (in the attached
debdiff) or whether you think further revision is needed before upload.

** Patch added: "golang-1524164-mergier-slangasek.diff"
   https://bugs.launchpad.net/ubuntu/+source/golang/+bug/1524165/+attachment/4550305/+files/golang-1524164-mergier-slangasek.diff

-- 
You received this bug notification because you are a member of Ubuntu
Foundations Bugs, which is subscribed to golang in Ubuntu.
https://bugs.launchpad.net/bugs/1524165

Title:
  merge with debian

Status in golang package in Ubuntu:
  New

Bug description:
  I'm attaching a debdiff that merges the latest version from Debian.
  Well sort of: it also includes a pile of things that should really be
  in Debian, but haven't been fixed there yet -- see the list of Debian
  bugs mentioned in the changelog and the patches in them. But it gets
  the rewritten debian/rules from Debian, which is much simpler and
  clearer.

  I've uploaded this to my ppa at
  https://launchpad.net/~mwhudson/+archive/ubuntu/ppa/+packages so it at
  least builds on amd64, i386 and ppc64el and I've stared at the
  debdiffs for the amd64 debs and they look OK to me.

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/golang/+bug/1524165/+subscriptions