--- a/ChangeLog	Wed Oct 15 17:18:35 2008 +0200
+++ b/ChangeLog	Wed Oct 15 17:31:55 2008 +0100
@@ -1,4 +1,17 @@
-2008-10-15  Xerxes Rånby <xerxes@zafena.se
+2008-10-15  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* ChangeLog: Fix typo.
+	* INSTALL: Fix typos and make installation
+	requirements clearer.
+	* Makefile.am:
+	Patch the OpenJDK build with the version
+	of IcedTea being used. Use $(HG) instead of 'hg'.
+	* configure.ac:
+	Check for Mercurial.
+	* patches/icedtea-version.patch:
+	Fix to use IcedTea6.
+
+2008-10-15  Xerxes Rånby <xerxes@zafena.se>
 
 	* patches/icedtea-arch.patch: Update for m68k.
 

--- a/INSTALL	Wed Oct 15 17:18:35 2008 +0200
+++ b/INSTALL	Wed Oct 15 17:31:55 2008 +0100
@@ -1,5 +1,5 @@
-Building IcedTea 1.6.0
-======================
+Building IcedTea6
+=================
 
 For convenience we've provided make targets that automatically
 download, extract and patch the source code from openjdk.java.net, in
@@ -29,11 +29,13 @@
 libpng-devel
 libjpeg-devel = 6b
 zlib-devel
-rhino
-netbeans (harness, platform8, apisupport1, java2, ide9) - for visualvm
-jakarta-commons-logging - for visualvm
+rhino (can be disabled using --without-rhino)
 
-For builing the PulseAudio based mixer, you will need
+For building VisualVM, you will need:
+netbeans (harness, platform8, apisupport1, java2, ide9)
+jakarta-commons-logging
+
+For building the PulseAudio based mixer, you will need
 pulseaudio-libs-devel >= 0.9.11
 pulseaudio >= 0.9.11
 
@@ -97,7 +99,7 @@
 that it already provides a JIT for many platforms to which HotSpot has
 not yet been ported, including ppc, ppc64, arm and mips.  To use CACAO
 as the VM, use the --with-cacao option.  This will download CACAO
-0.99.2 during the build.  To use a different version, use
+0.99.3 during the build.  To use a different version, use
 --with-cacao-home=<dir> to point to an existing installation which use
 the Sun VM interface.
 

--- a/Makefile.am	Wed Oct 15 17:18:35 2008 +0200
+++ b/Makefile.am	Wed Oct 15 17:31:55 2008 +0100
@@ -270,7 +270,7 @@
 
 # Mercurial snapshot.
 snapshot: dist
-	mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz
+	mv $(DIST_ARCHIVES) $(distdir)-`$(HG) tip --template '{node}'`.tar.gz
 
 # OpenJDK Source Preparation Targets
 # ==================================
@@ -621,7 +621,13 @@
 	  echo ERROR patch $${all_patches_ok} FAILED! ; \
 	  echo WARNING make clean-patch before retrying a fix ; \
 	  false; \
-	fi
+	fi ; \
+	if [ -e $(abs_top_srcdir)/.hg ]; then \
+	  revision="-r`(cd $(srcdir); $(HG) tip --template '{rev}')`" ; \
+	fi ; \
+	icedtea_version="$(PACKAGE_VERSION)$${revision}" ; \
+	sed -i "s#IcedTea6#IcedTea6 $${icedtea_version}#" openjdk/jdk/make/common/shared/Defs.gmk
+
 if ENABLE_LIVECONNECT
 	cp -a plugin/icedtea/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
 	cp -a plugin/icedtea/netscape rt/
@@ -679,7 +685,7 @@
 	  echo ERROR patch $${all_patches_ok} FAILED! ; \
 	  echo WARNING make clean-patch before retrying a fix ; \
 	  false; \
-	fi
+	fi ; 
 
 clean-patch-fsg:
 	rm -f stamps/patch-fsg.stamp
@@ -1446,7 +1452,7 @@
 endif
 	mkdir -p stamps
 	touch stamps/pulse-java-jar.stamp
-	
+
 stamps/pulse-java-class.stamp: 
 if ENABLE_PULSE_JAVA
 	mkdir -p $(PULSE_JAVA_CLASS_DIR)
@@ -1454,17 +1460,17 @@
 	then \
 		(cd $(PULSE_JAVA_JAVA_SRCDIR); \
 		 $(JAVAC) -d ../../../$(PULSE_JAVA_CLASS_DIR) \
-          	-bootclasspath  \
+		-bootclasspath  \
 	        '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
-          	org/classpath/icedtea/pulseaudio/*.java\
-          	) \
+		org/classpath/icedtea/pulseaudio/*.java\
+		) \
         else \
-        	(cd $(PULSE_JAVA_JAVA_SRCDIR); \
-        	$(ICEDTEA_BOOT_DIR)/bin/javac -d ../../../$(PULSE_JAVA_CLASS_DIR)\
-        	-bootclasspath \
+		(cd $(PULSE_JAVA_JAVA_SRCDIR); \
+		$(ICEDTEA_BOOT_DIR)/bin/javac -d ../../../$(PULSE_JAVA_CLASS_DIR)\
+		-bootclasspath \
 	        '$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar' \
-        	org/classpath/icedtea/pulseaudio/*.java\
-        	) \
+		org/classpath/icedtea/pulseaudio/*.java\
+		) \
         fi
 	cp  -r $(PULSE_JAVA_JAVA_SRCDIR)/META-INF $(PULSE_JAVA_CLASS_DIR)
 endif

--- a/configure.ac	Wed Oct 15 17:18:35 2008 +0200
+++ b/configure.ac	Wed Oct 15 17:31:55 2008 +0100
@@ -30,6 +30,8 @@
 dnl OpenJDK's README-builds.html lists gawk as a build dependency so we
 dnl check for it explicitly rather than using AC_PROG_AWK.
 FIND_TOOL([GAWK], [gawk])
+AC_PATH_TOOL([HG],[hg])
+AC_SUBST([HG])
 
 AC_ARG_WITH([gcj-home],
 	    [AS_HELP_STRING([--with-gcj-home],

--- a/patches/icedtea-version.patch	Wed Oct 15 17:18:35 2008 +0200
+++ b/patches/icedtea-version.patch	Wed Oct 15 17:31:55 2008 +0100
@@ -1,14 +1,17 @@
---- openjdk/jdk/make/common/shared/Defs.gmk.orig	2008-09-12 21:05:40.000000000 +0200
-+++ openjdk/jdk/make/common/shared/Defs.gmk	2008-09-12 21:07:14.000000000 +0200
-@@ -194,7 +194,7 @@
+diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk
+--- openjdk.orig/jdk/make/common/shared/Defs.gmk	2008-10-15 15:36:07.000000000 +0100
++++ openjdk/jdk/make/common/shared/Defs.gmk	2008-10-15 15:36:53.000000000 +0100
+@@ -194,8 +194,8 @@
  
  # Default names
  ifdef OPENJDK
 -  LAUNCHER_NAME = openjdk
+-  PRODUCT_NAME = OpenJDK
 +  LAUNCHER_NAME = java
-   PRODUCT_NAME = OpenJDK
++  PRODUCT_NAME = IcedTea6
    PRODUCT_SUFFIX = Runtime Environment
    JDK_RC_PLATFORM_NAME = Platform
+   COMPANY_NAME = N/A
 @@ -260,12 +260,7 @@
  JDK_UNDERSCORE_VERSION =  $(subst .,_,$(JDK_VERSION))
  JDK_MKTG_UNDERSCORE_VERSION =  $(subst .,_,$(JDK_MKTG_VERSION))