From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 17 Sep 2024 08:54:04 +0000 (+0100)
Subject: Merge version 17.0.12+7-2+rpi1 and 17.0.13~6ea-1 to produce 17.0.13~6ea-1+rpi1
X-Git-Tag: archive/raspbian/17.0.13_6ea-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e0618e80e0a39219130d83d47ff307e392b26428;p=openjdk-17.git

Merge version 17.0.12+7-2+rpi1 and 17.0.13~6ea-1 to produce 17.0.13~6ea-1+rpi1
---

e0618e80e0a39219130d83d47ff307e392b26428
diff --cc debian/changelog
index fe152f5e0,2bfe3e5ca..033a6d576
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,19 +1,28 @@@
- openjdk-17 (17.0.12+7-2+rpi1) trixie-staging; urgency=medium
++openjdk-17 (17.0.13~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 <root@raspbian.org>  Mon, 19 Aug 2024 07:20:24 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 17 Sep 2024 08:54:03 +0000
++
+ openjdk-17 (17.0.13~6ea-1) unstable; urgency=medium
+ 
+   * OpenJDK 17.0.13 early access, build 6.
+ 
+   [ Vladimir Petko ]
+   * d/copyright-generator/strip-common-licenses.sh: Add GPLv3 to the
+     list of common licenses.
+   * d/JB-*.override.in: Update lintian overrides.
+   * d/s/lintian-override: Add source-contains-prebuilt-javascript-object
+     due to LP: 2032992.
+   * d/p/jdk-8334895-proposed.patch: Fix typo in the patch description.
+   * d/t/problemlist.csv: Update problemlist.csv for July release
+   * d/t/jtreg-autopkgtest.{in,sh}: Increase jtreg test timeouts.
+   * Enable dtrace support.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Mon, 09 Sep 2024 15:48:20 +0200
  
  openjdk-17 (17.0.12+7-2) unstable; urgency=medium
  
diff --cc debian/patches/series
index d1bb92228,71da604b1..420f1637e
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -37,12 -36,8 +36,9 @@@ update-permission-test.patc
  ldap-timeout-test-use-ip.patch
  test-use-ip-address.patch
  loong64-autoconf-config.diff
- googletest-version.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