[vmkit-commits] [vmkit] r59060 - in /vmkit/trunk: LICENSE.TXT lib/N3/Mono/LICENSE.TXT lib/N3/Mono/Mono.cpp lib/N3/PNetLib/LICENSE.TXT lib/N3/PNetLib/PNetLib.cpp

Tue Nov 11 10:55:03 PST 2008

Author: geoffray
Date: Tue Nov 11 12:55:00 2008
New Revision: 59060

URL: http://llvm.org/viewvc/llvm-project?rev=59060&view=rev
Log:
Fix licensing issue.


Added:
    vmkit/trunk/lib/N3/Mono/LICENSE.TXT
    vmkit/trunk/lib/N3/PNetLib/LICENSE.TXT
Modified:
    vmkit/trunk/LICENSE.TXT
    vmkit/trunk/lib/N3/Mono/Mono.cpp
    vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp

Modified: vmkit/trunk/LICENSE.TXT
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/LICENSE.TXT?rev=59060&r1=59059&r2=59060&view=diff

==============================================================================

--- vmkit/trunk/LICENSE.TXT (original)
+++ vmkit/trunk/LICENSE.TXT Tue Nov 11 12:55:00 2008
@@ -42,3 +42,25 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
 SOFTWARE.
 
+==============================================================================
+Copyrights and Licenses for Third Party Software Distributed with LLVM:
+==============================================================================
+The VMKit software contains code written by third parties.  Such software will
+have its own individual LICENSE.TXT file in the directory in which it appears.
+This file will describe the copyrights, license, and restrictions which apply
+to that code.
+
+The disclaimer of warranty in the University of Illinois Open Source License
+applies to all code in the LLVM Distribution, and nothing in any of the
+other licenses gives permission to use the names of the LLVM Team or the
+University of Illinois to endorse or promote products derived from this
+Software.
+
+The following pieces of software have additional or alternate copyrights,
+licenses, and/or restrictions:
+
+Program             Directory
+-------             ---------
+Mono libraries      vmkit/lib/N3/Mono
+PNetlib libraries   vmkit/lib/N3/PNet
+

Added: vmkit/trunk/lib/N3/Mono/LICENSE.TXT
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/Mono/LICENSE.TXT?rev=59060&view=auto

==============================================================================
--- vmkit/trunk/lib/N3/Mono/LICENSE.TXT (added)
+++ vmkit/trunk/lib/N3/Mono/LICENSE.TXT Tue Nov 11 12:55:00 2008
@@ -0,0 +1,22 @@
+--------------------------------------------------------------------------------
+VMKit Mono runtime
+--------------------------------------------------------------------------------
+All files are licensed under the VMKit license with the following additions:
+
+vmkit/lib/N3/Mono/Mono.cpp
+
+        This code is dual licensed under the LGPL or commercial licenses.
+
+        The LGPL ensures that Mono can be used in most scenarios, but
+        gives Novell the flexibility to relicense the code for embedded
+        systems or commercial settings where the LGPL can not be used.
+
+        Contact mono at novell.com for details on obtaining the Mono
+        runtime under other terms.
+        
+        (C) 2008 Ximian, Inc.  http://www.ximian.com
+
+vmkit/lib/N3/Mono/number-formatter.h
+
+        This file is under the Mono License.
+        (C) 2008 Ximian, Inc.  http://www.ximian.com

Modified: vmkit/trunk/lib/N3/Mono/Mono.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/Mono/Mono.cpp?rev=59060&r1=59059&r2=59060&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/Mono/Mono.cpp (original)
+++ vmkit/trunk/lib/N3/Mono/Mono.cpp Tue Nov 11 12:55:00 2008
@@ -2,8 +2,11 @@
 //
 //                              N3
 //
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// This file is licensed under the University of Illinois Open Source License
+// and the Mono License. See LICENSE.TXT for details.
+// The file also has the following additional copyright:
+//
+// (C) 2008 Ximian, Inc.  http://www.ximian.com
 //
 //===----------------------------------------------------------------------===//
 

Added: vmkit/trunk/lib/N3/PNetLib/LICENSE.TXT
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/LICENSE.TXT?rev=59060&view=auto

==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/LICENSE.TXT (added)
+++ vmkit/trunk/lib/N3/PNetLib/LICENSE.TXT Tue Nov 11 12:55:00 2008
@@ -0,0 +1,22 @@
+--------------------------------------------------------------------------------
+VMKit PNetLib runtime
+--------------------------------------------------------------------------------
+All files are licensed under the VMKit license with the following additions:
+
+vmkit/lib/N3/PNetLib/PNetLib.cpp
+      
+      Copyright (C) 2001, 2002, 2003  Southern Storm Software, Pty Ltd.
+
+      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 2 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

Modified: vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp?rev=59060&r1=59059&r2=59060&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp (original)
+++ vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp Tue Nov 11 12:55:00 2008
@@ -3,7 +3,25 @@
 //                              N3
 //
 // This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// License with the following additions:
+//
+// Copyright (C) 2001, 2002, 2003  Southern Storm Software, Pty Ltd.
+//
+// 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 2 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 



