Merge lp:~sil2100/ubuntu-push/golang-1.6-for-all into lp:ubuntu-push

[Łukasz Zemczak]

Make sure we build against golang-1.6. Add the golang 1.6 binary path to the PATH in debian/rules.

Make sure we build against golang-1.6. Add the golang 1.6 binary path to the PATH in debian/rules.

Unmerged revisions

169. By Łukasz Zemczak on 2016-08-09

Make sure we build against golang-1.6. Add the golang 1.6 binary path to the PATH in debian/rules.

=== modified file 'debian/control'
--- debian/control	2015-11-30 20:59:30 +0000
+++ debian/control	2016-08-09 16:14:09 +0000
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 9),
                dh-exec (>= 0.3),
                dh-golang,
-               golang-go,
+               golang-1.6-go,
                golang-go-dbus-dev,
                golang-go-xdg-dev,
                golang-gocheck-dev,
 
=== modified file 'debian/rules'
--- debian/rules	2016-07-08 20:20:36 +0000
+++ debian/rules	2016-08-09 16:14:09 +0000
@@ -3,6 +3,7 @@
 
 export DH_GOPKG := launchpad.net/ubuntu-push
 export UBUNTU_PUSH_TEST_RESOURCES_ROOT := $(CURDIR)
+export PATH := /usr/lib/go-1.6/bin:$(PATH)
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 # Skip tests on the archs they are known to be flaky with current configuration