[Bug 1524165] Re: merge with debian

2016-01-15 Thread Launchpad Bug Tracker
This bug was fixed in the package golang - 2:1.5.2-1ubuntu1 --- golang (2:1.5.2-1ubuntu1) xenial; urgency=low * Merge from Debian unstable (LP: #1524165). Remaining changes: - d/patches/armhf-elf-header.patch (see upstream bug https://github.com/golang/go/issues/7094)

[Bug 1524165] Re: merge with debian

2016-01-14 Thread Michael Hudson-Doyle
** Bug watch added: Debian Bug tracker #807304 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807304 -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1524165 Title: merge with debian To manage no

Re: [Bug 1524165] Re: merge with debian

2016-01-14 Thread Michael Hudson-Doyle
Hi Steve, Thanks for the very thorough review! On 15 January 2016 at 16:47, Steve Langasek 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

[Bug 1524165] Re: merge with debian

2016-01-14 Thread 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 sa

[Bug 1524165] Re: merge with debian

2016-01-06 Thread Michael Hudson-Doyle
Debian uploaded 1.5.2 at last, here's the diff from Debian to an updated merge (it's kinda big of course, I'll uploaded the diff from Debian to this as well). ** Patch added: "golang_1.5.1-0ubuntu4-1_1.5.2-1ubuntu1.diff" https://bugs.launchpad.net/ubuntu/+source/golang/+bug/1524165/+attachment

[Bug 1524165] Re: merge with debian

2016-01-06 Thread Michael Hudson-Doyle
Diff from Debian's 1.5.2-1 to my package. ** Patch added: "golang_1.5.2-1_1.5.2-1ubuntu1.diff" https://bugs.launchpad.net/ubuntu/+source/golang/+bug/1524165/+attachment/4545174/+files/golang_1.5.2-1_1.5.2-1ubuntu1.diff -- You received this bug notification because you are a member of Ubuntu

[Bug 1524165] Re: merge with debian

2015-12-14 Thread Michael Hudson-Doyle
Oh and one final comment and I'll shut up for today: Debian is in the process of uploading 1.5.2. If they actually do that soon, I'll redo the merge on top of that (which would be nice, because I can drop two patches). -- You received this bug notification because you are a member of Ubuntu Bugs,

Re: [Bug 1524165] Re: merge with debian

2015-12-14 Thread Michael Hudson-Doyle
>> - 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 >>

[Bug 1524165] Re: merge with debian

2015-12-14 Thread Michael Hudson-Doyle
Here are the changes from Debian. Looking reasonably tidy to me. ** Patch added: "changes from debian" https://bugs.launchpad.net/ubuntu/+source/golang/+bug/1524165/+attachment/4534865/+files/golang_1.5.1-4_1.5.1-4ubuntu1.diff -- You received this bug notification because you are a member of

[Bug 1524165] Re: merge with debian

2015-12-14 Thread Michael Hudson-Doyle
New debdiff (against ubuntu) ** Patch added: "proposed changes from 0ubuntu4" https://bugs.launchpad.net/ubuntu/+source/golang/+bug/1524165/+attachment/4534864/+files/golang_1.5.1-0ubuntu4_1.5.1-4ubuntu1.diff -- You received this bug notification because you are a member of Ubuntu Bugs, whic

Re: [Bug 1524165] Re: merge with debian

2015-12-14 Thread Michael Hudson-Doyle
On 15 December 2015 at 14:41, Steve Langasek 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 upload

Re: [Bug 1524165] Re: merge with debian

2015-12-14 Thread Michael Hudson-Doyle
On 15 December 2015 at 14:29, Steve Langasek 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

[Bug 1524165] Re: merge with debian

2015-12-14 Thread Steve Langasek
- 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. - debian/control: Debian's golang package has dependencies on golang-{doc,go,src} (= ${source:Version}); Debian has golang-{doc,go,s

[Bug 1524165] Re: merge with debian

2015-12-14 Thread Steve Langasek
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

[Bug 1524165] Re: merge with debian

2015-12-08 Thread Mathew Hodson
** Changed in: golang (Ubuntu) Importance: Undecided => Wishlist -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1524165 Title: merge with debian To manage notifications about this bug go to: http

[Bug 1524165] Re: merge with debian

2015-12-08 Thread Michael Hudson-Doyle
Also see bug #1524175 -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. 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/+