Mercurial > hg > release > icedtea7-forest-2.1
changeset 423:a66b58021165 icedtea-2.1-branchpoint
Merge
| author | andrew |
|---|---|
| date | Thu, 22 Dec 2011 15:19:43 +0000 |
| parents | 0a76e5390e68 (current diff) 50b5ada8ca3e (diff) |
| children | 72c84a7c7d6f |
| files | .hgtags make/Defs-internal.gmk |
| diffstat | 4 files changed, 36 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Sep 28 23:12:23 2011 +0100 +++ b/.hgtags Thu Dec 22 15:19:43 2011 +0000 @@ -124,5 +124,24 @@ 7203965666a4fe63bf82f5e4204f41ce6285e716 jdk7-b144 55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 +3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01 d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147 3defd24c2671eb2e7796b5dc45b98954341d73a7 icedtea-2.0-branchpoint +34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02 +bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03 +f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04 +9b9b5ce4176628b81c0530952979246fbe2db2d4 jdk7u1-b05 +831f1dadcc357616c50e267413a51c4a4b49d1df jdk7u2-b01 +91954c06ba1ef34dd30895419e9d99be12c90842 jdk7u2-b04 +c8b409d5b8d13dbe3fcdf107b22d928863c9de69 jdk7u2-b05 +4331602abe52bfbb6bc15bf8f9971ce4ddc4f47e jdk7u2-b06 +ee292b0e3cdfe4ba7f3e18a615e521e24a9006ce jdk7u2-b07 +ae0dc68f422ff96d8ce25c52fa2d1343837acd15 jdk7u2-b08 +b9d79c2d42bbd2bcf7fb93a08689066f6220609c jdk7u2-b09 +a88e2552f1d4395de6efcac01c1d2884ffccfc95 jdk7u1-b06 +7f0654079a6a7429a28482d96f7ce8ed6b54d1cd jdk7u1-b07 +bfc196b6a292af7d917fadc410fd703d11b71478 jdk7u1-b08 +be12d8ef36d1d75fe6476d61f921036ba49186b4 jdk7u2-b11 +b2deaf5bde5ec455a06786e8e2aea2e673be13aa jdk7u2-b12 +c95558e566ac3605c480a3d070b1102088dab07f jdk7u2-b13 +e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u2-b21
--- a/.jcheck/conf Wed Sep 28 23:12:23 2011 +0100 +++ b/.jcheck/conf Thu Dec 22 15:19:43 2011 +0000 @@ -1,1 +1,2 @@ project=jdk7 +bugids=dup
--- a/THIRD_PARTY_README Wed Sep 28 23:12:23 2011 +0100 +++ b/THIRD_PARTY_README Thu Dec 22 15:19:43 2011 +0000 @@ -216,15 +216,16 @@ is included with JRE 7, JDK 7, and OpenJDK 7. You are receiving a copy of the Elliptic Curve Cryptography library in source -form with the JDK 7 source distribution and object code in the JRE 7 & JDK 7 -runtime. - -The terms of the Oracle license do NOT apply to the Elliptic Curve -Cryptography library program; it is licensed under the following license, -separately from the Oracle programs you receive. If you do not wish to install -this program, you may delete the library named libsunec.so (on Solaris and -Linux systems) or sunec.dll (on Windows systems) from the JRE bin directory -reserved for native libraries. +form with the JDK 7 and OpenJDK7 source distributions, and as object code in +the JRE 7 & JDK 7 runtimes. + +In the case of the JRE 7 & JDK 7 runtimes, the terms of the Oracle license do +NOT apply to the Elliptic Curve Cryptography library; it is licensed under the +following license, separately from Oracle's JDK & JRE. If you do not wish to +install the Elliptic Curve Cryptography library, you may delete the library +named libsunec.so (on Solaris and Linux systems) or sunec.dll (on Windows +systems) from the JRE bin directory reserved for native libraries. + --- begin of LICENSE --- @@ -1000,7 +1001,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.2.18, which is +%% This notice is provided with respect to libpng 1.5.4, which is included with JRE 7, JDK 7, and OpenJDK 7. --- begin of LICENSE --- @@ -1014,8 +1015,10 @@ If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.18, May 15, 2007, are -Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are +This code is released under the libpng license. + +libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are +Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -1112,7 +1115,7 @@ Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 15, 2007 +July 7, 2011 --- end of LICENSE ---
--- a/make/Defs-internal.gmk Wed Sep 28 23:12:23 2011 +0100 +++ b/make/Defs-internal.gmk Thu Dec 22 15:19:43 2011 +0000 @@ -261,12 +261,6 @@ ifndef NO_DOCS # Default value (we want javadoc run) GENERATE_DOCS=true - # No DOCS build when JDK_UPDATE_VERSION set on non-OPENJDK builds - ifndef OPENJDK - ifdef JDK_UPDATE_VERSION - GENERATE_DOCS=false - endif - endif # If langtools, corba, jaxp, and jaxws are not being built, # a full jdk javadoc is not possible ifneq ($(BUILD_LANGTOOLS), true)