/hg/icedtea6: PR865 - Patching fails with patches/ecj/jaxws-getd...

[omajid at icedtea.classpath.org]

changeset 1b4551008907 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1b4551008907
author: Omair Majid <omajid at redhat.com>
date: Thu Feb 02 11:08:59 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                               |  8 +++++---
 patches/ecj/jaxws-getdtdtype.patch |  4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r b442e48932cf -r 1b4551008907 ChangeLog
--- a/ChangeLog	Wed Feb 01 15:15:10 2012 +0000
+++ b/ChangeLog	Thu Feb 02 11:08:59 2012 -0500
@@ -1,3 +1,9 @@
+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.
+
 2012-02-01  Andrew John Hughes  <ahughes at redhat.com>
 
 	* NEWS: Sync with 1.11 branch.
diff -r b442e48932cf -r 1b4551008907 NEWS
--- a/NEWS	Wed Feb 01 15:15:10 2012 +0000
+++ b/NEWS	Thu Feb 02 11:08:59 2012 -0500
@@ -12,10 +12,12 @@
 
 New in release 1.12 (2012-XX-XX):
 
+* Bug fixes
+  - PR865: Patching fails with patches/ecj/jaxws-getdtdtype.patch
 * Backports
-  - 6706974: Add krb5 test infrastructure
-  - 6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe
-  - 6761072: new krb5 tests fail on multiple platforms
+  - S6706974: Add krb5 test infrastructure
+  - S6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe
+  - S6761072: new krb5 tests fail on multiple platforms
 
 New in release 1.11 (2012-01-30):
 
diff -r b442e48932cf -r 1b4551008907 patches/ecj/jaxws-getdtdtype.patch
--- a/patches/ecj/jaxws-getdtdtype.patch	Wed Feb 01 15:15:10 2012 +0000
+++ b/patches/ecj/jaxws-getdtdtype.patch	Thu Feb 02 11:08:59 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}\