expose internal/pb packages.

we shouldn't use internal packages.

License: MIT
Signed-off-by: Juan Batiz-Benet <juan@benet.ai>

Godeps/Godeps.json

@@ -14,6 +14,11 @@
 			"Comment": "null-5",
 			"Rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675"
 		},
+		{
+			"ImportPath": "code.google.com/p/goprotobuf/proto",
+			"Comment": "go.r60-152",
+			"Rev": "36be16571e14f67e114bb0af619e5de2c1591679"
+		},
 		{
 			"ImportPath": "github.com/ActiveState/tail",
 			"Rev": "068b72961a6bc5b4a82cf4fc14ccc724c0cfa73a"

diagnostics/diag.go

@@ -15,7 +15,7 @@ import (
 	proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
 	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 
-	pb "github.com/ipfs/go-ipfs/diagnostics/internal/pb"
+	pb "github.com/ipfs/go-ipfs/diagnostics/pb"
 	host "github.com/ipfs/go-ipfs/p2p/host"
 	inet "github.com/ipfs/go-ipfs/p2p/net"
 	peer "github.com/ipfs/go-ipfs/p2p/peer"

exchange/bitswap/message/message.go

@@ -5,7 +5,7 @@ import (
 
 	blocks "github.com/ipfs/go-ipfs/blocks"
 	key "github.com/ipfs/go-ipfs/blocks/key"
-	pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/internal/pb"
+	pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/pb"
 	wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
 	inet "github.com/ipfs/go-ipfs/p2p/net"
 

exchange/bitswap/message/message_test.go

@@ -8,7 +8,7 @@ import (
 
 	blocks "github.com/ipfs/go-ipfs/blocks"
 	key "github.com/ipfs/go-ipfs/blocks/key"
-	pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/internal/pb"
+	pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/pb"
 )
 
 func TestAppendWanted(t *testing.T) {

merkledag/coding.go

@@ -6,7 +6,7 @@ import (
 
 	mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
 
-	pb "github.com/ipfs/go-ipfs/merkledag/internal/pb"
+	pb "github.com/ipfs/go-ipfs/merkledag/pb"
 	u "github.com/ipfs/go-ipfs/util"
 )
 

namesys/publisher.go

@@ -11,7 +11,7 @@ import (
 
 	key "github.com/ipfs/go-ipfs/blocks/key"
 	dag "github.com/ipfs/go-ipfs/merkledag"
-	pb "github.com/ipfs/go-ipfs/namesys/internal/pb"
+	pb "github.com/ipfs/go-ipfs/namesys/pb"
 	ci "github.com/ipfs/go-ipfs/p2p/crypto"
 	path "github.com/ipfs/go-ipfs/path"
 	pin "github.com/ipfs/go-ipfs/pin"

namesys/routing.go

@@ -8,7 +8,7 @@ import (
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 
 	key "github.com/ipfs/go-ipfs/blocks/key"
-	pb "github.com/ipfs/go-ipfs/namesys/internal/pb"
+	pb "github.com/ipfs/go-ipfs/namesys/pb"
 	path "github.com/ipfs/go-ipfs/path"
 	routing "github.com/ipfs/go-ipfs/routing"
 	u "github.com/ipfs/go-ipfs/util"

p2p/crypto/key.go

@@ -21,7 +21,7 @@ import (
 
 	proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
 
-	pb "github.com/ipfs/go-ipfs/p2p/crypto/internal/pb"
+	pb "github.com/ipfs/go-ipfs/p2p/crypto/pb"
 	u "github.com/ipfs/go-ipfs/util"
 )
 

p2p/crypto/pb/Makefile

@@ -4,7 +4,7 @@ GO = $(PB:.proto=.pb.go)
 all: $(GO)
 
 %.pb.go: %.proto
-		protoc --gogo_out=. --proto_path=../../../../../../:/usr/local/opt/protobuf/include:. $<
+		protoc --go_out=. --proto_path=../../../../../../:/usr/local/opt/protobuf/include:. $<
 
 clean:
 		rm *.pb.go

p2p/crypto/pb/crypto.pb.go

@@ -1,4 +1,4 @@
-// Code generated by protoc-gen-gogo.
+// Code generated by protoc-gen-go.
 // source: crypto.proto
 // DO NOT EDIT!
 
@@ -14,7 +14,7 @@ It has these top-level messages:
 */
 package crypto_pb
 
-import proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
+import proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.

p2p/crypto/rsa.go

@@ -10,7 +10,7 @@ import (
 
 	proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
 
-	pb "github.com/ipfs/go-ipfs/p2p/crypto/internal/pb"
+	pb "github.com/ipfs/go-ipfs/p2p/crypto/pb"
 )
 
 type RsaPrivateKey struct {

p2p/crypto/secio/protocol.go

@@ -12,7 +12,7 @@ import (
 	msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
 	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 	ci "github.com/ipfs/go-ipfs/p2p/crypto"
-	pb "github.com/ipfs/go-ipfs/p2p/crypto/secio/internal/pb"
+	pb "github.com/ipfs/go-ipfs/p2p/crypto/secio/pb"
 	peer "github.com/ipfs/go-ipfs/p2p/peer"
 	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
 	u "github.com/ipfs/go-ipfs/util"