diff --git a/debian/control b/debian/control index 6555f745..3358bc93 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: extra Maintainer: Max Lv Build-Depends: - asciidoc-base | asciidoc, + asciidoc, autotools-dev, debhelper (>= 9), dh-systemd (>= 1.5), @@ -12,17 +12,15 @@ Build-Depends: libssl-dev (>= 0.9.8), 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 Vcs-Browser: https://github.com/shadowsocks/shadowsocks-libev Package: shadowsocks-libev -Replaces: - shadowsocks (<< 1.5.3-2), -Breaks: - shadowsocks (<< 1.5.3-2), +Replaces: shadowsocks (<< 1.5.3-2) +Breaks: shadowsocks (<< 1.5.3-2) Architecture: any Depends: apg, @@ -42,11 +40,10 @@ Package: libshadowsocks-libev-dev Architecture: any Multi-Arch: same Section: libdevel -Breaks: - shadowsocks-libev (<< 2.4.0), +Breaks: shadowsocks-libev (<< 2.4.0) Depends: libshadowsocks-libev2 (= ${binary:Version}), - ${misc:Depends}, + ${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. @@ -64,12 +61,11 @@ Section: libs Replaces: libshadowsocks-libev1 Breaks: libshadowsocks-libev1, - shadowsocks-libev (<< 2.4.0), -Pre-Depends: - ${misc:Pre-Depends}, + shadowsocks-libev (<< 2.4.0) +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, - ${shlibs: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. diff --git a/debian/copyright b/debian/copyright index 2149d1b9..a70e4b6a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,41 +11,10 @@ License: GPL-3+ Files: debian/* Copyright: 2013-2015, Max Lv - 2015, Boyuan Yang <073plan@gmail.com> - 2017, Roger Shimizu + 2015-2016, Boyuan Yang <073plan@gmail.com> + 2016-2017, Roger Shimizu License: GPL-3+ -Files: libcork/* libipset/* -Copyright: 2011-2013, RedJack, LLC. -License: BSD-3-clause - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - . - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - . - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - . - Neither the name of RedJack Software, LLC nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - Files: doc/* Copyright: 2012-2017, Max Lv License: GFDL-1.1+ @@ -68,10 +37,6 @@ Files: m4/stack-protector.m4 Copyright: 2007 Google Inc. License: Apache-2.0 -Files: src/base64.c src/base64.h -Copyright: 2006 Ryan Martell -License: LGPL-2.1+ - Files: src/json.c src/json.h Copyright: 2012-2014, James McLaughlin et al. License: BSD-2-clause @@ -206,20 +171,3 @@ 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