From: Raspbian automatic forward porter Date: Sat, 17 Aug 2024 07:33:07 +0000 (+0100) Subject: Merge version 17.0.11+9-1~deb12u1+rpi1 and 17.0.12+7-2~deb12u1 to produce 17.0.12... X-Git-Tag: archive/raspbian/17.0.12+7-2_deb12u1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f7ad0cc5e90baf4589ce7cad18d3d8b0cea71ac4;p=openjdk-17.git Merge version 17.0.11+9-1~deb12u1+rpi1 and 17.0.12+7-2~deb12u1 to produce 17.0.12+7-2~deb12u1+rpi1 --- f7ad0cc5e90baf4589ce7cad18d3d8b0cea71ac4 diff --cc debian/changelog index f5b0be390,946d9c5ea..8fd517b4b --- a/debian/changelog +++ b/debian/changelog @@@ -1,13 -1,4 +1,13 @@@ - openjdk-17 (17.0.11+9-1~deb12u1+rpi1) bookworm-staging; urgency=medium ++openjdk-17 (17.0.12+7-2~deb12u1+rpi1) bookworm-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 Mon, 27 May 2024 19:46:39 +0000 ++ -- Raspbian forward porter Sat, 17 Aug 2024 07:33:06 +0000 + - openjdk-17 (17.0.11+9-1~deb12u1) bookworm-security; urgency=medium + openjdk-17 (17.0.12+7-2~deb12u1) bookworm-security; urgency=medium * Rebuild for bookworm diff --cc debian/patches/series index f86630df1,033563235..d1bb92228 --- a/debian/patches/series +++ b/debian/patches/series @@@ -38,5 -38,10 +38,11 @@@ ldap-timeout-test-use-ip.patc test-use-ip-address.patch loong64-autoconf-config.diff googletest-version.diff - 8307977-proposed.diff + jdk-8307977-proposed.patch + jdk-8295111.patch + jdk-8334502-proposed.patch + jdk-8334895-proposed.patch + jdk-8325567.patch + jdk-8336529-proposed.patch + jdk-8312488.patch +client_default.diff