Ubuntu Push Notifications

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

  1. golang-1.6-for-all
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Needs review
Proposed branch: lp:~sil2100/ubuntu-push/golang-1.6-for-all
Merge into: lp:ubuntu-push
Diff against target: 24 lines (+2/-1)
2 files modified
debian/control (+1/-1)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~sil2100/ubuntu-push/golang-1.6-for-all
Reviewer Review Type Date Requested Status
Ubuntu Push Hackers Pending
Review via email: mp+302443@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.

Unmerged revisions

169. By Łukasz Zemczak

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-11-30 20:59:30 +0000
3+++ debian/control 2016-08-09 16:14:09 +0000
4@@ -6,7 +6,7 @@
5 Build-Depends: debhelper (>= 9),
6 dh-exec (>= 0.3),
7 dh-golang,
8- golang-go,
9+ golang-1.6-go,
10 golang-go-dbus-dev,
11 golang-go-xdg-dev,
12 golang-gocheck-dev,
13
14=== modified file 'debian/rules'
15--- debian/rules 2016-07-08 20:20:36 +0000
16+++ debian/rules 2016-08-09 16:14:09 +0000
17@@ -3,6 +3,7 @@
18
19 export DH_GOPKG := launchpad.net/ubuntu-push
20 export UBUNTU_PUSH_TEST_RESOURCES_ROOT := $(CURDIR)
21+export PATH := /usr/lib/go-1.6/bin:$(PATH)
22
23 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
24 # Skip tests on the archs they are known to be flaky with current configuration

Subscribers

People subscribed via source and target branches