--- a/ChangeLog	Sun Jun 01 17:57:21 2008 +0200
+++ b/ChangeLog	Mon Jun 02 04:13:01 2008 +0100
@@ -1,3 +1,14 @@
+2008-06-02  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* Makefile.am:
+	Fix location of icedtea-ecj.patch for out-of-dir
+	and make distcheck builds, and rename ports target to
+	hotspot-ports to stop make dist downloading the JDK.
+	* Makefile.in: Regenerated.
+	* NEWS: Add release news.
+	* configure: Regenerated.
+	* configure.ac: Bump version number to 1.7.
+
 2008-06-01  Mark Wielaard  <mark@klomp.org>
 
 	* patches/icedtea-ecj.patch: Correct patch by reinstating

--- a/Makefile.am	Sun Jun 01 17:57:21 2008 +0200
+++ b/Makefile.am	Mon Jun 02 04:13:01 2008 +0100
@@ -455,7 +455,7 @@
 	touch stamps/ports-ecj.stamp
 
 # Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
 
 stamps/patch-ecj.stamp: stamps/clone-ecj.stamp
 	echo Checking $(ICEDTEA_ECJ_PATCH) ; \
@@ -1056,9 +1056,9 @@
 
 tools-class-files: stamps/tools-class-files.stamp
 
-ports: stamps/ports.stamp
+hotspot-ports: stamps/ports.stamp
 
-ports-ecj: stamps/ports-ecj.stamp
+hotspot-ports-ecj: stamps/ports-ecj.stamp
 
 clean: distclean-local
 

--- a/Makefile.in	Sun Jun 01 17:57:21 2008 +0200
+++ b/Makefile.in	Mon Jun 02 04:13:01 2008 +0100
@@ -426,7 +426,7 @@
 	$(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
 @WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE@BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
 @WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE@BOOTSTRAP_DIRECTORY_STAMP = 
 @WITH_OPENJDK_TRUE@BOOTSTRAP_DIRECTORY_STAMP = 
@@ -1496,9 +1496,9 @@
 
 tools-class-files: stamps/tools-class-files.stamp
 
-ports: stamps/ports.stamp
+hotspot-ports: stamps/ports.stamp
 
-ports-ecj: stamps/ports-ecj.stamp
+hotspot-ports-ecj: stamps/ports-ecj.stamp
 
 clean: distclean-local
 

--- a/NEWS	Sun Jun 01 17:57:21 2008 +0200
+++ b/NEWS	Mon Jun 02 04:13:01 2008 +0100
@@ -1,36 +1,98 @@
-New in release 1.2 (2008-05-28)
+New in release 1.7 (2008-06-02)
+
+  IcedTea is based on the hard work of a lot of people that contributed to
+  IcedTea6 and OpenJDK. The following noteworthy changes were added in
+  this release:
 
-- Updated to b09 build.
-- Added the the lcms library with PYCC and LINEAR_RGB ICC
-  profiles.
-- Integrated Gervill to provide midi support.
-- JTreg integrated.
-- javaws/NetX fixes:
-  -improved security, namely catching Socket permissions during    
-  runtime
-  -implemented the remaining JNLP services api (PrintService, 
-  JNLPRandomAccessFile)
-  -applet focusing bug fixed
-- sparc/sparc64 port
-- Desktop file integration.
-- Various zero fixes.
-- Sound fixes.
-- Font fixes.
-- Several other bug fixes.
+  - Paul Hohensee published a GNU/Linux hotspot Sparc port and Matthias
+   Klose integrated it into IcedTea.
+  - Keith Seiths and Andrew Haley made fixes to the awt color package so
+   that it now provides the lcms library with PYCC and LINEAR_RGB ICC
+   profiles, fixing several applications that did complex color
+   transformations.
+  - Karl Helgason wrote a midi software synthesizer called Gervill that
+   is now integrated in IcedTea so that javax.sound.midi support works
+   now. Mark Wielaard integrated it and made some fixes so that it works
+   better with javax.sound.sampled.
+  - Jonathan Gibbons released a free version of jtreg, which was imported
+   into IcedTea by Mark Wielaard so that a make check now runs all the
+   functional unit tests integrated into OpenJDK.
+  - Joshua Sumali made lots of fixes to the javaws/netx support. Including
+   improved security, namely catching Socket permissions during runtime,
+   implementing the remaining JNLP services api (PrintService and
+   JNLPRandomAccessFile), and applet focusing bug fixes, so now netx
+   plays nice with gcjwebplugin.
+  - Kelly O'Hair resolved the license issues with the (j)hat tool which is
+   now integrated.
+  - Lillian Angel and Tom Fitzsimmons added several .desktop files for
+   the various tools included for better GNU/Linux desktop integration.
+  - Thomas Fitzsimmons rewrote the cacert support to resolve issues with
+   applications like Glashfish and Eclipse which access the keystore
+   directly.
+  - Lillian Angel made lots of bug fixes to the packaging and integration
+   support, include improving the font support.
+  - IcedTea6 1.2 and IcedTea[7] 1.7 are completely synced up again thanks
+   to Andrew John Hughes.
+  - Andrew also did all the work to make sure IcedTea[7] is now based on
+   OpenJDK7 b26 as released by Xiomara Jayasena.
+  - Thomas Fitzsimmons rewrote the certificate keystore support.
+  - Christian Thalinger made various cacao integration fixes.
 
-New in release 1.1 (2008-04-04)
+New in release 1.6 (2008-02-13)
+
+- Zero-assembler implemented.
+- Netx support added. Still a work-in-progress.
+- Updated to build with gcc 4.3.
+- Many bug fixes.
 
-- Zero builds on any architecture.
-- New features added to NetX:
-   - Certificate fingerprints now show as part 
-     of certificate details.
-   - gcjwebplugin can now run applets through NetX, 
-     taking advantage of NetX's sandboxing and application security.
-   - User trusted certificates can be managed by passing the -viewer 
-     option to NetX. 
-- Updated to b08.
+New in release 1.5 (2008-01-03)
+
+- ppc/ppc64 support.
+- ecj bootstrapping re-implemented.
+- Updated to OpenJDK b24 build (now uses mercurial).
+- System libraries (libpng, libjpeg, zlib, giflib) are used 
+instead of OpenJDK's implementations.
 - Several bug fixes.
 
-New in release 1.0 (2008-02-15)
+New in release 1.4 (2007-10-12)
+
+* Updated to OpenJDK b21 build (README and INSTALL updated accordingly).
+* Now using SSL/Crypto support included in b21, OpenSSL certs
+still read directly.
+* TZdata fix: uses System's timezone data.
+* Memory issue fix: maximum PermGen space set to 128M and MaxHeap
+to 512M.
+* Xinerama fix: uses system installed library instead.
+* DebugInfo fix: generates full debuginfo, regardless of
+optimization.
+* Fixed JConsole crash.
+* Several other bug fixes.
+
+New in release 1.3 (2007-08-29)
 
-- Initial release
+* Updated to OpenJDK b18 build.
+* Web browser plugin support using gcjwebplugin.
+* Now using Font supported included in b18.
+* Graphics fixes.
+* SSL/Crypto fixes.
+* Refactored build process.
+
+New in release 1.2 (2007-08-01)
+
+* Updated to OpenJDK b16 build.
+* Freetype font support fully replacing the encumbered libt2k.
+* Path widening imported from GNU Classpath.
+* Window decorations on x86_64 fixed.
+* Bug fixes in various graphics classes.
+* Anti-aliasing support explicitly disabled (instead of crashing).
+* OpenSSL certs read directly
+* Various crypto bug fixes.
+
+New in release 1.1 (2007-07-12)
+
+* Color management and raster fixes for compatibility with LittleCMS.
+* Debuginfo is always generated.
+* Initial work to satisfy libt2k requirement with Freetype.
+* The GNU Crypto security providers have been imported from GNU
+  Classpath.
+* IcedTls security provider.

--- a/configure	Sun Jun 01 17:57:21 2008 +0200
+++ b/configure	Mon Jun 02 04:13:01 2008 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for icedtea 1.6.
+# Generated by GNU Autoconf 2.61 for icedtea 1.7.
 #
 # Report bugs to <fitzsim@redhat.com>.
 #
@@ -574,8 +574,8 @@
 # Identity of this package.
 PACKAGE_NAME='icedtea'
 PACKAGE_TARNAME='icedtea'
-PACKAGE_VERSION='1.6'
-PACKAGE_STRING='icedtea 1.6'
+PACKAGE_VERSION='1.7'
+PACKAGE_STRING='icedtea 1.7'
 PACKAGE_BUGREPORT='fitzsim@redhat.com'
 
 ac_default_prefix=bootstrap
@@ -1344,7 +1344,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures icedtea 1.6 to adapt to many kinds of systems.
+\`configure' configures icedtea 1.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1414,7 +1414,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of icedtea 1.6:";;
+     short | recursive ) echo "Configuration of icedtea 1.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1572,7 +1572,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-icedtea configure 1.6
+icedtea configure 1.7
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1586,7 +1586,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by icedtea $as_me 1.6, which was
+It was created by icedtea $as_me 1.7, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2276,7 +2276,7 @@
 
 # Define the identity of the package.
  PACKAGE='icedtea'
- VERSION='1.6'
+ VERSION='1.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12709,7 +12709,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by icedtea $as_me 1.6, which was
+This file was extended by icedtea $as_me 1.7, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12756,7 +12756,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-icedtea config.status 1.6
+icedtea config.status 1.7
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

--- a/configure.ac	Sun Jun 01 17:57:21 2008 +0200
+++ b/configure.ac	Mon Jun 02 04:13:01 2008 +0100
@@ -1,5 +1,5 @@
 AC_PREREQ([2.61])
-AC_INIT([icedtea], [1.6], [fitzsim@redhat.com])
+AC_INIT([icedtea], [1.7], [fitzsim@redhat.com])
 AM_INIT_AUTOMAKE([tar-pax])
 AC_CONFIG_FILES([Makefile])
 AC_CANONICAL_HOST