diff -Nru golang-1.6/debian/changelog golang-1.6/debian/changelog
--- golang-1.6/debian/changelog 2016-03-22 17:42:30.000000000 +1300
+++ golang-1.6/debian/changelog 2016-03-22 17:41:28.000000000 +1300
@@ -1,3 +1,10 @@
+golang (2:1.6-1ubuntu2) xenial; urgency=medium
+
+ * Include usr/bin/{go,gofmt} symlinks on non-golang architectures now that
+ gccgo no longer provides them.
+
+ -- Michael Hudson-Doyle <michael.hudson@canonical.com> Tue, 22 Mar 2016 17:38:31 +1300
+
golang (2:1.6-1ubuntu1) xenial; urgency=medium
* Merge from Debian unstable (LP: #1551489). Remaining changes:
diff -Nru golang-1.6/debian/rules golang-1.6/debian/rules
--- golang-1.6/debian/rules 2016-03-22 17:42:30.000000000 +1300
+++ golang-1.6/debian/rules 2016-03-22 17:41:28.000000000 +1300
@@ -84,12 +84,15 @@
override_dh_installdeb:
dh_installdeb
ifeq (false, $(IS_GOLANG_ARCH))
- : # these are empty dependency packages
+ : # these are almost empty dependency packages
rm -f debian/golang-go/DEBIAN/p*
rm -rf debian/golang-go/usr/share/man
install -d -m 755 debian/golang-src/usr/share/go/src
install -d -m 755 debian/golang-src/usr/share/go/include
install -d -m 755 debian/golang-src/usr/share/go/test
+ mkdir -p debian/golang-go/usr/bin
+ ln -s go-6 debian/golang-go/usr/bin/go
+ ln -s gofmt-6 debian/golang-go/usr/bin/gofmt
endif
override_dh_shlibdeps: