[Bug 1524165] Re: merge with debian

[Michael Hudson-Doyle]

Hi Steve,

Thanks for the very thorough review!

On 15 January 2016 at 16:47, Steve Langasek
<steve.langasek at canonical.com> wrote:
> 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.

Already done: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807304
(so I guess this bug number should be added to d/copyright?)

> - the changes to debian/source/lintian-overrides should be retained,
for the same reason.

OK.

> - 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.

Thanks.

> - 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.

I did wonder about this and assumed Debian was more likely to be
correct than me. Apparently not!

> - 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.

Er, yes they are? The versions being broke/replaced is 2:1-3~ and
trusty has 2:1.2.1-2ubuntu1 (which has the breaks/replaces of 2:1-3~
already). So I think this really can be dropped (it even seems
*precise* has a newer version than 1-3 :-)).

Of course it's pretty harmless to keep too.

> - the changelog should document those changes that have been dropped
and why (e.g., patches that are upstream and no longer needed here).

OK. Thanks.

> - 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.

Good spotting.

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

I guess I'd ask you to:

1) re-delete the breaks of golang-src
2) remove mention of same from changelog
3) add the bug number for the copyright changes to changelog

and upload away! And then we can do the 1.5.3 merge, but m-o-m should
get that right.

Cheers,
mwh

> ** 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 subscribed to the bug
> report.
> https://bugs.launchpad.net/bugs/1524165
>
> Title:
>   merge with debian
>
> To manage notifications about this bug go to:
> https://bugs.launchpad.net/ubuntu/+source/golang/+bug/1524165/+subscriptions

-- 
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