From 2424372d4f2d4e4e5ccf86d81b4b28a6efc7d6bc Mon Sep 17 00:00:00 2001
From: Chen Yufei <cyfdecyf@gmail.com>
Date: Fri, 17 May 2013 12:37:31 +0800
Subject: [PATCH 1/2] Bump version to 1.0

---
 README.md             | 2 +-
 script/set-version.sh | 4 ++--
 shadowsocks/util.go   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 25e8be2..16db5a6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # shadowsocks-go
 
-Current version: 0.6.2 [![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-go.png?branch=develop)](https://travis-ci.org/shadowsocks/shadowsocks-go)
+Current version: 1.0 [![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-go.png?branch=develop)](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).
 
diff --git a/script/set-version.sh b/script/set-version.sh
index ef88c15..df12b95 100755
--- a/script/set-version.sh
+++ b/script/set-version.sh
@@ -10,6 +10,6 @@ fi
 version=$1
 #echo $version
 
-sed -i -e "s,\(\tversion \+= \)\".*\"$,\1\"$version\"," shadowsocks/util.go
-sed -i -e "s/Version:.*$/Version: $version-1/" deb/DEBIAN/control
+sed -i -e "s,\(\tconst version \+= \)\".*\"$,\1\"$version\"," shadowsocks/util.go
+sed -i -e "s,^\(Current version: \)[^ ]\+,\1$version," README.md
 
diff --git a/shadowsocks/util.go b/shadowsocks/util.go
index eb9396b..4a5ceab 100644
--- a/shadowsocks/util.go
+++ b/shadowsocks/util.go
@@ -7,7 +7,7 @@ import (
 )
 
 func PrintVersion() {
-	const version = "0.6.2"
+	const version = "1.0"
 	fmt.Println("shadowsocks-go version", version)
 }
 

From 8dddaf70369a73d82a0a55617e2989f0e3110bf5 Mon Sep 17 00:00:00 2001
From: Chen Yufei <cyfdecyf@gmail.com>
Date: Fri, 17 May 2013 13:01:35 +0800
Subject: [PATCH 2/2] Include sample config in windows zip bundle.

---
 script/build.sh     | 10 ++++++++--
 script/createdeb.sh |  2 +-
 script/upload.sh    |  4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/script/build.sh b/script/build.sh
index b94363c..cd8077b 100755
--- a/script/build.sh
+++ b/script/build.sh
@@ -24,8 +24,10 @@ build() {
     if [[ $1 == "windows" ]]; then
         mv $prog.exe $ROOT/script/
         pushd $ROOT/script/
-        zip $name.zip $prog.exe shadowsocks.exe
-        rm -f $prog.exe
+        cp $ROOT/config.json sample-config.json
+        cp $ROOT/sample-config/client-multi-server.json multi-server.json
+        zip $name.zip $prog.exe shadowsocks.exe sample-config.json multi-server.json
+        rm -f $prog.exe sample-config.json multi-server.json
         mv $name.zip $bindir
         popd
     else
@@ -48,3 +50,7 @@ build linux 386 linux32 server
 #build windows amd64 win64 server
 #build windows 386 win32 server
 
+script/createdeb.sh amd64
+script/createdeb.sh 386
+mv shadowsocks-go_$version-1-*.deb bin/
+rm -rf shadowsocks-go_$version-1*
diff --git a/script/createdeb.sh b/script/createdeb.sh
index 92a061c..fb02278 100755
--- a/script/createdeb.sh
+++ b/script/createdeb.sh
@@ -13,7 +13,7 @@ export GOOS=linux
 
 arch=$1
 case $arch in
-    i386)
+    386)
         export GOARCH=386
         ;;
     amd64)
diff --git a/script/upload.sh b/script/upload.sh
index 3c5a89c..6db4882 100755
--- a/script/upload.sh
+++ b/script/upload.sh
@@ -26,6 +26,6 @@ upload "$version Windows Client 32bit" bin/shadowsocks-local-win32-$version.zip
 upload "$version Linux Server 32bit" bin/shadowsocks-server-linux32-$version.gz
 upload "$version Linux Server 64bit" bin/shadowsocks-server-linux64-$version.gz
 
-upload "$version Linux Server deb 32bit" bin/shadowsocks-go_0.6.1-1-i386.deb
-upload "$version Linux Server deb 64bit" bin/shadowsocks-go_0.6.1-1-amd64.deb
+upload "$version Linux Server deb 32bit" bin/shadowsocks-go_$version-1-i386.deb
+upload "$version Linux Server deb 64bit" bin/shadowsocks-go_$version-1-amd64.deb