From 454d1df4aad7f2a95e55647e10ff44ee8d00fa30 Mon Sep 17 00:00:00 2001
From: Brian Tiger Chow <brian.holderchow@gmail.com>
Date: Wed, 22 Oct 2014 05:13:48 -0700
Subject: [PATCH] fix(unixfs/pb) rename proto package -> unixfs_pb

---
 unixfs/pb/Makefile                     | 11 ++++++++---
 unixfs/pb/{data.pb.go => unixfs.pb.go} | 16 ++++++++--------
 unixfs/pb/{data.proto => unixfs.proto} |  2 +-
 3 files changed, 17 insertions(+), 12 deletions(-)
 rename unixfs/pb/{data.pb.go => unixfs.pb.go} (86%)
 rename unixfs/pb/{data.proto => unixfs.proto} (91%)

diff --git a/unixfs/pb/Makefile b/unixfs/pb/Makefile
index 87f182fe5..334feee74 100644
--- a/unixfs/pb/Makefile
+++ b/unixfs/pb/Makefile
@@ -1,5 +1,10 @@
-all: data.pb.go
+PB = $(wildcard *.proto)
+GO = $(PB:.proto=.pb.go)
 
-data.pb.go: data.proto
-	protoc --go_out=. data.proto
+all: $(GO)
 
+%.pb.go: %.proto
+		protoc --gogo_out=. --proto_path=../../../../../../:/usr/local/opt/protobuf/include:. $<
+
+clean:
+		rm *.pb.go
diff --git a/unixfs/pb/data.pb.go b/unixfs/pb/unixfs.pb.go
similarity index 86%
rename from unixfs/pb/data.pb.go
rename to unixfs/pb/unixfs.pb.go
index 2efdd8a4c..2ef262bd7 100644
--- a/unixfs/pb/data.pb.go
+++ b/unixfs/pb/unixfs.pb.go
@@ -1,19 +1,19 @@
-// Code generated by protoc-gen-go.
-// source: data.proto
+// Code generated by protoc-gen-gogo.
+// source: unixfs.proto
 // DO NOT EDIT!
 
 /*
-Package unixfs is a generated protocol buffer package.
+Package unixfs_pb is a generated protocol buffer package.
 
 It is generated from these files:
-	data.proto
+	unixfs.proto
 
 It has these top-level messages:
 	PBData
 */
-package unixfs
+package unixfs_pb
 
-import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
+import proto "github.com/jbenet/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.
@@ -57,7 +57,7 @@ func (x *PBData_DataType) UnmarshalJSON(data []byte) error {
 }
 
 type PBData struct {
-	Type             *PBData_DataType `protobuf:"varint,1,req,enum=unixfs.PBData_DataType" json:"Type,omitempty"`
+	Type             *PBData_DataType `protobuf:"varint,1,req,enum=unixfs.pb.PBData_DataType" json:"Type,omitempty"`
 	Data             []byte           `protobuf:"bytes,2,opt" json:"Data,omitempty"`
 	Filesize         *uint64          `protobuf:"varint,3,opt,name=filesize" json:"filesize,omitempty"`
 	Blocksizes       []uint64         `protobuf:"varint,4,rep,name=blocksizes" json:"blocksizes,omitempty"`
@@ -97,5 +97,5 @@ func (m *PBData) GetBlocksizes() []uint64 {
 }
 
 func init() {
-	proto.RegisterEnum("unixfs.PBData_DataType", PBData_DataType_name, PBData_DataType_value)
+	proto.RegisterEnum("unixfs.pb.PBData_DataType", PBData_DataType_name, PBData_DataType_value)
 }
diff --git a/unixfs/pb/data.proto b/unixfs/pb/unixfs.proto
similarity index 91%
rename from unixfs/pb/data.proto
rename to unixfs/pb/unixfs.proto
index b9504b0c3..68afa6681 100644
--- a/unixfs/pb/data.proto
+++ b/unixfs/pb/unixfs.proto
@@ -1,4 +1,4 @@
-package unixfs;
+package unixfs.pb;
 
 message PBData {
 	enum DataType {