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)

.gitignore

@@ -9,3 +9,5 @@
 *.orig
 *~
 .go-ipfs
+
+/test/bin

Dockerfile

@@ -1,10 +1,10 @@
 FROM golang:1.4
 MAINTAINER Brian Tiger Chow <btc@perfmode.com>
 
-ADD . /go/src/github.com/jbenet/go-ipfs
-RUN cd /go/src/github.com/jbenet/go-ipfs/cmd/ipfs && go install
+ADD . /go/src/github.com/ipfs/go-ipfs
+RUN cd /go/src/github.com/ipfs/go-ipfs/cmd/ipfs && go install
 
-RUN cp /go/src/github.com/jbenet/go-ipfs/bin/container_daemon /usr/local/bin/start_ipfs && \
+RUN cp /go/src/github.com/ipfs/go-ipfs/bin/container_daemon /usr/local/bin/start_ipfs && \
     chmod 755 /usr/local/bin/start_ipfs
 
 EXPOSE 4001 5001 8080

Godeps/Godeps.json

@@ -1,5 +1,5 @@
 {
-	"ImportPath": "github.com/jbenet/go-ipfs",
+	"ImportPath": "github.com/ipfs/go-ipfs",
 	"GoVersion": "go1.4.2",
 	"Packages": [
 		"./..."

Godeps/_workspace/src/bazil.org/fuse/fs/bench/bench_test.go

@@ -7,10 +7,10 @@ import (
 	"path"
 	"testing"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 type benchConfig struct {

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/debug.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
 )
 
 type flagDebug bool

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mounted.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
 )
 
 // Mount contains information about the mount for the test to use.

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/record.go

@@ -4,9 +4,9 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 // Writes gathers data from FUSE Write calls.

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/wait.go

@@ -4,9 +4,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 type nothing struct{}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/testfs.go

@@ -3,9 +3,9 @@ package fstestutil
 import (
 	"os"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 // SimpleFS is a trivial FS that just implements the Root method.

Godeps/_workspace/src/bazil.org/fuse/fs/serve.go

@@ -12,12 +12,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fuseutil"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fuseutil"
 )
 
 const (

Godeps/_workspace/src/bazil.org/fuse/fs/serve_test.go

@@ -14,13 +14,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fuseutil"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/syscallx"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fuseutil"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/syscallx"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 // TO TEST:

Godeps/_workspace/src/bazil.org/fuse/fs/tree.go

@@ -7,11 +7,11 @@ import (
 	pathpkg "path"
 	"strings"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
 )
 
 // A Tree implements a basic read-only directory tree for FUSE.

Godeps/_workspace/src/bazil.org/fuse/fuse_kernel_test.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
 )
 
 func TestOpenFlagsAccmodeMask(t *testing.T) {

Godeps/_workspace/src/bazil.org/fuse/fuseutil/fuseutil.go

@@ -1,7 +1,7 @@
 package fuseutil
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
 )
 
 // HandleRead handles a read request assuming that data is the entire file content.

Godeps/_workspace/src/bazil.org/fuse/hellofs/hello.go

@@ -7,10 +7,10 @@ import (
 	"log"
 	"os"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
-	_ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
+	_ "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 var Usage = func() {

Godeps/_workspace/src/bazil.org/fuse/options_nocomma_test.go

@@ -9,8 +9,8 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
 )
 
 func TestMountOptionCommaError(t *testing.T) {

Godeps/_workspace/src/bazil.org/fuse/options_test.go

@@ -6,10 +6,10 @@ import (
 	"syscall"
 	"testing"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func init() {

Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io/full.go

@@ -29,7 +29,7 @@
 package io
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 	"io"
 )
 

Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io/io.go

@@ -29,7 +29,7 @@
 package io
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 	"io"
 )
 

Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io/io_test.go

@@ -30,7 +30,7 @@ package io_test
 
 import (
 	"bytes"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
 	"code.google.com/p/gogoprotobuf/test"
 	"encoding/binary"
 	goio "io"

Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io/uint32.go

@@ -29,7 +29,7 @@
 package io
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 	"encoding/binary"
 	"io"
 )

Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io/varint.go

@@ -29,7 +29,7 @@
 package io
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 	"encoding/binary"
 	"errors"
 	"io"

Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/all_test.go

@@ -45,7 +45,7 @@ import (
 	"time"
 
 	. "./testdata"
-	. "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+	. "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 )
 
 var globalO *Buffer

Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/clone_test.go

@@ -34,7 +34,7 @@ package proto_test
 import (
 	"testing"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 
 	pb "./testdata"
 )

Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/equal_test.go

@@ -35,7 +35,7 @@ import (
 	"testing"
 
 	pb "./testdata"
-	. "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+	. "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 )
 
 // Four identical base messages.

Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/extensions_test.go

@@ -35,7 +35,7 @@ import (
 	"testing"
 
 	pb "./testdata"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 )
 
 func TestGetExtensionsWithMissingExtensions(t *testing.T) {

Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/size_test.go

@@ -36,7 +36,7 @@ import (
 	"testing"
 
 	pb "./testdata"
-	. "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+	. "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 )
 
 var messageWithExtension1 = &pb.MyMessage{Count: Int32(7)}

Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/testdata/test.pb.go

@@ -36,7 +36,7 @@ It has these top-level messages:
 */
 package testdata
 
-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 math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.

Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/text_parser_test.go

@@ -37,7 +37,7 @@ import (
 	"testing"
 
 	. "./testdata"
-	. "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+	. "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 )
 
 type UnmarshalTextTest struct {

Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/text_test.go

@@ -39,7 +39,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 
 	pb "./testdata"
 )

Godeps/_workspace/src/code.google.com/p/goprotobuf/proto/all_test.go

@@ -45,7 +45,7 @@ import (
 	"time"
 
 	. "./testdata"
-	. "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
+	. "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 )
 
 var globalO *Buffer

Godeps/_workspace/src/code.google.com/p/goprotobuf/proto/clone_test.go

@@ -34,7 +34,7 @@ package proto_test
 import (
 	"testing"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 
 	pb "./testdata"
 )

Godeps/_workspace/src/code.google.com/p/goprotobuf/proto/equal_test.go

@@ -35,7 +35,7 @@ import (
 	"testing"
 
 	pb "./testdata"
-	. "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
+	. "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 )
 
 // Four identical base messages.

Godeps/_workspace/src/code.google.com/p/goprotobuf/proto/extensions_test.go

@@ -35,7 +35,7 @@ import (
 	"testing"
 
 	pb "./testdata"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 )
 
 func TestGetExtensionsWithMissingExtensions(t *testing.T) {

Godeps/_workspace/src/code.google.com/p/goprotobuf/proto/size_test.go

@@ -36,7 +36,7 @@ import (
 	"testing"
 
 	pb "./testdata"
-	. "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
+	. "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 )
 
 var messageWithExtension1 = &pb.MyMessage{Count: Int32(7)}

Godeps/_workspace/src/code.google.com/p/goprotobuf/proto/testdata/test.pb.go

@@ -36,7 +36,7 @@ It has these top-level messages:
 */
 package testdata
 
-import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
+import proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.

Godeps/_workspace/src/code.google.com/p/goprotobuf/proto/text_parser_test.go

@@ -37,7 +37,7 @@ import (
 	"testing"
 
 	. "./testdata"
-	. "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
+	. "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 )
 
 type UnmarshalTextTest struct {

Godeps/_workspace/src/code.google.com/p/goprotobuf/proto/text_test.go

@@ -39,7 +39,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 
 	pb "./testdata"
 )

Godeps/_workspace/src/github.com/ActiveState/tail/cmd/gotail/gotail.go

@@ -5,7 +5,7 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/ActiveState/tail"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ActiveState/tail"
 	"os"
 )
 

Godeps/_workspace/src/github.com/ActiveState/tail/tail.go

@@ -5,10 +5,10 @@ package tail
 import (
 	"bufio"
 	"fmt"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/ActiveState/tail/ratelimiter"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/ActiveState/tail/util"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/ActiveState/tail/watch"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/gopkg.in/tomb.v1"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ActiveState/tail/ratelimiter"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ActiveState/tail/util"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ActiveState/tail/watch"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/gopkg.in/tomb.v1"
 	"io"
 	"io/ioutil"
 	"log"

Godeps/_workspace/src/github.com/ActiveState/tail/tail_test.go

@@ -8,7 +8,7 @@ package tail
 import (
 	"./watch"
 	_ "fmt"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/ActiveState/tail/ratelimiter"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ActiveState/tail/ratelimiter"
 	"io/ioutil"
 	"os"
 	"strings"

Godeps/_workspace/src/github.com/ActiveState/tail/tail_windows.go

@@ -3,7 +3,7 @@
 package tail
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/ActiveState/tail/winfile"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ActiveState/tail/winfile"
 	"os"
 )
 

Godeps/_workspace/src/github.com/ActiveState/tail/watch/inotify.go

@@ -4,9 +4,9 @@ package watch
 
 import (
 	"fmt"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/ActiveState/tail/util"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/howeyc/fsnotify"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/gopkg.in/tomb.v1"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ActiveState/tail/util"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/howeyc/fsnotify"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/gopkg.in/tomb.v1"
 	"os"
 	"path/filepath"
 )

Godeps/_workspace/src/github.com/ActiveState/tail/watch/inotify_tracker.go

@@ -3,7 +3,7 @@
 package watch
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/howeyc/fsnotify"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/howeyc/fsnotify"
 	"log"
 	"sync"
 )

Godeps/_workspace/src/github.com/ActiveState/tail/watch/polling.go

@@ -3,8 +3,8 @@
 package watch
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/ActiveState/tail/util"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/gopkg.in/tomb.v1"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ActiveState/tail/util"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/gopkg.in/tomb.v1"
 	"os"
 	"time"
 )

Godeps/_workspace/src/github.com/ActiveState/tail/watch/watch.go

@@ -3,7 +3,7 @@
 package watch
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/gopkg.in/tomb.v1"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/gopkg.in/tomb.v1"
 	"os"
 )
 

Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/basic/basic.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
 )
 
 var log = logrus.New()

Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/hook/hook.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake"
 )
 
 var log = logrus.New()

Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash.go

@@ -3,7 +3,7 @@ package logstash
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
 	"time"
 )
 

Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash_test.go

@@ -3,7 +3,7 @@ package logstash
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
 	"github.com/tobi/airbrake-go"
 )
 

Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
 )
 
 type notice struct {

Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/bugsnag/bugsnag-go"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
 )
 
 type bugsnagHook struct{}

Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag_test.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/bugsnag/bugsnag-go"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
 )
 
 type notice struct {

Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
 )
 
 const (

Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
 	"github.com/stvp/go-udp-testing"
 )
 

Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/getsentry/raven-go"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
 )
 
 var (

Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"github.com/getsentry/raven-go"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
 )
 
 const (

Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog.go

@@ -2,7 +2,7 @@ package logrus_syslog
 
 import (
 	"fmt"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
 	"log/syslog"
 	"os"
 )

Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog_test.go

@@ -1,7 +1,7 @@
 package logrus_syslog
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
 	"log/syslog"
 	"testing"
 )

Godeps/_workspace/src/github.com/cheggaaa/pb/example/copy/copy.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/cheggaaa/pb"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/cheggaaa/pb"
 	"os"
 	"fmt"
 	"io"

Godeps/_workspace/src/github.com/cheggaaa/pb/example/pb.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/cheggaaa/pb"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/cheggaaa/pb"
 	"time"
 )
 

Godeps/_workspace/src/github.com/chuckpreslar/inflect/languages.go

@@ -2,8 +2,8 @@
 package inflect
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/chuckpreslar/inflect/languages"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/chuckpreslar/inflect/types"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/chuckpreslar/inflect/languages"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/chuckpreslar/inflect/types"
 )
 
 var (

Godeps/_workspace/src/github.com/chuckpreslar/inflect/languages/english.go

@@ -2,7 +2,7 @@
 package languages
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/chuckpreslar/inflect/types"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/chuckpreslar/inflect/types"
 )
 
 // Defines irregular words, uncountables words, and pluralization/singularization rules for the English language.

Godeps/_workspace/src/github.com/crowdmob/goamz/aws/attempt_test.go

@@ -1,7 +1,7 @@
 package aws_test
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
 	"gopkg.in/check.v1"
 	"time"
 )

Godeps/_workspace/src/github.com/crowdmob/goamz/aws/aws_test.go

@@ -1,7 +1,7 @@
 package aws_test
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
 	"gopkg.in/check.v1"
 	"io/ioutil"
 	"os"

Godeps/_workspace/src/github.com/crowdmob/goamz/aws/sign_test.go

@@ -2,7 +2,7 @@ package aws_test
 
 import (
 	"fmt"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
 	"gopkg.in/check.v1"
 	"net/http"
 	"strings"

Godeps/_workspace/src/github.com/crowdmob/goamz/s3/export_test.go

@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
 )
 
 var originalStrategy = attempts

Godeps/_workspace/src/github.com/crowdmob/goamz/s3/lifecycle_test.go

@@ -2,7 +2,7 @@ package s3_test
 
 import (
 	"encoding/xml"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3"
 	"gopkg.in/check.v1"
 	"io/ioutil"
 	"net/http"

Godeps/_workspace/src/github.com/crowdmob/goamz/s3/multi_test.go

@@ -2,7 +2,7 @@ package s3_test
 
 import (
 	"encoding/xml"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3"
 	"gopkg.in/check.v1"
 	"io"
 	"io/ioutil"

Godeps/_workspace/src/github.com/crowdmob/goamz/s3/s3.go

@@ -29,7 +29,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
 )
 
 const debug = false

Godeps/_workspace/src/github.com/crowdmob/goamz/s3/s3_test.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/crowdmob/goamz/testutil"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3"
 	"gopkg.in/check.v1"
 )
 

Godeps/_workspace/src/github.com/crowdmob/goamz/s3/s3i_test.go

@@ -5,8 +5,8 @@ import (
 	"crypto/md5"
 	"fmt"
 	"github.com/crowdmob/goamz/testutil"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3"
 	"gopkg.in/check.v1"
 	"io/ioutil"
 	"net"

Godeps/_workspace/src/github.com/crowdmob/goamz/s3/s3t_test.go

@@ -1,9 +1,9 @@
 package s3_test
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3/s3test"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3/s3test"
 	"gopkg.in/check.v1"
 )
 

Godeps/_workspace/src/github.com/crowdmob/goamz/s3/s3test/server.go

@@ -7,7 +7,7 @@ import (
 	"encoding/hex"
 	"encoding/xml"
 	"fmt"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3"
 	"io"
 	"io/ioutil"
 	"log"

Godeps/_workspace/src/github.com/crowdmob/goamz/s3/sign.go

@@ -4,7 +4,7 @@ import (
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/base64"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
 	"log"
 	"sort"
 	"strings"

Godeps/_workspace/src/github.com/crowdmob/goamz/s3/sign_test.go

@@ -1,8 +1,8 @@
 package s3_test
 
 import (
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3"
 	"gopkg.in/check.v1"
 )
 

Godeps/_workspace/src/github.com/facebookgo/atomicfile/atomicfile_test.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/facebookgo/atomicfile"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/facebookgo/atomicfile"
 )
 
 func test(t *testing.T, dir, prefix string) {

Godeps/_workspace/src/github.com/facebookgo/stack/stack_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/facebookgo/stack"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/facebookgo/stack"
 )
 
 func indirect1() stack.Stack {

Godeps/_workspace/src/github.com/facebookgo/stackerr/stackerr.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/facebookgo/stack"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/facebookgo/stack"
 )
 
 // Error provides the wrapper that adds multiple Stacks to an error. Each Stack

Godeps/_workspace/src/github.com/facebookgo/stackerr/stackerr_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/facebookgo/stackerr"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/facebookgo/stackerr"
 )
 
 func TestNew(t *testing.T) {

Godeps/_workspace/src/github.com/fd/go-nat/natpmp.go

@@ -4,7 +4,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jackpal/go-nat-pmp"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jackpal/go-nat-pmp"
 )
 
 var (

Godeps/_workspace/src/github.com/fd/go-nat/upnp.go

@@ -4,9 +4,9 @@ import (
 	"net"
 	"time"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway1"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway2"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway1"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway2"
 )
 
 var (

Godeps/_workspace/src/github.com/fzzy/radix/redis/client.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/fzzy/radix/redis/resp"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/fzzy/radix/redis/resp"
 )
 
 const (

Godeps/_workspace/src/github.com/h2so5/utp/benchmark/main.go

@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/davecheney/profile"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/dustin/go-humanize"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/h2so5/utp"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/dustin/go-humanize"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/h2so5/utp"
 )
 
 type RandReader struct{}

Godeps/_workspace/src/github.com/h2so5/utp/ucat/ucat.go

@@ -20,7 +20,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	utp "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/h2so5/utp"
+	utp "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/h2so5/utp"
 )
 
 var verbose = false

Godeps/_workspace/src/github.com/howeyc/fsnotify/example_test.go

@@ -7,7 +7,7 @@ package fsnotify_test
 import (
 	"log"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/howeyc/fsnotify"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/howeyc/fsnotify"
 )
 
 func ExampleNewWatcher() {

Godeps/_workspace/src/github.com/huin/goupnp/cmd/example_httpu_serving/example_httpu_serving.go

@@ -4,7 +4,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/httpu"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/httpu"
 )
 
 func main() {

Godeps/_workspace/src/github.com/huin/goupnp/cmd/example_internetgateway1/example_internetgateway1.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway1"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway1"
 )
 
 func main() {

Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway1/internetgateway1.go

@@ -11,8 +11,8 @@ package internetgateway1
 import (
 	"time"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/soap"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/soap"
 )
 
 // Hack to avoid Go complaining if time isn't used.

Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway2/internetgateway2.go

@@ -11,8 +11,8 @@ package internetgateway2
 import (
 	"time"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/soap"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/soap"
 )
 
 // Hack to avoid Go complaining if time isn't used.

Godeps/_workspace/src/github.com/huin/goupnp/device.go

@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/scpd"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/soap"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/scpd"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/soap"
 )
 
 const (

Godeps/_workspace/src/github.com/huin/goupnp/example/example_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway1"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway1"
 )
 
 // Use discovered WANPPPConnection1 services to find external IP addresses.

Godeps/_workspace/src/github.com/huin/goupnp/gotasks/specgen_task.go

@@ -18,8 +18,8 @@ import (
 	"text/template"
 
 	"github.com/huin/goutil/codegen"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/scpd"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/scpd"
 	"github.com/jingweno/gotask/tasking"
 )
 

Godeps/_workspace/src/github.com/huin/goupnp/goupnp.go

@@ -20,8 +20,8 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/httpu"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/ssdp"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/httpu"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/ssdp"
 )
 
 // ContextError is an error that wraps an error with some context information.

Godeps/_workspace/src/github.com/huin/goupnp/service_client.go

@@ -2,7 +2,7 @@ package goupnp
 
 import (
 	"fmt"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/soap"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/soap"
 )
 
 // ServiceClient is a SOAP client, root device and the service for the SOAP

Godeps/_workspace/src/github.com/huin/goupnp/ssdp/registry.go

@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/httpu"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/httpu"
 )
 
 const (

Godeps/_workspace/src/github.com/huin/goupnp/ssdp/ssdp.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/httpu"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/huin/goupnp/httpu"
 )
 
 const (

Godeps/_workspace/src/github.com/inconshreveable/go-update/check/check.go

@@ -10,8 +10,8 @@ import (
 	"net/http"
 	"runtime"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/inconshreveable/go-update"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/kardianos/osext"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/inconshreveable/go-update"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/kardianos/osext"
 )
 
 type Initiative string

Godeps/_workspace/src/github.com/inconshreveable/go-update/update.go

@@ -126,9 +126,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/inconshreveable/go-update/download"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/kardianos/osext"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/kr/binarydist"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/inconshreveable/go-update/download"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/kardianos/osext"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/kr/binarydist"
 )
 
 // The type of a binary patch, if any. Only bsdiff is supported