Skip to content

Commit

Permalink
sync debian/ folder with debian package 2.5.3+ds-1 (#866)
Browse files Browse the repository at this point in the history
  • Loading branch information
rogers0 authored and madeye committed Oct 4, 2016
1 parent b16e55d commit 6577372
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 2 deletions.
2 changes: 2 additions & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ Package: libshadowsocks-libev2
Architecture: any
Multi-Arch: same
Section: libs
Replaces: libshadowsocks-libev1
Breaks:
libshadowsocks-libev1,
shadowsocks-libev (<< 2.4.0),
Pre-Depends:
${misc:Pre-Depends},
Expand Down
73 changes: 71 additions & 2 deletions debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,35 @@ Files: doc/*
Copyright: 2012-2016, Max Lv <[email protected]>
License: GFDL-1.1+

Files: m4/ax_pthread.m4
Copyright: 2008 Steven G. Johnson <[email protected]>
2011 Daniel Richard G. <[email protected]>
License: GPL-3+ with Autoconf exception

Files: m4/ax_tls.m4
Copyright: 2008 Alan Woodland <[email protected]>
2010 Diego Elio Petteno` <[email protected]>
License: GPL-3+ with Autoconf exception

Files: m4/pcre.m4
Copyright: 2015 Syrone Wong <[email protected]>
License: Apache-2.0

Files: m4/stack-protector.m4
Copyright: 2007 Google Inc.
License: Apache-2.0

Files: src/json.c src/json.h
Copyright: 2012-2014, James McLaughlin et al.
License: BSD-2-clause

Files: src/resolv.c src/resolv.h
Copyright: 2014, Dustin Lundquist <[email protected]>
Files: src/http.c src/http.h src/protocol.h src/resolv.c src/resolv.h src/tls.c src/tls.h
Copyright: 2011-2014, Dustin Lundquist <[email protected]>
License: BSD-2-clause

Files: src/rule.c src/rule.h
Copyright: 2011-2012, Dustin Lundquist <[email protected]>
2011, Manuel Kasper <[email protected]>
License: BSD-2-clause

Files: src/ss-nat
Expand Down Expand Up @@ -84,6 +107,25 @@ License: BSD-1-clause
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

License: Apache-2.0
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You 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
.
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 version 2.0 license
can be found in "/usr/share/common-licenses/Apache-2.0".

License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
Expand Down Expand Up @@ -133,3 +175,30 @@ License: GPL-3+
.
On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

License: GPL-3+ with Autoconf exception
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
.
This program 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 General
Public License for more details.
.
You should have received a copy of the GNU General Public License along
with this program. If not, see <http://www.gnu.org/licenses/>.
.
As a special exception, the respective Autoconf Macro's copyright owner
gives unlimited permission to copy, distribute and modify the configure
scripts that are the output of Autoconf when processing the Macro. You
need not follow the terms of the GNU General Public License when using
or distributing such scripts, even though portions of the text of the
Macro appear in them. The GNU General Public License (GPL) does govern
all other use of the material that constitutes the Autoconf Macro.
.
This special exception to the GPL applies to versions of the Autoconf
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.

0 comments on commit 6577372

Please sign in to comment.