changeset in /hg/icedtea: Fix liveconnect-dist.patch, needs to b...

[Andrew John Hughes]

changeset d552def09688 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d552def09688
description:
	Fix liveconnect-dist.patch, needs to be against files with netx.patch applied.

	2009-05-27  Andrew John Hughes  <ahughes at redhat.com>

		* patches/icedtea-liveconnect-dist.patch:
		Recreated with netx.patch applied.

diffstat:

2 files changed, 21 insertions(+), 16 deletions(-)
ChangeLog                              |    5 +++++
patches/icedtea-liveconnect-dist.patch |   32 ++++++++++++++++----------------

diffs (72 lines):

diff -r f67799fce886 -r d552def09688 ChangeLog
--- a/ChangeLog	Fri May 29 16:09:12 2009 +0100
+++ b/ChangeLog	Fri May 29 16:52:00 2009 +0100
@@ -1,3 +1,8 @@ 2009-05-27  Andrew John Hughes  <ahughes
+2009-05-27  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-liveconnect-dist.patch:
+	Recreated with netx.patch applied.
+
 2009-05-27  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r f67799fce886 -r d552def09688 patches/icedtea-liveconnect-dist.patch
--- a/patches/icedtea-liveconnect-dist.patch	Fri May 29 16:09:12 2009 +0100
+++ b/patches/icedtea-liveconnect-dist.patch	Fri May 29 16:52:00 2009 +0100
@@ -1,6 +1,6 @@ diff -Nru openjdk2.orig/jdk/make/common/
-diff -Nru openjdk2.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk2/jdk/make/common/internal/Defs-liveconnect.gmk
---- openjdk2.orig/jdk/make/common/internal/Defs-liveconnect.gmk	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk2/jdk/make/common/internal/Defs-liveconnect.gmk	2009-05-28 09:18:45.000000000 +0100
+diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk
+--- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk	1970-01-01 01:00:00.000000000 +0100
++++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk	2009-05-29 16:49:35.000000000 +0100
 @@ -0,0 +1,27 @@
 +#
 +# Copyright 2009 Red Hat, Inc.  All Rights Reserved.
@@ -29,12 +29,12 @@ diff -Nru openjdk2.orig/jdk/make/common/
 +
 +IMPORT_TOOLS_PACKAGES +=
 +
-diff -Nru openjdk2.orig/jdk/make/common/internal/ImportComponents.gmk openjdk2/jdk/make/common/internal/ImportComponents.gmk
---- openjdk2.orig/jdk/make/common/internal/ImportComponents.gmk	2009-05-29 02:09:27.000000000 +0100
-+++ openjdk2/jdk/make/common/internal/ImportComponents.gmk	2009-05-29 02:11:58.000000000 +0100
-@@ -46,6 +46,9 @@
- ifndef JAXWS_DIST
-   include $(BUILDDIR)/common/internal/Defs-jaxws.gmk
+diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk
+--- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk	2009-05-29 16:48:26.000000000 +0100
++++ openjdk/jdk/make/common/internal/ImportComponents.gmk	2009-05-29 16:50:02.000000000 +0100
+@@ -49,6 +49,9 @@
+ ifndef NETX_DIST
+   include $(BUILDDIR)/common/internal/Defs-netx.gmk
  endif
 +ifndef LIVECONNECT_DIST
 +  include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk
@@ -42,20 +42,20 @@ diff -Nru openjdk2.orig/jdk/make/common/
  
  # Clean up these lists so empty lists are empty
  IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES))
-@@ -157,6 +160,7 @@
- $(call import-one-classes,CORBA_DIST,$1)
+@@ -162,6 +165,7 @@
  $(call import-one-classes,JAXP_DIST,$1)
  $(call import-one-classes,JAXWS_DIST,$1)
+ $(call import-one-classes,NETX_DIST,$1)
 +$(call import-one-classes,LIVECONNECT_DIST,$1)
  endef
  
  # Clean up import files
-diff -Nru openjdk2.orig/jdk/make/common/shared/Defs.gmk openjdk2/jdk/make/common/shared/Defs.gmk
---- openjdk2.orig/jdk/make/common/shared/Defs.gmk	2009-05-29 02:09:27.000000000 +0100
-+++ openjdk2/jdk/make/common/shared/Defs.gmk	2009-05-29 02:12:06.000000000 +0100
-@@ -344,6 +344,11 @@
+diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk
+--- openjdk.orig/jdk/make/common/shared/Defs.gmk	2009-05-29 16:48:26.000000000 +0100
++++ openjdk/jdk/make/common/shared/Defs.gmk	2009-05-29 16:49:35.000000000 +0100
+@@ -349,6 +349,11 @@
  else
-   JAXWS_DIST =
+   NETX_DIST =
  endif
 +ifdef ALT_LIVECONNECT_DIST
 +  LIVECONNECT_DIST := $(call FullPath,$(ALT_LIVECONNECT_DIST))