From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 25 Jun 2024 04:40:55 +0000 (+0100)
Subject: Merge version 20.14.0+dfsg-1+rpi1 and 20.14.0+dfsg-3 to produce 20.14.0+dfsg-3+rpi1
X-Git-Tag: archive/raspbian/20.14.0+dfsg-3+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2d426e8441e7e5036a97a9deb96b5975027934d3;p=nodejs.git

Merge version 20.14.0+dfsg-1+rpi1 and 20.14.0+dfsg-3 to produce 20.14.0+dfsg-3+rpi1
---

2d426e8441e7e5036a97a9deb96b5975027934d3
diff --cc debian/changelog
index 9fec311e3,cf1556a0b..f56d3e4f1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,15 +1,24 @@@
- nodejs (20.14.0+dfsg-1+rpi1) trixie-staging; urgency=medium
++nodejs (20.14.0+dfsg-3+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 13 Jun 2024 00:30:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 25 Jun 2024 04:40:55 +0000
++
+ nodejs (20.14.0+dfsg-3) unstable; urgency=medium
+ 
+   * test-cpu-prof-dir-absolute is flaky
+   * Fix: skip failing test in the right suite
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Wed, 19 Jun 2024 12:03:27 +0200
+ 
+ nodejs (20.14.0+dfsg-2) unstable; urgency=medium
+ 
+   * Patch: fix tests for openssl 3.2.2. Closes: #1073013
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Wed, 12 Jun 2024 11:41:24 +0200
  
  nodejs (20.14.0+dfsg-1) unstable; urgency=medium