/hg/release/icedtea6-1.11: PR865: Patching fails with patches/ec...

[omajid at icedtea.classpath.org]

changeset 9ecd3246e68e in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=9ecd3246e68e
author: Omair Majid <omajid at redhat.com>
date: Thu Feb 02 11:15:09 2012 -0500

	PR865: Patching fails with patches/ecj/jaxws-getdtdtype.patch

	Changeset 380a9db76b36 removed the security patch from the list of
	patches to apply but did not update this patch.

	2012-02-02 Omair Majid <omajid at redhat.com>

	 PR865: Patching fails with patches/ecj/jaxws-getdtdtype.patch
	    * NEWS: Update with fix.
	    * patches/ecj/jaxws-getdtdtype.patch: Update to apply correctly


diffstat:

 ChangeLog                          |  6 ++++++
 NEWS                               |  3 +++
 patches/ecj/jaxws-getdtdtype.patch |  4 ++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diffs (40 lines):

diff -r a5c946d5f4bc -r 9ecd3246e68e ChangeLog
--- a/ChangeLog	Tue Jan 31 12:36:36 2012 +0000
+++ b/ChangeLog	Thu Feb 02 11:15:09 2012 -0500
@@ -1,3 +1,9 @@
+2012-02-02  Omair Majid  <omajid at redhat.com>
+
+	PR865: Patching fails with	patches/ecj/jaxws-getdtdtype.patch
+	* patches/ecj/jaxws-getdtdtype.patch: Update to apply correctly.
+	* NEWS: Update with fix.
+
 2012-01-31  Andrew Haley  <aph at redhat.com>
 
 	* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
diff -r a5c946d5f4bc -r 9ecd3246e68e NEWS
--- a/NEWS	Tue Jan 31 12:36:36 2012 +0000
+++ b/NEWS	Thu Feb 02 11:15:09 2012 -0500
@@ -12,6 +12,9 @@
 
 New in release 1.11.1 (2012-XX-XX):
 
+* Bug fixes
+  - PR865: Patching fails with patches/ecj/jaxws-getdtdtype.patch
+
 New in release 1.11 (2012-01-30):
 
 * Use HotSpot 20 as the default virtual machine.
diff -r a5c946d5f4bc -r 9ecd3246e68e patches/ecj/jaxws-getdtdtype.patch
--- a/patches/ecj/jaxws-getdtdtype.patch	Tue Jan 31 12:36:36 2012 +0000
+++ b/patches/ecj/jaxws-getdtdtype.patch	Thu Feb 02 11:15:09 2012 -0500
@@ -5,8 +5,8 @@
  patches.dir=patches
  
  # Patches to apply
--jaxws_src.patch.list=7013971.patch xjc.patch
-+jaxws_src.patch.list=7013971.patch xjc.patch getdtdtype.patch
+-jaxws_src.patch.list=xjc.patch
++jaxws_src.patch.list=xjc.patch getdtdtype.patch
  
  # Sanity information
  sanity.info= Sanity Settings:${line.separator}\