/hg/release/icedtea6-1.10: Only apply PR639 fix on hs20.

[andrew at icedtea.classpath.org]

changeset 07b540ab66e5 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=07b540ab66e5
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Feb 24 01:40:07 2011 +0000

	Only apply PR639 fix on hs20.

	2011-02-24 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Only apply PR639 fix on hs20.
		* NEWS: Updated.


diffstat:

3 files changed, 11 insertions(+), 2 deletions(-)
ChangeLog   |    6 ++++++
Makefile.am |    6 ++++--
NEWS        |    1 +

diffs (46 lines):

diff -r 31d8dc2212b0 -r 07b540ab66e5 ChangeLog
--- a/ChangeLog	Thu Feb 24 00:44:14 2011 +0000
+++ b/ChangeLog	Thu Feb 24 01:40:07 2011 +0000
@@ -1,3 +1,9 @@ 2011-02-24  Andrew John Hughes  <ahughes
+2011-02-24  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Only apply PR639 fix on hs20.
+	* NEWS: Updated.
+
 2011-02-24  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Add new patch.
diff -r 31d8dc2212b0 -r 07b540ab66e5 Makefile.am
--- a/Makefile.am	Thu Feb 24 00:44:14 2011 +0000
+++ b/Makefile.am	Thu Feb 24 01:40:07 2011 +0000
@@ -325,14 +325,16 @@ ICEDTEA_PATCHES = \
 	patches/openjdk/6663040-com.sun.awt.patch \
 	patches/openjdk/6775317-non-AA-simple-shape-performance.patch \
 	patches/openjdk/6766342-AA-simple-shape-performance.patch \
-	patches/pr600-arm-jvm.cfg.patch \
-	patches/pr639-missing_shark_include.patch
+	patches/pr600-arm-jvm.cfg.patch
 
 if !WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
 	patches/hotspot/$(HSBUILD)/no-precompiled-headers.patch \
 	patches/hotspot/$(HSBUILD)/too-many-args.patch \
 	patches/openjdk/6997495-test_correction_6857159.patch
+else
+ICEDTEA_PATCHES += \
+	patches/pr639-missing_shark_include.patch
 endif
 
 if WITH_RHINO
diff -r 31d8dc2212b0 -r 07b540ab66e5 NEWS
--- a/NEWS	Thu Feb 24 00:44:14 2011 +0000
+++ b/NEWS	Thu Feb 24 01:40:07 2011 +0000
@@ -440,6 +440,7 @@ New in release 1.10 (2011-XX-XX):
   - PR633: IcedTea installs javaws manpages on x86 even with --disable-webstart
   - PR635: zero fails to build on icedtea6 trunk 20110217 with hs20
   - PR586: Sources missing from src.zip
+  - PR639: Add missing include line for Shark.
 * Cleanup
   - Patches are no longer prefixed with 'icedtea-'.
   - All m4 macros are now prefixed with 'IT_' to denote their origin correctly.