Skip to content

Commit

Permalink
* fix build issue
Browse files Browse the repository at this point in the history
  • Loading branch information
shell909090 committed Aug 24, 2014
1 parent 47d0183 commit 78f7ee2
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 28 deletions.
2 changes: 1 addition & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
shadowsocks (2.1.0-1) unstable; urgency=low

* Initial release (Closes: 758900)
* Initial release (Closes: #758900)

-- Shell.Xu <[email protected]> Sat, 23 Aug 2014 00:56:04 +0800
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Vcs-Browser: http://github.com/shell909090/shadowsocks

Package: shadowsocks
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-setuptools, python-m2crypto
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-setuptools, python-m2crypto
Description: Fast tunnel proxy that helps you bypass firewalls
A secure socks5 proxy, designed to protect your Internet traffic.
.
Expand Down
27 changes: 6 additions & 21 deletions debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,15 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: shadowsocks
Source: https://github.com/clowwindy/shadowsocks

Files: debian/*
Copyright: 2014 Shell.Xu <[email protected]>
License: Expat

Files: *
Copyright: 2014 clowwindy <[email protected]>
License: MIT
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.
.
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.
License: Expat

Files: debian/*
Copyright: 2014 Shell.Xu <[email protected]>
License: MIT
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
Expand Down
3 changes: 3 additions & 0 deletions debian/gbp.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[DEFAULT]
upstream-branch = master
debian-branch = master
5 changes: 0 additions & 5 deletions debian/rules
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
#!/usr/bin/make -f
# -*- makefile -*-
# Sample debian/rules that uses debhelper.
# This file was originally written by Joey Hess and Craig Small.
# As a special exception, when this file is copied by dh-make into a
# dh-make output file, you may use that output file without restriction.
# This special exception was added by Craig Small in version 0.37 of dh-make.

# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
Expand Down

0 comments on commit 78f7ee2

Please sign in to comment.