diff --git a/debian/changelog b/debian/changelog index 4e7ad16..4e1c86a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +shadowsocks (2.9.0-1) UNRELEASED; urgency=medium + + * Upstream update (Closes: #824640) + * Remove reference not exists (Closes: #810688) + + -- shell Sat, 01 Oct 2016 16:14:47 +0800 + shadowsocks (2.1.0-1) unstable; urgency=low * Initial release (Closes: #758900) diff --git a/debian/control b/debian/control index da00920..44ec943 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: python Priority: extra Maintainer: Shell.Xu Build-Depends: debhelper (>= 8), python-all (>= 2.6.6-3~), python-setuptools -Standards-Version: 3.9.5 -Homepage: https://github.com/clowwindy/shadowsocks +Standards-Version: 3.9.8 +Homepage: https://github.com/shadowsocks/shadowsocks Vcs-Git: git://github.com/shell909090/shadowsocks.git Vcs-Browser: http://github.com/shell909090/shadowsocks diff --git a/debian/copyright b/debian/copyright index 7be8162..eac938a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,30 +1,27 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: shadowsocks -Source: https://github.com/clowwindy/shadowsocks +Source: https://github.com/shadowsocks/shadowsocks Files: debian/* -Copyright: 2014 Shell.Xu -License: Expat +Copyright: 2016 Shell.Xu +License: Apache-2.0 Files: * Copyright: 2014 clowwindy -License: Expat +License: Apache-2.0 -License: Expat - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - . - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems, the complete text of the Apache License 2.0 can + be found in "/usr/share/common-licenses/Apache-2.0" \ No newline at end of file diff --git a/debian/sslocal.1 b/debian/sslocal.1 index 0c2cf51..f3bbda6 100644 --- a/debian/sslocal.1 +++ b/debian/sslocal.1 @@ -56,4 +56,4 @@ The programs are documented fully by .IR "Shell Xu " and .IR "Clowwindy ", -available via the Info system. +. diff --git a/debian/ssserver.1 b/debian/ssserver.1 index 0c2cf51..f3bbda6 100644 --- a/debian/ssserver.1 +++ b/debian/ssserver.1 @@ -56,4 +56,4 @@ The programs are documented fully by .IR "Shell Xu " and .IR "Clowwindy ", -available via the Info system. +.