Mercurial > hg > release > icedtea6-1.9
changeset 2345:11e7784eb228
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:04:04 +0100 |
| parents | 1c554e7ce79e |
| children | b80005297ae5 |
| files | ChangeLog NEWS patches/ecj/icedtea-jaxws-getdtdtype.patch |
| diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jul 09 16:58:17 2011 +0200 +++ b/ChangeLog Tue Jul 19 22:04:04 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-07-09 Xerxes Rånby <xerxes@zafena.se> Mark Wielaard <mark@klomp.org>
--- a/NEWS Sat Jul 09 16:58:17 2011 +0200 +++ b/NEWS Tue Jul 19 22:04:04 2011 +0100 @@ -10,6 +10,8 @@ New in release 1.9.9 (20XX-XX-XX): +* Bug Fixes + - PR744: icedtea6-1.10.2 : patching error * Shark - PR632: patches/security/20110215/6878713.patch breaks shark zero build
--- a/patches/ecj/icedtea-jaxws-getdtdtype.patch Sat Jul 09 16:58:17 2011 +0200 +++ b/patches/ecj/icedtea-jaxws-getdtdtype.patch Tue Jul 19 22:04:04 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}\