From 7e0b10911c71e4eeedc08fd7da153bcc32db42a0 Mon Sep 17 00:00:00 2001 From: "Shell.Xu" Date: Fri, 28 Oct 2016 20:37:12 +0800 Subject: [PATCH] * merge back thomas's change --- debian/changelog | 13 +++++++++++-- debian/control | 17 +++++++++++------ debian/copyright | 10 +++++----- debian/install | 2 +- debian/shadowsocks.manpages | 2 +- debian/sslocal.1 | 2 +- debian/ssserver.1 | 2 +- 7 files changed, 31 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4e1c86a..f8aa970 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,18 @@ -shadowsocks (2.9.0-1) UNRELEASED; urgency=medium +shadowsocks (2.9.0-1) unstable; urgency=medium + [ Shell Xu ] * Upstream update (Closes: #824640) * Remove reference not exists (Closes: #810688) - -- shell Sat, 01 Oct 2016 16:14:47 +0800 + [ Thomas Goirand ] + * Added lsb-base as Depends:. + * Removed Pre-Depends: dpkg (>= 1.15.6~). + * Ran wrap-and-sort -t -a. + * Fixed VCS URLs to use https. + * Removed useless obsolete version of python-all build-depends. + * Fixed debian/copyright ordering. + + -- Shell.Xu Sat, 01 Oct 2016 16:14:47 +0800 shadowsocks (2.1.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 44ec943..fa0b1ec 100644 --- a/debian/control +++ b/debian/control @@ -2,18 +2,23 @@ Source: shadowsocks Section: python Priority: extra Maintainer: Shell.Xu -Build-Depends: debhelper (>= 8), python-all (>= 2.6.6-3~), python-setuptools +Build-Depends: debhelper (>= 8), + python-all, + python-setuptools, Standards-Version: 3.9.8 Homepage: https://github.com/shadowsocks/shadowsocks -Vcs-Git: git://github.com/shell909090/shadowsocks.git -Vcs-Browser: http://github.com/shell909090/shadowsocks +Vcs-Git: https://github.com/shell909090/shadowsocks.git +Vcs-Browser: https://github.com/shell909090/shadowsocks Package: shadowsocks Architecture: all -Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${misc:Depends}, ${python:Depends}, python-pkg-resources, python-m2crypto +Depends: lsb-base (>= 3.0-6), + python-m2crypto, + python-pkg-resources, + ${misc:Depends}, + ${python:Depends}, Description: Fast tunnel proxy that helps you bypass firewalls A secure socks5 proxy, designed to protect your Internet traffic. . This package contain local and server part of shadowsocks, a fast, - powerful tunnel proxy to bypass firewalls. \ No newline at end of file + powerful tunnel proxy to bypass firewalls. diff --git a/debian/copyright b/debian/copyright index eac938a..14f0851 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,14 +2,14 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: shadowsocks Source: https://github.com/shadowsocks/shadowsocks -Files: debian/* -Copyright: 2016 Shell.Xu -License: Apache-2.0 - Files: * Copyright: 2014 clowwindy License: Apache-2.0 +Files: debian/* +Copyright: 2016 Shell.Xu +License: Apache-2.0 + License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,4 +24,4 @@ License: Apache-2.0 limitations under the License. . On Debian systems, the complete text of the Apache License 2.0 can - be found in "/usr/share/common-licenses/Apache-2.0" \ No newline at end of file + be found in "/usr/share/common-licenses/Apache-2.0" diff --git a/debian/install b/debian/install index a614864..a16a450 100644 --- a/debian/install +++ b/debian/install @@ -1 +1 @@ -debian/config.json etc/shadowsocks/ \ No newline at end of file +debian/config.json etc/shadowsocks/ diff --git a/debian/shadowsocks.manpages b/debian/shadowsocks.manpages index 3df8a33..98b6847 100644 --- a/debian/shadowsocks.manpages +++ b/debian/shadowsocks.manpages @@ -1,2 +1,2 @@ debian/sslocal.1 -debian/ssserver.1 \ No newline at end of file +debian/ssserver.1 diff --git a/debian/sslocal.1 b/debian/sslocal.1 index f3bbda6..05ef510 100644 --- a/debian/sslocal.1 +++ b/debian/sslocal.1 @@ -55,5 +55,5 @@ Quiet mode, only show warnings/errors. The programs are documented fully by .IR "Shell Xu " and -.IR "Clowwindy ", +.IR "Clowwindy " . diff --git a/debian/ssserver.1 b/debian/ssserver.1 index f3bbda6..05ef510 100644 --- a/debian/ssserver.1 +++ b/debian/ssserver.1 @@ -55,5 +55,5 @@ Quiet mode, only show warnings/errors. The programs are documented fully by .IR "Shell Xu " and -.IR "Clowwindy ", +.IR "Clowwindy " .