Merge branch 'release/0.6.1' into develop

CHANGELOG

@@ -1,3 +1,8 @@
+0.6.1 (2013-03-04)
+    * Small performance improvement
+    * For windows: provide shadowsocks-tray.exe to hide shadowsocks-local.exe in
+      system tray. (Thanks to phuslu's taskbar.)
+
 0.6 (2013-01-23)
 
     * Generate ciphers on demand (encryption table cache is removed)

README.md

@@ -1,6 +1,6 @@
 # shadowsocks-go
 
-Current version: 0.6 [![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-go.png)](https://travis-ci.org/shadowsocks/shadowsocks-go)
+Current version: 0.6.1 [![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-go.png)](https://travis-ci.org/shadowsocks/shadowsocks-go)
 
 shadowsocks-go is a lightweight tunnel proxy which can help you get through firewalls. It is a port of [shadowsocks](https://github.com/clowwindy/shadowsocks).
 

deb/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: shadowsocks-go
-Version: 0.6-1
+Version: 0.6.1-1
 Section: net
 Priority: optional
 Architecture: any

script/createdeb.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 cd "$( dirname "${BASH_SOURCE[0]}" )/.."
+ver=$(awk '/\tconst version =/ { print $4 }' shadowsocks/util.go | sed -e 's/"//g')
 
 if [[ $# != 1 ]]; then
     echo "$0 <arch, i386 or amd64>"
@@ -30,14 +31,15 @@ go build -a -v || exit 1
 popd
 
 # create debian package
-DEBDIR=shadowsocks-go_0.6-1-$arch
+DEBDIR=shadowsocks-go_$ver-1-$arch
 rm -rf $DEBDIR
 cp -r deb $DEBDIR
 
 sed -i -e "s/^Architecture.*$/Architecture: $arch/" $DEBDIR/DEBIAN/control || exit 1
 
 mkdir -p $DEBDIR/usr/bin
 cp cmd/shadowsocks-server/shadowsocks-server $DEBDIR/usr/bin/shadowsocks
+rm -f cmd/shadowsocks-server/shadowsocks-server
 
 fakeroot dpkg-deb --build $DEBDIR
 

shadowsocks/util.go

@@ -7,7 +7,7 @@ import (
 )
 
 func PrintVersion() {
-	const version = "0.6"
+	const version = "0.6.1"
 	fmt.Println("shadowsocks-go version", version)
 }