/hg/release/icedtea7-2.4: 8 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Sun Jun 9 14:59:52 PDT 2013 

changeset c80657a5e6e4 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=c80657a5e6e4
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jun 07 21:57:24 2013 +0100

	Added tag icedtea-2.4-branchpoint for changeset d0b14be8cbf8


changeset 49b6622d207d in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=49b6622d207d
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jun 07 22:20:58 2013 +0100

	Prepare for 2.4.0 release.

	2013-06-07  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* configure.ac: Set to 2.4.0.
		* NEWS: Set release date.


changeset 40b63423b460 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=40b63423b460
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sun Jun 09 18:51:53 2013 +0100

	Add Debian bug ID for PR1435.

	2013-06-09  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* NEWS: Add Debian bug ID for PR1435.


changeset 7878af901e02 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=7878af901e02
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sun Jun 09 18:54:26 2013 +0100

	Remove jconsole directory from GENERATED_FILES.

	2013-06-09  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* Makefile.am:
		Remove jconsole directory from GENERATED_FILES.


changeset bf68125e04a1 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=bf68125e04a1
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sun Jun 09 18:58:29 2013 +0100

	Remove non-existent JamVM patch directory.

	2013-06-09  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* Makefile.am:
		(EXTRA_DIST): Remove non-existent JamVM patch
		directory.


changeset 19d5e254d347 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=19d5e254d347
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sun Jun 09 19:14:13 2013 +0100

	Use the 2.4 release branch.

	2013-06-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* Makefile.am,
		(CORBA_CHANGESET): Update to IcedTea 2.4 forest head.
		(JAXP_CHANGESET): Likewise.
		(JAXWS_CHANGESET): Likewise.
		(JDK_CHANGESET): Likewise.
		(LANGTOOLS_CHANGESET): Likewise.
		(OPENJDK_CHANGESET): Likewise.
		(CORBA_SHA256SUM): Likewise.
		(JAXP_SHA256SUM): Likewise.
		(JAXWS_SHA256SUM): Likewise.
		(JDK_SHA256SUM): Likewise.
		(LANGTOOLS_SHA256SUM): Likewise.
		(OPENJDK_SHA256SUM): Likewise.
		(ICEDTEA_PREFIX): Set to icedtea7-forest-2.4
		(ICEDTEA_HG_URL): Set to release forest.
		* hotspot.map: Update default to head of IcedTea7 2.4
		forest HotSpot.


changeset c753600d9acf in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=c753600d9acf
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sun Jun 09 21:52:45 2013 +0100

	Use 'IcedTea' as ICEDTEA_NAME.

	2013-04-21  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* Makefile.am:
		(ICEDTEA_NAME): Make same across all versions.


changeset 3d670ce98cfa in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=3d670ce98cfa
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sun Jun 09 22:59:18 2013 +0100

	Added tag icedtea-2.4.0 for changeset c753600d9acf


diffstat:

 .hgtags      |   2 ++
 ChangeLog    |  46 ++++++++++++++++++++++++++++++++++++++++++++++
 Makefile.am  |  32 +++++++++++++++-----------------
 NEWS         |   4 ++--
 configure.ac |   2 +-
 hotspot.map  |   2 +-
 6 files changed, 67 insertions(+), 21 deletions(-)

diffs (170 lines):

diff -r d0b14be8cbf8 -r 3d670ce98cfa .hgtags
--- a/.hgtags	Fri Jun 07 20:28:52 2013 +0100
+++ b/.hgtags	Sun Jun 09 22:59:18 2013 +0100
@@ -34,3 +34,5 @@
 d35c742babc02eb874684ea7cb647ef5eda55c75 icedtea-2.1-branchpoint
 2917541bbda4f6745b157f39d7bd39472cae5235 icedtea-2.2-branchpoint
 60c41b88775a8043ff4922278eb0e801c330e8fe icedtea-2.3-branchpoint
+d0b14be8cbf8a705a3bec6cf8828b982405b059c icedtea-2.4-branchpoint
+c753600d9acfbbf87a5b201dde78068fb43f54d4 icedtea-2.4.0
diff -r d0b14be8cbf8 -r 3d670ce98cfa ChangeLog
--- a/ChangeLog	Fri Jun 07 20:28:52 2013 +0100
+++ b/ChangeLog	Sun Jun 09 22:59:18 2013 +0100
@@ -1,3 +1,49 @@
+2013-04-21  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* Makefile.am:
+	(ICEDTEA_NAME): Make same across all versions.
+
+2013-06-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am,
+	(CORBA_CHANGESET): Update to IcedTea 2.4 forest head.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	(ICEDTEA_PREFIX): Set to icedtea7-forest-2.4
+	(ICEDTEA_HG_URL): Set to release forest.
+	* hotspot.map: Update default to head of IcedTea7 2.4
+	forest HotSpot.
+
+2013-06-09  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* Makefile.am:
+	(EXTRA_DIST): Remove non-existent JamVM patch
+	directory.
+
+2013-06-09  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* Makefile.am:
+	(GENERATED_FILES): Remove non-existent jconsole
+	directory.
+
+2013-06-09  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* NEWS: Add Debian bug ID for PR1435.
+
+2013-06-07  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* configure.ac: Set to 2.4.0.
+	* NEWS: Set release date.
+
 2013-06-07  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	PR1276: Synchronise CACAO rules between IcedTea6/7/8
diff -r d0b14be8cbf8 -r 3d670ce98cfa Makefile.am
--- a/Makefile.am	Fri Jun 07 20:28:52 2013 +0100
+++ b/Makefile.am	Sun Jun 09 22:59:18 2013 +0100
@@ -4,19 +4,19 @@
 JDK_UPDATE_VERSION = 40
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
-CORBA_CHANGESET = fd00f67b65c4
-JAXP_CHANGESET = 7dc9a882c6f8
-JAXWS_CHANGESET = ea9a36dfd4ee
-JDK_CHANGESET = 3f1f89553b54
-LANGTOOLS_CHANGESET = 68c60cde94a7
-OPENJDK_CHANGESET = 78c6b2167b94
+CORBA_CHANGESET = 71d5ec2f3dfb
+JAXP_CHANGESET = 5eaf3bca7f68
+JAXWS_CHANGESET = 9d2007a13c02
+JDK_CHANGESET = 29ce11184945
+LANGTOOLS_CHANGESET = ffb1b6bc4750
+OPENJDK_CHANGESET = 9c74cb4a3ae8
 
-CORBA_SHA256SUM = 57e71ca50c31456ef8a3086cfe81e6ff627ea207645bbd4dced1e73c51528c56
-JAXP_SHA256SUM = 293bcceac6557965c201437b123cef23c5855dbb22b25f487ba87ccdd1991355
-JAXWS_SHA256SUM = 814fc497356289efb153509837cd97d5a019c388f7f9b1ad98247cf445b9c11d
-JDK_SHA256SUM = ca8ff71beba0303d2593f97706a8638ea1948d8387a533a16fce70d6bb85bf88
-LANGTOOLS_SHA256SUM = 807e8d5301dee8e0f532096237987f4b812c472e3d9182d349c1b3371676ec59
-OPENJDK_SHA256SUM = 8de6db8e7b249577f8cfbd343de3a76068200af5ead43255e8f77de3ac34a38f
+CORBA_SHA256SUM = 0191c678935dac77c0ad085bedb59e6bcc93e0712c3a4ef2b7171562e129807c
+JAXP_SHA256SUM = 25bb13db8a426c2d84e13eed0d598c88c447af41de3f678a70680897c38083fd
+JAXWS_SHA256SUM = 4cff8300b4c23e9327607f7c09295a99ef7d1032d8397429c7879ba489d14456
+JDK_SHA256SUM = 13024c623bb37c4d44cb3b724876d7827924868fb8f94428faa87ddb11492352
+LANGTOOLS_SHA256SUM = 80cbe75f7c268e97619e8007f8d29ecbbb7584062c1286c8b470f875526028f3
+OPENJDK_SHA256SUM = 4adfde4b056ea8f35b639156c7cad8bac140ba7957ea8ce49b440089babc6579
 
 CACAO_VERSION = e215e36be9fc
 CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
@@ -30,8 +30,8 @@
 JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
 JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
 
-ICEDTEA_PREFIX = icedtea7-forest
-ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX)
+ICEDTEA_PREFIX = icedtea7-forest-2.4
+ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/release/$(ICEDTEA_PREFIX)
 OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7
 CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/
 CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/
@@ -416,7 +416,7 @@
   ICEDTEA_SHARK_BUILD = true
 endif
 
-ICEDTEA_NAME = IcedTea7
+ICEDTEA_NAME = IcedTea
 if HAS_ICEDTEA_REVISION
 ICEDTEA_REV = +${ICEDTEA_REVISION}
 endif
@@ -657,7 +657,6 @@
 	$(top_srcdir)/generated/sun/util/resources/*.java \
 	$(top_srcdir)/generated/sun/print/resources/serviceui*.java \
 	$(top_srcdir)/generated/sun/tools/jar/resources/jar*.java \
-	$(top_srcdir)/generated/sun/tools/jconsole/*.java \
 	$(top_srcdir)/generated/sun/management/resources/agent*.java \
 	$(top_srcdir)/generated/java/nio/*.java \
 	$(top_srcdir)/generated/java/nio/channels/*.java \
@@ -760,7 +759,6 @@
 EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \
 	$(top_srcdir)/patches/boot/*.patch \
 	$(top_srcdir)/patches/cacao/*.patch \
-	$(top_srcdir)/patches/jamvm/*.patch \
 	$(top_srcdir)/patches/boot/hotspot/*/*.patch \
 	tools-copy contrib overlays \
 	javaws.png javaws.desktop \
diff -r d0b14be8cbf8 -r 3d670ce98cfa NEWS
--- a/NEWS	Fri Jun 07 20:28:52 2013 +0100
+++ b/NEWS	Sun Jun 09 22:59:18 2013 +0100
@@ -10,7 +10,7 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
-New in release 2.4.0 (2012-XX-XX):
+New in release 2.4.0 (2012-06-09):
 
 OpenJDK
   - PR1209, S7170638: Use DTRACE_PROBE[N] in JNI Set and SetStatic Field.
@@ -816,7 +816,7 @@
   - RH513605, PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive
   - PR1358: Make XRender mandatory
   - PR1360: Check for /usr/lib64 JVMs and generic JPackage alternative
-  - PR1435: OpenJDK 7 returns incorrect TrueType font metrics
+  - PR1435, D657854: OpenJDK 7 returns incorrect TrueType font metrics
   - PR728: GTKLookAndFeel does not honor gtk-alternative-button-order
 * CACAO
   - src/vm/jit/x86_64/asmpart.S (asm_abstractmethoderror): Keep stack aligned.
diff -r d0b14be8cbf8 -r 3d670ce98cfa configure.ac
--- a/configure.ac	Fri Jun 07 20:28:52 2013 +0100
+++ b/configure.ac	Sun Jun 09 22:59:18 2013 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.4pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.4.0], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 
diff -r d0b14be8cbf8 -r 3d670ce98cfa hotspot.map
--- a/hotspot.map	Fri Jun 07 20:28:52 2013 +0100
+++ b/hotspot.map	Sun Jun 09 22:59:18 2013 +0100
@@ -1,2 +1,2 @@
 # version url changeset sha256sum
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 25fe5bf8dee3 844c0c901bda689dd28f3e7846973431bf354bed1efc793d75b78844e21107ce
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot c67fd7874b1a 34e60aba6db2f7a5cac7861058db283bd1edcdd9194a5490114cf76edd71696d

More information about the distro-pkg-dev mailing list