Reorged imports from jbenet/go-ipfs to ipfs/go-ipfs

- Modified Godeps/Godeps.json by hand
- [TEST] Updated welcome docs hash to sharness
- [TEST] Updated contact doc
- [TEST] disabled breaking test (t0080-repo refs local)

peer/queue/queue_test.go

@@ -6,10 +6,10 @@ import (
 	"testing"
 	"time"
 
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	u "github.com/jbenet/go-ipfs/util"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	u "github.com/ipfs/go-ipfs/util"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func TestQueue(t *testing.T) {

peer/queue/sync.go

 package queue
 
 import (
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
 )
 
 var log = eventlog.Logger("peerqueue")

protocol/identify/id.go

@@ -4,19 +4,19 @@ import (
 	"strings"
 	"sync"
 
-	ggio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
-	semver "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-
-	host "github.com/jbenet/go-ipfs/p2p/host"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	protocol "github.com/jbenet/go-ipfs/p2p/protocol"
-	pb "github.com/jbenet/go-ipfs/p2p/protocol/identify/pb"
-	config "github.com/jbenet/go-ipfs/repo/config"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-	lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
+	ggio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
+	semver "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+
+	host "github.com/ipfs/go-ipfs/p2p/host"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
+	pb "github.com/ipfs/go-ipfs/p2p/protocol/identify/pb"
+	config "github.com/ipfs/go-ipfs/repo/config"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+	lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
 )
 
 var log = eventlog.Logger("net/identify")

protocol/identify/id_test.go

@@ -4,13 +4,13 @@ import (
 	"testing"
 	"time"
 
-	host "github.com/jbenet/go-ipfs/p2p/host"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	identify "github.com/jbenet/go-ipfs/p2p/protocol/identify"
-	testutil "github.com/jbenet/go-ipfs/p2p/test/util"
+	host "github.com/ipfs/go-ipfs/p2p/host"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	identify "github.com/ipfs/go-ipfs/p2p/protocol/identify"
+	testutil "github.com/ipfs/go-ipfs/p2p/test/util"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func subtestIDService(t *testing.T, postDialWait time.Duration) {

protocol/identify/obsaddr.go

@@ -4,9 +4,9 @@ import (
 	"sync"
 	"time"
 
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 // ObservedAddr is an entry for an address reported by our peers.

protocol/identify/obsaddr_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 // TestObsAddrSet

protocol/identify/pb/identify.pb.go

@@ -13,7 +13,7 @@ It has these top-level messages:
 */
 package identify_pb
 
-import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+import proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 import json "encoding/json"
 import math "math"
 

protocol/mux.go

@@ -5,10 +5,10 @@ import (
 	"io"
 	"sync"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-	lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+	lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
 )
 
 var log = eventlog.Logger("net/mux")

protocol/mux_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	inet "github.com/jbenet/go-ipfs/p2p/net"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
 )
 
 var testCases = map[string]string{

protocol/protocol.go

@@ -3,7 +3,7 @@ package protocol
 import (
 	"io"
 
-	msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
+	msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
 )
 
 // ID is an identifier used to write protocol headers in streams.

protocol/relay/relay.go

@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"io"
 
-	mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
+	mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
 
-	host "github.com/jbenet/go-ipfs/p2p/host"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	protocol "github.com/jbenet/go-ipfs/p2p/protocol"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
+	host "github.com/ipfs/go-ipfs/p2p/host"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
 )
 
 var log = eventlog.Logger("p2p/protocol/relay")

protocol/relay/relay_test.go

@@ -4,13 +4,13 @@ import (
 	"io"
 	"testing"
 
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	protocol "github.com/jbenet/go-ipfs/p2p/protocol"
-	relay "github.com/jbenet/go-ipfs/p2p/protocol/relay"
-	testutil "github.com/jbenet/go-ipfs/p2p/test/util"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
+	relay "github.com/ipfs/go-ipfs/p2p/protocol/relay"
+	testutil "github.com/ipfs/go-ipfs/p2p/test/util"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 var log = eventlog.Logger("relay_test")

test/backpressure/backpressure_test.go

@@ -7,14 +7,14 @@ import (
 	"testing"
 	"time"
 
-	host "github.com/jbenet/go-ipfs/p2p/host"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	protocol "github.com/jbenet/go-ipfs/p2p/protocol"
-	testutil "github.com/jbenet/go-ipfs/p2p/test/util"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	host "github.com/ipfs/go-ipfs/p2p/host"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
+	testutil "github.com/ipfs/go-ipfs/p2p/test/util"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 var log = eventlog.Logger("backpressure")

test/reconnects/reconnect_test.go

@@ -8,15 +8,15 @@ import (
 	"testing"
 	"time"
 
-	host "github.com/jbenet/go-ipfs/p2p/host"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	swarm "github.com/jbenet/go-ipfs/p2p/net/swarm"
-	protocol "github.com/jbenet/go-ipfs/p2p/protocol"
-	testutil "github.com/jbenet/go-ipfs/p2p/test/util"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-
-	ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	host "github.com/ipfs/go-ipfs/p2p/host"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	swarm "github.com/ipfs/go-ipfs/p2p/net/swarm"
+	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
+	testutil "github.com/ipfs/go-ipfs/p2p/test/util"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+
+	ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func init() {

test/util/key.go

@@ -5,14 +5,14 @@ import (
 	"io"
 	"testing"
 
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-	u "github.com/jbenet/go-ipfs/util"
-	testutil "github.com/jbenet/go-ipfs/util/testutil"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+	u "github.com/ipfs/go-ipfs/util"
+	testutil "github.com/ipfs/go-ipfs/util/testutil"
 
-	ic "github.com/jbenet/go-ipfs/p2p/crypto"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
+	ic "github.com/ipfs/go-ipfs/p2p/crypto"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 var log = eventlog.Logger("boguskey")

test/util/util.go

@@ -3,14 +3,14 @@ package testutil
 import (
 	"testing"
 
-	bhost "github.com/jbenet/go-ipfs/p2p/host/basic"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	swarm "github.com/jbenet/go-ipfs/p2p/net/swarm"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	tu "github.com/jbenet/go-ipfs/util/testutil"
+	bhost "github.com/ipfs/go-ipfs/p2p/host/basic"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	swarm "github.com/ipfs/go-ipfs/p2p/net/swarm"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	tu "github.com/ipfs/go-ipfs/util/testutil"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func GenSwarmNetwork(t *testing.T, ctx context.Context) *swarm.Network {