--- a/ChangeLog	Mon Nov 05 16:53:59 2012 +0100
+++ b/ChangeLog	Tue Nov 06 18:28:55 2012 +0100
@@ -1,3 +1,13 @@
+2012-11-06  Xerxes Rånby  <xerxes@zafena.se>
+	    Stefan Ring  <stefan@complang.tuwien.ac.at>
+
+	* Makefile.am (CACAO_VERSION, CACAO_SHA256SUM): Updated.
+	(ICEDTEA_PATCHES): Removed patches/cacao/jsig.patch.
+	(stamps/cacao.stamp): Create Xusage.txt and libjsig.so as for JamVM.
+	* patches/cacao/jsig.patch: Removed.
+	* HACKING: Updated.
+	* NEWS: Updated.
+
 2012-11-01  Lukas Berk  <lberk@redhat.com>
 
 	* Makefile.am:

--- a/HACKING	Mon Nov 05 16:53:59 2012 +0100
+++ b/HACKING	Tue Nov 06 18:28:55 2012 +0100
@@ -89,9 +89,6 @@
 * icedtea-java2d-mitre-join.patch: Backport fix for mitre join decoration (S6812600).
 * icedtea-java2d-stroker-internal-joint.patch: Fix penultimate joint created by GeneralPath.closePath().
 * icedtea-java2d-stroker-internal-close-joint.patch: Fix final joint created by GeneralPath.closePath().
-* icedtea-cacao.patch: For the 'java' command, create new thread depending on the current VM.
-* icedtea-cacao-no-mmap-first-page.patch: Don't mmap the first memory page.
-* cacao/no-strict-aliasing.patch: Turn off strict aliasing which causes an issue with the verifier when building with GCC 4.4 (cacao PR129).
 * icedtea-shark.patch: Add support for the Shark JIT.
 * icedtea-xshm.patch: Support newer X11 headers for awt_GraphicsEnv.h.
 
@@ -138,6 +135,9 @@
 
 The following patches are only applied when building with the CACAO virtual machine:
 
+* cacao/launcher.patch: For the 'java' command, create new thread depending on the current VM.
+* cacao/memory.patch: Increase memory while building langtools for cacao builds.
+
 The following patches are to support Xrender pipeline (-Dsun.java2d.xrender):
 
 * icedtea-xrender-xxx.patch: Numbered patches from xrender branch

--- a/NEWS	Mon Nov 05 16:53:59 2012 +0100
+++ b/NEWS	Tue Nov 06 18:28:55 2012 +0100
@@ -56,6 +56,13 @@
     are actually missing from the boot JDK
   - PR1114: Provide option to turn off downloading of tarballs (--disable-downloading)
   - PR1176: Synchronise CACAO rules between IcedTea6/7/8 where possible
+* CACAO
+  - PR1120: Unified version for icedtea6/7
+  - CA166, CA167: check-langtools fixes for icedtea6
+  - Implemented sun.misc.Perf.highResCounter
+  - CACAO now identifies by its own Mercurial revision
+  - Some memory barrier maintenance
+  - Ability to run when compiled as Thumb on armv5 (no Thumb JIT though) 
 * JamVM
   - ARMv6 armhf: Changes for Raspbian (Raspberry Pi)
   - PPC: Don't use lwsync if it isn't supported