[Pkg-voip-commits] [ring] 02/05: Added copyright section for opendht

[Alexandre Viau]

This is an automated email from the git hooks/post-receive script.

aviau pushed a commit to branch master
in repository ring.

commit 31a08ea23f51aae1e8895f415e620b609312409f
Author: aviau <alexandre at alexandreviau.net>
Date:   Fri Apr 1 12:45:23 2016 -0400

    Added copyright section for opendht
---
 debian/copyright | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/debian/copyright b/debian/copyright
index 050d9c3..71bcee9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -186,6 +186,52 @@ License: Boost-1.0
 ## End of msgpack ##
 ####################
 
+######################
+## Start of opendht ##
+######################
+
+Files: daemon/contrib/tarballs-unpacked/opendht*
+Copyright: 2014-2016 Savoir-faire Linux Inc
+License: GPL-3+
+
+Files: daemon/contrib/tarballs-unpacked/opendht*/securedht.h
+Copyright: 2014-2016 Savoir-faire Linux Inc.
+License: GPL-3-with-openssl-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, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
+ .
+ Additional permission under GNU GPL version 3 section 7:
+ .
+ If you modify this program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
+ grants you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work.
+
+Files: daemon/contrib/tarballs-unpacked/opendht*/dht.h
+       daemon/contrib/tarballs-unpacked/opendht*/dht.cpp
+Copyright: 2009-2014 Juliusz Chroboczek
+           2014-2016 Savoir-faire Linux Inc
+License: Expat
+
+####################
+## End of opendht ##
+####################
+
 License: GPL-3+
  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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/ring.git