Mercurial > hg > release > icedtea6-1.13
changeset 3157:a359fcb9891d
Merge
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Tue, 15 Jul 2014 17:54:05 +0100 |
| parents | 21a1b0e6077e (current diff) 0d6fd5bae539 (diff) |
| children | 98dcce0066c5 |
| files | ChangeLog NEWS |
| diffstat | 4 files changed, 22 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Jul 15 17:40:35 2014 +0100 +++ b/.hgtags Tue Jul 15 17:54:05 2014 +0100 @@ -26,3 +26,4 @@ eb77bc7992a9c321470c8426c901abd75ed8f567 icedtea6-1.13.1 84eda38cea6394a1973c62aed9e26086690db5c7 icedtea6-1.13.2 d616ea6189f4d38427d0035eea31eb592ff90ebd icedtea6-1.13.3 +41b9b1df898c29f45b09aff3fdd8dad164a9bf7a icedtea6-1.13.4
--- a/ChangeLog Tue Jul 15 17:40:35 2014 +0100 +++ b/ChangeLog Tue Jul 15 17:54:05 2014 +0100 @@ -1,10 +1,12 @@ -2014-05-28 Andrew John Hughes <gnu.andrew@redhat.com> - - * Makefile.am: - (ICEDTEA_PATCHES): Add new patches. - * NEWS: Updated. - * patches/openjdk/7183251-netbeans_renders_text_wrong.patch: - Backport text layout fixes. +2014-07-15 Omair Majid <omajid@redhat.com> + + * NEWS: Add a section for 1.13.5 + * configure.ac: Bump to 1.13.5pre. + +2014-07-15 Omair Majid <omajid@redhat.com> + + * NEWS: Set unembargo date. + * configure.ac: Bump to 1.13.4. 2014-07-14 Omair Majid <omajid@redhat.com> @@ -28,6 +30,14 @@ * patches/openjdk/6650759-missing_inference.patch: Remove upstreamed patch. +2014-05-28 Andrew John Hughes <gnu.andrew@redhat.com> + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patches. + * NEWS: Updated. + * patches/openjdk/7183251-netbeans_renders_text_wrong.patch: + Backport text layout fixes. + 2014-05-22 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am:
--- a/NEWS Tue Jul 15 17:40:35 2014 +0100 +++ b/NEWS Tue Jul 15 17:54:05 2014 +0100 @@ -12,7 +12,9 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 1.13.4 (2014-07-XX): +New in release 1.13.5 (2014-XX-YY): + +New in release 1.13.4 (2014-07-15): * Security fixes - S8029755: Enhance subject class
--- a/configure.ac Tue Jul 15 17:40:35 2014 +0100 +++ b/configure.ac Tue Jul 15 17:54:05 2014 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.13.4pre],[distro-pkg-dev@openjdk.java.net]) +AC_INIT([icedtea6],[1.13.5pre],[distro-pkg-dev@openjdk.java.net]) AC_CANONICAL_HOST AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.9 tar-pax foreign])