* merge back thomas's change

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 <shell@dskvmdeb.lan>  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 <shell909090@gmail.com>  Sat, 01 Oct 2016 16:14:47 +0800
 
 shadowsocks (2.1.0-1) unstable; urgency=low
 

debian/control

@@ -2,18 +2,23 @@ Source: shadowsocks
 Section: python
 Priority: extra
 Maintainer: Shell.Xu <shell909090@gmail.com>
-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.
+ powerful tunnel proxy to bypass firewalls.

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 <shell909090@gmail.com>
-License: Apache-2.0
-
 Files: *
 Copyright: 2014 clowwindy <clowwindy42@gmail.com>
 License: Apache-2.0
 
+Files: debian/*
+Copyright: 2016 Shell.Xu <shell909090@gmail.com>
+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"
+ be found in "/usr/share/common-licenses/Apache-2.0"

debian/install

@@ -1 +1 @@
-debian/config.json etc/shadowsocks/
+debian/config.json etc/shadowsocks/

debian/shadowsocks.manpages

@@ -1,2 +1,2 @@
 debian/sslocal.1
-debian/ssserver.1
+debian/ssserver.1

debian/sslocal.1

@@ -55,5 +55,5 @@ Quiet mode, only show warnings/errors.
 The programs are documented fully by
 .IR "Shell Xu <shell909090@gmail.com>"
 and 
-.IR "Clowwindy <clowwindy42@gmail.com>",
+.IR "Clowwindy <clowwindy42@gmail.com>"
 .

debian/ssserver.1

@@ -55,5 +55,5 @@ Quiet mode, only show warnings/errors.
 The programs are documented fully by
 .IR "Shell Xu <shell909090@gmail.com>"
 and 
-.IR "Clowwindy <clowwindy42@gmail.com>",
+.IR "Clowwindy <clowwindy42@gmail.com>"
 .