/hg/release/icedtea6-1.9: Bump cacao version to changeset includ...

[doko at icedtea.classpath.org]

changeset f24a287fb69d in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=f24a287fb69d
author: doko at ubuntu.com
date: Fri Aug 27 23:46:48 2010 +0200

	Bump cacao version to changeset including build fixes for ARM and
	S390

	2010-08-27 Matthias Klose <doko at ubuntu.com>

	 * Makefile.am: Bump cacao version to changeset including
	build fixes for ARM and S390.
	        * patches/cacao/version-parsing.patch: Remove, applied upstream.


diffstat:

3 files changed, 9 insertions(+), 15 deletions(-)
ChangeLog                           |    6 ++++++
Makefile.am                         |    7 +++----
patches/cacao/version-parsing.patch |   11 -----------

diffs (55 lines):

diff -r 490708229ca2 -r f24a287fb69d ChangeLog
--- a/ChangeLog	Fri Aug 27 14:50:02 2010 -0400
+++ b/ChangeLog	Fri Aug 27 23:46:48 2010 +0200
@@ -164,6 +164,12 @@ 2010-08-02  Andrew John Hughes  <ahughes
 	* patches/fonts-gentoo.patch:
 	Add a font configuration for Gentoo
 	(currently a copy of Fedora's).
+
+2010-08-27  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am: Bump cacao version to changeset including build
+	fixes for ARM and S390.
+	* patches/cacao/version-parsing.patch: Remove, applied upstream.
 
 2010-08-27  Deepak Bhole <dbhole at redhat.com>
 
diff -r 490708229ca2 -r f24a287fb69d Makefile.am
--- a/Makefile.am	Fri Aug 27 14:50:02 2010 -0400
+++ b/Makefile.am	Fri Aug 27 23:46:48 2010 +0200
@@ -5,8 +5,8 @@ OPENJDK_VERSION = b20
 OPENJDK_VERSION = b20
 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
 
-CACAO_VERSION = dd4532afd08a
-CACAO_SHA256SUM = fc876403aeb46c6c16693cfc75ba0a2e581f7a98ddd02ac7f2bf4fc5c20765b4
+CACAO_VERSION = e321b101a9ee
+CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444
 CACAO_BASE_URL = http://mips.complang.tuwien.ac.at
 CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2
 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
@@ -306,8 +306,7 @@ ICEDTEA_PATCHES += \
 	patches/cacao/launcher.patch \
 	patches/cacao/arm-arch-defines.patch \
 	patches/cacao/jsig.patch \
-	patches/cacao/memory.patch \
-	patches/cacao/version-parsing.patch
+	patches/cacao/memory.patch
 endif
 
 if WITH_CACAO
diff -r 490708229ca2 -r f24a287fb69d patches/cacao/version-parsing.patch
--- a/patches/cacao/version-parsing.patch	Fri Aug 27 14:50:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- cacao/cacao/m4/version.m4~	2010-06-23 16:18:58.000000000 +0100
-+++ cacao/cacao/m4/version.m4	2010-06-24 19:11:36.000000000 +0100
-@@ -29,7 +29,7 @@
- then
-     major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'`
-     minor=`echo "$version" | $SED -e 's/^[[0-9]]*\.//' -e 's/\.[[0-9a-z.+]]*$//'`
--    micro=`echo "$version" | $SED -e 's/^[[0-9]]*\.[[0-9]]*\.//' -e 's/[[a-z.+]]*$//'`
-+    micro=`echo "$version" | $SED -r -e 's/^[[0-9]]*\.[[0-9]]*\.([[0-9]]*).*/\1/'`
-     extra=`echo "$version" | $SED -e 's/^[[0-9]]*\.[[0-9]]*\.[[0-9]]*//'`
- else
-     major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'`