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

[Daniel Pocock]

The following commit has been merged in the master branch:
commit 9ceefcabb661b56693883f02800b25dac1434312
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Wed May 23 11:41:43 2012 +0000

    Elaborate on debian/copyright details

diff --git a/debian/copyright b/debian/copyright
index 8e8f2e5..f627256 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,7 +25,11 @@ 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.
+ project remains constrained by the 4th clause.  Each file has
+ comments inside indicating whether it was contributed under
+ the 4-clause or less restrictive 3-clause license.  When the
+ product is used as a whole, the more restrictive 4-clause
+ license is in effect.
  .
  This copyright file includes a copy of the Vovida license
  and also a copy of the BSD license used for newer parts of
@@ -48,6 +52,44 @@ Comment:
  material copyright (C) Free Software Foundation, but with
  unlimited use rather than GPL.
 
+Files: b2bua/* apps/sipdial/*
+Copyright: 2012, Daniel Pocock <daniel at pocock.com.au>
+License: BSD
+
+Files: apps/sipdial/MacOS/*
+Copright: 2007, Marcus Mueller and Helge Hess
+License: BSD
+
+Files: rutil/dns/ares/*
+Copyright: 1998, Massachusetts Institute of Technology
+License: MIT
+
+Files: apps/clicktocall/* apps/ichat-gw/*
+Copyright: 2009, SIP Spectrum, Inc.
+License: BSD
+
+Files: p2p/*
+Copyright: 2008, Various contributors to the Resiprocate project
+License: BSD
+
+Files: p2p/s2c/s2c/*
+Copyright: 2008, RTFM, Inc
+License: BSD
+
+Files: reflow/* resip/recon/*
+Copyright: 2007-2008, Plantronics, Inc.
+License: BSD
+
+Files: reTurn/*
+Copyright: 2007-2008, Plantronics, Inc.
+           2011-2012, Daniel Pocock
+License: BSD
+
+Files: tfm/*
+Copyright: 2005, PurpleComm, Inc.
+           2000-2005 Vovida Networks, Inc
+License: BSD-PurpleComm
+
 Files: debian/*
 Copyright: 2012, Daniel Pocock <daniel at pocock.com.au> and
            2009, Gregor Jasny <gjasny at googlemail.com>
@@ -124,6 +166,43 @@ License: BSD
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
+License: MIT
+ Permission to use, copy, modify, and distribute this
+ software and its documentation for any purpose and without
+ fee is hereby granted, provided that the above copyright
+ notice appear in all copies and that both that copyright
+ notice and this permission notice appear in supporting
+ documentation, and that the name of M.I.T. not be used in
+ advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+ M.I.T. makes no representations about the suitability of
+ this software for any purpose.  It is provided "as is"
+ without express or implied warranty.
+
+License: BSD-PurpleComm
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+ * 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.
+ * Neither the name of PurpleComm, Inc. nor the names of its contributors may
+   be used to endorse or promote products derived from this software without
+   specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
+
 License: autotools-artefacts
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.

-- 
reSIProcate