From: Raspbian automatic forward porter Date: Sun, 7 Jan 2024 07:25:15 +0000 (+0000) Subject: Merge version 17.0.9+9-2+rpi1 and 17.0.10~6ea-1 to produce 17.0.10~6ea-1+rpi1 X-Git-Tag: archive/raspbian/17.0.10_6ea-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=02a5c6d18b697301aa756f13283d23b3ad0e9067;p=openjdk-17.git Merge version 17.0.9+9-2+rpi1 and 17.0.10~6ea-1 to produce 17.0.10~6ea-1+rpi1 --- 02a5c6d18b697301aa756f13283d23b3ad0e9067 diff --cc debian/changelog index dd8e4ef81,04d8b2bf9..3eaff9c19 --- a/debian/changelog +++ b/debian/changelog @@@ -1,11 -1,20 +1,29 @@@ - openjdk-17 (17.0.9+9-2+rpi1) trixie-staging; urgency=medium ++openjdk-17 (17.0.10~6ea-1+rpi1) trixie-staging; urgency=medium + + [changes taken from 17.0.4+8-1~deb11u1+rpt1 by Serge Schneider] + * Build with client jvm variant + - https://github.com/raspberrypi/linux/issues/3306#issuecomment-1030781000 + * Default to client jvm on armhf + - -- Raspbian forward porter Sat, 11 Nov 2023 07:09:26 +0000 ++ -- Raspbian forward porter Sun, 07 Jan 2024 07:25:14 +0000 ++ + openjdk-17 (17.0.10~6ea-1) unstable; urgency=medium + + * OpenJDK 17.0.10 early access, build 6. + + [ Pushkar Kulkarni ] + * debian/copyright: Fix whitespace issues. + + [ Vladimir Petko ] + * d/copyright: Fix lintian warning. + + [ Matthias Klose ] + * d/copyright: Fix source location. + * Build-depend on jtreg7 instead of jtreg6. + * d/p/googletest-version.diff: Ignore the version check, keep 1.14. + * Refresh patches. + + -- Matthias Klose Tue, 26 Dec 2023 13:18:48 +0100 openjdk-17 (17.0.9+9-2) unstable; urgency=medium diff --cc debian/patches/series index 9b6cd98c9,740114ac0..ecaab525e --- a/debian/patches/series +++ b/debian/patches/series @@@ -37,5 -37,4 +37,5 @@@ update-permission-test.patc ldap-timeout-test-use-ip.patch test-use-ip-address.patch loong64-autoconf-config.diff - 8315020.diff + googletest-version.diff +client_default.diff