--- a/ChangeLog	Fri Jul 23 10:56:39 2010 +0100
+++ b/ChangeLog	Fri Jul 23 11:37:22 2010 +0100
@@ -1,3 +1,13 @@
+2010-07-23  Andrew John Hughes  <ahughes@redhat.com>
+
+	* netx/netscape/javascript/JSObjectCreatePermission.java:
+	Remove duplicate file.
+	* acinclude.m4:
+	(WITH_OPENJDK_SRC_DIR): Fix breakage in parameter caused
+	by previous configure help update.
+	* netx/net/sourceforge/jnlp/Launcher.java: Synchronise
+	with IcedTea6 version.
+
 2010-07-23  Andrew John Hughes  <ahughes@redhat.com>
 
 	* netx/net/sourceforge/jnlp/security/AccessWarningPane.java:

--- a/acinclude.m4	Fri Jul 23 10:56:39 2010 +0100
+++ b/acinclude.m4	Fri Jul 23 11:37:22 2010 +0100
@@ -252,8 +252,8 @@
 [
   DEFAULT_SRC_DIR=${abs_top_builddir}/openjdk
   AC_MSG_CHECKING([for an OpenJDK source directory])
-  AC_ARG_WITH([openjdk-src-dir=DIR],
-              [AS_HELP_STRING([--with-openjdk-src-dir=PATH],specify the location of the OpenJDK source tree)],
+  AC_ARG_WITH([openjdk-src-dir],
+              [AS_HELP_STRING([--with-openjdk-src-dir=DIR],specify the location of the OpenJDK source tree)],
   [
     OPENJDK_SRC_DIR=${withval}
     with_external_src_dir=true

--- a/netx/net/sourceforge/jnlp/Launcher.java	Fri Jul 23 10:56:39 2010 +0100
+++ b/netx/net/sourceforge/jnlp/Launcher.java	Fri Jul 23 11:37:22 2010 +0100
@@ -19,11 +19,13 @@
 
 import java.applet.Applet;
 import java.awt.Container;
-import java.io.*;
+import java.io.File;
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadMXBean;
 import java.lang.reflect.Method;
-import java.net.*;
+import java.net.InetAddress;
+import java.net.URL;
+import java.net.UnknownHostException;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.jar.JarFile;

--- a/netx/netscape/javascript/JSObjectCreatePermission.java	Fri Jul 23 10:56:39 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/* JSObjectCreatePermission.java
-   Copyright (C) 2009  Red Hat
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-IcedTea is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package netscape.javascript;
-
-import java.security.BasicPermission;
-
-
-public class JSObjectCreatePermission extends BasicPermission {
-    public JSObjectCreatePermission() {
-        super("JSObjectCreate");
-    }
-}