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

[Daniel Pocock]

The following commit has been merged in the master branch:
commit a26bbd7fad99ab07e626e38ba3238275baa9341c
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Wed May 23 21:58:37 2012 +0200

    Add more license text to copyright

diff --git a/debian/copyright b/debian/copyright
index b4b67ac..a0bc602 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -32,7 +32,7 @@ Comment:
  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
+ and also a copy of the BSD licenses used for newer parts of
  the code.
  .
  The project links against libradiusclient-ng2 which also has a
@@ -66,7 +66,7 @@ License: MIT
 
 Files: apps/clicktocall/* apps/ichat-gw/*
 Copyright: 2009, SIP Spectrum, Inc.
-License: BSD
+License: BSD-SIPSpectrum
 
 Files: p2p/*
 Copyright: 2008, Various contributors to the Resiprocate project
@@ -78,12 +78,12 @@ License: BSD
 
 Files: reflow/* resip/recon/*
 Copyright: 2007-2008, Plantronics, Inc.
-License: BSD
+License: BSD-Plantronics and BSD-SIPSpectrum
 
 Files: reTurn/*
 Copyright: 2007-2008, Plantronics, Inc.
            2011-2012, Daniel Pocock
-License: BSD
+License: BSD-Plantronics and BSD
 
 Files: tfm/*
 Copyright: 2005, PurpleComm, Inc.
@@ -203,6 +203,62 @@ License: BSD-PurpleComm
  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: BSD-SIPSpectrum
+ 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 SIP Spectrum 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: BSD-Plantronics
+ 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 Plantronics 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