changeset in /hg/icedtea: 2007-09-28 Lillian Angel <langel at red...

[Lillian Angel]

changeset bd242131c707 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bd242131c707
description:
	2007-09-28  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-plugin.patch: Fixed so it patches correctly.

diffstat:

4 files changed, 13 insertions(+), 10 deletions(-)
ChangeLog                    |    4 ++++
Makefile.in                  |    9 +++++----
configure                    |    2 --
patches/icedtea-plugin.patch |    8 ++++----

diffs (67 lines):

diff -r 7111f5efaaf3 -r bd242131c707 ChangeLog
--- a/ChangeLog	Fri Sep 28 14:25:29 2007 -0400
+++ b/ChangeLog	Fri Sep 28 15:50:51 2007 -0400
@@ -1,3 +1,7 @@ 2007-09-28  Lillian Angel  <langel at redha
+2007-09-28  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-plugin.patch: Fixed so it patches correctly.
+
 2007-09-28  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.am: Updated to b21. Removed all targets used to build
diff -r 7111f5efaaf3 -r bd242131c707 Makefile.in
--- a/Makefile.in	Fri Sep 28 14:25:29 2007 -0400
+++ b/Makefile.in	Fri Sep 28 15:50:51 2007 -0400
@@ -202,9 +202,9 @@ ICEDTEA_ENDORSED_DIR = \
 
 ICEDTEA_ENV = \
 	"ANT_HOME=/usr" \
-	"BUILD_NUMBER=b19" \
-	"JRE_RELEASE_VERSION=1.7.0-b19" \
-	"HOTSPOT_RELEASE_VERSION=1.7.0-b19" \
+	"BUILD_NUMBER=b21" \
+	"JRE_RELEASE_VERSION=1.7.0-b21" \
+	"HOTSPOT_RELEASE_VERSION=1.7.0-b21" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
@@ -249,7 +249,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-certbundle.patch \
 	patches/icedtea-demos.patch \
 	patches/icedtea-use-system-tzdata.patch \
-	patches/icedtea-build.patch \
+	patches/icedtea-java-home.patch \
+	patches/icedtea-headers.patch \
 	$(FAST_BUILD_PATCH)
 
 
diff -r 7111f5efaaf3 -r bd242131c707 configure
--- a/configure	Fri Sep 28 14:25:29 2007 -0400
+++ b/configure	Fri Sep 28 15:50:51 2007 -0400
@@ -4800,8 +4800,6 @@ fi
 fi
 
 
-{ echo "$as_me:$LINENO: result: icedtea home is set to SYSTEM_ICEDTEA_DIR" >&5
-echo "${ECHO_T}icedtea home is set to SYSTEM_ICEDTEA_DIR" >&6; }
 
 
   case "${host}" in
diff -r 7111f5efaaf3 -r bd242131c707 patches/icedtea-plugin.patch
--- a/patches/icedtea-plugin.patch	Fri Sep 28 14:25:29 2007 -0400
+++ b/patches/icedtea-plugin.patch	Fri Sep 28 15:50:51 2007 -0400
@@ -1267,10 +1267,10 @@
 +	return message;
 +    }
 +}
---- ../openjdk-b20/openjdk/j2se/make/sun/Makefile	2007-09-13 03:52:44.000000000 -0400
-+++ openjdk/j2se/make/sun/Makefile	2007-09-14 10:24:42.000000000 -0400
-@@ -63,7 +63,7 @@
- 	  awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \
+--- openjdk/j2se/make/sun/Makefile.orig	2007-09-28 15:47:08.000000000 -0400
++++ openjdk/j2se/make/sun/Makefile	2007-09-28 15:47:23.000000000 -0400
+@@ -60,7 +60,7 @@
+ 	  awt splashscreen $(XAWT_SUBDIR) \
  	  xjc schemagen wsgen wsimport \
            $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
 -	  font jpeg cmm applet corba rmi beans $(JDBC_SUBDIR) \