Merge branch 'master' of github.com:shadowsocks/shadowsocks-libev

.gitignore

@@ -25,7 +25,7 @@ debian/shadowsocks-libev.substvars
 debian/*.debhelper*
 .dirstamp
 shadowsocks-libev.pc
-debian/libshadowsocks-libev1.symbols
+debian/libshadowsocks-libev*.symbols
 libsodium/src/libsodium/include/sodium/version.h
 
 # Ignore per-project vim config

debian/.gitignore

@@ -1,5 +1,5 @@
 *.substvars
 debhelper-build-stamp
-libshadowsocks-libev1/
+libshadowsocks-libev*/
 libshadowsocks-libev-dev/
 tmp/

debian/control

@@ -2,34 +2,51 @@ Source: shadowsocks-libev
 Section: net
 Priority: extra
 Maintainer: Max Lv <max.c.lv@gmail.com>
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.5), pkg-config,
-               libssl-dev (>= 0.9.8), autotools-dev, mime-support, gawk,
-               asciidoc, xmlto, libpcre3-dev
+Build-Depends:
+ asciidoc,
+ autotools-dev,
+ debhelper (>= 9),
+ dh-systemd (>= 1.5),
+ gawk,
+ libpcre3-dev,
+ libssl-dev (>= 0.9.8),
+ mime-support,
+ pkg-config,
+ xmlto,
 Standards-Version: 3.9.8
 Homepage: https://www.shadowsocks.org
 Vcs-Git: https://github.com/shadowsocks/shadowsocks-libev.git
 Vcs-Browser: https://github.com/shadowsocks/shadowsocks-libev
 
-Package: shadowsocks-libev
-Replaces: shadowsocks (<< 1.5.3-2)
-Breaks: shadowsocks (<< 1.5.3-2)
+Package: libshadowsocks-libev-dev
 Architecture: any
-Depends: apg, ${shlibs:Depends}, ${misc:Depends}
-Description: lightweight and secure socks5 proxy
+Section: libdevel
+Breaks:
+ shadowsocks-libev (<< 2.4.0),
+Depends:
+ libshadowsocks-libev2 (= ${binary:Version}),
+ ${misc:Depends},
+Description: lightweight and secure socks5 proxy (development files)
  Shadowsocks-libev is a lightweight and secure socks5 proxy for
  embedded devices and low end boxes.
  .
  Shadowsocks-libev was inspired by Shadowsock (in Python). It's rewritten
  in pure C and only depends on libev, mbedTLS and a few other tiny
  libraries.
+ .
+ This package provides C header files for the libraries.
 
-Package: libshadowsocks-libev1
+Package: libshadowsocks-libev2
 Architecture: any
 Multi-Arch: same
 Section: libs
-Breaks: shadowsocks-libev (<< 2.4.0)
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks:
+ shadowsocks-libev (<< 2.4.0),
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: lightweight and secure socks5 proxy (shared library)
  Shadowsocks-libev is a lightweight and secure socks5 proxy for
  embedded devices and low end boxes.
@@ -40,17 +57,20 @@ Description: lightweight and secure socks5 proxy (shared library)
  .
  This package provides shared libraries.
 
-Package: libshadowsocks-libev-dev
+Package: shadowsocks-libev
+Replaces:
+ shadowsocks (<< 1.5.3-2),
+Breaks:
+ shadowsocks (<< 1.5.3-2),
 Architecture: any
-Section: libdevel
-Breaks: shadowsocks-libev (<< 2.4.0)
-Depends: libshadowsocks-libev1 (= ${binary:Version}), ${misc:Depends}
-Description: lightweight and secure socks5 proxy (development files)
+Depends:
+ apg,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: lightweight and secure socks5 proxy
  Shadowsocks-libev is a lightweight and secure socks5 proxy for
  embedded devices and low end boxes.
  .
  Shadowsocks-libev was inspired by Shadowsock (in Python). It's rewritten
  in pure C and only depends on libev, mbedTLS and a few other tiny
  libraries.
- .
- This package provides C header files for the libraries.

debian/libshadowsocks-libev-dev.install

@@ -1,3 +1,3 @@
 usr/include/
-usr/lib/*/pkgconfig/
 usr/lib/*/libshadowsocks-libev.so
+usr/lib/*/pkgconfig/

debian/shadowsocks-libev.install

@@ -1,4 +1,4 @@
-usr/bin/
-usr/share/man/
 debian/config.json usr/share/shadowsocks-libev
 debian/shadowsocks-libev-*.service lib/systemd/system
+usr/bin/
+usr/share/man/

src/Makefile.am

@@ -1,4 +1,4 @@
-VERSION_INFO = 1:0:0
+VERSION_INFO = 2:0:0
 
 AM_CFLAGS = -g -O2 -Wall -Werror -Wno-deprecated-declarations -fno-strict-aliasing -std=gnu99 -D_GNU_SOURCE
 AM_CFLAGS += $(PTHREAD_CFLAGS)

src/Makefile.in

@@ -461,7 +461,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-VERSION_INFO = 1:0:0
+VERSION_INFO = 2:0:0
 AM_CFLAGS = -g -O2 -Wall -Werror -Wno-deprecated-declarations \
 	-fno-strict-aliasing -std=gnu99 -D_GNU_SOURCE \
 	$(PTHREAD_CFLAGS) $(am__append_1) \