/hg/icedtea: Boot patches should patch openjdk-boot.

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Tue May 18 07:12:44 PDT 2010


changeset a8b1c8bb75b9 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a8b1c8bb75b9
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue May 18 15:12:38 2010 +0100

	Boot patches should patch openjdk-boot.

	2010-05-18 Andrew John Hughes <ahughes at redhat.com>

	 * patches/boot/scanner-charsets.patch: Patch
	openjdk-boot not openjdk.


diffstat:

2 files changed, 12 insertions(+), 7 deletions(-)
ChangeLog                           |    5 +++++
patches/boot/scanner-charsets.patch |   14 +++++++-------

diffs (55 lines):

diff -r 1a1a1952c309 -r a8b1c8bb75b9 ChangeLog
--- a/ChangeLog	Mon May 17 22:32:12 2010 +0100
+++ b/ChangeLog	Tue May 18 15:12:38 2010 +0100
@@ -1,3 +1,8 @@ 2010-05-17 Andrew John Hughes  <ahughes@
+2010-05-18 Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/boot/scanner-charsets.patch:
+	Patch openjdk-boot not openjdk.
+
 2010-05-17 Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/boot/icedtea-dbcs.patch,
diff -r 1a1a1952c309 -r a8b1c8bb75b9 patches/boot/scanner-charsets.patch
--- a/patches/boot/scanner-charsets.patch	Mon May 17 22:32:12 2010 +0100
+++ b/patches/boot/scanner-charsets.patch	Tue May 18 15:12:38 2010 +0100
@@ -1,6 +1,6 @@ diff -r 5d5ee1c92a1b make/tools/src/buil
 diff -r 5d5ee1c92a1b make/tools/src/build/tools/charsetmapping/EUC_TW.java
---- openjdk.orig/jdk/make/tools/src/build/tools/charsetmapping/EUC_TW.java	Fri May 14 14:06:33 2010 +0100
-+++ openjdk/jdk/make/tools/src/build/tools/charsetmapping/EUC_TW.java	Mon May 17 20:40:10 2010 +0100
+--- openjdk-boot.orig/jdk/make/tools/src/build/tools/charsetmapping/EUC_TW.java	Fri May 14 14:06:33 2010 +0100
++++ openjdk-boot/jdk/make/tools/src/build/tools/charsetmapping/EUC_TW.java	Mon May 17 20:40:10 2010 +0100
 @@ -27,7 +27,6 @@
  
  import java.io.*;
@@ -11,7 +11,7 @@ diff -r 5d5ee1c92a1b make/tools/src/buil
  import java.nio.charset.*;
 diff -r 5d5ee1c92a1b make/tools/src/build/tools/charsetmapping/HKSCS.java
 --- openjdk.orig/jdk/make/tools/src/build/tools/charsetmapping/HKSCS.java	Fri May 14 14:06:33 2010 +0100
-+++ openjdk/jdk/make/tools/src/build/tools/charsetmapping/HKSCS.java	Mon May 17 20:40:10 2010 +0100
++++ openjdk-boot/jdk/make/tools/src/build/tools/charsetmapping/HKSCS.java	Mon May 17 20:40:10 2010 +0100
 @@ -28,7 +28,6 @@
  import java.io.*;
  import java.util.Arrays;
@@ -21,8 +21,8 @@ diff -r 5d5ee1c92a1b make/tools/src/buil
  import java.util.regex.*;
  import java.nio.charset.*;
 diff -r 5d5ee1c92a1b make/tools/src/build/tools/charsetmapping/Main.java
---- openjdk.orig/jdk/make/tools/src/build/tools/charsetmapping/Main.java	Fri May 14 14:06:33 2010 +0100
-+++ openjdk/jdk/make/tools/src/build/tools/charsetmapping/Main.java	Mon May 17 20:40:10 2010 +0100
+--- openjdk-boot.orig/jdk/make/tools/src/build/tools/charsetmapping/Main.java	Fri May 14 14:06:33 2010 +0100
++++ openjdk-boot/jdk/make/tools/src/build/tools/charsetmapping/Main.java	Mon May 17 20:40:10 2010 +0100
 @@ -25,9 +25,6 @@
  
  package build.tools.charsetmapping;
@@ -34,8 +34,8 @@ diff -r 5d5ee1c92a1b make/tools/src/buil
  
      public static void main(String args[]) throws Exception {
 diff -r 5d5ee1c92a1b make/tools/src/build/tools/charsetmapping/Utils.java
---- openjdk.orig/jdk/make/tools/src/build/tools/charsetmapping/Utils.java	Fri May 14 14:06:33 2010 +0100
-+++ openjdk/jdk/make/tools/src/build/tools/charsetmapping/Utils.java	Mon May 17 20:40:10 2010 +0100
+--- openjdk-boot.orig/jdk/make/tools/src/build/tools/charsetmapping/Utils.java	Fri May 14 14:06:33 2010 +0100
++++ openjdk-boot/jdk/make/tools/src/build/tools/charsetmapping/Utils.java	Mon May 17 20:40:10 2010 +0100
 @@ -26,6 +26,7 @@
  package build.tools.charsetmapping;
  



More information about the distro-pkg-dev mailing list