[Pkg-voip-commits] [SCM] reSIProcate branch, master, updated. upstream/1.8.0_pre1-32-g0e32f58

[Daniel Pocock]

The following commit has been merged in the master branch:
commit 0e32f5852febb91641e3cad05719d3351ef9d1fc
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Tue May 22 14:04:35 2012 +0200

    Add more detail to debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 5cb0218..3ac6ff1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,9 +5,61 @@ Source: https://svn.resiprocate.org/viewsvn/resiprocate/main/
 
 Files: *
 Copyright: 2000, Vovida Networks, Inc.
+           2000, Massachusetts Institute of Technology
+           2000, Jacob Butcher
+           2002, The Internet Society
+           2003, Jason Fischl
+           2004, Pingtel Corp.
+           2005, Purplecomm, Inc.
            2005, Scott Godin / SIP Spectrum Inc.
+           2006, Peter Gutmann
+           2006, SIPfoundry Inc.
+           2007, Marcus Mueller and Helge Hess
            2007, Plantronics, Inc.
-License: Vovida and BSD
+           2007, Eric Rescorla and Derek MacDonald
+           2008, RTFM, Inc.
+           2007-2012, Daniel Pocock
+           2012, Ready Technology (UK) Limited
+License: Vovida
+Comment:
+ All work was originally licensed under the 4-clause Vovida license.
+ Upstream developers have been contributing new material to the
+ project using a 3-clause BSD license.  Therefore, the overall
+ project remains constrained by the 4th clause.
+ .
+ This copyright file includes a copy of the Vovida license
+ and also a copy of the BSD license used for newer parts of
+ the code.
+ .
+ The project links against libradiusclient-ng2 which also has a
+ BSD-derived 4-clause license.  The 4th clause of the Vovida
+ and libradiusclient-ng2 licenses are compatible and cumulative
+ when used together.
+ .
+ The project links against OpenSSL which has a 5-clause license.
+ The OpenSSL license clauses are compatible and cumulative
+ when used together.
+
+Files: aclocal.m4, **/Makefile.in, configure
+Copyright: 1992-2010, Free Software Foundation, Inc.
+License: public-domain
+Comment:
+ The artefacts created by the autotools build system contain
+ material copyright (C) Free Software Foundation, but with
+ unlimited use rather than GPL.
+ .
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+
+Files: debian/*
+Copyright: 2012, Daniel Pocock <daniel at pocock.com.au> and
+           2009, Gregor Jasny <gjasny at googlemail.com>
+License: GPL-3+
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
+License: Vovida
  The Vovida Software License, Version 1.0
  .
  Redistribution and use in source and binary forms, with or without
@@ -46,11 +98,32 @@ License: Vovida and BSD
  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  DAMAGE.
 
-Files: debian/*
-Copyright: 2012, Daniel Pocock <daniel at pocock.com.au> and
-           2009, Gregor Jasny <gjasny at googlemail.com>
-License: GPL-3+
- On Debian systems, the full text of the GNU General Public
- License version 3 can be found in the file
- `/usr/share/common-licenses/GPL-3'.
+License: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ .
+ 2. 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.
+ .
+ 3. Neither the name of the author(s) nor the names of any contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) 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 AUTHOR(S) 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.
 

-- 
reSIProcate