Merge lp:~jonas-drange/ubuntu-push/replace-dead-deps into lp:ubuntu-push

[Jonas G. Drange]

re-enable the developer environment by replacing dead upstream dependencies with new ones, but keep the namespace intact.

Get the development environment working again. This is a temporary hack, the plan is to replace those dependencies, but we're blocked until lp:1606618 and lp:1606626 are solved.

Note: I've looked over the new upstream deps, but that's not much of a security audit. However, a package will never be built off of these github deps as packages are built off of golang packages in the archive.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:171
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/24/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1165/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1165
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1048
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1048
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1048
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1037/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1037
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1037/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1037/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1037/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1037
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1037/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1037/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1037/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1037
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1037/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1037/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/24/rebuild

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

Superseded by https://code.launchpad.net/~jonas-drange/ubuntu-push/fix-1628327/+merge/307159

review: Disapprove

Unmerged revisions

171. By Jonas G. Drange on 2016-08-10

merge prereq

170. By Jonas G. Drange on 2016-07-29

nuke the changelog entry

169. By Jonas G. Drange on 2016-07-26

hack upstream deps for now

=== modified file 'Makefile'
--- Makefile	2016-03-09 16:12:39 +0000
+++ Makefile	2016-08-10 10:57:08 +0000
@@ -10,8 +10,9 @@
 GODEPS = launchpad.net/gocheck
 GODEPS += launchpad.net/go-dbus/v1
 GODEPS += launchpad.net/go-xdg/v0
-GODEPS += code.google.com/p/gosqlite/sqlite3
-GODEPS += code.google.com/p/go-uuid/uuid
+
+GODEPS += github.com/rothgar/gosqlite/sqlite3
+GODEPS += github.com/pborman/uuid
 
 # cgocheck=0 is a workaround for lp:1555198
 GOTEST := GODEBUG=cgocheck=0 ./scripts/goctest
@@ -34,9 +35,15 @@
 	$(RM) -r $(GOPATH)/pkg
 	mkdir -p $(GOPATH)/bin
 	mkdir -p $(GOPATH)/pkg
-	go get -u launchpad.net/godeps
+	go get -u github.com/rogpeppe/godeps
 	go get -d -u $(GODEPS)
 	$(GOPATH)/bin/godeps -u dependencies.tsv
+
+	# Workaround for lp:1606618 and lp:1606626
+	mkdir -p $(GOPATH)/src/code.google.com/p/go-uuid/
+	ln -s $(GOPATH)/src/github.com/rothgar/gosqlite $(GOPATH)/src/code.google.com/p/gosqlite
+	ln -s $(GOPATH)/src/github.com/pborman/uuid $(GOPATH)/src/code.google.com/p/go-uuid/uuid
+
 	go install $(GODEPS)
 
 dependencies.tsv:
 
=== modified file 'dependencies.tsv'
--- dependencies.tsv	2015-11-20 15:03:47 +0000
+++ dependencies.tsv	2016-08-10 10:57:08 +0000
@@ -1,5 +1,3 @@
-code.google.com/p/go-uuid	hg	7dda39b2e7d5e265014674c5af696ba4186679e9	11
-code.google.com/p/gosqlite	hg	74691fb6f83716190870cde1b658538dd4b18eb0	15
-launchpad.net/go-dbus/v1	bzr	[e-mail]-20141023032446-s5icvsucwlv5o38a	129
+launchpad.net/go-dbus/v1	bzr	[e-mail]-20150203130125-kqqbam1jsp3tmlk5	136
 launchpad.net/go-xdg/v0	bzr	[e-mail]-20140208094800-gubd5md7cro3mtxa	10
 launchpad.net/gocheck	bzr	[e-mail]-20140225173054-xu9zlkf9kxhvow02	87