From b0be74ad48df3aa748637fbf60fb1ab17ca8cfa6 Mon Sep 17 00:00:00 2001 From: "Shell.Xu" Date: Sun, 24 Aug 2014 02:55:58 +0800 Subject: [PATCH 1/7] * fix base version and quite mode --- debian/control | 2 +- debian/shadowsocks.default | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index ad22e42..bd7f3ac 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: extra Maintainer: Shell.Xu Build-Depends: debhelper (>= 8), python, 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-Browser: http://git.debian.org/?p=collab-maint/shadowsocks.git;a=summary diff --git a/debian/shadowsocks.default b/debian/shadowsocks.default index f82b17a..a520602 100644 --- a/debian/shadowsocks.default +++ b/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" From a053b1e1108132786603429c0f8b03e10edf5e01 Mon Sep 17 00:00:00 2001 From: "Shell.Xu" Date: Sun, 24 Aug 2014 03:00:48 +0800 Subject: [PATCH 2/7] * add vcs info in control file --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index bd7f3ac..b929c4d 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Shell.Xu Build-Depends: debhelper (>= 8), python, python-setuptools Standards-Version: 3.9.5 Homepage: https://github.com/clowwindy/shadowsocks -#Vcs-Git: git://git.debian.org/collab-maint/shadowsocks.git -#Vcs-Browser: http://git.debian.org/?p=collab-maint/shadowsocks.git;a=summary +Vcs-Git: git://github.com/shell909090/shadowsocks.git +Vcs-Browser: http://github.com/shell909090/shadowsocks Package: shadowsocks Architecture: all From 47d0183b80fb01fb56c99edda4cc90edb847c7b4 Mon Sep 17 00:00:00 2001 From: "Shell.Xu" Date: Sun, 24 Aug 2014 03:03:08 +0800 Subject: [PATCH 3/7] * 3.9.5 is not passed in stable system --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index b929c4d..5edf525 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: extra Maintainer: Shell.Xu Build-Depends: debhelper (>= 8), python, python-setuptools -Standards-Version: 3.9.5 +Standards-Version: 3.9.4 Homepage: https://github.com/clowwindy/shadowsocks Vcs-Git: git://github.com/shell909090/shadowsocks.git Vcs-Browser: http://github.com/shell909090/shadowsocks From 78f7ee2ca135e3da38ca35e01e2fceddb772fb68 Mon Sep 17 00:00:00 2001 From: "Shell.Xu" Date: Sun, 24 Aug 2014 13:48:58 +0800 Subject: [PATCH 4/7] * fix build issue --- debian/changelog | 2 +- debian/control | 2 +- debian/copyright | 27 ++++++--------------------- debian/gbp.conf | 3 +++ debian/rules | 5 ----- 5 files changed, 11 insertions(+), 28 deletions(-) create mode 100644 debian/gbp.conf diff --git a/debian/changelog b/debian/changelog index 445c1b6..4e7ad16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ shadowsocks (2.1.0-1) unstable; urgency=low - * Initial release (Closes: 758900) + * Initial release (Closes: #758900) -- Shell.Xu Sat, 23 Aug 2014 00:56:04 +0800 diff --git a/debian/control b/debian/control index 5edf525..349c19d 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Vcs-Browser: http://github.com/shell909090/shadowsocks Package: shadowsocks Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-setuptools, python-m2crypto +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-setuptools, python-m2crypto Description: Fast tunnel proxy that helps you bypass firewalls A secure socks5 proxy, designed to protect your Internet traffic. . diff --git a/debian/copyright b/debian/copyright index 7be1b17..7be8162 100644 --- a/debian/copyright +++ b/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 +License: Expat + Files: * Copyright: 2014 clowwindy -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 - 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. +License: Expat -Files: debian/* -Copyright: 2014 Shell.Xu -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 diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..2929e3b --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +upstream-branch = master +debian-branch = master \ No newline at end of file diff --git a/debian/rules b/debian/rules index 01e5f9b..dafca02 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +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 From fcdb1a34023b349bbd147d5c10c64c8048e44ed0 Mon Sep 17 00:00:00 2001 From: "Shell.Xu" Date: Sun, 24 Aug 2014 15:56:21 +0800 Subject: [PATCH 5/7] * not sure why, but gbp.conf made python source code disappear --- debian/control | 2 +- debian/gbp.conf | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 debian/gbp.conf diff --git a/debian/control b/debian/control index 349c19d..5edf525 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Vcs-Browser: http://github.com/shell909090/shadowsocks Package: shadowsocks Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-setuptools, python-m2crypto +Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-setuptools, python-m2crypto Description: Fast tunnel proxy that helps you bypass firewalls A secure socks5 proxy, designed to protect your Internet traffic. . diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index 2929e3b..0000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,3 +0,0 @@ -[DEFAULT] -upstream-branch = master -debian-branch = master \ No newline at end of file From 6d161756366b413e4ed39bd38723a2895a468cca Mon Sep 17 00:00:00 2001 From: "Shell.Xu" Date: Mon, 25 Aug 2014 09:13:51 +0800 Subject: [PATCH 6/7] * issue with package --- debian/control | 5 +++-- debian/rules | 3 --- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 5edf525..4468dc7 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: shadowsocks Section: python Priority: extra Maintainer: Shell.Xu -Build-Depends: debhelper (>= 8), python, python-setuptools +Build-Depends: debhelper (>= 8), python-all (>= 2.6.6-3~), python-setuptools Standards-Version: 3.9.4 Homepage: https://github.com/clowwindy/shadowsocks Vcs-Git: git://github.com/shell909090/shadowsocks.git @@ -10,7 +10,8 @@ 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-setuptools, python-m2crypto Description: Fast tunnel proxy that helps you bypass firewalls A secure socks5 proxy, designed to protect your Internet traffic. . diff --git a/debian/rules b/debian/rules index dafca02..62e2bb6 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,5 @@ #!/usr/bin/make -f # -*- makefile -*- -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - %: dh $@ --with python2 --buildsystem=python_distutils From 7ac2967d2917ad78aed0e621237222bd4973af3b Mon Sep 17 00:00:00 2001 From: "Shell.Xu" Date: Mon, 25 Aug 2014 12:30:23 +0800 Subject: [PATCH 7/7] * still package issue --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 4468dc7..da00920 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: extra Maintainer: Shell.Xu Build-Depends: debhelper (>= 8), python-all (>= 2.6.6-3~), python-setuptools -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Homepage: https://github.com/clowwindy/shadowsocks Vcs-Git: git://github.com/shell909090/shadowsocks.git Vcs-Browser: http://github.com/shell909090/shadowsocks @@ -11,7 +11,7 @@ Vcs-Browser: http://github.com/shell909090/shadowsocks Package: shadowsocks Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${misc:Depends}, ${python:Depends}, python-setuptools, python-m2crypto +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. .