Merge pull request #175 from shell909090/master

dd already uploaded

debian/changelog

@@ -1,5 +1,5 @@
 shadowsocks (2.1.0-1) unstable; urgency=low
 
-  * Initial release (Closes: 758900)
+  * Initial release (Closes: #758900)
 
  -- Shell.Xu <shell909090@gmail.com>  Sat, 23 Aug 2014 00:56:04 +0800

debian/control

@@ -2,15 +2,16 @@ Source: shadowsocks
 Section: python
 Priority: extra
 Maintainer: Shell.Xu <shell909090@gmail.com>
-Build-Depends: debhelper (>= 8), python, python-setuptools
+Build-Depends: debhelper (>= 8), python-all (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Homepage: https://github.com/clowwindy/shadowsocks
-#Vcs-Git: git://git.debian.org/collab-maint/shadowsocks.git
+Vcs-Git: git://github.com/shell909090/shadowsocks.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/shadowsocks.git;a=summary
+Vcs-Browser: http://github.com/shell909090/shadowsocks
 
 Package: shadowsocks
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-setuptools, python-m2crypto
+Pre-Depends: dpkg (>= 1.15.6~)
+Depends: ${misc:Depends}, ${python:Depends}, python-pkg-resources, python-m2crypto
 Description: Fast tunnel proxy that helps you bypass firewalls
  A secure socks5 proxy, designed to protect your Internet traffic.
  .

debian/copyright

@@ -2,30 +2,15 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: shadowsocks
 Source: https://github.com/clowwindy/shadowsocks
 
+Files: debian/*
+Copyright: 2014 Shell.Xu <shell909090@gmail.com>
+License: Expat
+
 Files: *
 Copyright: 2014 clowwindy <clowwindy42@gmail.com>
-License: MIT
+License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- . 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
 
-Files: debian/*
+License: Expat
-Copyright: 2014 Shell.Xu <shell909090@gmail.com>
-License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights

debian/rules

@@ -1,13 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 %:
 	dh $@ --with python2 --buildsystem=python_distutils

debian/shadowsocks.default

@@ -9,4 +9,4 @@ USERID="nobody"
 #
 
 # Additional options that are passed to the Daemon.
-DAEMON_OPTS="-c /etc/shadowsocks/config.json"
+DAEMON_OPTS="-q -c /etc/shadowsocks/config.json"