Mercurial > hg > release > icedtea6-1.10
changeset 2485:a652f386460b
Remove shark from EXTRA_DIST and fix formatting in NEWS file.
2011-03-02 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(EXTRA_DIST): Remove dead shark directory.
* NEWS: Fix formatting.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 02 Mar 2011 19:26:46 +0000 |
| parents | 1ad2d765dd39 |
| children | 767e82690eb3 |
| files | ChangeLog Makefile.am NEWS |
| diffstat | 3 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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@redhat.com> + + * Makefile.am: + (EXTRA_DIST): Remove dead shark directory. + * NEWS: Fix formatting. + 2011-03-02 Andrew John Hughes <ahughes@redhat.com> * NEWS: Set release date.
--- 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 @@ EXTRA_DIST = generated \ $(abs_top_srcdir)/patches/* \ - contrib shark arm_port \ + contrib arm_port \ overlays \ jconsole.desktop policytool.desktop \ test/jtreg \
--- a/NEWS Wed Mar 02 18:35:41 2011 +0000 +++ b/NEWS Wed Mar 02 19:26:46 2011 +0000 @@ -16,10 +16,8 @@ * 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