8u74-2: Update JavaFX License

3 files changed, 14 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 42d70d3dd2cb..42e606231cca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jdk-docs
 	pkgdesc = Documentation for Oracle Java Development Kit
 	pkgver = 8u74
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.oracle.com/technetwork/java/javase/downloads/index.html
 	arch = any
 	license = custom:Oracle
@@ -11,11 +11,11 @@ pkgbase = jdk-docs
 	source = http://download.oracle.com/otn-pub/java/jdk/8u74-b02/jdk-8u74-docs-all.zip
 	source = http://download.oracle.com/otn-pub/java/javafx/8.0.72-b15/javafx-8u72-apidocs.zip
 	source = LICENSE-Documentation
-	source = LICENSE-JavaFX
+	source = LICENSE-Oracle-Legal-Notices
 	md5sums = d98ad2762c2c7e48af3a93272764b5ce
 	md5sums = 1a97e0c6e666cfcb11c52a76a43be96b
 	md5sums = 4d54057ca75b691366977dab2277e869
-	md5sums = b2a9fa7a855645ba5e1ea2ea555cce25
+	md5sums = 3137397f4dba13f4a79157819af583a3
 
 pkgname = jdk-docs
 
diff --git a/LICENSE-JavaFX b/LICENSE-Oracle-Legal-Notices
index d81798467068..3a099faca953 100644
--- a/LICENSE-JavaFX
+++ b/LICENSE-Oracle-Legal-Notices
@@ -1,31 +1,30 @@
 Oracle Legal Notices
 Copyright Notice
+Copyright © 1993, 2016, Oracle and/or its affiliates. All rights reserved.
 
-Copyright © 1993, 2014, Oracle and/or its affiliates. All rights reserved.
 Trademark Notice
-
 Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.
 
 Intel and Intel Xeon are trademarks or registered trademarks of Intel Corporation. All SPARC trademarks are used under license and are trademarks or registered trademarks of SPARC International, Inc. AMD, Opteron, the AMD logo, and the AMD Opteron logo are trademarks or registered trademarks of Advanced Micro Devices. UNIX is a registered trademark of The Open Group.
-License Restrictions Warranty/Consequential Damages Disclaimer
 
+License Restrictions Warranty/Consequential Damages Disclaimer
 This software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.
-Warranty Disclaimer
 
+Warranty Disclaimer
 The information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.
-Restricted Rights Notice
 
+Restricted Rights Notice
 If this is software or related documentation that is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:
 
 U.S. GOVERNMENT END USERS: Oracle programs, including any operating system, integrated software, any programs installed on the hardware, and/or documentation, delivered to U.S. Government end users are "commercial computer software" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, use, duplication, disclosure, modification, and adaptation of the programs, including any operating system, integrated software, any programs installed on the hardware, and/or documentation, shall be subject to license terms and license restrictions applicable to the programs. No other rights are granted to the U.S. Government.
-Hazardous Applications Notice
 
+Hazardous Applications Notice
 This software or hardware is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications that may create a risk of personal injury. If you use this software or hardware in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure its safe use. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software or hardware in dangerous applications.
-Third-Party Content, Products, and Services Disclaimer
 
+Third-Party Content, Products, and Services Disclaimer
 This software or hardware and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.
-Alpha and Beta Draft Documentation Notice
 
+Alpha and Beta Draft Documentation Notice
 If this document is in preproduction status:
 
-This documentation is in preproduction status and is intended for demonstration and preliminary use only. It may not be specific to the hardware on which you are using the software. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to this documentation and will not be responsible for any loss, costs, or damages incurred due to the use of this documentation.
+This documentation is in preproduction status and is intended for demonstration and preliminary use only. It may not be specific to the hardware on which you are using the software. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to this documentation and will not be responsible for any loss, costs, or damages incurred due to the use of this documentation.
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index cc92d8b4ac53..8ce5446f0ebf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _major=8
 _minor=74
 _build=b02
 pkgver=${_major}u${_minor}
-pkgrel=1
+pkgrel=2
 pkgdesc="Documentation for Oracle Java Development Kit"
 arch=('any')
 url="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
@@ -19,11 +19,11 @@ source=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/jdk-$pkgver
 #        "http://download.oracle.com/otn-pub/java/javafx/$_major.0.$_minor-$_build/javafx-$pkgver-apidocs.zip"
         'http://download.oracle.com/otn-pub/java/javafx/8.0.72-b15/javafx-8u72-apidocs.zip'
         'LICENSE-Documentation'
-        'LICENSE-JavaFX')
+        'LICENSE-Oracle-Legal-Notices')
 md5sums=('d98ad2762c2c7e48af3a93272764b5ce'
          '1a97e0c6e666cfcb11c52a76a43be96b'
          '4d54057ca75b691366977dab2277e869'
-         'b2a9fa7a855645ba5e1ea2ea555cce25')
+         '3137397f4dba13f4a79157819af583a3')
 
 DLAGENTS=('http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u')