[Pkg-privacy-commits] [pt-websocket] 04/11: Imported Upstream version 0.2

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository pt-websocket.

commit e86c247a6c6c83d85b450a8c814548a94cc25d24
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Thu May 22 11:49:26 2014 +0100

    Imported Upstream version 0.2
---
 .gitignore                                         |  4 ++--
 Makefile                                           | 22 +++++++++++-----------
 README                                             |  2 +-
 .../pt-websocket-client.go                         |  0
 .../pt-websocket-server.go                         |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1fee725..1e915e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/websocket-client
-/websocket-server
+/pt-websocket-client/pt-websocket-client
+/pt-websocket-server/pt-websocket-server
diff --git a/Makefile b/Makefile
index b723c86..4882798 100644
--- a/Makefile
+++ b/Makefile
@@ -9,26 +9,26 @@ GOBUILDFLAGS =
 #   apt-get install gccgo-multilib
 # GOBUILDFLAGS = -compiler gccgo -gccgoflags "-O3 -m32 -static-libgo"
 
-all: websocket-server/websocket-server
+all: pt-websocket-server/pt-websocket-server
 
-websocket-server/websocket-server: websocket-server/*.go websocket/*.go
-	cd websocket-server && go build $(GOBUILDFLAGS)
+pt-websocket-server/pt-websocket-server: pt-websocket-server/*.go websocket/*.go
+	cd pt-websocket-server && go build $(GOBUILDFLAGS)
 
-websocket-client/websocket-client: websocket-client/*.go
-	cd websocket-client && go build $(GOBUILDFLAGS)
+pt-websocket-client/pt-websocket-client: pt-websocket-client/*.go
+	cd pt-websocket-client && go build $(GOBUILDFLAGS)
 
-doc/websocket-server.1: websocket-server/websocket-server
+doc/pt-websocket-server.1: pt-websocket-server/pt-websocket-server
 	help2man --no-info --name "WebSocket server pluggable transport" --version-string "$(VERSION)" -o "$@" "$<"
 
-install: websocket-server/websocket-server
+install: pt-websocket-server/pt-websocket-server
 	mkdir -p "$(DESTDIR)$(BINDIR)"
-	cp -f websocket-server/websocket-server "$(DESTDIR)$(BINDIR)"
+	cp -f "$<" "$(DESTDIR)$(BINDIR)"
 
 clean:
-	rm -f websocket-server/websocket-server websocket-client/websocket-client
-	rm -f doc/websocket-server.1
+	rm -f pt-websocket-server/pt-websocket-server pt-websocket-client/pt-websocket-client
+	rm -f doc/pt-websocket-server.1
 
 fmt:
-	go fmt ./websocket-server ./websocket-client ./websocket
+	go fmt ./pt-websocket-server ./pt-websocket-client ./websocket
 
 .PHONY: all install clean fmt
diff --git a/README b/README
index 718dd67..f2844eb 100644
--- a/README
+++ b/README
@@ -27,4 +27,4 @@ Add configuration like the following to the relay's torrc. You can
 change the --port option; make sure that port is open in the firewall.
 
         ExtORPort 6669
-        ServerTransportPlugin websocket exec /usr/local/bin/websocket-server --port 9901
+        ServerTransportPlugin websocket exec /usr/local/bin/pt-websocket-server --port 9901
diff --git a/websocket-client/websocket-client.go b/pt-websocket-client/pt-websocket-client.go
similarity index 100%
rename from websocket-client/websocket-client.go
rename to pt-websocket-client/pt-websocket-client.go
diff --git a/websocket-server/websocket-server.go b/pt-websocket-server/pt-websocket-server.go
similarity index 98%
rename from websocket-server/websocket-server.go
rename to pt-websocket-server/pt-websocket-server.go
index 4120df8..c393ebc 100644
--- a/websocket-server/websocket-server.go
+++ b/pt-websocket-server/pt-websocket-server.go
@@ -2,7 +2,7 @@
 //
 // Usage in torrc:
 // 	ExtORPort 6669
-// 	ServerTransportPlugin websocket exec ./websocket-server --port 9901
+// 	ServerTransportPlugin websocket exec ./pt-websocket-server --port 9901
 package main
 
 import (

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pt-websocket.git