Issue number:

Obtained from:
Submitted by:   Travis
Reviewed by:


Sun is adding an alternative license term to the SGI Free B license which
is permitted under that license.  We are removing a couple of provisions
from the SGI Free B license to make the license more liberal for our end
users of JOGL.  So these changes are just communication of that.  There are
no actual source code changes, just changes to the license file and the
license text in each source code file.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@856 232f8b59-042b-4e1e-8c03-345bb8c30851

3 files changed, 33 insertions, 3 deletions

diff --git a/src/classes/javax/media/opengl/glu/GLUtessellator.java b/src/classes/javax/media/opengl/glu/GLUtessellator.java
index df42a8a82..cb7bd9d76 100755
--- a/src/classes/javax/media/opengl/glu/GLUtessellator.java
+++ b/src/classes/javax/media/opengl/glu/GLUtessellator.java
@@ -1,5 +1,5 @@
 /*
-* Portions Copyright (C) 2003 Sun Microsystems, Inc.
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
 * All rights reserved.
 */
 
@@ -20,6 +20,16 @@
 ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
 ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
 **
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
 ** Original Code. The Original Code is: OpenGL Sample Implementation,
 ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
 ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
diff --git a/src/classes/javax/media/opengl/glu/GLUtessellatorCallback.java b/src/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
index 9d4946b00..253b50743 100755
--- a/src/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
+++ b/src/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
@@ -1,5 +1,5 @@
 /*
-* Portions Copyright (C) 2003 Sun Microsystems, Inc.
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
 * All rights reserved.
 */
 
@@ -20,6 +20,16 @@
 ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
 ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
 **
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
 ** Original Code. The Original Code is: OpenGL Sample Implementation,
 ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
 ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
diff --git a/src/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java b/src/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
index eaccf0b15..bf6f2d29a 100755
--- a/src/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
+++ b/src/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
@@ -1,5 +1,5 @@
 /*
-* Portions Copyright (C) 2003 Sun Microsystems, Inc.
+* Portions Copyright (C) 2003-2006 Sun Microsystems, Inc.
 * All rights reserved.
 */
 
@@ -20,6 +20,16 @@
 ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
 ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
 **
+** NOTE:  The Original Code (as defined below) has been licensed to Sun
+** Microsystems, Inc. ("Sun") under the SGI Free Software License B
+** (Version 1.1), shown above ("SGI License").   Pursuant to Section
+** 3.2(3) of the SGI License, Sun is distributing the Covered Code to
+** you under an alternative license ("Alternative License").  This
+** Alternative License includes all of the provisions of the SGI License
+** except that Section 2.2 and 11 are omitted.  Any differences between
+** the Alternative License and the SGI License are offered solely by Sun
+** and not by SGI.
+**
 ** Original Code. The Original Code is: OpenGL Sample Implementation,
 ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
 ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.