changeset 16861:9104479f9252

8174977: Update license files with consistent license/notice names Reviewed-by: alanb, mchung Contributed-by: jeannette.hung@oracle.com
author mchung
date Tue, 14 Mar 2017 15:52:41 -0700
parents ded4aa6817b2
children 2e09a4e9a954
files src/java.desktop/share/legal/colorimaging.md src/java.desktop/share/legal/jpeg.md src/java.desktop/share/legal/libpng.md src/java.desktop/share/legal/mesa3d.md src/java.desktop/unix/legal/fontconfig.md src/java.smartcardio/unix/legal/pcsclite.md src/java.xml.crypto/share/legal/santuario.md src/jdk.crypto.cryptoki/share/legal/pkcs11cryptotoken.md src/jdk.crypto.ec/share/legal/ecc.md
diffstat 9 files changed, 16 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/share/legal/colorimaging.md	Tue Mar 14 07:04:50 2017 -0700
+++ b/src/java.desktop/share/legal/colorimaging.md	Tue Mar 14 15:52:41 2017 -0700
@@ -1,5 +1,7 @@
 ## Eastman Kodak Company: Kodak Color Management System (kcms) and portions of color management and imaging software
 
-### Notice
+### Eastman Kodak Notice
+<pre>
+Portions Copyright Eastman Kodak Company 1991-2003
+</pre>
 
-Portions Copyright Eastman Kodak Company 1991-2003
--- a/src/java.desktop/share/legal/jpeg.md	Tue Mar 14 07:04:50 2017 -0700
+++ b/src/java.desktop/share/legal/jpeg.md	Tue Mar 14 15:52:41 2017 -0700
@@ -1,4 +1,4 @@
-## JPEG rb6
+## JPEG release 6b
 
 ### JPEG License
 <pre>
--- a/src/java.desktop/share/legal/libpng.md	Tue Mar 14 07:04:50 2017 -0700
+++ b/src/java.desktop/share/legal/libpng.md	Tue Mar 14 15:52:41 2017 -0700
@@ -1,6 +1,6 @@
-## Libpng v 1.6.23
+## libpng v1.6.23
 
-### Libpng License
+### libpng License
 <pre>
 
 This copy of the libpng notices is provided for your convenience.  In case of
--- a/src/java.desktop/share/legal/mesa3d.md	Tue Mar 14 07:04:50 2017 -0700
+++ b/src/java.desktop/share/legal/mesa3d.md	Tue Mar 14 15:52:41 2017 -0700
@@ -1,6 +1,6 @@
 ## Mesa 3-D Graphics Library v4.1
 
-### Mesa 3-D Graphics Library License
+### Mesa License
 <pre>
 
 Mesa 3-D graphics library
--- a/src/java.desktop/unix/legal/fontconfig.md	Tue Mar 14 07:04:50 2017 -0700
+++ b/src/java.desktop/unix/legal/fontconfig.md	Tue Mar 14 15:52:41 2017 -0700
@@ -1,6 +1,6 @@
-## FontConfig v2.5
+## Fontconfig v2.5
 
-### FontConfig License
+### Fontconfig License
 <pre>
 
 Copyright 2001,2003 Keith Packard
--- a/src/java.smartcardio/unix/legal/pcsclite.md	Tue Mar 14 07:04:50 2017 -0700
+++ b/src/java.smartcardio/unix/legal/pcsclite.md	Tue Mar 14 15:52:41 2017 -0700
@@ -1,6 +1,6 @@
 ## PC/SC Lite for Suse Linux v1.1.1
 
-### PC/SC Lite for Suse Linux License
+### PC/SC Lite License
 <pre>
 
 Copyright (c) 1999-2004 David Corcoran <corcoran@linuxnet.com>
--- a/src/java.xml.crypto/share/legal/santuario.md	Tue Mar 14 07:04:50 2017 -0700
+++ b/src/java.xml.crypto/share/legal/santuario.md	Tue Mar 14 15:52:41 2017 -0700
@@ -1,6 +1,6 @@
 ## Apache Santuario v1.5.4
 
-### Notice
+### Apache Santuario Notice
 <pre>
 
   Apache Santuario - XML Security for Java
--- a/src/jdk.crypto.cryptoki/share/legal/pkcs11cryptotoken.md	Tue Mar 14 07:04:50 2017 -0700
+++ b/src/jdk.crypto.cryptoki/share/legal/pkcs11cryptotoken.md	Tue Mar 14 15:52:41 2017 -0700
@@ -1,4 +1,4 @@
-## PKCS #11 Cryptographic Token Interface, v2.20 amendment 3 Header Files
+## PKCS #11 Cryptographic Token Interface v2.20 Amendment 3 Header Files
 
 ### PKCS #11 Cryptographic Token Interface License
 <pre>
--- a/src/jdk.crypto.ec/share/legal/ecc.md	Tue Mar 14 07:04:50 2017 -0700
+++ b/src/jdk.crypto.ec/share/legal/ecc.md	Tue Mar 14 15:52:41 2017 -0700
@@ -1,6 +1,6 @@
-## Mozilla Elliptic Curve Cryptography
+## Mozilla Elliptic Curve Cryptography (ECC)
 
-### Notice
+### Mozilla ECC Notice
 <pre>
 
 This notice is provided with respect to Elliptic Curve Cryptography,
@@ -21,7 +21,7 @@
 
 </pre>
 
-### LGPL 2.1 License
+### LGPL 2.1
 <pre>
 
                   GNU LESSER GENERAL PUBLIC LICENSE