Mercurial > hg > release > icedtea6-1.10
changeset 2530:f6d1c2b1d869
PR744: Fix jaxws patch broken by latest security update.
2011-07-11 Andrew John Hughes <ahughes@redhat.com>
PR744: Patching error
* NEWS: Updated.
* patches/ecj/icedtea-jaxws-getdtdtype.patch:
Update patch to apply after security patch.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Tue, 19 Jul 2011 22:13:38 +0100 |
| parents | 6c21fc007867 |
| children | 7ba3ed55131e |
| files | ChangeLog NEWS patches/ecj/jaxws-getdtdtype.patch |
| diffstat | 3 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jun 29 18:16:57 2011 +0100 +++ b/ChangeLog Tue Jul 19 22:13:38 2011 +0100 @@ -1,3 +1,10 @@ +2011-07-11 Andrew John Hughes <ahughes@redhat.com> + + PR744: Patching error + * NEWS: Updated. + * patches/ecj/icedtea-jaxws-getdtdtype.patch: + Update patch to apply after security patch. + 2011-06-29 Andrew John Hughes <ahughes@redhat.com> * acinclude.m4:
--- a/NEWS Wed Jun 29 18:16:57 2011 +0100 +++ b/NEWS Tue Jul 19 22:13:38 2011 +0100 @@ -13,6 +13,7 @@ * Bug fixes - PR748: Icedtea6 fails to build with Linux 3.0. + - PR744: icedtea6-1.10.2 : patching error * Backports: - S7037283, RH712211: Null Pointer Exception in SwingUtilities2. - S6769607, PR677: Modal frame hangs for a while.
--- a/patches/ecj/jaxws-getdtdtype.patch Wed Jun 29 18:16:57 2011 +0100 +++ b/patches/ecj/jaxws-getdtdtype.patch Tue Jul 19 22:13:38 2011 +0100 @@ -5,8 +5,8 @@ patches.dir=patches # Patches to apply --jaxws_src.patch.list=xjc.patch -+jaxws_src.patch.list=xjc.patch getdtdtype.patch +-jaxws_src.patch.list=7013971.patch xjc.patch ++jaxws_src.patch.list=7013971.patch xjc.patch getdtdtype.patch # Sanity information sanity.info= Sanity Settings:${line.separator}\