Manual merge of version 18.19.0+dfsg-6+rpi1 and 20.14.0+dfsg-1 to produce 20.14.0...

diff --cc debian/changelog
index 65aaab967a6b8bba186772dcf19698dcebdaacff,9aa564e8eaca7a2070896287afeb8d195832d8d6..9fec311e3b3b874da350becdd238dd1d52065ae1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,85 +1,94 @@@
- nodejs (18.19.0+dfsg-6+rpi1) trixie-staging; urgency=medium
++nodejs (20.14.0+dfsg-1+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>  Tue, 19 Dec 2023 12:56:10 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 13 Jun 2024 00:30:45 +0000
++
+ nodejs (20.14.0+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream version 20.14.0+dfsg
+ 
+   [ Gianfranco Costamagna ]
+   * Drop double newline in changelog
+ 
+   [ Zixing Liu ]
+   * Use proper method to specify Node.js path when running tests
+   * test_ci.patch: revert Makefile changes to use upstream selection logic
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Mon, 03 Jun 2024 13:36:41 +0200
+ 
+ nodejs (20.13.1+dfsg-2) unstable; urgency=medium
+ 
+   * Flaky sequential/test-worker-heapsnapshot-options.
+     Closes: #1071382
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Sat, 18 May 2024 14:26:22 +0200
+ 
+ nodejs (20.13.1+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream version 20.13.1+dfsg
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Wed, 15 May 2024 13:52:04 +0200
+ 
+ nodejs (20.13.0+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream version 20.13.0+dfsg
+   * test-fs-utimes* fail because of libuv1 bug
+   * mark some more tests as flaky
+   * watch: ada 2.7.8
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Wed, 08 May 2024 19:48:54 +0200
+ 
+ nodejs (20.12.2+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream version 20.12.2+dfsg
+   * copyright:
+     + exclude tools/gyp
+     + simplifications
+     + fix license ~holders
+   * patch: add link to upstream bug
+   * Suggests node-corepack
+   * Include permission headers
+   * Override lintian warning about brotli test
+   * Deps:
+     + pkg-config becomes pkgconf
+     + python3-packaging
+     + gyp >= 0.16
+   * Breaks/Replace libnode108, libnode109
+   * Drop python3-distutils from deps/test deps. Closes: #1065909
+   * Let some riscv64, mips64el tests fail.
+   * openssl 3.2 compatibility patch
+   * mark setuid tests as failing, because this nodejs version
+     does not support setuid with shared libuv. See: CVE-2024-22017
+   * multilib patch: process.config not in shadow realm
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Tue, 23 Apr 2024 11:53:20 +0200
+ 
+ nodejs (20.10.0+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream version 20.10.0+dfsg
+   * Drop kfreebsd-*, mips(el) architectures
+   * new architecture: loong64, thanks to Shi Pujin  
+   * patch:
+     + remove mips-related, refresh
+     + let loong64 have some failing tests
+     + more doc for localhost-no-addrconfig
+     + disable zlib embedding in v8
+   * fix boostrapping of nodejs package:
+     + update README.source
+     + nodoc: disable bash completion output
+     + patch: disable shared builtins when flag
+       node-builtin-modules-path is used
+   * copyright:
+     + deps/v8/third_party/glibc/ with some LGPL-2.1+ code
+     + exclude tools/github_reporter/index.js
+     + disappeared file patterns
+     + deps/v8/third_party/ittapi/include/fortran/
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Sat, 16 Dec 2023 13:56:50 +0100
  
  nodejs (18.19.0+dfsg-6) unstable; urgency=medium
  

diff --cc debian/rules
index ff404f8ee8ce6b82a998c72960e9a67ec2c8b8fb,fb9084bcfb24a55cd74fe465a0c1a58bdf0747c4..138cf9bd17e36d21236ef1a7908f202c37ce6dcf
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -252,11 -223,9 +225,9 @@@ override_dh_auto_test-indep
        # skip tests
  
  override_dh_auto_test-arch:
 -ifeq ($(filter nocheck,$(DEB_BUILD_PROFILES)),)
 +ifeq ($(filter nocheck,$(DEB_BUILD_PROFILES)),testsuitedisabled)
-       -ln -s /usr/bin/node node
        mkdir -p $(NODE_TEST_DIR)
        $(MAKE) $(DEB_MAKE_CHECK_TARGET)
-       rm -f node
        rm -rf $(NODE_TEST_DIR)
  endif