/hg/release/icedtea6-1.10: Remove shark from EXTRA_DIST and fix ...

[andrew at icedtea.classpath.org]

changeset a652f386460b in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=a652f386460b
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Mar 02 19:26:46 2011 +0000

	Remove shark from EXTRA_DIST and fix formatting in NEWS file.

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

	 * Makefile.am: (EXTRA_DIST): Remove dead shark
	directory.
		* NEWS: Fix formatting.


diffstat:

2 files changed, 4 insertions(+), 2 deletions(-)
ChangeLog |    4 ++++
NEWS      |    2 --

diffs (41 lines):

diff -r 1ad2d765dd39 -r a652f386460b ChangeLog
--- a/ChangeLog	Wed Mar 02 18:35:41 2011 +0000
+++ b/ChangeLog	Wed Mar 02 19:26:46 2011 +0000
@@ -1,3 +1,9 @@ 2011-03-02  Andrew John Hughes  <ahughes
+2011-03-02  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(EXTRA_DIST): Remove dead shark directory.
+	* NEWS: Fix formatting.
+
 2011-03-02  Andrew John Hughes  <ahughes at redhat.com>
 
 	* NEWS: Set release date.
diff -r 1ad2d765dd39 -r a652f386460b Makefile.am
--- a/Makefile.am	Wed Mar 02 18:35:41 2011 +0000
+++ b/Makefile.am	Wed Mar 02 19:26:46 2011 +0000
@@ -551,7 +551,7 @@ ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \
 
 EXTRA_DIST = generated \
 	$(abs_top_srcdir)/patches/* \
-	contrib shark arm_port \
+	contrib arm_port \
 	overlays \
 	jconsole.desktop policytool.desktop \
 	test/jtreg \
diff -r 1ad2d765dd39 -r a652f386460b NEWS
--- a/NEWS	Wed Mar 02 18:35:41 2011 +0000
+++ b/NEWS	Wed Mar 02 19:26:46 2011 +0000
@@ -16,10 +16,8 @@ New in release 1.10 (2011-03-02):
 * The option --with-openjdk becomes --with-jdk-home and --disable-bootstrap
 * Support for building with HotSpot 20 from its stable tree
 * Added out-of-the-box JamVM support using --enable-jamvm.
-* Allow building of JamVM beside the default VM by using
-  --with-additional-vms=jamvm
-* Allow the location of the JamVM source zip to be specified using
-  --with-jamvm-src-zip
+* Allow building of JamVM beside the default VM by using --with-additional-vms=jamvm
+* Allow the location of the JamVM source zip to be specified using --with-jamvm-src-zip
 * Import of OpenJDK6 b21 including upgrade to HotSpot 19
   - S6961870: More rebranding fixes for templates/gpl-*-header files
   - S6976186: Shark build system changes