- 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,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.
- debian/patches/skip-userns-tests-when-chrooted.patch: seems to be newly-added 
in this revision.
- debian/rules: your merge results look very different than mine, this warrants 
a closer look since the pre-existing delta was quite large.

-- 
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/+bug/1524165/+subscriptions

-- 
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs

Reply via email to