[Bug 1524165] Re: merge with debian

[Michael Hudson-Doyle]

On 15 December 2015 at 14:29, Steve Langasek
<steve.langasek at canonical.com> wrote:
> 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.

Yes, true. They would be remaining changes if the Debian maintainers
merged my patches...

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

Well, maybe. I could certainly drop the build-deps, the copyright
changes, the nocheck support and the lintian warnings for now but the
two patches are required to avoid ftbfs and the race file stuff is a
gross bug I'd rather not import. I'll give it a go.

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

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