From c12e450e98e1ebcdfe40d4941295b5a88d2f2c4c Mon Sep 17 00:00:00 2001 From: Boyuan Yang <073plan@gmail.com> Date: Thu, 8 Sep 2016 09:35:28 -0500 Subject: [PATCH] Update Debian dependency and bump library soname (#814) * debian: add libpcre3-dev as build dependency. * Bump soname of libshadowsocks-libev. Soname for libshadowsocks-libev is bumped from 1:0:0 to 2:0:0 due to ABI breakage between shadowsocks-libev 2.5.0 and 2.5.1. --- .gitignore | 2 +- debian/.gitignore | 2 +- debian/control | 58 +++++++++++++------ debian/libshadowsocks-libev-dev.install | 2 +- ....install => libshadowsocks-libev2.install} | 0 debian/shadowsocks-libev.install | 4 +- src/Makefile.am | 2 +- src/Makefile.in | 2 +- 8 files changed, 46 insertions(+), 26 deletions(-) rename debian/{libshadowsocks-libev1.install => libshadowsocks-libev2.install} (100%) diff --git a/.gitignore b/.gitignore index 23ebeea4..72a51ea5 100644 --- a/.gitignore +++ b/.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 diff --git a/debian/.gitignore b/debian/.gitignore index 66194abf..4bd3419f 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,5 +1,5 @@ *.substvars debhelper-build-stamp -libshadowsocks-libev1/ +libshadowsocks-libev*/ libshadowsocks-libev-dev/ tmp/ diff --git a/debian/control b/debian/control index 96e0f5f3..1c3bedfa 100644 --- a/debian/control +++ b/debian/control @@ -2,34 +2,51 @@ Source: shadowsocks-libev Section: net Priority: extra Maintainer: Max Lv -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. diff --git a/debian/libshadowsocks-libev-dev.install b/debian/libshadowsocks-libev-dev.install index c5a85ff1..304e0ed9 100644 --- a/debian/libshadowsocks-libev-dev.install +++ b/debian/libshadowsocks-libev-dev.install @@ -1,3 +1,3 @@ usr/include/ -usr/lib/*/pkgconfig/ usr/lib/*/libshadowsocks-libev.so +usr/lib/*/pkgconfig/ diff --git a/debian/libshadowsocks-libev1.install b/debian/libshadowsocks-libev2.install similarity index 100% rename from debian/libshadowsocks-libev1.install rename to debian/libshadowsocks-libev2.install diff --git a/debian/shadowsocks-libev.install b/debian/shadowsocks-libev.install index 68cdab23..f6cd2247 100644 --- a/debian/shadowsocks-libev.install +++ b/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/ diff --git a/src/Makefile.am b/src/Makefile.am index ba96aa0d..b08517d4 100644 --- a/src/Makefile.am +++ b/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) diff --git a/src/Makefile.in b/src/Makefile.in index 60f3e8e7..39ca1703 100644 --- a/src/Makefile.in +++ b/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) \