Merge version 17.0.9+9-2+rpi1 and 17.0.10~6ea-1 to produce 17.0.10~6ea-1+rpi1 archive/raspbian/17.0.10_6ea-1+rpi1 raspbian/17.0.10_6ea-1+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Sun, 7 Jan 2024 07:25:15 +0000 (07:25 +0000)
committerRaspbian automatic forward porter <root@raspbian.org>
Sun, 7 Jan 2024 07:25:15 +0000 (07:25 +0000)
1  2 
debian/changelog
debian/patches/series
debian/rules

index dd8e4ef81078614760e72aa9f80c321e39ab4b76,04d8b2bf98b2582f1975846ae99f6d0d64d81849..3eaff9c19e35680d1cc176aa9fa35bbbe163b9e6
@@@ -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 <root@raspbian.org>  Sat, 11 Nov 2023 07:09:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  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 <doko@ubuntu.com>  Tue, 26 Dec 2023 13:18:48 +0100
  
  openjdk-17 (17.0.9+9-2) unstable; urgency=medium
  
index 9b6cd98c92bb550964cbc96d6d43b9c8ade94f3e,740114ac0025961760701a7e84a13453f8fba0f6..ecaab525e3efd92f8ba1d1f288ad5c035a31e4a5
@@@ -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
diff --cc debian/rules
Simple merge