Merge pull request #578 from jonboulle/import

Godeps: unrewrite import paths

Author: jonboulle

Godeps/Godeps.json

@@ -10,7 +10,7 @@ if [ ! -h gopath/src/${REPO_PATH} ]; then
 fi
 
 export GOBIN=${PWD}/bin
-export GOPATH=${PWD}/gopath
+export GOPATH=${PWD}/Godeps/_workspace:${PWD}/gopath
 
 eval $(go env)
 export GOOS GOARCH

Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go

@@ -22,8 +22,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/appc/spec/Godeps/_workspace/src/golang.org/x/net/html"
-	"github.com/appc/spec/Godeps/_workspace/src/golang.org/x/net/html/atom"
+	"golang.org/x/net/html"
+	"golang.org/x/net/html/atom"
 )
 
 type acMeta struct {

Godeps/_workspace/src/golang.org/x/net/html/example_test.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/appc/spec/schema/types"
 
-	"github.com/appc/spec/Godeps/_workspace/src/github.com/camlistore/go4/errorutil"
+	"github.com/camlistore/go4/errorutil"
 )
 
 const (

Godeps/_workspace/src/golang.org/x/net/html/node.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/appc/spec/schema/types"
 
-	"github.com/appc/spec/Godeps/_workspace/src/github.com/camlistore/go4/errorutil"
+	"github.com/camlistore/go4/errorutil"
 )
 
 const PodManifestKind = types.ACKind("PodManifest")

Godeps/_workspace/src/golang.org/x/net/html/parse.go

@@ -19,7 +19,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/appc/spec/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource"
+	"k8s.io/kubernetes/pkg/api/resource"
 )
 
 var (

Godeps/_workspace/src/golang.org/x/net/html/parse_test.go

@@ -18,7 +18,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/appc/spec/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource"
+	"k8s.io/kubernetes/pkg/api/resource"
 )
 
 func mustQuantity(s string) *resource.Quantity {

Godeps/_workspace/src/golang.org/x/net/html/token.go

@@ -17,7 +17,7 @@ package types
 import (
 	"encoding/json"
 
-	"github.com/appc/spec/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
+	"github.com/coreos/go-semver/semver"
 )
 
 var (

Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/quantity.go

@@ -19,7 +19,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/appc/spec/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
+	"github.com/coreos/go-semver/semver"
 )
 
 func TestMarshalSemver(t *testing.T) {