[asterisk-scf-commits] asterisk-scf/integration/media_rtp_pjmedia.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  b62f07365be496d5aa0886bf2c26d05ba4000146 (commit)
      from  c6dd5c7d3b3372bed13675470919838d5a14326d (commit)

Summary of changes:
 LICENSE.txt |  118 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 61 insertions(+), 57 deletions(-)


- Log -----------------------------------------------------------------
commit b62f07365be496d5aa0886bf2c26d05ba4000146
Author: David M. Lee <dlee at digium.com>
Date:   Mon Oct 25 10:51:47 2010 -0500

    clean up license file

diff --git a/LICENSE.txt b/LICENSE.txt
index 4d5fc3e..ff0499c 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,68 +1,71 @@
-Asterisk SCF is distributed by Digium, Inc. (Digium) under the 
-GNU General Public License version 2 (GPLv2) and is also available under 
-alternative licenses negotiated directly with Digium. If you obtained 
-Asterisk SCF under the GPLv2, then those terms apply to all programs 
-you distribute that communicate using the Asterisk SCF object interfaces 
-(APIs) on objects provided by Asterisk SCF’s components, as defined below. 
-A copy of the GPLv2 is included in the Asterisk SCF source tree in the 
-file COPYING.txt
+Asterisk SCF is distributed by Digium, Inc. (Digium) under the GNU
+General Public License version 2 (GPLv2) and is also available under
+alternative licenses negotiated directly with Digium. If you obtained
+Asterisk SCF under the GPLv2, then those terms apply to all programs
+you distribute that communicate using the Asterisk SCF object
+interfaces (APIs) on objects provided by Asterisk SCF's components, as
+defined below.  A copy of the GPLv2 is included in the Asterisk SCF
+source tree in the file COPYING.txt.
 
-Asterisk SCF is a collection of programs that communicate with each other 
-over defined APIs. This communication can occur within a single process 
-(if two programs are loaded into a suitable container), between processes 
-on a single machine, between processes on different machines, or some 
-combination. In addition, these APIs are usable across a number of 
-platforms and also across a variety of programming languages, many of 
-which are interpreted (scripting) languages. Because of this flexibility 
-and the possible ambiguity in interpretation of the provisions of the 
-GPLv2 as they apply to Asterisk SCF, Digium makes the following 
-statement:
+Asterisk SCF is a collection of programs that communicate with each
+other over defined APIs. This communication can occur within a single
+process (if two programs are loaded into a suitable container),
+between processes on a single machine, between processes on different
+machines, or some combination. In addition, these APIs are usable
+across a number of platforms and also across a variety of programming
+languages, many of which are interpreted (scripting)
+languages. Because of this flexibility and the possible ambiguity in
+interpretation of the provisions of the GPLv2 as they apply to
+Asterisk SCF, Digium makes the following statement:
 
-    It is Digium’s interpretation that because the Asterisk SCF APIs, 
-    by definition, expose direct, and indirect, complex remote, and non-remote, 
-    function calls on objects provided by Asterisk SCF’s programs, that usage 
-    of these APIs between the program hosting the object(s) and the program 
-    accessing the object(s) creates a derivative work that must be covered 
-    wholly by GPLv2, even if the mechanism used to invoke the function calls 
-    employs a cross-process or network connection. As a result, any program 
-    that employs the Asterisk SCF APIs to perform its intended functions, 
-    and would not be able to perform those intended functions without using 
-    these APIs to communicate with Asterisk SCF programs, or derivatives of 
-    Asterisk SCF programs, is subject to the terms of the GPLv2 when it is 
-    distributed, unless the distributor of the program has obtained explicit 
-    written permission from Digium to distribute it under a different 
-    license.
+    It is Digium's interpretation that because the Asterisk SCF APIs,
+    by definition, expose direct, and indirect, complex remote, and
+    non-remote, function calls on objects provided by Asterisk SCF's
+    programs, that usage of these APIs between the program hosting the
+    object(s) and the program accessing the object(s) creates a
+    derivative work that must be covered wholly by GPLv2, even if the
+    mechanism used to invoke the function calls employs a
+    cross-process or network connection. As a result, any program that
+    employs the Asterisk SCF APIs to perform its intended functions,
+    and would not be able to perform those intended functions without
+    using these APIs to communicate with Asterisk SCF programs, or
+    derivatives of Asterisk SCF programs, is subject to the terms of
+    the GPLv2 when it is distributed, unless the distributor of the
+    program has obtained explicit written permission from Digium to
+    distribute it under a different license.
 
-Digium is able to grant, at its sole discretion, permission for companies, 
-individuals or organizations to distribute programs that use the 
-Asterisk SCF APIs under open source or proprietary terms. Digium is able 
-to do this because all components of the Asterisk SCF package are either 
-copyrighted by Digium, because Digium has been granted a sufficient license 
-by the component’s copyright holder(s), or some combination thereof.
+Digium is able to grant, at its sole discretion, permission for
+companies, individuals or organizations to distribute programs that
+use the Asterisk SCF APIs under open source or proprietary
+terms. Digium is able to do this because all components of the
+Asterisk SCF package are either copyrighted by Digium, because Digium
+has been granted a sufficient license by the component's copyright
+holder(s), or some combination thereof.
 
-Digium grants specific permission for anyone to distribute programs that 
-use the Asterisk SCF APIs and also use the OpenSSL toolkit, 
-Ice (Internet Communication Engine) from ZeroC and/or the UW IMAP toolkit 
-(“Open Source Exceptions”), even though the terms of the GPLv2 do not allow 
-such distribution. This permission only extends to distributions that 
-properly acknowledge and comply with the terms of the licenses on the 
-Open Source Exceptions that are used in addition to the terms of 
+Digium grants specific permission for anyone to distribute programs
+that use the Asterisk SCF APIs and also use the OpenSSL toolkit, Ice
+(Internet Communication Engine) from ZeroC and/or the UW IMAP toolkit
+("Open Source Exceptions"), even though the terms of the GPLv2 do not
+allow such distribution. This permission only extends to distributions
+that properly acknowledge and comply with the terms of the licenses on
+the Open Source Exceptions that are used in addition to the terms of
 the GPLv2.
 
-If you wish to use Asterisk SCF code in other GPLv2 programs, there is 
-no requirement that you provide the same permissions for these 
-Open Source Exceptions to recipients of your programs (although if you 
-have written a program for Asterisk SCF, Digium would strongly encourage 
+If you wish to use Asterisk SCF code in other GPLv2 programs, there is
+no requirement that you provide the same permissions for these Open
+Source Exceptions to recipients of your programs (although if you have
+written a program for Asterisk SCF, Digium would strongly encourage
 you to grant the same permissions granted by Digium).
 
-The ‘Ice’ and ‘ZeroC’ names are trademarks of ZeroC, Inc.
+The 'Ice' and 'ZeroC' names are trademarks of ZeroC, Inc.
 
-The “Asterisk SCF” name and logos are trademarks owned by Digium and use 
-of them is subject to Digium’s trademark licensing policies. If you wish 
-to use these trademarks for purposes other than unmodified redistribution 
-of Asterisk SCF source code obtained from Digium, you should contact 
-Digium’s licensing department to determine the necessary steps you must 
-take. For more information on this policy, please read:
+The "Asterisk SCF" name and logos are trademarks owned by Digium and
+use of them is subject to Digium's trademark licensing policies. If
+you wish to use these trademarks for purposes other than unmodified
+redistribution of Asterisk SCF source code obtained from Digium, you
+should contact Digium's licensing department to determine the
+necessary steps you must take. For more information on this policy,
+please read:
 
 http://www.digium.com/en/company/profile/trademarkpolicy.php
 
@@ -72,9 +75,10 @@ If you have any questions regarding our licensing policy, please contact us:
 +1.256.428.6000 (via telephone outside the USA)
 +1.256.864.0464 (via FAX inside or outside the USA)
 IAX2/pbx.digium.com (via IAX2)
+sip:6000 at digium.com (via SIP)
 licensing at digium.com (via email)
 
 Digium, Inc.
 445 Jan Davis Drive NW
 Huntsville, AL 35806
-USA
\ No newline at end of file
+USA

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/media_rtp_pjmedia.git