changeset in /hg/icedtea: Post 1.9 updates: Bump to 1.10-pre and...

[Andrew John Hughes]

changeset bf7c34ac17a5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bf7c34ac17a5
description:
	Post 1.9 updates: Bump to 1.10-pre and switch to using IcedTea7 forest.

	2009-03-20  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am: Switch to IcedTea
		forest rather than build drop x.
		* NEWS,
		* configure.ac: Prepare for next release.

diffstat:

4 files changed, 12 insertions(+), 5 deletions(-)
ChangeLog    |    7 +++++++
Makefile.am  |    6 ++----
NEWS         |    2 ++
configure.ac |    2 +-

diffs (60 lines):

diff -r 9933c527970b -r bf7c34ac17a5 ChangeLog
--- a/ChangeLog	Fri Mar 20 11:42:36 2009 +0000
+++ b/ChangeLog	Fri Mar 20 11:57:47 2009 +0000
@@ -1,3 +1,10 @@ 2009-03-20  Andrew John Hughes  <ahughes
+2009-03-20  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Switch to IcedTea
+	forest rather than build drop x.
+	* NEWS,
+	* configure.ac: Prepare for next release.
+
 2009-03-20  Andrew John Hughes  <ahughes at redhat.com>
 
 	* NEWS: Add release date for 1.9.
diff -r 9933c527970b -r bf7c34ac17a5 Makefile.am
--- a/Makefile.am	Fri Mar 20 11:42:36 2009 +0000
+++ b/Makefile.am	Fri Mar 20 11:57:47 2009 +0000
@@ -1,6 +1,4 @@ OPENJDK_DATE = 05_mar_2009
-OPENJDK_DATE = 05_mar_2009
 OPENJDK_MD5SUM = a451251ebdd9a219b16429369fa72e2a
-OPENJDK_VERSION = b50
 
 CACAO_VERSION = 0.99.4
 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
@@ -1516,7 +1514,7 @@ BSD_HG_URL = http://hg.openjdk.java.net/
 BSD_HG_URL = http://hg.openjdk.java.net/bsd-port/bsd-port
 NIO2_HG_URL = http://hg.openjdk.java.net/nio/nio/
 
-OPENJDK_URL = http://www.java.net/download/openjdk/jdk7/promoted/$(OPENJDK_VERSION)/
+OPENJDK_URL = http://hg.openjdk.java.net/icedtea/jdk7/archive/
 
 if USE_ALT_OPENJDK_SRC_ZIP
   OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
@@ -1524,7 +1522,7 @@ if USE_HG
 if USE_HG
   OPENJDK_SRC_ZIP = 
 else
-  OPENJDK_SRC_ZIP = openjdk-7-ea-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).zip
+  OPENJDK_SRC_ZIP = tip.tar.gz
 endif
 endif
 
diff -r 9933c527970b -r bf7c34ac17a5 NEWS
--- a/NEWS	Fri Mar 20 11:42:36 2009 +0000
+++ b/NEWS	Fri Mar 20 11:57:47 2009 +0000
@@ -1,3 +1,5 @@ New in release 1.9 (2009-03-20)
+New in release 1.10 (XXXX-XX-XX)
+
 New in release 1.9 (2009-03-20)
 
 - Security fixes for:
diff -r 9933c527970b -r bf7c34ac17a5 configure.ac
--- a/configure.ac	Fri Mar 20 11:42:36 2009 +0000
+++ b/configure.ac	Fri Mar 20 11:57:47 2009 +0000
@@ -1,4 +1,4 @@ AC_INIT([icedtea], [1.9], [distro-pkg-de
-AC_INIT([icedtea], [1.9], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [1.10-pre], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.10 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 AC_CANONICAL_HOST