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

This commit is contained in:
Max Lv
2016-06-12 09:09:21 +08:00
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ debian/shadowsocks-libev.substvars
debian/*.debhelper*
.dirstamp
shadowsocks-libev.pc
debian/libshadowsocks1.symbols
debian/libshadowsocks-libev1.symbols
libsodium/src/libsodium/include/sodium/version.h
# Ignore garbage of OS X
+2 -2
View File
@@ -1,4 +1,4 @@
*.substvars
libshadowsocks1/
libshadowsocks-dev/
libshadowsocks-libev1/
libshadowsocks-libev-dev/
tmp/
+1 -1
View File
@@ -36,7 +36,7 @@ Architecture: any
Section: libdevel
Priority: extra
Breaks: shadowsocks-libev (<< 2.4.0)
Depends: libshadowsocks1 (= ${binary:Version}), ${misc:Depends}
Depends: libshadowsocks-libev1 (= ${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.