Mercurial > hg > icedtea14
changeset 2684:853c543f0a22
Merge with IcedTea 8.0.0
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Wed, 18 Mar 2020 04:26:41 +0000 |
| parents | 8c8a4be37087 (diff) eb7ebc35656b (current diff) |
| children | 2663d0ce795a |
| files | ChangeLog Makefile.am NEWS configure.ac patches/disable-intree-ec.patch patches/nss-config-with-sunec.patch patches/nss-config.patch patches/nss-not-enabled-config-with-sunec.patch patches/nss-not-enabled-config.patch patches/pr2126.patch patches/rh1022017.patch |
| diffstat | 4 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Oct 24 03:30:04 2019 +0100 +++ b/ChangeLog Wed Mar 18 04:26:41 2020 +0000 @@ -56,6 +56,14 @@ * remove-intree-libraries.sh.in: Drop conditional removal of SunEC code. +2019-10-01 Andrew John Hughes <gnu_andrew@member.fsf.org> + + Start next major release cycle (9.0.0/OpenJDK 14) + * Makefile.am: + (ICEDTEA_MAJOR): Bump to icedtea14. + * NEWS: Add section for 9.0.0. + * configure.ac: Bump to 9.0.0pre00. + 2018-02-15 Andrew John Hughes <gnu_andrew@member.fsf.org> * patches/pr2126.patch,
--- a/Makefile.am Thu Oct 24 03:30:04 2019 +0100 +++ b/Makefile.am Wed Mar 18 04:26:41 2020 +0000 @@ -41,7 +41,7 @@ JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz -ICEDTEA_MAJOR = icedtea13 +ICEDTEA_MAJOR = icedtea14 ICEDTEA_PREFIX = $(ICEDTEA_MAJOR)-forest ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX) ICEDTEA_URL = $(DROP_URL)/$(ICEDTEA_MAJOR)/$(ICEDTEA_RELEASE)
--- a/NEWS Thu Oct 24 03:30:04 2019 +0100 +++ b/NEWS Wed Mar 18 04:26:41 2020 +0000 @@ -10,6 +10,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 9.0.0 (2019-XX-XX): + New in release 8.0.0 (2019-XX-XX): New in release 7.0.0 (2019-XX-XX):
--- a/configure.ac Thu Oct 24 03:30:04 2019 +0100 +++ b/configure.ac Wed Mar 18 04:26:41 2020 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [8.0.0pre00], [distro-pkg-dev@openjdk.java.net]) +AC_INIT([icedtea], [9.0.0pre00], [distro-pkg-dev@openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AM_MAINTAINER_MODE([enable]) AC_CONFIG_FILES([Makefile])