merge conflicts

Author: Alexandre Van de Sande

.gitignore

@@ -17,3 +17,6 @@
 *~
 .project
 .settings
+
+cmd/ethereum/ethereum
+cmd/mist/mist

.travis.yml

@@ -12,8 +12,9 @@ install:
   - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
   - go get github.com/mattn/goveralls
   - go get gopkg.in/check.v1
-  - DEPS=$(go list -f '{{.Imports}}' ./... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$DEPS" ]; then go get -d -v $DEPS; fi
+  - go get github.com/tools/godep
 before_script:
+  - godep restore
   - gofmt -l -w .
   - goimports -l -w .
   - golint .

Dockerfile

@@ -1,27 +1,26 @@
-FROM ubuntu:14.04
+FROM ubuntu:14.04.1
 
 ## Environment setup
 ENV HOME /root
 ENV GOPATH /root/go
-ENV PATH /golang/bin:/root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
-ENV PKG_CONFIG_PATH /opt/qt54/lib/pkgconfig
+ENV PATH /root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
 
 RUN mkdir -p /root/go
 ENV DEBIAN_FRONTEND noninteractive
 
 ## Install base dependencies
 RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y git mercurial build-essential software-properties-common pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev mesa-common-dev libglu1-mesa-dev
+RUN apt-get install -y git mercurial build-essential software-properties-common wget pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev
 
-## Install Qt5.4 dependencies from PPA
-RUN add-apt-repository ppa:beineri/opt-qt54-trusty -y
-RUN apt-get update -y
-RUN apt-get install -y qt54quickcontrols qt54webengine 
+## Install Qt5.4
+# RUN add-apt-repository ppa:beineri/opt-qt54-trusty -y
+# RUN apt-get update -y
+# RUN apt-get install -y qt54quickcontrols qt54webengine mesa-common-dev libglu1-mesa-dev
+# ENV PKG_CONFIG_PATH /opt/qt54/lib/pkgconfig
 
-## Build and install latest Go
-RUN git clone https://go.googlesource.com/go golang
-RUN cd golang && git checkout go1.4.1
-RUN cd golang/src && ./make.bash && go version
+# Install Golang
+RUN wget https://storage.googleapis.com/golang/go1.4.1.linux-amd64.tar.gz
+RUN tar -C /usr/local -xzf go*.tar.gz && go version
 
 # this is a workaround, to make sure that docker's cache is invalidated whenever the git repo changes
 ADD https://api.github.com/repos/ethereum/go-ethereum/git/refs/heads/develop file_does_not_exist