Bump debhelper 10

debhelper 10 is available in the following Debian/Ubuntu releases:
 - Debian 8.x Jessie (jessie-backports)
 - Debian 9.x Stretch / unstable
 - Ubuntu 16.04 Xenial (xenial-backports)
 - Ubuntu 16.10 Yakkety

debhelper supports dh-autoreconf and dh-systemd by default, so we can
safely remove a few Build-Depends and dh params.

We also sync a few other files under debian/ folder with Debian release
3.0.2+ds-1~exp1.

debian/README.Debian

@@ -6,8 +6,10 @@ reads the default configuration in /etc/default/shadowsocks-libev is installed
 and enabled by default, plus some other service templates placed in
 /lib/systemd/system, which can be used by users later.
 
- -- Boyuan Yang <073plan@gmail.com>  Wed, 14 Oct 2015 09:18:50 +0800
+The systemd service templates accept one parameter to determine the
+configuration json file that is used by this instance. For example,
+if the user starts a service called "shadowsocks-libev-local@foobar.service",
+This service instance will start the "ss-local" client and read
+/etc/shadowsocks-libev/foobar.json as its configuration file.
 
-(No special notes.)
-
- -- Max Lv <max.c.lv@gmail.com>  Sat, 06 Apr 2013 16:59:15 +0800
+ -- Boyuan Yang <073plan@gmail.com>  Thu, 08 Sep 2016 19:01:20 +0800

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -1,22 +1,18 @@
 Source: shadowsocks-libev
 Section: net
 Priority: extra
-Maintainer: Max Lv <max.c.lv@gmail.com>
+Maintainer: Roger Shimizu <rogershimizu@gmail.com>
+Uploaders: Max Lv <max.c.lv@gmail.com>, Boyuan Yang <073plan@gmail.com>
 Build-Depends:
- asciidoc,
- autotools-dev,
- debhelper (>= 9),
- dh-systemd (>= 1.5),
- dh-autoreconf,
- gawk,
- libpcre3-dev,
+ asciidoc-base | asciidoc,
+ debhelper (>= 10),
+ libev-dev,
  libmbedtls-dev,
+ libpcre3-dev,
  libsodium-dev (>= 1.0.8~),
  libudns-dev,
- libev-dev,
- mime-support,
  pkg-config,
- xmlto,
+ xmlto
 Standards-Version: 3.9.8
 Homepage: https://www.shadowsocks.org
 Vcs-Git: https://github.com/shadowsocks/shadowsocks-libev.git

debian/copyright

@@ -37,6 +37,14 @@ Files: m4/stack-protector.m4
 Copyright: 2007 Google Inc.
 License: Apache-2.0
 
+Files: scripts/deb4*.sh
+Copyright: 2017 Roger Shimizu <rogershimizu@gmail.com>
+License: GPL-3+
+
+Files: src/base64.c src/base64.h
+Copyright: 2006 Ryan Martell <rdm4@martellventures.com>
+License: LGPL-2.1+
+
 Files: src/json.c src/json.h
 Copyright: 2012-2014, James McLaughlin et al.
 License: BSD-2-clause
@@ -171,3 +179,20 @@ License: GPL-3+ with Autoconf exception
  Macro released by the Autoconf Archive. When you make and distribute a
  modified version of the Autoconf Macro, you may extend this special
  exception to the GPL to apply to your modified version as well.
+
+License: LGPL-2.1+
+ This file is part of FFmpeg.
+ .
+ FFmpeg is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ FFmpeg is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with FFmpeg; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

debian/rules

@@ -14,15 +14,14 @@ override_dh_auto_install:
 	dh_auto_install
 
 override_dh_auto_configure:
+	# Whether to have stack-protector is decided by dpkg-buildflags.
+	# So --disable-ssp here should be safe. See Bug#829498
 	dh_auto_configure -- \
-        --enable-shared \
-        --disable-ssp
+		--enable-shared \
+		--disable-ssp
 
 override_dh_installchangelogs:
 	dh_installchangelogs -XChanges
 
-override_dh_shlibdeps:
-	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
-
 %:
-	dh $@ --with systemd,autoreconf
+	dh $@

debian/shadowsocks-libev.docs

@@ -1,3 +1,4 @@
 AUTHORS
 README.md
 debian/copyright.original
+scripts

debian/watch

@@ -1,6 +1,7 @@
 version=4
 
-opts=" \
+opts="repack,compression=xz, \
+   dversionmangle=s/\+ds\d*$//,repacksuffix=+ds, \
    filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%shadowsocks-libev-$1.tar.gz%" \
    https://github.com/shadowsocks/shadowsocks-libev/tags \
    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate