7203312 gocr TPNO updates s11-update
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Tue, 09 Oct 2012 11:22:46 -0700
branchs11-update
changeset 2376 588bb0fc58e8
parent 2371 9fb3a90fda0c
child 2377 62cc5642c379
7203312 gocr TPNO updates
components/gocr/gocr.license
--- a/components/gocr/gocr.license	Mon Oct 08 23:21:31 2012 -0700
+++ b/components/gocr/gocr.license	Tue Oct 09 11:22:46 2012 -0700
@@ -1,20 +1,14 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
+-------------
+- GOCR 0.48 -
+-------------
 
---------------------------------------------------------------------
+Oracle Internal Tracking Number 8587
 
-
-		    GNU GENERAL PUBLIC LICENSE
+GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+                          675 Mass Ave, Cambridge, MA 02139, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -68,6 +62,7 @@
   The precise terms and conditions for copying, distribution and
 modification follow.
 
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -123,6 +118,7 @@
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
 
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -181,6 +177,7 @@
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
 
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -238,6 +235,7 @@
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
 
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -291,7 +289,8 @@
 
 		     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+
+	Appendix: How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,7 +302,7 @@
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    Copyright (C) 19yy  <name of author>
 
     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
@@ -317,15 +316,14 @@
 
     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
-
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision version 69, Copyright (C) 19yy name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.