From 78f7ee2ca135e3da38ca35e01e2fceddb772fb68 Mon Sep 17 00:00:00 2001 From: "Shell.Xu" Date: Sun, 24 Aug 2014 13:48:58 +0800 Subject: [PATCH] * 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