From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 12 Jan 2025 09:39:32 +0000 (+0000)
Subject: Merge version 20.18.1+dfsg-1+rpi1 and 20.18.1+dfsg-2 to produce 20.18.1+dfsg-2+rpi1
X-Git-Tag: archive/raspbian/20.18.1+dfsg-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=433468b4bf4a6d621ce08da5914a6747dbc65951;p=nodejs.git

Merge version 20.18.1+dfsg-1+rpi1 and 20.18.1+dfsg-2 to produce 20.18.1+dfsg-2+rpi1
---

433468b4bf4a6d621ce08da5914a6747dbc65951
diff --cc debian/changelog
index 38d2cb645,36aeee053..bbd24971c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,19 @@@
- nodejs (20.18.1+dfsg-1+rpi1) trixie-staging; urgency=medium
++nodejs (20.18.1+dfsg-2+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 18.10.0+dfsg-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 15 Nov 2022 03:51:54 +0000]
 +  * Set --with-arm-version=6 on raspbian.
 +  * Use armv6k CFLAGS on raspbian.
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 11 Dec 2024 04:51:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 12 Jan 2025 09:39:32 +0000
++
+ nodejs (20.18.1+dfsg-2) unstable; urgency=medium
+ 
+   * Depends node-corepack
+   * Two patches to make some tests pass with openssl 3.4
+     Closes: #1091807.
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Wed, 01 Jan 2025 14:34:52 +0100
  
  nodejs (20.18.1+dfsg-1) unstable; urgency=medium